diff mbox series

[2/2] package/tvheadend: remove dependency to libavresample

Message ID 20230105191813.3533745-2-bernd.kuhls@t-online.de
State Superseded
Headers show
Series [1/2] package/freeswitch: ffmpeg's libavresample is an optional dependency | expand

Commit Message

Bernd Kuhls Jan. 5, 2023, 7:18 p.m. UTC 
Add upstream patch to remove check for libavresample, this library is not
used by tvheadend.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...ove-libavresample-from-build-scripts.patch | 38 +++++++++++++++++++
 package/tvheadend/Config.in                   |  1 -
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 package/tvheadend/0002-remove-libavresample-from-build-scripts.patch
diff mbox series

Patch

diff --git a/package/tvheadend/0002-remove-libavresample-from-build-scripts.patch b/package/tvheadend/0002-remove-libavresample-from-build-scripts.patch
new file mode 100644
index 0000000000..63dfbb38d1
--- /dev/null
+++ b/package/tvheadend/0002-remove-libavresample-from-build-scripts.patch
@@ -0,0 +1,38 @@ 
+From 3a9e511b614bbbcea395e3ee8c16dc15692a17d4 Mon Sep 17 00:00:00 2001
+From: Pim Zandbergen <pim@zandbergen.org>
+Date: Fri, 30 Dec 2022 01:46:43 +0100
+Subject: [PATCH] remove libavresample from build scripts
+
+Downloaded from upstream PR:
+https://github.com/tvheadend/tvheadend/pull/1487
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile  | 1 -
+ configure | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0ae3a19cab..a56a2fbdf9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -93,7 +93,6 @@ ifeq ($(CONFIG_LIBAV),yes)
+ FFMPEG_LIBS := \
+     libavfilter \
+     libswresample \
+-    libavresample \
+     libswscale \
+     libavformat \
+     libavcodec \
+diff --git a/configure b/configure
+index c087502bf3..8ce559fa7b 100755
+--- a/configure
++++ b/configure
+@@ -642,7 +642,6 @@ else
+ 
+     check_pkg libavfilter   ">=6.47.100"  || has_libav=false
+     check_pkg libswresample ">=2.1.100"   && has_resample=true
+-    check_pkg libavresample ">=3.0.0"     && has_resample=true
+     check_pkg libswscale    ">=4.1.100"   || has_libav=false
+     check_pkg libavformat   ">=57.41.100" || has_libav=false
+     check_pkg libavcodec    ">=57.48.101" || has_libav=false
diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 99a24ec011..3d21897c6d 100644
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -63,7 +63,6 @@  config BR2_PACKAGE_TVHEADEND_TRANSCODING
 	bool "transcoding support"
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	select BR2_PACKAGE_FFMPEG
-	select BR2_PACKAGE_FFMPEG_AVRESAMPLE
 	select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	# vp8 encoder needs c++