Merge pull request #286 from AlwinEsch/depends-update

add-on depends library updates

depends/common/ffmpeg/0004-ffmpeg-linux-fix-asm-binutil-since-2.41.patch

@@ -0,0 +1,58 @@
+--- a/libavcodec/x86/mathops.h
++++ b/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+

depends/common/gas-preprocessor/gas-preprocessor.sha256

@@ -1 +1 @@
-4800c17dd529815ea73aee9658c3682f69bf45518d24408b5a58d678fdc94b94
+5b5a47869a45f6c33d3857b923ec409e41e0813b90b63b7e120b45e0037ee3dc

depends/common/gas-preprocessor/gas-preprocessor.txt

@@ -1 +1 @@
-gas-preprocessor https://github.com/FFmpeg/gas-preprocessor/archive/9309c67acb535ca6248f092e96131d8eb07eefc1.tar.gz
+gas-preprocessor https://github.com/FFmpeg/gas-preprocessor/archive/971df11b06a94dd42881144e4e53be30eb3fee68.tar.gz

depends/common/gmp/gmp.sha256

@@ -1 +1 @@
-fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
+a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898

depends/common/gmp/gmp.txt

@@ -1 +1 @@
-gmp https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz
+gmp https://gmplib.org/download/gmp/gmp-6.3.0.tar.xz

depends/common/gnutls/0001-android-hackfix-fpending_c.patch

@@ -10,8 +10,8 @@
 +  return 1;
 +#else
    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */
-   return fp->_p - fp->_bf._base;
+   return fp_->_p - fp_->_bf._base;
 +#endif
  #elif defined __EMX__                /* emx+gcc */
-   return fp->_ptr - fp->_buffer;
+   return fp_->_ptr - fp_->_buffer;
  #elif defined __minix                /* Minix */

depends/common/gnutls/0002-hack-fix-about-rsa_compute_root_tr.patch

@@ -0,0 +1,41 @@
+--- a/lib/nettle/backport/rsa-sign-tr.c
++++ b/lib/nettle/backport/rsa-sign-tr.c
+@@ -88,10 +88,10 @@
+  * attacks which rely on faults on hardware, or even software MPI
+  * implementation. */
+ int
+-rsa_compute_root_tr(const struct rsa_public_key *pub,
+-		    const struct rsa_private_key *key,
+-		    void *random_ctx, nettle_random_func *random,
+-		    mpz_t x, const mpz_t m)
++backport_rsa_compute_root_tr(const struct rsa_public_key *pub,
++			     const struct rsa_private_key *key,
++			     void *random_ctx, nettle_random_func *random,
++			     mpz_t x, const mpz_t m)
+ {
+   int res;
+   mpz_t t, mb, xb, ri;
+@@ -142,7 +142,7 @@
+
+   nn = mpz_size (pub->n);
+
+-  res = rsa_compute_root_tr(pub, key, random_ctx, random, xz,
++  res = backport_rsa_compute_root_tr(pub, key, random_ctx, random, xz,
+ 			    mpz_roinit_n(mz, m, nn));
+
+   if (res)
+@@ -347,10 +347,10 @@
+  * in buffer copying both in case of success or error.
+  */
+ int
+-rsa_compute_root_tr(const struct rsa_public_key *pub,
+-		    const struct rsa_private_key *key,
+-		    void *random_ctx, nettle_random_func *random,
+-		    mpz_t x, const mpz_t m)
++backport_rsa_compute_root_tr(const struct rsa_public_key *pub,
++			     const struct rsa_private_key *key,
++			     void *random_ctx, nettle_random_func *random,
++			     mpz_t x, const mpz_t m)
+ {
+   TMP_GMP_DECL (l, mp_limb_t);
+   mp_size_t nn = mpz_size(pub->n);

depends/common/gnutls/gnutls.sha256

@@ -1 +1 @@
-0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5
+2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b

depends/common/gnutls/gnutls.txt

@@ -1 +1 @@
-gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz
+gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.4.tar.xz

depends/common/libpng/0001-disable-neon-arm-apple.patch

@@ -1,14 +1,12 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -92,8 +92,9 @@
+@@ -134,7 +134,7 @@
+
  # Set definitions and sources for ARM.
- if(TARGET_ARCH MATCHES "^arm" OR
-    TARGET_ARCH MATCHES "^aarch64")
--  if(TARGET_ARCH MATCHES "^arm64" OR
--     TARGET_ARCH MATCHES "^aarch64")
-+  if(NOT APPLE AND
-+     (TARGET_ARCH MATCHES "^arm64" OR
-+      TARGET_ARCH MATCHES "^aarch64"))
+ if(TARGET_ARCH MATCHES "^(ARM|arm|aarch)")
+-  if(TARGET_ARCH MATCHES "^(ARM64|arm64|aarch64)")
++  if(NOT APPLE AND TARGET_ARCH MATCHES "^(ARM64|arm64|aarch64)")
      set(PNG_ARM_NEON_POSSIBLE_VALUES on off)
      set(PNG_ARM_NEON "on"
          CACHE STRING "Enable ARM NEON optimizations: on|off; on is default")
+

depends/common/libpng/libpng.sha256

@@ -1 +1 @@
-a00e9d2f2f664186e4202db9299397f851aea71b36a35e74910b8820e380d441
+fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a

depends/common/libpng/libpng.txt

@@ -1 +1 @@
-libpng https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.tar.gz
+libpng https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.43.tar.gz

depends/common/libxml2/0001-check-about-readline-lib-also-presence-of-header.patch

@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -151,7 +151,10 @@ if (NOT MSVC)
+@@ -151,7 +151,10 @@
  	check_include_files(inttypes.h HAVE_INTTYPES_H)
  	check_function_exists(isascii HAVE_ISASCII)
  	check_library_exists(history append_history "" HAVE_LIBHISTORY)

depends/common/libxml2/0002-disable-docs.patch

@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -574,16 +574,6 @@ if(LIBXML2_WITH_PYTHON)
+@@ -574,16 +574,6 @@
  	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime)
  endif()
 

depends/common/libxml2/0003-fix_cmakelist.patch

@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -396,15 +396,15 @@ endif()
+@@ -396,15 +396,15 @@
  if(LIBXML2_WITH_ICU)
  	target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc)
  	if(WIN32)
@@ -19,7 +19,7 @@
  endif()
 
  if(LIBXML2_WITH_THREADS)
-@@ -414,7 +414,7 @@ endif()
+@@ -414,7 +414,7 @@
 
  if(LIBXML2_WITH_ZLIB)
  	target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB)
@@ -28,7 +28,7 @@
  endif()
 
  set_target_properties(
-@@ -428,23 +428,11 @@ set_target_properties(
+@@ -428,23 +428,11 @@
          SOVERSION ${LIBXML_MAJOR_VERSION}
  )
 
@@ -56,7 +56,7 @@
  endif()
 
  install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development)
-@@ -577,30 +565,30 @@ endif()
+@@ -577,30 +565,30 @@
 
  configure_package_config_file(
  	libxml2-config.cmake.cmake.in libxml2-config.cmake
@@ -94,13 +94,13 @@
  	COMPONENT development
 --- a/libxml-2.0.pc.in
 +++ b/libxml-2.0.pc.in
-@@ -8,6 +8,7 @@ Name: libXML
+@@ -8,6 +8,7 @@
  Version: @VERSION@
  Description: libXML library version2.
  Requires:
 -Libs: -L${libdir} @XML_LIBS@
 -Libs.private: @XML_PRIVATE_LIBS@ @LIBS@
 +Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@
 +Libs: -L${libdir} -l@XML_LIB_NAME@
-+Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@
++Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WINSOCK_LIBS@ @LIBS@
  Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@

depends/common/libxml2/libxml2.sha256

@@ -1 +1 @@
-2fd59eccfe277f7b7dec8836254acbebd24af33857a018dd64ddcf92d88d7f7e
+2fb6259e907c916c2c07bde24a13f460f2f07e43bc6470d658dfdcfa08b1ace5

depends/common/libxml2/libxml2.txt

@@ -1 +1 @@
-libxml2 https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.4.tar.gz
+libxml2 https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.7.tar.gz

depends/common/libzvbi/0009-fix-building-libzvbi-version-0.2.41-on-debian-bullse.patch → depends/common/libzvbi/0009-fix-building-libzvbi-version-0.2.42-on-debian-bullse.patch

@@ -1,8 +1,3 @@
-diff --git a/README b/README
-new file mode 100644
-index 0000000..e69de29
-diff --git a/configure.ac b/configure.ac
-index 915875a..3f2c06f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1,7 +1,7 @@
@@ -11,10 +6,10 @@ index 915875a..3f2c06f 100644
  dnl Autoconf initialization
 -AC_PREREQ([2.71])
 +AC_PREREQ([2.69])
- AC_INIT([zvbi],[0.2.41])
+ AC_INIT([zvbi],[0.2.42])
 
  AC_CONFIG_SRCDIR(src/vbi.c)
-@@ -46,9 +46,9 @@ AC_CHECK_LIB([m], [cos],,[
+@@ -46,9 +46,9 @@
  dnl Checks for header files.
  dnl Generated by Autoscan.
  AC_PATH_X
@@ -27,7 +22,7 @@ index 915875a..3f2c06f 100644
  		  sys/time.h syslog.h unistd.h])
 
  dnl Checks for typedefs, structures, and compiler characteristics.
-@@ -78,10 +78,10 @@ dnl - getaddrinfo: HAVE_GETADDRINFO used in "src/proxy-msg.c"
+@@ -78,10 +78,10 @@
  dnl   and we don't want to refactor that yet.
  dnl - strptime: HAVE_STRPTIME used below for other parts of
  dnl   configure.ac

depends/common/libzvbi/libzvbi.sha256

@@ -1 +1 @@
-568c59b237bb58b46495e1f8e9bbe778e45ba89b4cd856506aa4c8f0a131eccc
+e7614a847ce7dd2c05f1db84d21dcf25085565932efb014f27107ae940884d7f

depends/common/libzvbi/libzvbi.txt

@@ -1 +1 @@
-libzvbi https://github.com/zapping-vbi/zvbi/archive/refs/tags/v0.2.41.tar.gz
+libzvbi https://github.com/zapping-vbi/zvbi/archive/refs/tags/v0.2.42.tar.gz

depends/common/nettle/nettle.sha256

@@ -1 +1 @@
-0ee7adf5a7201610bb7fe0acbb7c9b3be83be44904dd35ebbcd965cd896bfeaa
+ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3

depends/common/nettle/nettle.txt

@@ -1 +1 @@
-nettle https://ftp.gnu.org/gnu/nettle/nettle-3.9.tar.gz
+nettle https://ftp.gnu.org/gnu/nettle/nettle-3.9.1.tar.gz

depends/common/xz-utils/xz-utils.sha256

@@ -1 +1 @@
-92177bef62c3824b4badc524f8abcce54a20b7dbcfb84cde0a2eb8b49159518c
+92177bef62c3824b4badc524f8abcce54a20b7dbcfb84cde0a2eb8b49159518c

depends/common/xz-utils/xz-utils.txt

@@ -1 +1 @@
-xz-utils https://tukaani.org/xz/xz-5.4.3.tar.xz
+xz-utils http://mirrors.kodi.tv/build-deps/sources/xz-5.4.3.tar.xz

depends/common/zlib/01-build-static.patch

@@ -1,31 +1,33 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -147,10 +147,11 @@
+@@ -149,12 +149,12 @@
      set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
  endif(MINGW)
 
 -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 -add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 -set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 -set_target_properties(zlib PROPERTIES SOVERSION 1)
-+add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 +if(BUILD_SHARED_LIBS)
 +    set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 +    set_target_properties(zlib PROPERTIES SOVERSION 1)
 +endif()
 
  if(NOT CYGWIN)
      # This property causes shared libraries on Linux to have the full version
-@@ -165,7 +166,7 @@
+@@ -169,7 +169,7 @@
 
  if(UNIX)
      # On unix-like platforms the library is almost always called libz
 -   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
 +   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
-    if(NOT APPLE)
+    if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
       set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
     endif()
-@@ -175,7 +176,7 @@
+@@ -179,7 +179,7 @@
  endif()
 
  if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )

depends/common/zlib/03-install-pkgconfig-in-lib.patch → depends/common/zlib/02-install-pkgconfig-in-lib.patch

@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -12,7 +12,7 @@ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation direc
+@@ -11,7 +11,7 @@
  set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
  set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
  set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
@@ -9,4 +9,3 @@
 
  include(CheckTypeSize)
  include(CheckFunctionExists)
-

depends/common/zlib/flags.txt

@@ -0,0 +1 @@
+-DZLIB_BUILD_EXAMPLES=OFF

depends/common/zlib/zlib.sha256

@@ -1 +1 @@
-d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
+38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32

depends/common/zlib/zlib.txt

@@ -1 +1 @@
-zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.13.tar.xz
+zlib https://www.zlib.net/zlib-1.3.1.tar.xz

inputstream.ffmpegdirect/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.ffmpegdirect"
-  version="21.3.4"
+  version="21.3.5"
   name="Inputstream FFmpeg Direct"
   provider-name="Ross Nicholson">
   <requires>@ADDON_DEPENDS@</requires>