tvheadend42: remove ffmpegx depends

packages/addons/service/tvheadend42/package.mk

@@ -10,7 +10,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
 PKG_URL="https://github.com/tvheadend/tvheadend/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \
+PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps libdvbcsa libhdhomerun \
                     libiconv openssl pngquant:host Python3:host dtv-scan-tables"
 PKG_DEPENDS_CONFIG="ffmpegx"
 PKG_SECTION="service"
@@ -33,20 +33,20 @@ PKG_TVH_TRANSCODING="\
   --disable-libvpx_static \
   --disable-libx264_static \
   --disable-libx265_static \
-  --enable-libav \
-  --enable-libfdkaac \
-  --enable-libopus \
-  --enable-libvorbis \
-  --enable-libx264"
+  --disable-libav \
+  --disable-libfdkaac \
+  --disable-libopus \
+  --disable-libvorbis \
+  --disable-libx264"
 
 # hw specific transcoding options
 if [ "${TARGET_ARCH}" = "x86_64" ]; then
   PKG_DEPENDS_TARGET+=" libva"
   # specific transcoding options
   PKG_TVH_TRANSCODING="${PKG_TVH_TRANSCODING} \
-    --enable-vaapi \
-    --enable-libvpx \
-    --enable-libx265"
+    --disable-vaapi \
+    --disable-libvpx \
+    --disable-libx265"
 else
   # for != "x86_64" targets
   # specific transcoding options

packages/addons/service/tvheadend42/patches/tvheadend42-01-dvb-scan-path.patch

@@ -1,6 +1,6 @@
 --- a/src/input/mpegts/scanfile.c
 +++ b/src/input/mpegts/scanfile.c
-@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path, int lock )
+@@ -906,7 +906,7 @@ scanfile_init ( const char *muxconf_path
  #elif defined(PLATFORM_FREEBSD)
      path = "/usr/local/share/dtv-scan-tables";
  #else

packages/addons/service/tvheadend42/patches/tvheadend42-02-hdhomerun-includes.patch

@@ -2,7 +2,7 @@ fix libhdhomerun includes
 
 --- a/configure
 +++ b/configure
-@@ -362,7 +362,7 @@ if enabled hdhomerun_static; then
+@@ -394,7 +394,7 @@ if enabled hdhomerun_static; then
  else
  
    if enabled_or_auto hdhomerun_client; then

packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch

@@ -11,13 +11,11 @@ causing an FTBFS.  Instead, recognize both the old and new symbols.
  src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-index 58dec51ab3..18068faf5d 100644
 --- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
 +++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
-@@ -32,7 +32,8 @@
- 
- #include "config.h"
+@@ -28,7 +28,8 @@
+ #include <arpa/inet.h>
+ #include <openssl/sha.h>
  
 -#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN
 +#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \

packages/addons/service/tvheadend42/patches/tvheadend42-04-Fix-building-with-fno-common.patch

@@ -9,11 +9,9 @@ Subject: [PATCH] Fix building with -fno-common (default from GCC 10)
  src/input/mpegts.h | 2 +-
  3 files changed, 5 insertions(+), 3 deletions(-)
 
-diff --git a/src/input.h b/src/input.h
-index a9c96df048..3dce355c6a 100644
 --- a/src/input.h
 +++ b/src/input.h
-@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
+@@ -128,8 +128,8 @@ void tvh_hardware_delete ( tvh_hardware_
  extern const idclass_t tvh_input_class;
  extern const idclass_t tvh_input_instance_class;
  
@@ -24,8 +22,6 @@ index a9c96df048..3dce355c6a 100644
  
  #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
  #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
-diff --git a/src/input/mpegts.c b/src/input/mpegts.c
-index e02d491f19..fca4f34296 100644
 --- a/src/input/mpegts.c
 +++ b/src/input/mpegts.c
 @@ -20,6 +20,8 @@
@@ -37,11 +33,9 @@ index e02d491f19..fca4f34296 100644
  extern memoryinfo_t mpegts_input_queue_memoryinfo;
  extern memoryinfo_t mpegts_input_table_memoryinfo;
  
-diff --git a/src/input/mpegts.h b/src/input/mpegts.h
-index 9dda3bacaa..9c4c57b73b 100644
 --- a/src/input/mpegts.h
 +++ b/src/input/mpegts.h
-@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener
+@@ -1132,7 +1132,7 @@ typedef struct mpegts_listener
    void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
  } mpegts_listener_t;
  

packages/addons/service/tvheadend42/patches/tvheadend42-05-webui-query-url-fix.patch

@@ -21,7 +21,6 @@ https://github.com/tvheadend/tvheadend/commit/ce09077056f9c6558c188d135cec3be85c
      }
  
      function playProgram() {
-
 --- a/src/webui/static/app/dvr.js
 +++ b/src/webui/static/app/dvr.js
 @@ -87,13 +87,11 @@ tvheadend.dvrDetails = function(uuid) {

packages/addons/service/tvheadend42/patches/tvheadend42-06-satip-upnp-fix.patch

@@ -8,11 +8,9 @@ Subject: [PATCH] SAT>IP client: UPnP header field names are case insensitive
  src/input/mpegts/satip/satip.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
-index 4d522e19c4..58e91d30bb 100644
 --- a/src/input/mpegts/satip/satip.c
 +++ b/src/input/mpegts/satip/satip.c
-@@ -1175,19 +1175,19 @@ satip_discovery_service_received
+@@ -1125,19 +1125,19 @@ satip_discovery_service_received
      if (ptr == NULL)
        break;
      if (http_tokenize(ptr, argv, 2, ':') == 2) {