[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

Tue, 18 Jan 2022 17:16:04 -0800 

commit:     3354d1716f1b68e51991b04b28fe6df16ef1545a
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Jan 16 02:04:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 19 01:14:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3354d171

media-video/ffmpeg: add 5.0

Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/ffmpeg/Manifest                                  | 1 +
 media-video/ffmpeg/{ffmpeg-9999.ebuild => ffmpeg-5.0.ebuild} | 5 +++--
 media-video/ffmpeg/ffmpeg-9999.ebuild                        | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d1bac784ee01..87ac85442819 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,3 +5,4 @@ DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 
3b0eb332459921435b60e72f5c572034abf65
 DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 
97e1e598e4abe397b06298d545c3073ea2303e11c01e98343fe09d99174e02ca94f52c4df0d389fbefe7814686221446d30f107092f00cb0b69275c8747d6f32
 SHA512 
ec5566f8684f0ceb18184d59786ea1fc166ab28c46260ebcca5b919ad53137ba7317fd0c537e97df28553572a0d5e42c558773c808cf76995d67985aec2d6d4d
 DIST ffmpeg-4.4.1.tar.bz2 11494996 BLAKE2B 
050b0501cb21f44451d59bf3b20b18d55234636b5a69a4962103d63f80ce9af172cc2cecb1e33b92334fcf635b283afddbdfa20cbd6deb526008cdb34ae01c16
 SHA512 
c41e63ffa9f5465ea3a7f4a8b255b299a2f49d5868ada4310a2344b8fea02476365c44871defd5609da55c805cbb58f34063dbdd4b203ade932cba8b3cfefc72
 DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B 
a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf
 SHA512 
212c330f477e9452b9d7873d6d3c452a5c946b6b9c17b01d94c60fda66e61e53b78388ef7686b8d9415a27cd3e05d5f0d6639a02a22467dbf1ed483b5594c80f
+DIST ffmpeg-5.0.tar.bz2 11821587 BLAKE2B 
76abc243707712b7974552cfbd703b5059487ac05b76744dcaacab45924598bffe173b41354a41718a7b5bd0933e71e95a11f9e715b9127b49cc19a88124a3d6
 SHA512 
2e7f05d3218201869602a32fc473ae55f9b8bc22d2710ebe7523953c27d39cf459e91e34d3b940d8ffe90677b028cea04c5b189775b1718a83b2b73943ba3f61

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-5.0.ebuild
similarity index 98%
copy from media-video/ffmpeg/ffmpeg-9999.ebuild
copy to media-video/ffmpeg/ffmpeg-5.0.ebuild
index 4a5d570d6c24..a6be1e984dff 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.ebuild
@@ -220,7 +220,7 @@ RDEPEND="
        jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
        libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
        libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+       libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
        libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
        libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
        libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
@@ -260,7 +260,7 @@ RDEPEND="
                >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
        )
        vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-       vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
+       vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] )
        X? (
                >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
                >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -382,6 +382,7 @@ multilib_src_configure() {
 
        if use openssl ; then
                myconf+=( --disable-gnutls )
+               has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 
)
        fi
 
        # (temporarily) disable non-multilib deps

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 4a5d570d6c24..a6be1e984dff 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -220,7 +220,7 @@ RDEPEND="
        jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
        libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
        libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+       libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
        libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
        libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
        libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
@@ -260,7 +260,7 @@ RDEPEND="
                >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
        )
        vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-       vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
+       vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] )
        X? (
                >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
                >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -382,6 +382,7 @@ multilib_src_configure() {
 
        if use openssl ; then
                myconf+=( --disable-gnutls )
+               has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 
)
        fi
 
        # (temporarily) disable non-multilib deps

Reply via email to