From 297cd22075ee5c13824aeb422c6b8c32ea527049 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 10 Jul 2022 13:03:05 +0000 Subject: [PATCH 1/6] cxxtools: update to 3.0 --- .../addons/addon-depends/cxxtools/package.mk | 4 +-- ...ols-char-when-moving-or-copying-data.patch | 31 ------------------- ...ols-2.2.1-superflous-copy-constuctor.patch | 23 -------------- .../patches/cxxtools-crosscompile.patch | 6 ++-- 4 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-explicit-cast-in-cxxtools-char-when-moving-or-copying-data.patch delete mode 100644 packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-superflous-copy-constuctor.patch diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk index 7fe56f9ebc..0cabf6c174 100644 --- a/packages/addons/addon-depends/cxxtools/package.mk +++ b/packages/addons/addon-depends/cxxtools/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cxxtools" -PKG_VERSION="2.2.1" -PKG_SHA256="8cebb6d6cda7c93cc4f7c0d552a68d50dd5530b699cf87916bb3b708fdc4e342" +PKG_VERSION="3.0" +PKG_SHA256="07b18037fb0983f6292f5c8d53e2369e9e7a9711df2c9ad50838aacbc8c62f7c" PKG_LICENSE="GPL-2" PKG_SITE="http://www.tntnet.org/cxxtools.html" PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-explicit-cast-in-cxxtools-char-when-moving-or-copying-data.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-explicit-cast-in-cxxtools-char-when-moving-or-copying-data.patch deleted file mode 100644 index 638c32cd3e..0000000000 --- a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-make-explicit-cast-in-cxxtools-char-when-moving-or-copying-data.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 607073936f5ce1b1c348d432c19234863a072cc7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= -Date: Sat, 2 Jun 2018 15:23:14 +0200 -Subject: [PATCH] Make explicit cast in cxxtools::Char when moving or copying - data This removes a warning message from the compiler. - ---- - include/cxxtools/char.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h -index 00b91fd3..4ad72883 100644 ---- a/include/cxxtools/char.h -+++ b/include/cxxtools/char.h -@@ -324,14 +324,14 @@ namespace std { - inline char_traits::char_type* - char_traits::move(char_type* s1, const char_type* s2, int_type n) - { -- return (cxxtools::Char*)std::memmove(s1, s2, n * sizeof(cxxtools::Char)); -+ return static_cast(std::memmove(static_cast(s1), static_cast(s2), n * sizeof(cxxtools::Char))); - } - - - inline char_traits::char_type* - char_traits::copy(char_type* s1, const char_type* s2, size_t n) - { -- return (cxxtools::Char*)std::memcpy(s1, s2, n * sizeof(cxxtools::Char)); -+ return static_cast(std::memcpy(static_cast(s1), static_cast(s2), n * sizeof(cxxtools::Char))); - } - - diff --git a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-superflous-copy-constuctor.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-superflous-copy-constuctor.patch deleted file mode 100644 index e8116fd90b..0000000000 --- a/packages/addons/addon-depends/cxxtools/patches/cxxtools-2.2.1-superflous-copy-constuctor.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tommi=20M=C3=A4kitalo?= -Date: Fri, 31 Jan 2021 17:20:24 +0100 -Subject: [PATCH] superflous copy constuctor - ---- - include/cxxtools/char.h | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/include/cxxtools/char.h b/include/cxxtools/char.h -index 1e637317..3a4ed62a 100644 ---- a/include/cxxtools/char.h -+++ b/include/cxxtools/char.h -@@ -114,9 +112,6 @@ - return Char(0); - } - -- Char& operator=(const Char& ch) -- { _value = ch._value; return *this; } -- - /** - * @brief Returns the internal value (unsigned 32 bits) of this character. - * @return The 32-bit-value of this character. diff --git a/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch b/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch index ff3446c12f..85fedbdf02 100644 --- a/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch +++ b/packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch @@ -12,9 +12,9 @@ diff -Naur cxxtools-2.2/configure cxxtools-2.2.patch/configure -diff -Naur cxxtools-2.2/configure.in cxxtools-2.2.patch/configure.in ---- cxxtools-2.2/configure.in 2013-04-20 23:31:50.000000000 +0200 -+++ cxxtools-2.2.patch/configure.in 2014-01-03 20:26:32.064005192 +0100 +diff -Naur cxxtools-2.2/configure.ac cxxtools-2.2.patch/configure.ac +--- cxxtools-2.2/configure.ac 2013-04-20 23:31:50.000000000 +0200 ++++ cxxtools-2.2.patch/configure.ac 2014-01-03 20:26:32.064005192 +0100 @@ -106,8 +106,8 @@ AC_PROG_LIBTOOL From 9fa2b16d1220a8b3202dfc378093c8dd32b3bd05 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 10 Jul 2022 13:03:35 +0000 Subject: [PATCH 2/6] tntnet: update to 3.0 --- .../addons/addon-depends/tntnet/package.mk | 9 +- .../tntnet/patches/tntnet-2.2-fix_gcc47.patch | 18 - .../patches/tntnet-pkgconfig-support.patch | 517 ------------------ 3 files changed, 2 insertions(+), 542 deletions(-) delete mode 100644 packages/addons/addon-depends/tntnet/patches/tntnet-2.2-fix_gcc47.patch delete mode 100644 packages/addons/addon-depends/tntnet/patches/tntnet-pkgconfig-support.patch diff --git a/packages/addons/addon-depends/tntnet/package.mk b/packages/addons/addon-depends/tntnet/package.mk index 6dea9d3e7d..5b94fceb0a 100644 --- a/packages/addons/addon-depends/tntnet/package.mk +++ b/packages/addons/addon-depends/tntnet/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tntnet" -PKG_VERSION="2.2.1" -PKG_SHA256="c83170d08ef04c5868051e1c28c74b9562fe71e9e8263828e755ad5bd3547521" +PKG_VERSION="3.0" +PKG_SHA256="718e5519b0a403f7f766358bf66a85c008119c48189d1c2b7651fd0af9018e27" PKG_LICENSE="GPL-2" PKG_SITE="http://www.tntnet.org/" PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz" @@ -34,11 +34,6 @@ post_configure_target() { } post_makeinstall_target() { - rm -rf ${INSTALL}/usr/bin/${PKG_NAME}-config - cp ${PKG_NAME}-config ${TOOLCHAIN}/bin - sed -e "s:\(['= ]\)/usr:\\1${PKG_ORIG_SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/${PKG_NAME}-config - chmod +x ${TOOLCHAIN}/bin/${PKG_NAME}-config - rm -rf ${INSTALL}/usr/bin rm -rf ${INSTALL}/usr/share } diff --git a/packages/addons/addon-depends/tntnet/patches/tntnet-2.2-fix_gcc47.patch b/packages/addons/addon-depends/tntnet/patches/tntnet-2.2-fix_gcc47.patch deleted file mode 100644 index a21d34f9b7..0000000000 --- a/packages/addons/addon-depends/tntnet/patches/tntnet-2.2-fix_gcc47.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Include unistd.h to fix FTBFS with gcc-4.7 - tntnet (2.1-1ubuntu1) quantal; urgency=low - . - * Add missing header to fix FTBFS with gcc4.7 on non-amd64 archs -Author: Micah Gersten - -Index: tntnet-2.2/framework/defcomp/static.cpp -=================================================================== ---- tntnet-2.2.orig/framework/defcomp/static.cpp 2013-04-21 22:13:57.000000000 +0300 -+++ tntnet-2.2/framework/defcomp/static.cpp 2013-05-19 23:12:17.000000000 +0300 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/packages/addons/addon-depends/tntnet/patches/tntnet-pkgconfig-support.patch b/packages/addons/addon-depends/tntnet/patches/tntnet-pkgconfig-support.patch deleted file mode 100644 index 8a6b3963c3..0000000000 --- a/packages/addons/addon-depends/tntnet/patches/tntnet-pkgconfig-support.patch +++ /dev/null @@ -1,517 +0,0 @@ -diff -Naur tntnet-2.2.1/configure tntnet-2.2.1.patch/configure ---- tntnet-2.2.1/configure 2014-01-17 20:11:49.000000000 +0100 -+++ tntnet-2.2.1.patch/configure 2016-01-07 06:34:42.002634975 +0100 -@@ -16495,7 +16546,7 @@ - ac_config_files="$ac_config_files tntnet-config" - - --ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile" -+ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile pkgconfig/tntnet.pc pkgconfig/tntnet_sdk.pc sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile" - - - cat >confcache <<\_ACEOF -@@ -17642,6 +17693,8 @@ - "framework/common/Makefile") CONFIG_FILES="$CONFIG_FILES framework/common/Makefile" ;; - "framework/runtime/Makefile") CONFIG_FILES="$CONFIG_FILES framework/runtime/Makefile" ;; - "framework/defcomp/Makefile") CONFIG_FILES="$CONFIG_FILES framework/defcomp/Makefile" ;; -+ "pkgconfig/tntnet.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet.pc" ;; -+ "pkgconfig/tntnet_sdk.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet_sdk.pc" ;; - "sdk/tools/common/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/common/Makefile" ;; - "sdk/tools/ecppc/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppc/Makefile" ;; - "sdk/tools/ecppl/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppl/Makefile" ;; -diff -Naur tntnet-2.2.1/configure.in tntnet-2.2.1.patch/configure.in ---- tntnet-2.2.1/configure.in 2014-01-17 20:11:40.000000000 +0100 -+++ tntnet-2.2.1.patch/configure.in 2016-01-07 06:08:14.679087771 +0100 -@@ -218,6 +218,8 @@ - framework/common/Makefile - framework/runtime/Makefile - framework/defcomp/Makefile -+ pkgconfig/tntnet.pc -+ pkgconfig/tntnet_sdk.pc - sdk/tools/common/Makefile - sdk/tools/ecppc/Makefile - sdk/tools/ecppl/Makefile -diff -Naur tntnet-2.2.1/Makefile.am tntnet-2.2.1.patch/Makefile.am ---- tntnet-2.2.1/Makefile.am 2014-01-17 20:12:20.000000000 +0100 -+++ tntnet-2.2.1.patch/Makefile.am 2016-01-07 06:07:03.793973412 +0100 -@@ -80,3 +80,9 @@ - Releasenotes-2.2.markdown \ - Releasenotes-2.2.1.markdown \ - $(pkgdata_SCRIPTS) -+ -+pkgconfigdir = $(libdir)/pkgconfig/ -+ -+pkgconfig_DATA = \ -+ pkgconfig/tntnet.pc \ -+ pkgconfig/tntnet_sdk.pc -diff -Naur tntnet-2.2.1/Makefile.in tntnet-2.2.1.patch/Makefile.in ---- tntnet-2.2.1/Makefile.in 2014-01-17 20:12:26.000000000 +0100 -+++ tntnet-2.2.1.patch/Makefile.in 2016-01-07 06:33:05.045478363 +0100 -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.12.2 from Makefile.am. -+# Makefile.in generated by automake 1.13.4 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2012 Free Software Foundation, Inc. -+# Copyright (C) 1994-2013 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -14,24 +14,53 @@ - - @SET_MAKE@ - -+ - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__make_running_with_option = \ -+ case $${target_option-} in \ -+ ?) ;; \ -+ *) echo "am__make_running_with_option: internal error: invalid" \ -+ "target option '$${target_option-}' specified" >&2; \ -+ exit 1;; \ -+ esac; \ -+ has_opt=no; \ -+ sane_makeflags=$$MAKEFLAGS; \ -+ if $(am__is_gnu_make); then \ -+ sane_makeflags=$$MFLAGS; \ -+ else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -+ bs=\\; \ -+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ -+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ -- test $$am__dry = yes; \ -- } -+ fi; \ -+ skip_next=no; \ -+ strip_trailopt () \ -+ { \ -+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ -+ }; \ -+ for flg in $$sane_makeflags; do \ -+ test $$skip_next = yes && { skip_next=no; continue; }; \ -+ case $$flg in \ -+ *=*|--*) continue;; \ -+ -*I) strip_trailopt 'I'; skip_next=yes;; \ -+ -*I?*) strip_trailopt 'I';; \ -+ -*O) strip_trailopt 'O'; skip_next=yes;; \ -+ -*O?*) strip_trailopt 'O';; \ -+ -*l) strip_trailopt 'l'; skip_next=yes;; \ -+ -*l?*) strip_trailopt 'l';; \ -+ -[dEDm]) skip_next=yes;; \ -+ -[JT]) skip_next=yes;; \ -+ esac; \ -+ case $$flg in \ -+ *$$target_option*) has_opt=yes; break;; \ -+ esac; \ -+ done; \ -+ test $$has_opt = yes -+am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -+am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -52,11 +81,13 @@ - host_triplet = @host@ - target_triplet = @target@ - subdir = . --DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -- $(srcdir)/Makefile.in $(srcdir)/tntnet-config.in \ -- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ -- TODO config.guess config.sub depcomp install-sh ltmain.sh \ -- missing -+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ -+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -+ $(top_srcdir)/configure $(am__configure_deps) \ -+ $(srcdir)/tntnet-config.in \ -+ $(top_srcdir)/pkgconfig/tntnet.pc.in \ -+ $(top_srcdir)/pkgconfig/tntnet_sdk.pc.in COPYING TODO \ -+ config.guess config.sub depcomp install-sh missing ltmain.sh - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_compile_flag.m4 \ -@@ -71,7 +102,8 @@ - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/framework/common/config.h --CONFIG_CLEAN_FILES = tntnet-config -+CONFIG_CLEAN_FILES = tntnet-config pkgconfig/tntnet.pc \ -+ pkgconfig/tntnet_sdk.pc - CONFIG_CLEAN_VPATH_FILES = - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ -@@ -100,27 +132,62 @@ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } --am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" -+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" \ -+ "$(DESTDIR)$(pkgconfigdir)" - SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS) -+AM_V_P = $(am__v_P_@AM_V@) -+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -+am__v_P_0 = false -+am__v_P_1 = : -+AM_V_GEN = $(am__v_GEN_@AM_V@) -+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -+am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_1 = -+AM_V_at = $(am__v_at_@AM_V@) -+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -+am__v_at_0 = @ -+am__v_at_1 = - SOURCES = - DIST_SOURCES = --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-dvi-recursive install-exec-recursive \ -- install-html-recursive install-info-recursive \ -- install-pdf-recursive install-ps-recursive install-recursive \ -- installcheck-recursive installdirs-recursive pdf-recursive \ -- ps-recursive uninstall-recursive -+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ -+ ctags-recursive dvi-recursive html-recursive info-recursive \ -+ install-data-recursive install-dvi-recursive \ -+ install-exec-recursive install-html-recursive \ -+ install-info-recursive install-pdf-recursive \ -+ install-ps-recursive install-recursive installcheck-recursive \ -+ installdirs-recursive pdf-recursive ps-recursive \ -+ tags-recursive uninstall-recursive - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -+DATA = $(pkgconfig_DATA) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive --AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ -+am__recursive_targets = \ -+ $(RECURSIVE_TARGETS) \ -+ $(RECURSIVE_CLEAN_TARGETS) \ -+ $(am__extra_recursive_targets) -+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -+# Read a list of newline-separated strings from the standard input, -+# and print each of them once, without duplicates. Input order is -+# *not* preserved. -+am__uniquify_input = $(AWK) '\ -+ BEGIN { nonempty = 0; } \ -+ { items[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in items) print i; }; } \ -+' -+# Make sure the list of sources is unique. This is necessary because, -+# e.g., the same source file might be shared among _SOURCES variables -+# for different programs/libraries. -+am__define_uniq_tagged_files = \ -+ list='$(am__tagged_files)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope -@@ -179,6 +246,7 @@ - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ - AM_CFLAGS = @AM_CFLAGS@ -+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -382,6 +450,11 @@ - Releasenotes-2.2.1.markdown \ - $(pkgdata_SCRIPTS) - -+pkgconfigdir = $(libdir)/pkgconfig/ -+pkgconfig_DATA = \ -+ pkgconfig/tntnet.pc \ -+ pkgconfig/tntnet_sdk.pc -+ - all: all-recursive - - .SUFFIXES: -@@ -421,6 +494,10 @@ - $(am__aclocal_m4_deps): - tntnet-config: $(top_builddir)/config.status $(srcdir)/tntnet-config.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -+pkgconfig/tntnet.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet.pc.in -+ cd $(top_builddir) && $(SHELL) ./config.status $@ -+pkgconfig/tntnet_sdk.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet_sdk.pc.in -+ cd $(top_builddir) && $(SHELL) ./config.status $@ - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ -@@ -500,6 +577,27 @@ - - distclean-libtool: - -rm -f libtool config.lt -+install-pkgconfigDATA: $(pkgconfig_DATA) -+ @$(NORMAL_INSTALL) -+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ -+ fi; \ -+ for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; \ -+ done | $(am__base_list) | \ -+ while read files; do \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ -+ done -+ -+uninstall-pkgconfigDATA: -+ @$(NORMAL_UNINSTALL) -+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ -+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) - - # This directory's subdirectories are mostly independent; you can cd - # into them and run 'make' without going through this Makefile. -@@ -507,14 +605,13 @@ - # (1) if the variable is set in 'config.status', edit 'config.status' - # (which will cause the Makefiles to be regenerated when you run 'make'); - # (2) otherwise, pass the desired values on the 'make' command line. --$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): -- @fail= failcom='exit 1'; \ -- for f in x $$MAKEFLAGS; do \ -- case $$f in \ -- *=* | --[!k]*);; \ -- *k*) failcom='fail=yes';; \ -- esac; \ -- done; \ -+$(am__recursive_targets): -+ @fail=; \ -+ if $(am__make_keepgoing); then \ -+ failcom='fail=yes'; \ -+ else \ -+ failcom='exit 1'; \ -+ fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ -@@ -535,31 +632,13 @@ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" --tags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ -- done --ctags-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -- done --cscopelist-recursive: -- list='$(SUBDIRS)'; for subdir in $$list; do \ -- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ -- done - --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -- mkid -fID $$unique --tags: TAGS -+ID: $(am__tagged_files) -+ $(am__define_uniq_tagged_files); mkid -fID $$unique -+tags: tags-recursive -+TAGS: tags - --TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -@@ -575,12 +654,7 @@ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -@@ -592,15 +666,11 @@ - $$unique; \ - fi; \ - fi --ctags: CTAGS --CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ctags: ctags-recursive -+ -+CTAGS: ctags -+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) -+ $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique -@@ -609,18 +679,16 @@ - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -- - cscope: cscope.files - test ! -s cscope.files \ - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -- - clean-cscope: - -rm -f cscope.files -+cscope.files: clean-cscope cscopelist -+cscopelist: cscopelist-recursive - --cscope.files: clean-cscope cscopelist-recursive cscopelist -- --cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS) $(LISP)'; \ -+cscopelist-am: $(am__tagged_files) -+ list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ -@@ -754,9 +822,9 @@ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -- chmod -R a-w $(distdir); chmod u+w $(distdir) -- mkdir $(distdir)/_build -- mkdir $(distdir)/_inst -+ chmod -R a-w $(distdir) -+ chmod u+w $(distdir) -+ mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -@@ -820,10 +888,10 @@ - exit 1; } >&2 - check-am: all-am - check: check-recursive --all-am: Makefile $(SCRIPTS) -+all-am: Makefile $(SCRIPTS) $(DATA) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \ -+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-recursive -@@ -878,7 +946,7 @@ - - info-am: - --install-data-am: install-pkgdataSCRIPTS -+install-data-am: install-pkgconfigDATA install-pkgdataSCRIPTS - - install-dvi: install-dvi-recursive - -@@ -924,30 +992,29 @@ - - ps-am: - --uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS -+uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA \ -+ uninstall-pkgdataSCRIPTS -+ -+.MAKE: $(am__recursive_targets) install-am install-strip - --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ -- cscopelist-recursive ctags-recursive install-am install-strip \ -- tags-recursive -- --.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -- all all-am am--refresh check check-am clean clean-cscope \ -- clean-generic clean-libtool cscope cscopelist \ -- cscopelist-recursive ctags ctags-recursive dist dist-all \ -- dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ -- dist-zip distcheck distclean distclean-generic \ -+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ -+ am--refresh check check-am clean clean-cscope clean-generic \ -+ clean-libtool cscope cscopelist-am ctags ctags-am dist \ -+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ -+ dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ -- install-pkgdataSCRIPTS install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am \ -- uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS -+ install-pkgconfigDATA install-pkgdataSCRIPTS install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ -+ uninstall-am uninstall-binSCRIPTS uninstall-pkgconfigDATA \ -+ uninstall-pkgdataSCRIPTS - - - tntnet-config: tntnet-config.in -diff -Naur tntnet-2.2.1/pkgconfig/tntnet.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in ---- tntnet-2.2.1/pkgconfig/tntnet.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in 2016-01-07 06:07:03.794973414 +0100 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: tntnet -+Description: Modular, multithreaded web application library for C++ -+Version: @PACKAGE_VERSION@ -+Libs: -L${libdir} -ltntnet -+Cflags: -I${includedir} -+Requires.private: cxxtools -diff -Naur tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in ---- tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in 2016-01-07 06:07:03.795973416 +0100 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: tntnet_sdk -+Description: Helper library for ecpp-parsing programs -+Version: @PACKAGE_VERSION@ -+Libs: -L${libdir} -ltntnet_sdk -+Cflags: -I${includedir} -+Requires.private: cxxtools From 53c9831fc826bfd48697e858ccbfabd91b299003 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 10 Jul 2022 13:01:34 +0000 Subject: [PATCH 3/6] vdr-plugin-live: update to 3.1.6 - migrate to cxxtools 3.0 - migrate to tntnet 3.0 - migrate to pcre2 from pcre --- .../vdr-plugins/vdr-plugin-live/package.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk index caddd3c630..155d5c0866 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk @@ -3,14 +3,14 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vdr-plugin-live" -PKG_VERSION="b2938deb061a83454d14aeb149c18a87e38e8b25" -PKG_SHA256="f74844fad4f0c3fd828816fd3f094ff740d82d31a164b0cd6384aff9fb7e33b8" +PKG_VERSION="3.1.6" +PKG_SHA256="8231f22d397b6cc954615304a12319fb74553aa67fbf12536b1df6727f69b8a2" PKG_LICENSE="GPL" PKG_SITE="http://live.vdr-developer.org/en/index.php" -PKG_URL="https://github.com/MarkusEh/vdr-plugin-live/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre" +PKG_URL="https://github.com/MarkusEh/vdr-plugin-live/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre2:host pcre2" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" -PKG_LONGDESC="Allows a comfortable operation of VDR and some of its plugins trough a web interface." +PKG_LONGDESC="Allows a comfortable operation of VDR and some of its plugins through a web interface." PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="+pic -parallel" From 67725530a632d7ccecd134ba7d2f58d31c0bfb7d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 11 Jul 2022 10:32:49 +0000 Subject: [PATCH 4/6] vdr-plugin-restfulapi: include -lssl to support cxxtools 3.0 --- .../patches/vdr-plugin-restfulapi-01-static-lib-order.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01-static-lib-order.patch b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01-static-lib-order.patch index fa998e0bcd..8ed4c1a5f9 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01-static-lib-order.patch +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01-static-lib-order.patch @@ -5,7 +5,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -LIBS += $(shell cxxtools-config --libs) -lcxxtools-http -+LIBS += -lcxxtools-http $(shell cxxtools-config --libs) ++LIBS += -lcxxtools-http $(shell cxxtools-config --libs) -lssl CONFDIR = $(call PKGCFG,configdir) PLGCONFDIR = $(CONFDIR)/plugins/$(PLUGIN) - \ No newline at end of file + From 9c7c2b084ab3ecf27fda26bc4cb0bba26a095580 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 10 Jul 2022 13:16:19 +0000 Subject: [PATCH 5/6] vdr-addon: update for live 3.1.6 and addon (120) --- packages/addons/service/vdr-addon/changelog.txt | 3 +++ packages/addons/service/vdr-addon/package.mk | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/vdr-addon/changelog.txt b/packages/addons/service/vdr-addon/changelog.txt index df09fa48b3..52b3514b48 100644 --- a/packages/addons/service/vdr-addon/changelog.txt +++ b/packages/addons/service/vdr-addon/changelog.txt @@ -1,3 +1,6 @@ +120 +- update live to 3.1.6 + 119 - update VDR to 2.6.1 diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index 237929107a..88cac4ff63 100644 --- a/packages/addons/service/vdr-addon/package.mk +++ b/packages/addons/service/vdr-addon/package.mk @@ -5,7 +5,7 @@ PKG_NAME="vdr-addon" PKG_VERSION="2.6.1" -PKG_REV="119" +PKG_REV="120" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -65,7 +65,7 @@ addon() { $(get_build_dir vdr-plugin-streamdev)/server/locale/* \ ${ADDON_BUILD}/${PKG_ADDON_ID}/locale - cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.13 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib cp -P $(get_build_dir vdr)/vdr ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/vdr.bin cp -PR $(get_build_dir vdr)/locale/* ${ADDON_BUILD}/${PKG_ADDON_ID}/locale From cb10c32ad3d7abbf3770686f9e2717bd9dd3abca Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 28 May 2021 08:30:14 +0000 Subject: [PATCH 6/6] pcre2: update to 10.40 and PKG_URL --- packages/addons/addon-depends/pcre2/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/pcre2/package.mk b/packages/addons/addon-depends/pcre2/package.mk index 1cab3acb74..afa23bf0e1 100644 --- a/packages/addons/addon-depends/pcre2/package.mk +++ b/packages/addons/addon-depends/pcre2/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pcre2" -PKG_VERSION="10.36" -PKG_SHA256="a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c" +PKG_VERSION="10.40" +PKG_SHA256="14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68" PKG_LICENSE="BSD" PKG_SITE="http://www.pcre.org/" -PKG_URL="${SOURCEFORGE_SRC}/pcre/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_URL="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PKG_VERSION}/pcre2-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A set of functions that implement regular expression pattern matching using the same syntax." PKG_TOOLCHAIN="cmake"