[Buildroot] [PATCH 1/2] package/freeswitch: ffmpeg's libavresample is an optional dependency

[Buildroot] [PATCH 1/2] package/freeswitch: ffmpeg's libavresample is an optional dependency

[Bernd Kuhls]

See upstream commit from 2019:
https://github.com/signalwire/freeswitch/commit/e9c58084db249845af88011a1e3c5d7b9ec05a76#diff-2cd3a5516ad0fc3cba6d14d0ea3e72da43a2c2fc3c21eb7ade6c49d52136bbd2R43

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/freeswitch/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in
index bad101486c..1ab624c33c 100644
--- a/package/freeswitch/Config.in
+++ b/package/freeswitch/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_FREESWITCH
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # apr, included in freeswitch source
 	depends on BR2_USE_WCHAR # uses wchar_t
-	select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_JPEG
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Bernd Kuhls]

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 --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++
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/freeswitch: ffmpeg's libavresample is an optional dependency

[Yann E. MORIN]

Bernd, All,

On 2023-01-05 20:18 +0100, Bernd Kuhls spake thusly:
> See upstream commit from 2019:
> https://github.com/signalwire/freeswitch/commit/e9c58084db249845af88011a1e3c5d7b9ec05a76#diff-2cd3a5516ad0fc3cba6d14d0ea3e72da43a2c2fc3c21eb7ade6c49d52136bbd2R43
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/freeswitch/Config.in | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in
> index bad101486c..1ab624c33c 100644
> --- a/package/freeswitch/Config.in
> +++ b/package/freeswitch/Config.in
> @@ -5,7 +5,6 @@ config BR2_PACKAGE_FREESWITCH
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	depends on BR2_USE_MMU # apr, included in freeswitch source
>  	depends on BR2_USE_WCHAR # uses wchar_t
> -	select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
>  	select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG
>  	select BR2_PACKAGE_LIBCURL
>  	select BR2_PACKAGE_JPEG
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/freeswitch: ffmpeg's libavresample is an optional dependency

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Bernd, All,
 > On 2023-01-05 20:18 +0100, Bernd Kuhls spake thusly:
 >> See upstream commit from 2019:
 >> https://github.com/signalwire/freeswitch/commit/e9c58084db249845af88011a1e3c5d7b9ec05a76#diff-2cd3a5516ad0fc3cba6d14d0ea3e72da43a2c2fc3c21eb7ade6c49d52136bbd2R43
 >> 
 >> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

 > Applied to master, thanks.

Committed to 2023.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot