From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 35D76158094 for ; Sun, 21 Aug 2022 02:39:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60826E097B; Sun, 21 Aug 2022 02:39:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 157A7E097B for ; Sun, 21 Aug 2022 02:39:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE849341111 for ; Sun, 21 Aug 2022 02:39:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49A0256C for ; Sun, 21 Aug 2022 02:39:39 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661049546.a73ef46b806cc76752ac0f6c3b453452787261bb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/, media-video/ffmpeg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/ffmpeg-4.4.2.ebuild media-video/ffmpeg/ffmpeg-5.0.1.ebuild media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch X-VCS-Directories: media-video/ffmpeg/files/ media-video/ffmpeg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a73ef46b806cc76752ac0f6c3b453452787261bb X-VCS-Branch: master Date: Sun, 21 Aug 2022 02:39:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6fe532a3-8861-4814-b079-cd16142582ec X-Archives-Hash: 3a1b26077ed1029a9f8c5c079340ba13 commit: a73ef46b806cc76752ac0f6c3b453452787261bb Author: Sam James gentoo org> AuthorDate: Sun Aug 21 02:39:06 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Aug 21 02:39:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a73ef46b media-video/ffmpeg: fix configure with >=media-libs/libsdl2-2.24.0 ffmpeg needed adaptation to the new libsdl2 versioning scheme. Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-4.4.2.ebuild | 3 ++- media-video/ffmpeg/ffmpeg-5.0.1.ebuild | 3 ++- .../ffmpeg-4.4.2-libsdl2-new-version-scheme.patch | 25 ++++++++++++++++++++++ .../ffmpeg-5.0.1-libsdl2-new-version-scheme.patch | 25 ++++++++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild index 161cb301720b..49985fd883f3 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild @@ -332,7 +332,8 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch - "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch + "${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch + "${FILESDIR}"/${P}-libsdl2-new-version-scheme.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild index 17f3f4c919f0..09f3d902db11 100644 --- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild @@ -332,7 +332,8 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch - "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch + "${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch + "${FILESDIR}"/${P}-libsdl2-new-version-scheme.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-4.4.2-libsdl2-new-version-scheme.patch new file mode 100644 index 000000000000..b592c2f9b72d --- /dev/null +++ b/media-video/ffmpeg/files/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 +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 +Signed-off-by: Gyan Doshi +--- 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) diff --git a/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch b/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch new file mode 100644 index 000000000000..f95ff1cb7065 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-5.0.1-libsdl2-new-version-scheme.patch @@ -0,0 +1,25 @@ +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/240d82f26eef10461c8b78b09a0db76c464deea8 + +From: Christopher Degawa +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 +Signed-off-by: Gyan Doshi +--- a/configure ++++ b/configure +@@ -6739,7 +6739,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)