Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(main/libtsduck): 3.39.3956 #22807

Merged
merged 1 commit into from
Jan 25, 2025
Merged

bump(main/libtsduck): 3.39.3956 #22807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions packages/libtsduck/Makefile.inc.patch
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions packages/libtsduck/Makefile.inc.patch.beforehostbuild
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions packages/libtsduck/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 11 additions & 0 deletions packages/libtsduck/scripts-make-config.sh.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
24 changes: 24 additions & 0 deletions packages/libtsduck/scripts-make-config.sh.patch.beforehostbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Loading