From 10d0d96705e61516b390b67c973207680c0e83fb Mon Sep 17 00:00:00 2001 From: Aditya Alok Date: Tue, 28 Sep 2021 01:14:46 +0530 Subject: [PATCH 1/2] tvheadend: fix bus error tvheadend: enable libavutil Revert "tvheadend: enable libavutil" This reverts commit 619b8c6d15ebaa150f5950ec6ad3991f9b03fa0a. tvheadend: enable debug build tvheadend: enable debug build again gdbm: fix ssl certificate expired issue tvheadend: try tvheadend: try 2 tvheadend: try 3 gdbm: revert to https tvheadend: try 4 tvheadend: build from master Revert "tvheadend: build from master" This reverts commit ce010e9d082f23d102b0b860f27d17f9147dadf3. tvheadend: fix bus error tvheadend: fix bus error tvheadend: fix build tvheadend: fix build tvheadend: fix bus error --- packages/tvheadend/build.sh | 21 ++++++--------------- packages/tvheadend/define_memalign.patch | 0 packages/tvheadend/time_64.patch | 15 +++++++++++++++ packages/tvheadend/time_64.patch64 | 13 ------------- 4 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 packages/tvheadend/define_memalign.patch create mode 100644 packages/tvheadend/time_64.patch delete mode 100644 packages/tvheadend/time_64.patch64 diff --git a/packages/tvheadend/build.sh b/packages/tvheadend/build.sh index f297ae574..2c5787447 100644 --- a/packages/tvheadend/build.sh +++ b/packages/tvheadend/build.sh @@ -3,27 +3,18 @@ TERMUX_PKG_DESCRIPTION="TV streaming server for Linux and Android supporting DVB TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@MrAdityaAlok " TERMUX_PKG_VERSION=4.2.8 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/tvheadend/tvheadend/archive/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_SHA256=1aef889373d5fad2a7bd2f139156d4d5e34a64b6d38b87b868a2df415f01f7ad -TERMUX_PKG_DEPENDS="openssl, libiconv, zlib, ffmpeg, pcre2, libopus, libdvbcsa, libx264, libx265, libvpx, libfdk-aac, libogg, libtheora, libvorbis, pngquant" +TERMUX_PKG_DEPENDS="libiconv, ffmpeg, libopus, libx264, libx265, libvpx, libfdk-aac, libogg, libtheora, libvorbis, pngquant" +TERMUX_PKG_BUILD_DEPENDS="gettext, openssl, zlib, libdvbcsa, pcre2, dbus" TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_DEBUG_BUILD=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-android ---nowerror ---enable-pcre ---enable-zlib --enable-pngquant ---enable-ffmpeg ---enable-libx264 ---enable-libx265 ---enable-libvpx ---enable-libogg ---enable-libtheora ---enable-libvorbis ---enable-libfdkaac ---enable-libopus +--enable-dvbcsa --disable-libav ---enable-tvhcsa --disable-hdhomerun_static --disable-ffmpeg_static --disable-avahi @@ -34,7 +25,7 @@ termux_step_pre_configure() { CFLAGS+=" -I${TERMUX_PREFIX}/include" - # Arm (or Android ?) does not support mmx and sse2 instructions. + # Arm does not support mmx and sse2 instructions, still checks return true if [ "${TERMUX_ARCH}" = "arm" ] || [ "${TERMUX_ARCH}" = "aarch64" ]; then patch -p1 <"${TERMUX_PKG_BUILDER_DIR}/disable-mmx-sse2" fi diff --git a/packages/tvheadend/define_memalign.patch b/packages/tvheadend/define_memalign.patch new file mode 100644 index 000000000..e69de29bb diff --git a/packages/tvheadend/time_64.patch b/packages/tvheadend/time_64.patch new file mode 100644 index 000000000..033b6fa0d --- /dev/null +++ b/packages/tvheadend/time_64.patch @@ -0,0 +1,15 @@ +--- tvheadend/src/compat.h 2021-09-19 19:48:05.000000000 +0530 ++++ tvheadend-mod/src/compat.h 2021-10-02 10:56:34.486999999 +0530 +@@ -30,10 +30,11 @@ + #define pthread_yield() sched_yield() + #endif + #define S_IEXEC S_IXUSR ++#if !defined(__LP64__) + #include + // 32-bit Android has only timegm64() and not timegm(). + // We replicate the behaviour of timegm() when the result overflows time_t. +- ++#endif + #endif /* ENABLE_ANDROID */ + + #ifndef ENABLE_EPOLL_CREATE1 diff --git a/packages/tvheadend/time_64.patch64 b/packages/tvheadend/time_64.patch64 deleted file mode 100644 index c38e95fb0..000000000 --- a/packages/tvheadend/time_64.patch64 +++ /dev/null @@ -1,13 +0,0 @@ ---- tvheadend/src/compat.h 2021-09-19 19:48:05.484999708 +0530 -+++ tvheadend-mod/src/compat.h 2021-09-20 21:30:01.315999938 +0530 -@@ -30,10 +30,6 @@ - #define pthread_yield() sched_yield() - #endif - #define S_IEXEC S_IXUSR --#include --// 32-bit Android has only timegm64() and not timegm(). --// We replicate the behaviour of timegm() when the result overflows time_t. -- - #endif /* ENABLE_ANDROID */ - - #ifndef ENABLE_EPOLL_CREATE1 From 45af2870f30f88c5b09d0b202f0e62956294a9e5 Mon Sep 17 00:00:00 2001 From: Aditya Alok Date: Sat, 2 Oct 2021 15:34:09 +0530 Subject: [PATCH 2/2] tvheadend: define MEMALIGN tvheadend: fix bus error --- packages/tvheadend/build.sh | 2 +- packages/tvheadend/define_memalign.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/tvheadend/build.sh b/packages/tvheadend/build.sh index 2c5787447..65408eaac 100644 --- a/packages/tvheadend/build.sh +++ b/packages/tvheadend/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=1aef889373d5fad2a7bd2f139156d4d5e34a64b6d38b87b868a2df415f01f7 TERMUX_PKG_DEPENDS="libiconv, ffmpeg, libopus, libx264, libx265, libvpx, libfdk-aac, libogg, libtheora, libvorbis, pngquant" TERMUX_PKG_BUILD_DEPENDS="gettext, openssl, zlib, libdvbcsa, pcre2, dbus" TERMUX_PKG_BUILD_IN_SRC=true -TERMUX_DEBUG_BUILD=true + TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-android --enable-pngquant diff --git a/packages/tvheadend/define_memalign.patch b/packages/tvheadend/define_memalign.patch index e69de29bb..e9be9f264 100644 --- a/packages/tvheadend/define_memalign.patch +++ b/packages/tvheadend/define_memalign.patch @@ -0,0 +1,11 @@ +--- tvheadend-4.2.8/src/descrambler/ffdecsa/FFdecsa.c 2019-01-12 14:28:47.000000000 +0530 ++++ tvheadend-4.2.8-mod/src/descrambler/ffdecsa/FFdecsa.c 2021-10-02 15:27:44.648481179 +0530 +@@ -106,7 +106,7 @@ + #define FREE(X) free(X) + #endif + #ifndef MEMALIGN +-#define MEMALIGN ++#define MEMALIGN __attribute__((aligned(8))) + #endif + + //// debug tool