diff --git a/packages/multimedia/zvbi/package.mk b/packages/multimedia/zvbi/package.mk index 7bd8459a79..4a87a77f32 100644 --- a/packages/multimedia/zvbi/package.mk +++ b/packages/multimedia/zvbi/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="zvbi" -PKG_VERSION="0.2.42" -PKG_SHA256="e7614a847ce7dd2c05f1db84d21dcf25085565932efb014f27107ae940884d7f" +PKG_VERSION="0.2.43" +PKG_SHA256="437522d8d0906c43c0a51163f40a3a7e4c0f1f377c0d2d5f25c1b69c827fb3ed" PKG_LICENSE="GPL2" PKG_SITE="https://github.com/zapping-vbi/zvbi" PKG_URL="https://github.com/zapping-vbi/zvbi/archive/refs/tags/v${PKG_VERSION}.tar.gz" @@ -13,7 +13,9 @@ PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-dvb \ --disable-bktr \ + --disable-examples \ --disable-nls \ --disable-proxy \ + --disable-tests \ --without-doxygen \ --without-x" 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 cd6a3ba721..3bfa6fde15 100644 --- a/packages/multimedia/zvbi/patches/zvbi-0010-fix-static-linking.patch +++ b/packages/multimedia/zvbi/patches/zvbi-0010-fix-static-linking.patch @@ -9,22 +9,3 @@ if test "x$HAVE_PNG" = xyes; then AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have libpng]) fi ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -19,4 +19,4 @@ EXTRA_DIST = \ - INCLUDES = -I$(top_srcdir)/src - - LDADD = $(top_builddir)/src/libzvbi.la \ -- $(PTHREAD_LIB) -lm $(PNG_LIB) -+ $(PTHREAD_LIB) $(PNG_LIB) -lm ---- a/examples/Makefile.in -+++ b/examples/Makefile.in -@@ -262,7 +262,7 @@ EXTRA_DIST = \ - - INCLUDES = -I$(top_srcdir)/src - LDADD = $(top_builddir)/src/libzvbi.la \ -- $(PTHREAD_LIB) -lm $(PNG_LIB) -+ $(PTHREAD_LIB) $(PNG_LIB) -lm - - all: all-am - diff --git a/packages/multimedia/zvbi/patches/zvbi-0020-ioctl.patch b/packages/multimedia/zvbi/patches/zvbi-0020-ioctl.patch deleted file mode 100644 index 4af7cb1a53..0000000000 --- a/packages/multimedia/zvbi/patches/zvbi-0020-ioctl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/contrib/ntsc-cc.c -+++ b/contrib/ntsc-cc.c -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -45,6 +44,7 @@ - #include "src/libzvbi.h" - - #ifdef ENABLE_V4L2 -+# include - # include - # include "src/videodev2k.h" - #endif diff --git a/packages/multimedia/zvbi/patches/zvbi-0050-prevent-test.patch b/packages/multimedia/zvbi/patches/zvbi-0050-prevent-test.patch deleted file mode 100644 index 118558f9a6..0000000000 --- a/packages/multimedia/zvbi/patches/zvbi-0050-prevent-test.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -22,8 +22,6 @@ SUBDIRS = \ - src \ - $(proxy_dirs) \ - contrib \ -- examples \ -- test \ - po \ - doc - ---- a/Makefile.in -+++ b/Makefile.in -@@ -78,7 +78,7 @@ pkgconfigDATA_INSTALL = $(INSTALL_DATA) - 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 - 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) \ - contrib \ -- examples \ -- test \ - po \ - doc - ---- a/configure.ac -+++ b/configure.ac -@@ -384,7 +384,6 @@ AM_CONDITIONAL(BUILD_STATIC_LIB, [test "x$enable_static" = xyes]) - AC_OUTPUT([ - Makefile - contrib/Makefile -- examples/Makefile - daemon/Makefile - daemon/zvbid.init - doc/Doxyfile -@@ -392,7 +391,6 @@ AC_OUTPUT([ - m4/Makefile - src/Makefile - src/dvb/Makefile -- test/Makefile - po/Makefile.in - zvbi.spec - zvbi-0.2.pc 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 deleted file mode 100644 index be243e2ec0..0000000000 --- a/packages/multimedia/zvbi/patches/zvbi-0060-configure-ac--Move-sincos-function-check-to-AC_CHECK_FUNCS.patch +++ /dev/null @@ -1,51 +0,0 @@ -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])