Merge pull request #7606 from MrAdityaAlok/tvheadend

tvheadend: fix bus error

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 <dev.aditya.alok@gmail.com>"
 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_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

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

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 <time64.h>
+ // 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

packages/tvheadend/time_64.patch64

@@ -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 <time64.h>
--// 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