bump(main/libtsduck): 3.35.3258

This commit is contained in:
termux-pacman-bot
2023-10-16 20:31:22 +00:00
parent 93a36ee490
commit 0ccd976d18
3 changed files with 17 additions and 17 deletions

View File

@@ -2,10 +2,11 @@ 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"
_VERSION=3.33-3139
TERMUX_PKG_VERSION=${_VERSION//-/.}
TERMUX_PKG_SRCURL=https://github.com/tsduck/tsduck/archive/refs/tags/v${_VERSION}.tar.gz
TERMUX_PKG_SHA256=d7cdad9e46bf454cf7c952f23cd4b18f7690671ee8e0829d3a5da11db94b6201
TERMUX_PKG_VERSION="3.35.3258"
TERMUX_PKG_SRCURL=https://github.com/tsduck/tsduck/archive/refs/tags/v$(sed 's/\./-/2' <<< $TERMUX_PKG_VERSION).tar.gz
TERMUX_PKG_SHA256=7c28d04fad9ef8415dc02d56f377e5b2b4c3f173dcc9487a906ee73da38f4e41
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_VERSION_SED_REGEXP='s/-/./g'
TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcurl, libedit"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_EXTRA_MAKE_ARGS="
@@ -22,7 +23,7 @@ NOSRT=1
NORIST=1
NOEDITLINE=
NOTELETEXT=1
NOGITHUB=1
NOGITHUB=1
"
TERMUX_PKG_RM_AFTER_INSTALL="etc/security etc/udev"
TERMUX_PKG_HOSTBUILD=true
@@ -57,6 +58,9 @@ termux_step_pre_configure() {
}
termux_step_make() {
sed -i "s|\$(call F_SEARCH_CROSS,g++)|${CXX}|g" ${TERMUX_PKG_SRCDIR}/Makefile.inc
sed -i "s|\$(call F_SEARCH_CROSS,gcc)|${CC}|g" ${TERMUX_PKG_SRCDIR}/Makefile.inc
sed -i "s|\$(call F_SEARCH_CROSS,ld)|${LD}|g" ${TERMUX_PKG_SRCDIR}/Makefile.inc
make -j $TERMUX_MAKE_PROCESSES \
CXX="$CXX" \
GCC="$CC" \

View File

@@ -1,23 +1,19 @@
--- a/src/libtsduck/Makefile
+++ b/src/libtsduck/Makefile
@@ -141,7 +141,7 @@
@@ -153,7 +153,7 @@
@echo ' [DTAPI] $(if $(DTAPI_OBJECT),using $(DTAPI_OBJECT),no DTAPI available)'; \
echo ' [LD] $@'; \
cd $(OBJDIR); \
- $(CXX) $(CXXFLAGS) $(SOFLAGS) $(notdir $(OBJS)) $(DTAPI_OBJECT) $(LIBTSDUCK_LDLIBS) $(LDLIBS_EXTRA) $(LDLIBS) -shared -o $@
+ $(CXX) $(CXXFLAGS) $(SOFLAGS) $(LDFLAGS) $(notdir $(OBJS)) $(DTAPI_OBJECT) $(LIBTSDUCK_LDLIBS) $(LDLIBS_EXTRA) $(LDLIBS) -shared -o $@
- $(CXX) $(SOFLAGS) $(LDFLAGS) $(notdir $(OBJS)) $(DTAPI_OBJECT) $(LIBTSDUCK_LDLIBS) $(LDLIBS_EXTRA) $(LDLIBS) -shared -o $@
+ $(CXX) $(SOFLAGS) $(LDFLAGS) $(LDFLAGS) $(notdir $(OBJS)) $(DTAPI_OBJECT) $(LIBTSDUCK_LDLIBS) $(LDLIBS_EXTRA) $(LDLIBS) -shared -o $@
# The static library is build differently. There are four specific categories:
# tables, descriptors, charsets and plugins. These classes use self-registration
@@ -203,11 +203,8 @@
+@$(call F_RECURSE,config python java)
@@ -217,7 +217,6 @@
PRECONFIG = $(SYSROOT)$(SYSPREFIX)/include/tsduck/tsPreConfiguration.h
install-devel: $(STATIC_LIBTSDUCK) $(TSDUCK_H)
- rm -rf $(SYSROOT)$(SYSPREFIX)/include/tsduck
install -d -m 755 $(SYSROOT)$(USRLIBDIR) $(SYSROOT)$(SYSPREFIX)/include/tsduck
install -m 644 $(STATIC_LIBTSDUCK) $(SYSROOT)$(USRLIBDIR)
install -m 644 $(addsuffix /*.h,$(PUBLIC_INCLUDES)) $(TSDUCK_H) $(SYSROOT)$(SYSPREFIX)/include/tsduck
- $(if $(NOTELETEXT),rm -f $(SYSROOT)$(SYSPREFIX)/include/tsduck/tsTeletextDemux.h)
- $(if $(NOTELETEXT),rm -f $(SYSROOT)$(SYSPREFIX)/include/tsduck/tsTeletextPlugin.h)
$(if $(NOTELETEXT),$(SED) -i -e '/TeletextDemux/d' -e '/TeletextPlugin/d' $(SYSROOT)$(SYSPREFIX)/include/tsduck/tsduck.h)
+@$(call F_RECURSE,config python java)

View File

@@ -1,11 +1,11 @@
--- a/src/libtsduck/config/Makefile
+++ b/src/libtsduck/config/Makefile
@@ -66,7 +66,7 @@
@@ -65,7 +65,7 @@
$(TABLES_DEST): $(TABLES_SRC) $(TABLES_SUBS) $(BINDIR)/tsxml
@echo ' [GEN] $(notdir $@)'; \
- $(BINDIR)/tsxml --merge $(TABLES_SRC) $(TABLES_SUBS) --sort _tables --sort _descriptors --uncomment -o $@
- $(TSXML) --merge $(TABLES_SRC) $(TABLES_SUBS) --sort _tables --sort _descriptors --uncomment -o $@
+ tsxml --merge $(TABLES_SRC) $(TABLES_SUBS) --sort _tables --sort _descriptors --uncomment -o $@
$(NAMES_DEST): $(NAMES_SRC) $(NAMES_SUBS)
$(NAMES_DEST): $(NAMES_SRC)
@echo ' [GEN] $(notdir $@)'; \