bump(main/tsduck): 3.37-3670
This commit is contained in:
parent
14b725c7b6
commit
c7ae5e972e
|
@ -1,12 +1,11 @@
|
|||
--- a/Makefile.inc
|
||||
+++ b/Makefile.inc
|
||||
@@ -538,7 +538,7 @@
|
||||
@@ -559,7 +559,7 @@ LDFLAGS_PTHREAD = $(if $(MACOS),,-pthread)
|
||||
|
||||
# External libraries
|
||||
|
||||
-LDLIBS += -lstdc++ -lpthread $(if $(MACOS)$(OPENBSD),,-lrt) -lm
|
||||
-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.
|
||||
|
||||
|
|
|
@ -2,10 +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.36.3528"
|
||||
TERMUX_PKG_VERSION="3.37.3670"
|
||||
_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=068ef1cbc60821a4cce8d50c876edef5150ad581b31f4a92f085e20b3becd0eb
|
||||
TERMUX_PKG_SHA256=dbb7c654330108c509f2d8a97fe0346e3a1f55ad959e13dcee4a40dd04507886
|
||||
TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcurl, libedit"
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
|
@ -28,6 +28,7 @@ NOTEST=1
|
|||
NOVATEK=1
|
||||
SYSPREFIX=${TERMUX_PREFIX}
|
||||
USELIB64=
|
||||
CXXFLAGS_WARNINGS=
|
||||
"
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="
|
||||
etc/security
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
--- a/src/libtsduck/Makefile
|
||||
+++ b/src/libtsduck/Makefile
|
||||
@@ -194,7 +194,6 @@
|
||||
@@ -191,7 +191,6 @@ install-tools: $(SHARED_LIBTSDUCK)
|
||||
PRECONFIG = $(SYSROOT)$(SYSPREFIX)/include/tsduck/tsPreConfiguration.h
|
||||
|
||||
install-devel: $(STATIC_LIBTSDUCK) $(TSDUCK_H)
|
||||
install-devel: $(if $(NOSTATIC),,$(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)
|
||||
$(if $(NOSTATIC),,install -m 644 $(STATIC_LIBTSDUCK) $(SYSROOT)$(USRLIBDIR))
|
||||
install -m 644 $(addsuffix /*.h,$(PUBLIC_INCLUDES)) $(TSDUCK_H) $(SYSROOT)$(SYSPREFIX)/include/tsduck
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
--- a/src/libtsduck/base/system/tsSysUtils.h
|
||||
+++ b/src/libtsduck/base/system/tsSysUtils.h
|
||||
@@ -72,6 +72,8 @@
|
||||
@@ -72,6 +72,8 @@ namespace ts {
|
||||
#elif defined(TS_WINDOWS)
|
||||
// Second parameter of ::DeviceIoControl().
|
||||
typedef ::DWORD ioctl_request_t;
|
||||
using ioctl_request_t = ::DWORD;
|
||||
+ #elif defined(TS_ANDROID)
|
||||
+ typedef int ioctl_request_t;
|
||||
+ using ioctl_request_t = int;
|
||||
#else
|
||||
// Extract the type of the second parameter of ::ioctl().
|
||||
// It is "unsigned long" on most Linux systems but "int" on Alpine Linux.
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/src/libtsduck/config/Makefile
|
||||
+++ b/src/libtsduck/config/Makefile
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
$(TABLES_DEST): $(TABLES_SRC) $(TABLES_SUBS) $(BINDIR)/tsxml
|
||||
@echo ' [GEN] $(notdir $@)'; \
|
||||
- $(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)
|
||||
@echo ' [GEN] $(notdir $@)'; \
|
Loading…
Reference in New Issue