mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #9001 from heitbaum/inputstream.ffmpegdirect
inputstream.ffmpegdirect: update zvbi to 0.2.42 and addon (3)
This commit is contained in:
CvH
GitHub
commit
b496791cf7
@ -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"
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
From 429cf9337588d6e028bd1dc4633953b4eff09597 Mon Sep 17 00:00:00 2001
|
||||
From: Ileana Dumitrescu <ileanadumitrescu95@gmail.com>
|
||||
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 <https://autotools.info/forwardporting/autoconf.html>
|
||||
|
||||
-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 <stdio.h>
|
||||
-#include <math.h>
|
||||
-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])
|
||||
Loading…
x
Reference in New Issue
Block a user