[Buildroot] [PATCH] package/ffmpeg: handle new SDL2 version scheme

[Buildroot] [PATCH] package/ffmpeg: handle new SDL2 version scheme

[Corentin Labbe]

Current ffmpeg package does not install ffplay.
The root cause is that ffmpeg configure does not detect SDL2 due to
version mismatch.
The patch fixing that is taken from gentoo portage tree.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 ...peg-4.4.2-libsdl2-new-version-scheme.patch | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/ffmpeg/0005-ffmpeg-4.4.2-libsdl2-new-version-scheme.patch

diff --git a/package/ffmpeg/0005-ffmpeg-4.4.2-libsdl2-new-version-scheme.patch b/package/ffmpeg/0005-ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
new file mode 100644
index 0000000000..b592c2f9b7
--- /dev/null
+++ b/package/ffmpeg/0005-ffmpeg-4.4.2-libsdl2-new-version-scheme.patch
@@ -0,0 +1,25 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/839f98ff6719cf2db0cbd88cd787a1b19b9cbf47
+
+From: Christopher Degawa <ccom@randomderp.com>
+Date: Wed, 11 May 2022 15:11:04 -0500
+Subject: [PATCH] configure: extend SDL check to accept all 2.x versions
+
+sdl2 recently changed their versioning, moving the patch level to minor level
+https://github.com/libsdl-org/SDL/commit/cd7c2f1de7d9e418bb554047d714dd7cacc020ff
+and have said that they will instead ship sdl3.pc for 3.0.0
+
+Fixes ticket 9768
+
+Signed-off-by: Christopher Degawa <ccom@randomderp.com>
+Signed-off-by: Gyan Doshi <ffmpeg@gyani.pro>
+--- a/configure
++++ b/configure
+@@ -6383,7 +6383,7 @@ fi
+ 
+ if enabled sdl2; then
+     SDL2_CONFIG="${cross_prefix}sdl2-config"
+-    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
++    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
+     if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
+         sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
+         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
-- 
2.25.1

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

Re: [Buildroot] [PATCH] package/ffmpeg: handle new SDL2 version scheme

[Joachim Wiberg]

On Sun, Oct 16, 2022 at 08:06, Corentin Labbe <clabbe@baylibre.com> wrote:

> Current ffmpeg package does not install ffplay.  The root cause is
> that ffmpeg configure does not detect SDL2 due to version mismatch.
> The patch fixing that is taken from gentoo portage tree.
>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

Reviewed-by: Joachim Wiberg <troglobit@gmail.com>

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

Re: [Buildroot] [PATCH] package/ffmpeg: handle new SDL2 version scheme

[Bernd Kuhls]

Am Sun, 16 Oct 2022 08:06:29 +0000 schrieb Corentin Labbe:

> Current ffmpeg package does not install ffplay.
> The root cause is that ffmpeg configure does not detect SDL2 due to
> version mismatch.
> The patch fixing that is taken from gentoo portage tree.

Hi,

this patch is also included in the new version:
http://patchwork.ozlabs.org/project/buildroot/patch/
20221016152034.1161161-1-bernd.kuhls@t-online.de/

Regards, Bernd

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

Re: [Buildroot] [PATCH] package/ffmpeg: handle new SDL2 version scheme

[Thomas Petazzoni via buildroot]

On Sun, 16 Oct 2022 08:06:29 +0000
Corentin Labbe <clabbe@baylibre.com> wrote:

> Current ffmpeg package does not install ffplay.
> The root cause is that ffmpeg configure does not detect SDL2 due to
> version mismatch.
> The patch fixing that is taken from gentoo portage tree.
> 
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
>  ...peg-4.4.2-libsdl2-new-version-scheme.patch | 25 +++++++++++++++++++
>  1 file changed, 25 insertions(+)
>  create mode 100644 package/ffmpeg/0005-ffmpeg-4.4.2-libsdl2-new-version-scheme.patch

Thanks Corentin for the patch. However on the same day, Bernd submitted
a patch that bumps ffmpeg to 4.4.3, which also addresses the problem as
this fix is already in ffmpeg 4.4.3.

Also, for next contributions: we want the patch to be generated with
"git format-patch", and you need to add your Signed-off-by line in the
patch itself.

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot