diff options
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r-- | media-video/ffmpeg/Manifest | 18 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild | 8 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild | 7 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild | 7 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4-r1.ebuild | 7 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild (renamed from media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild) | 18 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-5.0-r1.ebuild (renamed from media-video/ffmpeg/ffmpeg-5.0.ebuild) | 15 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 17 | ||||
-rw-r--r-- | media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch | 59 | ||||
-rw-r--r-- | media-video/ffmpeg/files/vmaf-models-default-path.patch | 13 | ||||
-rw-r--r-- | media-video/ffmpeg/metadata.xml | 2 |
11 files changed, 133 insertions, 38 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index a05010a8068e..4e96d87ac5bf 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -2,6 +2,8 @@ AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b362 AUX ffmpeg-4.3-altivec-novsx-yuv2rgb.patch 1110 BLAKE2B ceccefcb4dd106067c0200801408c759c9b4746177a224f4448ad557a3e8335d8d48710af4b476bb18180dcfd308ff958f5addb0a06e50ab1802e853c5d2f633 SHA512 402651608332e8a4056e64c1f7c1350527c543d51632f213a74b4ee455789f3f4eac1ce7afba63392a86fd7aed2fd7b96a66342c6639067ada66508fe2f8770c AUX ffmpeg-4.3-fix-build-without-SSSE3.patch 622 BLAKE2B 258b8bbe70d4d17c18d281a64341618d6089653e5a91a162309363bc1ed33c4eb4e5ae684de0ce4c5e199c6664a90761b9e3488982bff2a0e2e3cb56aa08f62b SHA512 509fb710586d934c782111e0b4e4ffd888f34311b5054a0521a7b6781615c562451f3c53bf7bd3cc5d42ddabe31fb4b63b653e7c32a38acc3574a813b0cae264 AUX ffmpeg-4.3.1-srt-1.4.2-build.patch 3240 BLAKE2B bbae19d16050233a09d888978b0bce6fada6ca707227157f7c2f68e2db2ed61a7ef4afa26fb7708b3f2a273e1436e97bc8f770d8f67df4b82a94a4a6ce9edd20 SHA512 e2e96472a204724358eb093eebea4d5f3339ac9a4d218ef115ee6d1e0404b0af73a3abe448d5fc0af31174bfc1dec7ce990dd64b05efe16251cf09dd1f476166 +AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb +AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6 @@ -10,11 +12,11 @@ DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 97e1e598e4abe397b06298d545c3073ea2303 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 -EBUILD ffmpeg-4.2.4-r1.ebuild 17692 BLAKE2B 9654b34fbc80bf66dd03a8bb42a4aa2756475d4ca28ca9a731edb7b4bdffff675d7e707b5cba41260d76a7de2f7c580e7a450751cbc6aaf6ff0e3e9395583785 SHA512 cf4d863cbab82eb754de7820a5601d2682ded18e95ad620635067b803d6df12e12c5102c433b5367713af07cc4b6cfe94482b08852dd30c748ef396ab828389a -EBUILD ffmpeg-4.3.1-r1.ebuild 17796 BLAKE2B 501db0e6e695fb6c92125d2fcaf1253b6cfb1b1de1c5c8e206693562ad82e6c3512aced041b08b05084cff7d201180cb941c69f372851e0b86d2a37aaad2bfab SHA512 a6ef98fdce4c6fc41bb82ea5fbc22e0f4ecaa34be21b78725b52a0aef37c92a99d03bb11505a3704d0c2526648d1f1525a9ff90942aae8bc7e3c56e3b1bb542b -EBUILD ffmpeg-4.3.2-r1.ebuild 17779 BLAKE2B 05bff39a27b13816694c986c804688c41c9f30330bd7f059e18e0a0e7d723ea5280635107569cf8ba8e6197c462f243cf3e570bde495faba6299294abdfb5bdd SHA512 dad26631f5af6b5976728c2e882283c20ca24d5b64c27baccafcb960b0bd4d2327e25429bb807900ac731f2c7232df0459bb567cf7f42c175ed688d3adb6f372 -EBUILD ffmpeg-4.4-r1.ebuild 17847 BLAKE2B 4342e8ccc15388a2456f45a166f22449956755b718a769c757de73e897504b8cad1cd011f2e7265b5ea9ae14c72728e917bfcae98dc7155a9f5e3d9636b5356e SHA512 9a0dd4cb24d7955de560acd3e15285b7e1c72a86e0701137e233163b45e85757eefab20c3d372428a019f0d781ff6d24484750ba7c36e1429f7d2e76bb4889e5 -EBUILD ffmpeg-4.4.1-r1.ebuild 17968 BLAKE2B 8d08046835a635d0b86e6bc2c337d96e1a1aab43dfee7fd6a9f7c3a5f5e81df74633994e9a1a935c7651dc3886adad27c3739f4c02b8f055298eb81cc2f4bbaf SHA512 3d290d855935ce01573c52e0fe7f6af790cdac5ecdd746e4c068f0f59c37f5d3a5a12c4d5b5321a9e9ad31577d8b0f5b52bedd00df64827b39202a6ac07dd4f5 -EBUILD ffmpeg-5.0.ebuild 17995 BLAKE2B 4bd1e4a798418575f0cc513690d2aea28b059bda02353a8127117ca24a4f9f916e5aaf12e3dbdd5aa3a3d75b8e97c3aea08e41f59ecd877358bf9f55842c1342 SHA512 dfc649ce3c587809cc59422f468be6595bd73d1a0e273de336a9bf075b6c526ee55d71138e8ca04d0f26e8f989f627cb9d19eec2e45a8fd4abd0788940c292ff -EBUILD ffmpeg-9999.ebuild 17995 BLAKE2B 4bd1e4a798418575f0cc513690d2aea28b059bda02353a8127117ca24a4f9f916e5aaf12e3dbdd5aa3a3d75b8e97c3aea08e41f59ecd877358bf9f55842c1342 SHA512 dfc649ce3c587809cc59422f468be6595bd73d1a0e273de336a9bf075b6c526ee55d71138e8ca04d0f26e8f989f627cb9d19eec2e45a8fd4abd0788940c292ff -MISC metadata.xml 6049 BLAKE2B 77d1c140a727f7502524b496badb024052581862093b141d743673c96f59a600cfc10796ef8af249dd1b66350a71ae7681232d13a4599c8f2c50995ddc57d9d7 SHA512 edee49b0166843a4a1f79e8c2ba413182498a7aa703715fc5de6babe2b74417fc27ae506221175047a604b57308d5a9862dc4e832a631f4891499e09f0e181ff +EBUILD ffmpeg-4.2.4-r1.ebuild 17710 BLAKE2B d8a71212b9b5d9c06beeb83ef1e94a2cba952c75982092381136aafce5de15bd769d7f11b6c9cf0ea68e72ce1dc92a46403b90bf08cd11d8f8e58717d4e7e622 SHA512 73d4cface189cc092c00e7e10e1c318924dad348f56fa0a7dc3829694bdae2dfbd963337d17c2a39fd25953dd8c54faebbcf02ea2a28e14f23f8adb45ee6892b +EBUILD ffmpeg-4.3.1-r1.ebuild 17815 BLAKE2B 0af16670e2539c3908d1c0ced67842efe9c29c75f3f01c5a01980cee568f706f70ad8f9334d0459efdcdaad34182a64f82c7c483cbac74f733bca3e16ff8d032 SHA512 d4f6beefa9997cc8154bafebf7490ab72f5ba5565aba63cba9957530a02b9554c34c60da2535aa702e59fc7af9bf0f307a2fb4a2eaf746cb51bb4fbf9d122cb3 +EBUILD ffmpeg-4.3.2-r1.ebuild 17798 BLAKE2B 28f93ad79fed4eec399d8c5dfd2d5d71288cff5d1a4f51e19fdf1312597c0d9c7099e6a6ae6d4ed2770a19af52f6056bd6c44abd5fbcc1103b49da82a2c43362 SHA512 7f83545de0a9c736a580c05464fe63889399c7761c42bd4b65b9d332f901d5ece4a22095a2385582fd35970d15322e7a53e449b1d7fc92d581b1868daf10a997 +EBUILD ffmpeg-4.4-r1.ebuild 17866 BLAKE2B f98d4fbd55a192d157953cf10455e80d1541f54743c089aac0dc9ac7c87c1e6d3040b189236bf37cf691b2872bf5b40cfe2af494df4754e8bdc39940e85467f8 SHA512 f40dac73d8415d6e6ada730f4d476973c6c11ca48bd5c46e07121f7793c21974af1e2044d1f3aa1271f14f9b1f75bc113ee0426c34c36ccf8cabe531f829a1bd +EBUILD ffmpeg-4.4.1-r3.ebuild 18186 BLAKE2B 773ef65426720535bfb9982e718c26546889fa72a4509181674aeb5bbc2883c737427dbaef13d294690679f6f016cef17f36313e2dafdc82edd0e102f1abb281 SHA512 54af77b2521f600ff51e25a8394002def234f9db0666b7298c85e3825da7e6014d2d229d228c3a6710e8f5521379a3b230cc3ee2fff4039746abb438e2c95c80 +EBUILD ffmpeg-5.0-r1.ebuild 18172 BLAKE2B 4c2041f9f432fa688e7a19522ae993814b9ea7c89bc261d96d2f3327a37823947403bccda66d3311785e3579db73a2056976606fdcfb1d5464312a10ef07ce0e SHA512 481a4d0f61112ff188655beb2a75d16a7fb1ff1c9520b6548a30c3a75df6efeaa0470b07a88b5e27c6af7a06aaee58ca4502fabe386dc60c697d0a686ae963e1 +EBUILD ffmpeg-9999.ebuild 18155 BLAKE2B 15cca17575575bf7a16e72186b8f09fe7a339702a72911fb9bdfdb2537ddc2f9039f56ea45292ed0389c5abae91783512935981b7d291ff7905bbcf084f0a986 SHA512 2add0b88bb2e50c70140253e020d03bfa854a2f76abe784c9454d0bc289729c33e950810205ce987ed777de05a65cc74bfcd1273a7b2458c2d69d86e86a59e2f +MISC metadata.xml 6269 BLAKE2B 5d7f3a5376927ddf9d9c95c7465bc2b8df451be3c2ba62be38cce88449222fb6b9d6c30d88e89c403a2d60eb3b3d3f95f762ac85f85f07d54712a24d2712e40f SHA512 fbd108f665076751db688ddd0bf05b9d1fd004eff547a6a3707be369e6919efe989d82f43c09775456fa0035699ec249c8a9941dbdbf7952b1c6be11cd26acda diff --git a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild index 82dafb11f513..4646abcd5728 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild @@ -83,7 +83,7 @@ FFMPEG_FLAG_MAP=( amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit @@ -250,7 +250,7 @@ RDEPEND=" svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) vorbis? ( @@ -303,7 +303,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" - cuda? ( video_cards_nvidia ) + cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) @@ -320,7 +320,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${WORKDIR}/${PN}"-4.2.2-ppc64-gcc.patch # both ppc patches from "${WORKDIR}/${PN}"-4.2.2-ppc64-altivec.patch # https://trac.ffmpeg.org/ticket/7861 - + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild index a37c584452c6..4bed84ce408b 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.1-r1.ebuild @@ -80,7 +80,7 @@ FFMPEG_FLAG_MAP=( amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit @@ -248,7 +248,7 @@ RDEPEND=" svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) vorbis? ( @@ -303,7 +303,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" - cuda? ( video_cards_nvidia ) + cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) @@ -321,6 +321,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch "${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch "${FILESDIR}"/${PN}-4.3.1-srt-1.4.2-build.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild index 02b369ae3848..398b9df600b8 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild @@ -80,7 +80,7 @@ FFMPEG_FLAG_MAP=( amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit @@ -248,7 +248,7 @@ RDEPEND=" svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) vorbis? ( @@ -303,7 +303,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" - cuda? ( video_cards_nvidia ) + cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) @@ -320,6 +320,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch "${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild index 5bd35b407776..197fd338b64d 100644 --- a/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4-r1.ebuild @@ -80,7 +80,7 @@ FFMPEG_FLAG_MAP=( amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit @@ -248,7 +248,7 @@ RDEPEND=" svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) vorbis? ( @@ -303,7 +303,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" - cuda? ( video_cards_nvidia ) + cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) @@ -318,6 +318,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild index 5dbd2c460106..2c8dc26e3f13 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild @@ -80,11 +80,11 @@ FFMPEG_FLAG_MAP=( amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab rubberband:librubberband zeromq:libzmq zimg:libzimg # libswresample options @@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=( amrenc:libvo-amrwbenc mp3:libmp3lame kvazaar:libkvazaar libaom openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame - webp:libwebp x264:libx264 x265:libx265 xvid:libxvid + webp:libwebp x264:libx264 x265:libx265 xvid:libxvid amf:amf ) IUSE=" @@ -252,9 +252,10 @@ RDEPEND=" svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] @@ -290,6 +291,7 @@ BDEPEND=" cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) test? ( net-misc/wget sys-devel/bc ) + amf? ( media-libs/amf-headers ) " # Code requiring FFmpeg to be built under gpl license @@ -307,7 +309,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" - cuda? ( video_cards_nvidia ) + cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) @@ -322,6 +324,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( @@ -336,6 +339,9 @@ src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} fi + + eapply "${FILESDIR}/vmaf-models-default-path.patch" + default echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die } @@ -456,7 +462,7 @@ multilib_src_configure() { ) local extra_libs - if use arm || use ppc ; then + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then # bug #782811 # bug #790590 extra_libs+="$(test-flags-CCLD -latomic) " diff --git a/media-video/ffmpeg/ffmpeg-5.0.ebuild b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild index a6be1e984dff..a818aa4782dc 100644 --- a/media-video/ffmpeg/ffmpeg-5.0.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild @@ -80,11 +80,11 @@ FFMPEG_FLAG_MAP=( amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab rubberband:librubberband zeromq:libzmq zimg:libzimg # libswresample options @@ -252,9 +252,10 @@ RDEPEND=" svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] @@ -307,7 +308,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" - cuda? ( video_cards_nvidia ) + cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) @@ -322,6 +323,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/ffmpeg-5.0-backport-ranlib-build-fix.patch ) MULTILIB_WRAPPED_HEADERS=( @@ -336,6 +338,9 @@ src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} fi + + eapply "${FILESDIR}/vmaf-models-default-path.patch" + default echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die } @@ -456,7 +461,7 @@ multilib_src_configure() { ) local extra_libs - if use arm || use ppc ; then + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then # bug #782811 # bug #790590 extra_libs+="$(test-flags-CCLD -latomic) " diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index a6be1e984dff..1f70d55ec169 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -80,11 +80,11 @@ FFMPEG_FLAG_MAP=( amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec vorbis:libvorbis vpx:libvpx zvbi:libzvbi # libavfilter options appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab rubberband:librubberband zeromq:libzmq zimg:libzimg # libswresample options @@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=( amrenc:libvo-amrwbenc mp3:libmp3lame kvazaar:libkvazaar libaom openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame - webp:libwebp x264:libx264 x265:libx265 xvid:libxvid + webp:libwebp x264:libx264 x265:libx265 xvid:libxvid amf:amf ) IUSE=" @@ -252,9 +252,10 @@ RDEPEND=" svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] @@ -290,6 +291,7 @@ BDEPEND=" cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) test? ( net-misc/wget sys-devel/bc ) + amf? ( media-libs/amf-headers ) " # Code requiring FFmpeg to be built under gpl license @@ -307,7 +309,7 @@ GPL_REQUIRED_USE=" ) " REQUIRED_USE=" - cuda? ( video_cards_nvidia ) + cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) @@ -336,6 +338,9 @@ src_prepare() { if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} fi + + eapply "${FILESDIR}/vmaf-models-default-path.patch" + default echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die } @@ -456,7 +461,7 @@ multilib_src_configure() { ) local extra_libs - if use arm || use ppc ; then + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then # bug #782811 # bug #790590 extra_libs+="$(test-flags-CCLD -latomic) " diff --git a/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch b/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch new file mode 100644 index 000000000000..1c264f752099 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-5.0-backport-ranlib-build-fix.patch @@ -0,0 +1,59 @@ +From bc5ccea3b9d2c71929af6271bd8afe9b6cfab436 Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu <adrian.ratiu@collabora.com> +Date: Mon, 14 Feb 2022 15:00:07 +0200 +Subject: [PATCH] configure: move ranlib -D test after setting defaults +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport [from master bc5ccea3b9d2c7] + +In Gentoo and ChromeOS we want to allow pure LLVM builds without +using GNU tools, so we block any unwanted mixed GNU/LLVM usages +(GNU tools are still kept around in our chroots for projects +like glibc which cannot yet be built otherwise). + +The default ${cross_prefix}${ranlib_default} points to GNU and +fails, so move the test a bit later - after the defaults are +set and the proper values get overriden - such that ffmpeg +configure calls the llvm-ranlib we desire. [1] + +[1] https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild?id=7a34377e3277a6a0e2eedd40e90452a44c55f1e6#n477 + +Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com> +Signed-off-by: Martin Storsjö <martin@martin.st> +--- + configure | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure b/configure +index 7d22c2a345..82642deabe 100755 +--- a/configure ++++ b/configure +@@ -4403,11 +4403,7 @@ cc_default="${cross_prefix}${cc_default}" + cxx_default="${cross_prefix}${cxx_default}" + nm_default="${cross_prefix}${nm_default}" + pkg_config_default="${cross_prefix}${pkg_config_default}" +-if ${cross_prefix}${ranlib_default} 2>&1 | grep -q "\-D "; then +- ranlib_default="${cross_prefix}${ranlib_default} -D" +-else +- ranlib_default="${cross_prefix}${ranlib_default}" +-fi ++ranlib_default="${cross_prefix}${ranlib_default}" + strip_default="${cross_prefix}${strip_default}" + windres_default="${cross_prefix}${windres_default}" + +@@ -4440,6 +4436,10 @@ set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \ + enabled cross_compile || host_cc_default=$cc + set_default host_cc + ++if ${ranlib} 2>&1 | grep -q "\-D "; then ++ ranlib="${ranlib} -D" ++fi ++ + pkg_config_fail_message="" + if ! $pkg_config --version >/dev/null 2>&1; then + warn "$pkg_config not found, library detection may fail." +-- +2.35.1 + diff --git a/media-video/ffmpeg/files/vmaf-models-default-path.patch b/media-video/ffmpeg/files/vmaf-models-default-path.patch new file mode 100644 index 000000000000..a9777e94b7aa --- /dev/null +++ b/media-video/ffmpeg/files/vmaf-models-default-path.patch @@ -0,0 +1,13 @@ +Put default path of models to /usr/share/vmaf/model + +--- a/libavfilter/vf_libvmaf.c ++++ b/libavfilter/vf_libvmaf.c +@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext { + #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + + static const AVOption libvmaf_options[] = { +- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, ++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/vmaf/model/vmaf_v0.6.1.json"}, 0, 1, FLAGS}, + {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index d9838e4cabf7..c07905a8339b 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -5,6 +5,7 @@ <email>media-video@gentoo.org</email> </maintainer> <use> + <flag name="amf">Enables support for AMD's Advanced Media Framework (AMF)</flag> <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag> <flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag> <flag name="appkit">Enables Apple AppKit framework</flag> @@ -56,6 +57,7 @@ <flag name="svt-av1">Enables AV1 encoding support via <pkg>media-libs/svt-av1</pkg>.</flag> <flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag> <flag name="vidstab">Enables video stabilization filter using vid.stab library (<pkg>media-libs/vidstab</pkg>).</flag> + <flag name="vmaf">Enables Netflix's perceptual video quality assessment filter using the library (<pkg>media-libs/libvmaf</pkg>).</flag> <flag name="vpx">Enables VP8 and VP9 codec support using libvpx: Decoding does not require this to be enabled but libvpx can also be used for decoding; encoding requires this useflag to be enabled though.</flag> <flag name="vulkan">Enables support for the vulkan API for GPU offload.</flag> <flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag> |