From 44c465e6df4eb54dabfc71454c0ce1aca998ee7f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 17 Jun 2024 12:28:57 +0000 Subject: [PATCH 1/2] zvbi: update to 0.2.42 and update PKG_ SITE and URL --- packages/multimedia/zvbi/package.mk | 9 ++-- .../zvbi-0010-fix-static-linking.patch | 15 +----- .../zvbi/patches/zvbi-0050-prevent-test.patch | 43 +++------------- ...cos-function-check-to-AC_CHECK_FUNCS.patch | 51 +++++++++++++++++++ 4 files changed, 66 insertions(+), 52 deletions(-) create mode 100644 packages/multimedia/zvbi/patches/zvbi-0060-configure-ac--Move-sincos-function-check-to-AC_CHECK_FUNCS.patch diff --git a/packages/multimedia/zvbi/package.mk b/packages/multimedia/zvbi/package.mk index 32a2f26ed4..7bd8459a79 100644 --- a/packages/multimedia/zvbi/package.mk +++ b/packages/multimedia/zvbi/package.mk @@ -2,13 +2,14 @@ # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="zvbi" -PKG_VERSION="0.2.35" -PKG_SHA256="fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318" +PKG_VERSION="0.2.42" +PKG_SHA256="e7614a847ce7dd2c05f1db84d21dcf25085565932efb014f27107ae940884d7f" PKG_LICENSE="GPL2" -PKG_SITE="http://zapping.sourceforge.net/ZVBI" -PKG_URL="https://downloads.sourceforge.net/sourceforge/zapping/zvbi-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://github.com/zapping-vbi/zvbi" +PKG_URL="https://github.com/zapping-vbi/zvbi/archive/refs/tags/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libpng zlib" PKG_LONGDESC="Library to provide functions to capture and decode VBI data." +PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-dvb \ --disable-bktr \ diff --git a/packages/multimedia/zvbi/patches/zvbi-0010-fix-static-linking.patch b/packages/multimedia/zvbi/patches/zvbi-0010-fix-static-linking.patch index 3988a3e212..cd6a3ba721 100644 --- a/packages/multimedia/zvbi/patches/zvbi-0010-fix-static-linking.patch +++ b/packages/multimedia/zvbi/patches/zvbi-0010-fix-static-linking.patch @@ -1,16 +1,5 @@ ---- a/configure -+++ b/configure -@@ -16515,7 +16515,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_destroy_write_struct" >&5 - $as_echo "$ac_cv_lib_png_png_destroy_write_struct" >&6; } - if test "x$ac_cv_lib_png_png_destroy_write_struct" = x""yes; then : -- LIBS="$LIBS -lpng -lz" -+ LIBS="-lpng -lz $LIBS" - else - HAVE_PNG="no" - fi ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -244,7 +244,7 @@ dnl (PNG page export) dnl HAVE_PNG="yes" diff --git a/packages/multimedia/zvbi/patches/zvbi-0050-prevent-test.patch b/packages/multimedia/zvbi/patches/zvbi-0050-prevent-test.patch index e97cee3811..118558f9a6 100644 --- a/packages/multimedia/zvbi/patches/zvbi-0050-prevent-test.patch +++ b/packages/multimedia/zvbi/patches/zvbi-0050-prevent-test.patch @@ -12,14 +12,14 @@ --- a/Makefile.in +++ b/Makefile.in @@ -78,7 +78,7 @@ pkgconfigDATA_INSTALL = $(INSTALL_DATA) - DATA = $(pkgconfig_DATA) - ETAGS = etags - CTAGS = ctags + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` -DIST_SUBDIRS = m4 src daemon contrib examples test po doc +DIST_SUBDIRS = m4 src daemon contrib po doc - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/zvbi-0.2.pc.in $(srcdir)/zvbi.spec.in \ + $(top_srcdir)/build-aux/compile \ @@ -268,8 +268,6 @@ SUBDIRS = \ src \ $(proxy_dirs) \ @@ -29,35 +29,8 @@ po \ doc ---- a/configure -+++ b/configure -@@ -18591,7 +18591,7 @@ else - fi - - --ac_config_files="$ac_config_files Makefile contrib/Makefile examples/Makefile daemon/Makefile daemon/zvbid.init doc/Doxyfile doc/Makefile m4/Makefile src/Makefile src/dvb/Makefile test/Makefile po/Makefile.in zvbi.spec zvbi-0.2.pc" -+ac_config_files="$ac_config_files Makefile contrib/Makefile daemon/Makefile daemon/zvbid.init doc/Doxyfile doc/Makefile m4/Makefile src/Makefile src/dvb/Makefile po/Makefile.in zvbi.spec zvbi-0.2.pc" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -19726,7 +19726,6 @@ do - "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; -- "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;; - "daemon/zvbid.init") CONFIG_FILES="$CONFIG_FILES daemon/zvbid.init" ;; - "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; -@@ -19734,7 +19733,6 @@ do - "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/dvb/Makefile") CONFIG_FILES="$CONFIG_FILES src/dvb/Makefile" ;; -- "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "zvbi.spec") CONFIG_FILES="$CONFIG_FILES zvbi.spec" ;; - "zvbi-0.2.pc") CONFIG_FILES="$CONFIG_FILES zvbi-0.2.pc" ;; ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -384,7 +384,6 @@ AM_CONDITIONAL(BUILD_STATIC_LIB, [test "x$enable_static" = xyes]) AC_OUTPUT([ Makefile diff --git a/packages/multimedia/zvbi/patches/zvbi-0060-configure-ac--Move-sincos-function-check-to-AC_CHECK_FUNCS.patch b/packages/multimedia/zvbi/patches/zvbi-0060-configure-ac--Move-sincos-function-check-to-AC_CHECK_FUNCS.patch new file mode 100644 index 0000000000..be243e2ec0 --- /dev/null +++ b/packages/multimedia/zvbi/patches/zvbi-0060-configure-ac--Move-sincos-function-check-to-AC_CHECK_FUNCS.patch @@ -0,0 +1,51 @@ +From 429cf9337588d6e028bd1dc4633953b4eff09597 Mon Sep 17 00:00:00 2001 +From: Ileana Dumitrescu +Date: Wed, 13 Mar 2024 17:42:18 +0200 +Subject: [PATCH] configure.ac: Move sincos function check to AC_CHECK_FUNCS + +--- + configure.ac | 24 +----------------------- + 1 file changed, 1 insertion(+), 23 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ba6f385..476fd69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,7 +89,7 @@ AC_CHECK_FUNCS([alarm dup2 gethostbyaddr gethostbyname getopt_long gettimeofday + inet_ntoa localtime_r memmove memset mkdir modf munmap + nl_langinfo putenv select setenv setlocale socket strcasecmp + strchr strdup strerror strncasecmp strndup strrchr strstr +- strtol strtoul tzset strptime getaddrinfo]) ++ strtol strtoul tzset strptime getaddrinfo sincos]) + + AM_CONDITIONAL(HAVE_STRPTIME, [test "x$HAVE_STRPTIME" = xyes]) + +@@ -112,28 +112,6 @@ dnl autoconf 2.71 required additional quotations and usages of "AC_LANG_SOURCE". + dnl "Noteworthy changes in autoconf version 2.66 through 2.68" + dnl + +-dnl sincos() is a GNU extension (a macro, not a function). +-dnl If not present we use a replacement. +-AC_MSG_CHECKING([for sincos]) +-AC_LINK_IFELSE([AC_LANG_SOURCE([ +-#include +-#include +-int main (void) { +-double s, c; +-/* Make sure the compiler does not optimize sincos() away +- so the linker can confirm its availability. */ +-scanf ("%f", &s); +-sincos (s, &s, &c); +-printf ("%f %f", s, c); +-return 0; +-} +-])],[ +- AC_MSG_RESULT([yes]) +- AC_DEFINE(HAVE_SINCOS, 1, [Define if the sincos() function is available]) +-],[ +- AC_MSG_RESULT([no]) +-]) +- + dnl log2() is a GNU extension (a macro, not a function). + dnl If not present we use a replacement. + AC_MSG_CHECKING([for log2]) From 2507873d9cd83938283bba8e6f50323dba28eb7a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 17 Jun 2024 13:03:52 +0000 Subject: [PATCH 2/2] inputstream.ffmpegdirect: update zvbi to 0.2.42 and addon (3) --- .../kodi-binary-addons/inputstream.ffmpegdirect/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk index 3b228fdec9..d704bc4edf 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk @@ -4,7 +4,7 @@ PKG_NAME="inputstream.ffmpegdirect" PKG_VERSION="21.3.5-Omega" PKG_SHA256="b28ccbd489d9b69779fd818ee158f69ebd6fd85b1f0410ffc8098ff0c8665bdc" -PKG_REV="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL2+" PKG_SITE="https://github.com/xbmc/inputstream.ffmpegdirect"