diff --git a/packages/libtsduck/Makefile.inc.patch b/packages/libtsduck/Makefile.inc.patch deleted file mode 100644 index 51f4faf8608498..00000000000000 --- a/packages/libtsduck/Makefile.inc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -559,7 +559,7 @@ LDFLAGS_PTHREAD = $(if $(MACOS),,-pthread) - - # External libraries - --LDLIBS += -lpthread $(if $(MACOS)$(OPENBSD),,-lrt) -lm -+LDLIBS += -lc++_shared -lm - - # Global compilation flags. - # Additional flags can be passed on the "make" command line using xxFLAGS_EXTRA. diff --git a/packages/libtsduck/Makefile.inc.patch.beforehostbuild b/packages/libtsduck/Makefile.inc.patch.beforehostbuild deleted file mode 100644 index a1a95b2f2ffd03..00000000000000 --- a/packages/libtsduck/Makefile.inc.patch.beforehostbuild +++ /dev/null @@ -1,24 +0,0 @@ ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -172,9 +172,9 @@ - - # Enforce English locale by default in all commands for predictible output. - --export LANGUAGE = en_US.UTF-8 --export LC_ALL = en_US.UTF-8 --export LANG = en_US.UTF-8 -+export LANGUAGE = C.UTF-8 -+export LC_ALL = C.UTF-8 -+export LANG = C.UTF-8 - - # Operating system, architecture, host name. - -@@ -292,7 +292,7 @@ - else ifneq ($(DEBUG),) - BINDIR = $(BINROOT)/debug-$(MAIN_ARCH)$(if $(HOSTNAME),-$(HOSTNAME),)$(BINDIR_SUFFIX) - else -- BINDIR = $(BINROOT)/release-$(MAIN_ARCH)$(if $(HOSTNAME),-$(HOSTNAME),)$(BINDIR_SUFFIX) -+ BINDIR = $(BINROOT)/release - endif - - OBJDIR = $(BINDIR)/objs-$(notdir $(CURDIR)) diff --git a/packages/libtsduck/build.sh b/packages/libtsduck/build.sh index 4b18243a6cc60d..dd1a658533525f 100644 --- a/packages/libtsduck/build.sh +++ b/packages/libtsduck/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://tsduck.io/ TERMUX_PKG_DESCRIPTION="An extensible toolkit for MPEG transport streams" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="3.38.3822" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="3.39.3956" _VERSION=$(echo "${TERMUX_PKG_VERSION}" | sed 's/\./-/2') TERMUX_PKG_SRCURL=https://github.com/tsduck/tsduck/archive/refs/tags/v${_VERSION}.tar.gz -TERMUX_PKG_SHA256=18bb779584384197dbb72af406cdcd42fe06efbf4a6ca8fd3138eb518b7ad369 +TERMUX_PKG_SHA256=1a391504967bd7a6ffb1cabd98bc6ee904a742081c0a17ead4d6639d58c82979 TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcurl, libedit" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_BUILD_IN_SRC=true @@ -30,6 +29,7 @@ NOVATEK=1 SYSPREFIX=${TERMUX_PREFIX} USELIB64= CXXFLAGS_WARNINGS= +NATIVEBINDIR=$TERMUX_PKG_HOSTBUILD_DIR/bin/release " TERMUX_PKG_RM_AFTER_INSTALL=" etc/security diff --git a/packages/libtsduck/scripts-make-config.sh.patch b/packages/libtsduck/scripts-make-config.sh.patch new file mode 100644 index 00000000000000..8a6a8bf64cbf1e --- /dev/null +++ b/packages/libtsduck/scripts-make-config.sh.patch @@ -0,0 +1,11 @@ +--- a/scripts/make-config.sh ++++ b/scripts/make-config.sh +@@ -575,7 +575,7 @@ CXXFLAGS_PTHREAD="-pthread" + [[ -z $MACOS ]] && LDFLAGS_PTHREAD="-pthread" + + # External libraries +-LDLIBS="$LDLIBS -lpthread" ++LDLIBS="$LDLIBS -lc++_shared" + [[ -n $NETBSD ]] && LDLIBS="$LDLIBS -lstdc++fs" + [[ -z $MACOS$OPENBSD ]] && LDLIBS="$LDLIBS -lrt" + LDLIBS="$LDLIBS -lm" diff --git a/packages/libtsduck/scripts-make-config.sh.patch.beforehostbuild b/packages/libtsduck/scripts-make-config.sh.patch.beforehostbuild new file mode 100644 index 00000000000000..d44843fc8a8d98 --- /dev/null +++ b/packages/libtsduck/scripts-make-config.sh.patch.beforehostbuild @@ -0,0 +1,24 @@ +--- a/scripts/make-config.sh ++++ b/scripts/make-config.sh +@@ -144,9 +144,9 @@ debug "NOEXTLIBS='$NOEXTLIBS'" + #----------------------------------------------------------------------------- + + # Enforce English locale by default in all commands for predictible output. +-LANGUAGE=en_US.UTF-8 +-LC_ALL=en_US.UTF-8 +-LANG=en_US.UTF-8 ++LANGUAGE=C.UTF-8 ++LC_ALL=C.UTF-8 ++LANG=C.UTF-8 + + [[ -z $LOCAL_OS ]] && LOCAL_OS=$(uname -s | tr A-Z a-z) + [[ -z $LOCAL_ARCH ]] && LOCAL_ARCH=$(uname -m) +@@ -332,7 +332,7 @@ else + BINDIR="$BINROOT/debug-${MAIN_ARCH}${hpart}${BINDIR_SUFFIX}" + else + # Default BINDIR for release mode. +- BINDIR="$BINROOT/release-${MAIN_ARCH}${hpart}${BINDIR_SUFFIX}" ++ BINDIR="$BINROOT/release" + fi + fi +