diff --git a/packages/libmediainfo/build.sh b/packages/libmediainfo/build.sh index 9c72e8058..c57046bb0 100644 --- a/packages/libmediainfo/build.sh +++ b/packages/libmediainfo/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Library for reading information from media files" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="../../../LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=20.09 +TERMUX_PKG_VERSION=21.03 TERMUX_PKG_SRCURL=https://mediaarea.net/download/source/libmediainfo/${TERMUX_PKG_VERSION}/libmediainfo_${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=a3d51fae55d8838e372def5d3fd172a795fa93ffa3389214bedb89e9dec90154 +TERMUX_PKG_SHA256=4606ee7498b51f81d8aa17d57c801bb0d9d31a3fb07f63b21816f2d55b9b4832 TERMUX_PKG_DEPENDS="libcurl, libzen, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-shared --enable-static --with-libcurl" diff --git a/packages/libzen/01_remove_libpthread.patch b/packages/libzen/01_remove_libpthread.patch index 6e1d1ab59..41080bdcd 100755 --- a/packages/libzen/01_remove_libpthread.patch +++ b/packages/libzen/01_remove_libpthread.patch @@ -1,31 +1,52 @@ -diff -r -u old/Project/GNU/Library/configure.ac Project/GNU/Library/configure.ac ---- old/Project/GNU/Library/configure.ac 2017-11-02 13:44:15.000000000 +0100 -+++ Project/GNU/Library/configure.ac 2019-12-05 13:03:44.363859500 +0100 -@@ -124,10 +124,10 @@ +diff -r -u old/Project/CMake/libzen.pc.in ./Project/CMake/libzen.pc.in +--- old/Project/CMake/libzen.pc.in 2021-03-25 15:29:18.000000000 +0100 ++++ ./Project/CMake/libzen.pc.in 2021-03-26 12:34:30.820891100 +0100 +@@ -3,10 +3,10 @@ + libdir=@LIB_INSTALL_DIR@ + includedir=@INCLUDE_INSTALL_DIR@ + Unicode=@ZenLib_Unicode@ +-Libs_Static=@LIB_INSTALL_DIR@/libzen.a -lpthread ++Libs_Static=@LIB_INSTALL_DIR@/libzen.a + + Name: libzen + Version: @ZenLib_VERSION@ + Description: ZenLib +-Libs: -L${libdir} -lzen -lpthread ++Libs: -L${libdir} -lzen + Cflags: -I${includedir} @ZenLib_CXXFLAGS@ +Only in ./Project: CodeBlocks +Only in ./Project: Coverity +Only in ./Project/GNU/Library: Makefile.am +Only in ./Project/GNU/Library: autogen.sh +diff -r -u old/Project/GNU/Library/configure.ac ./Project/GNU/Library/configure.ac +--- old/Project/GNU/Library/configure.ac 2021-03-25 15:29:19.000000000 +0100 ++++ ./Project/GNU/Library/configure.ac 2021-03-26 12:34:30.841028100 +0100 +@@ -144,10 +144,10 @@ dnl Common dnl if test "$enable_shared" = "yes"; then -- ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread -lstdc++ $ZenLib_LIBS" -+ ZenLib_LIBS="-L$(pwd)/.libs -lzen -lstdc++ $ZenLib_LIBS" +- ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread $ZenLib_LIBS" ++ ZenLib_LIBS="-L$(pwd)/.libs -lzen $ZenLib_LIBS" fi if test "$enable_static" = "yes"; then -- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static" -+ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static" +- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread $ZenLib_LIBS_Static" ++ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a $ZenLib_LIBS_Static" fi dnl ######################################################################### -@@ -232,7 +232,7 @@ +@@ -252,7 +252,7 @@ dnl ------------------------------------------------------------------------- dnl External libs dnl --LDFLAGS="$LDFLAGS -lpthread -lstdc++" -+LDFLAGS="$LDFLAGS -lstdc++" +-LDFLAGS="$LDFLAGS -lpthread" ++LDFLAGS="$LDFLAGS" - dnl ######################################################################### - dnl ### Output -diff -r -u old/Project/GNU/Library/libzen.pc.in Project/GNU/Library/libzen.pc.in ---- old/Project/GNU/Library/libzen.pc.in 2017-11-02 13:44:14.000000000 +0100 -+++ Project/GNU/Library/libzen.pc.in 2019-12-05 13:03:44.363859500 +0100 + dnl ------------------------------------------------------------------------- + dnl Check if thread safe variants of time functions are available +Only in ./Project/GNU/Library: libzen-config.in +diff -r -u old/Project/GNU/Library/libzen.pc.in ./Project/GNU/Library/libzen.pc.in +--- old/Project/GNU/Library/libzen.pc.in 2021-03-25 15:29:18.000000000 +0100 ++++ ./Project/GNU/Library/libzen.pc.in 2021-03-26 12:34:52.385894900 +0100 @@ -4,10 +4,10 @@ includedir=@includedir@ Unicode=@ZenLib_Unicode@ @@ -36,6 +57,6 @@ diff -r -u old/Project/GNU/Library/libzen.pc.in Project/GNU/Library/libzen.pc.in Name: libzen Version: @PACKAGE_VERSION@ Description: ZenLib --Libs: -L${libdir} -lzen -lpthread -lstdc++ -+Libs: -L${libdir} -lzen -lstdc++ +-Libs: -L${libdir} -lzen -lpthread ++Libs: -L${libdir} -lzen Cflags: -I${includedir} @ZenLib_CXXFLAGS@ diff --git a/packages/libzen/02_add_libandroid_glob.patch b/packages/libzen/02_add_libandroid_glob.patch index 297c607c3..82e70d14b 100755 --- a/packages/libzen/02_add_libandroid_glob.patch +++ b/packages/libzen/02_add_libandroid_glob.patch @@ -1,31 +1,32 @@ -diff -r -u old/Project/GNU/Library/configure.ac Project/GNU/Library/configure.ac ---- old/Project/GNU/Library/configure.ac 2019-12-09 18:08:43.564751200 +0100 -+++ Project/GNU/Library/configure.ac 2019-12-09 18:10:34.999619900 +0100 -@@ -124,10 +124,10 @@ +diff -r -u old/Project/GNU/Library/configure.ac ./Project/GNU/Library/configure.ac +--- old/Project/GNU/Library/configure.ac 2021-03-26 12:34:30.841028100 +0100 ++++ ./Project/GNU/Library/configure.ac 2021-03-26 12:39:42.820053800 +0100 +@@ -144,10 +144,10 @@ dnl Common dnl if test "$enable_shared" = "yes"; then -- ZenLib_LIBS="-L$(pwd)/.libs -lzen -lstdc++ $ZenLib_LIBS" -+ ZenLib_LIBS="-L$(pwd)/.libs -lzen -lstdc++ -landroid-glob $ZenLib_LIBS" +- ZenLib_LIBS="-L$(pwd)/.libs -lzen $ZenLib_LIBS" ++ ZenLib_LIBS="-L$(pwd)/.libs -lzen -landroid-glob $ZenLib_LIBS" fi if test "$enable_static" = "yes"; then -- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static" -+ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ -landroid-glob $ZenLib_LIBS_Static" +- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a $ZenLib_LIBS_Static" ++ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -landroid-glob $ZenLib_LIBS_Static" fi dnl ######################################################################### -@@ -232,7 +232,7 @@ +@@ -252,7 +252,7 @@ dnl ------------------------------------------------------------------------- dnl External libs dnl --LDFLAGS="$LDFLAGS -lstdc++" -+LDFLAGS="$LDFLAGS -lstdc++ -landroid-glob" +-LDFLAGS="$LDFLAGS" ++LDFLAGS="$LDFLAGS" -landroid-glob - dnl ######################################################################### - dnl ### Output -diff -r -u old/Project/GNU/Library/libzen.pc.in Project/GNU/Library/libzen.pc.in ---- old/Project/GNU/Library/libzen.pc.in 2019-12-09 18:08:43.564751200 +0100 -+++ Project/GNU/Library/libzen.pc.in 2019-12-09 18:10:52.801637000 +0100 + dnl ------------------------------------------------------------------------- + dnl Check if thread safe variants of time functions are available +Only in ./Project/GNU/Library: libzen-config.in +diff -r -u old/Project/GNU/Library/libzen.pc.in ./Project/GNU/Library/libzen.pc.in +--- old/Project/GNU/Library/libzen.pc.in 2021-03-26 12:34:52.385894900 +0100 ++++ ./Project/GNU/Library/libzen.pc.in 2021-03-26 12:39:17.510541700 +0100 @@ -4,10 +4,10 @@ includedir=@includedir@ Unicode=@ZenLib_Unicode@ @@ -36,6 +37,6 @@ diff -r -u old/Project/GNU/Library/libzen.pc.in Project/GNU/Library/libzen.pc.in Name: libzen Version: @PACKAGE_VERSION@ Description: ZenLib --Libs: -L${libdir} -lzen -lstdc++ -+Libs: -L${libdir} -lzen -lstdc++ -landroid-glob +-Libs: -L${libdir} -lzen ++Libs: -L${libdir} -lzen -landroid-glob Cflags: -I${includedir} @ZenLib_CXXFLAGS@ diff --git a/packages/libzen/build.sh b/packages/libzen/build.sh index fe2480416..1a45ab970 100755 --- a/packages/libzen/build.sh +++ b/packages/libzen/build.sh @@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="ZenLib C++ utility library" TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_LICENSE_FILE="../../../License.txt" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.4.38 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=0.4.39 TERMUX_PKG_SRCURL=https://mediaarea.net/download/source/libzen/${TERMUX_PKG_VERSION}/libzen_${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=ad98fccec235ed76a40e7da8856f0bcc9c8d07cafe4c3ce30c47407760add786 +TERMUX_PKG_SHA256=bbf877062227828ccca63d36af04a16789f3f1013e0c99f6dfd908bf5f2dbe43 TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-support" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-shared --enable-static" diff --git a/packages/mediainfo/build.sh b/packages/mediainfo/build.sh index 90b3ab7d6..eded1f2bf 100644 --- a/packages/mediainfo/build.sh +++ b/packages/mediainfo/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Command-line utility for reading information from media TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="../../../LICENSE" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=20.09 +TERMUX_PKG_VERSION=21.03 TERMUX_PKG_SRCURL=https://mediaarea.net/download/source/mediainfo/${TERMUX_PKG_VERSION}/mediainfo_${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=fad981d2c8154c98f4107da1d5bfafbe59fd7198519cc470e06bdd335c7819c3 +TERMUX_PKG_SHA256=c246912af47aa344f4484bf447021e64a8ff813ddf2ce971b12fb8564cb04636 TERMUX_PKG_DEPENDS="libmediainfo" termux_step_pre_configure() {