diff options
Diffstat (limited to 'media-video/ffmpeg')
10 files changed, 838 insertions, 4 deletions
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 6626c896ec83..80d9cbe4e60a 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -15,6 +15,12 @@ AUX ffmpeg-6.0-DECLARE_ALIGNED.patch 1006 BLAKE2B 10bf1b3f618e0fad2dfb33b42fcec6 AUX ffmpeg-6.0-binutils-2.41.patch 2217 BLAKE2B 2c8e96610fe1d198613405941b8f6ce36c1e8a543769a0dcfa5498dc0b4638e2e936dde8ad6c81a24b31dfc674ab7a2484e1a692f1ea911a1141276c05a5b13e SHA512 ec082acaaeb42061e2c6054f26fb6483170684f148200219ec8bc1fc04cf56a0d9bb31becd367c2cfdde3a9bc6bcf4d9fcdb646a57df3cda6935951e18759f6e AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe AUX ffmpeg-6.0-wint-conversion-vulkan.patch 1647 BLAKE2B 3d0f0de065a615f199cd3a3074f5038bf6652f41afa8f8754ade5f0112327f069d4cf8eddf3bc25139122d258caceb102dad7c2825b99f35c273e993caae817d SHA512 1fa7506eb393e44ba98ebaea1e98831912279d365ef8909f247913b912973f7782cb0ad869da4244b6a09b91f5cbb5a5207cbc5a4de8ec61fc313714ea663a80 +AUX ffmpeg-6.1-0001-avcodec-fft-Use-av_mallocz-to-avoid-invalid-free-uni.patch 1602 BLAKE2B a15fa5bf2d36743449fe718f2bbcd80dc3d1b2c26fab9cee4c9171c1ba1c2851a4101b10c1faf48b0bfb2777299244c9d0a6d0ee9e654a10ba4018c4080fbeaa SHA512 9ad0ea7aa80ec01b1623eb4cdad0cd0a6c35b2c8ed04365b0f5a63ef54297e3e66edce1b7a124a50f5c0b6c7d0f667e081fd5ef865381ad8f01d755147df2bd9 +AUX ffmpeg-6.1-0002-avcoded-fft-Fix-memory-leak-if-ctx2-is-used.patch 768 BLAKE2B 08a5e8f4d0c7abf8014eb5ebf3ab06613ff2380ead4e67445bf394e72facc4800b161ec45d2384524284ffc34bd4bcdc3e8691ec3b50811a6fec1109b7d522b8 SHA512 2556c282111b44979afecd0dc89cb5c79c1a18197fe956b12a74417f36d814e32404ec39ce4de1ce38b84e936741a38fb57beefc4eab7cf51ff9fef3648ca9c4 +AUX ffmpeg-6.1-0003-avcodec-decode-validate-hw_frames_ctx-when-AVHWAccel.patch 2600 BLAKE2B fa9620693f1c194da05b118884ed293d1929c4e352a1ad2b39688bed52082f80b912bf737c7ce974fb594bb8283840e18b825a1d95f612c644605220a79311bc SHA512 4a7bd00feee8cefa69793cc87a87a5d045fad17771c4de8f91bd34321472161f9eb922e54515d37d7738c02298351adb06743b852be2789fe99fb679c45984d8 +AUX ffmpeg-6.1-0004-lavc-dvdsubenc-only-check-canvas-size-when-it-is-act.patch 1099 BLAKE2B a7957dfaeb42aaa5fe3b1137343539a3fca515f435dfd4dd018779806c6d93a4cda50a51e5a45850aadaccde214daf07bf61812a8767d1b69b9952f707a4191a SHA512 05e2144edf90b95152532b63bc43a4be36e58cfb3309b307b8214339af82d93c0a2da48e7d2b48f96b0d040d77a93e44d6c36f49ba532e4ff70129b2d10f3cfb +AUX ffmpeg-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch 1198 BLAKE2B 3300031f7d9abc1ee22d4d74db0f47f4683de76b33534505ae0eb1b1df5e83b94d91c4ebd6449db8d330087db70ca6c6c3b3df8032d0441f6ef9170c7ad9b85e SHA512 ae7084bd4eeedf893c61da0590e0dcaf5a2e611d02ea1abd06292ada9fe8d0229e44b74f1a403680cc48ee330781d67d25fccbc381f0d607f745d805078d7a40 +AUX ffmpeg-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch 953 BLAKE2B 1f2049db77ef8ded2f28101408a16c6d831eecbbbe92285614e35a4a48860f289a59b92a378c90352ae52243ae7013d7de1f9a6e6cdb7e8278bf160fb6c7410c SHA512 e4a9d7e751c6bb77f3c063cce2fd5dd820782c85cf96a3e6e8dbf67224c14c47a11f1215e64fffce26f9a72c955678918f91417e775ed2947d8b080cd593b1dd AUX ffmpeg-6.1-wint-conversion.patch 3514 BLAKE2B fcb65b882af964a8f45f71ea3f885fc016e3f89c3d6f0bd6d661d489715c0f746e763a86c6ade1515e212b01559d90ea9c2a97c965e0c0f9087b8396cdd58414 SHA512 7e09fc1a811a21aee9eef0370e57a37817652229a6b0e58cd2e8723e8336124396fe40f6a7c6c5f860046410596027d27d900371ff86609b86ef94dd0633977f AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d119e71a91aaf45e8a32fd4fff270a129ca797c3b383a6074bea32fb582816660022a59d33bb6f557514df038baaf0271 SHA512 4d21f4b1622d8e47d2821ecac6b893847ada74d75db7d8aaac70efc7e6e7a6607c011b6fb2d015cb0c5e05f6a56e4feed43eca7d35b0f686a68261e6d9981b6a DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf @@ -31,14 +37,15 @@ DIST ffmpeg-6.1.tar.xz 10455956 BLAKE2B 5eaee0e0f72139e3b018e6ee26a102c7d6881ec8 DIST ffmpeg-6.1.tar.xz.asc 520 BLAKE2B 774ba20a8ad3d786368c7e6928ee0976cd943756f24e3f076dc0cc92fc0069637f0a9a92e3c5238c74148330385d040118d3c5f9af6b267d572283b8de83b286 SHA512 e4885270869cc6a1681bc3f76f344f77c4858c490a517e45a758d15214ce67c3c2113a1caa8ca65eb6447b68d822fa1dd730081345bcc0928faaf82bb76037ba EBUILD ffmpeg-4.4.4-r6.ebuild 19737 BLAKE2B 2fd87c7cd5c36f0fccfc90a0485f469c881162fa4978bebe1220d864c00b34f6845959046755e44b3f72f5b204465fccc8652a807bceea78af34de5f5fda61b9 SHA512 1f29f205b5d094b84c19593926e0175864c6cfca6b728c5b4e8b5b6f961671676c9d4c5b7a64a8c20f7c8bfbcf3f9717305d343df0173278573ca0a91b534769 EBUILD ffmpeg-4.4.4-r7.ebuild 19803 BLAKE2B 4956d69c8733d897aaa58d1801970258e20992f73550880b98184f33b417e97ae0eaf64f1d29e02f7de17bbcacccfdaa4f85f2e9f666b9b70683fbf810178e21 SHA512 fa8803cfb31255e2b9773ccb18eb89d8e5fa525027fbf8671c6ea5f69a8607713b97fdd2f5e9e591077adb051673af388397492ff7c13754bfd2b93f62a58bde -EBUILD ffmpeg-4.4.4-r8.ebuild 19896 BLAKE2B 050ff6d127ddeed315f2648ee91958aca0a51797bf9581f7ad64365b714c24fe2ae203a122e581668ce7824e0f98e6599833a02b89e00289f2ff238474f246c8 SHA512 89107c7ee312f37e2b259084affb61bb3a61f63b5b4d2614ccad64764308b55eeb41db8d01ed6546cf9ba2567b469715d0beda01a8ab70b77c712dafeeb237bb +EBUILD ffmpeg-4.4.4-r8.ebuild 19895 BLAKE2B 1162ddb4c3c9500d2798ce5e859619b561261be027cedc595264b1972a421bad3a5dc84d1904a08d91fe591cf8d2fabbe2a57fa2301c6ac70797985027b49962 SHA512 5e88b1e2d7bacb7e7a91d2080e718d8447307d340373812635aa5f6869951b8e386a193cfbe04c98dc18e6b49491a7b89a3edcc1f107eeb318fddcc6aa4c0988 EBUILD ffmpeg-5.1.3-r5.ebuild 19853 BLAKE2B a17d01a6d9e24006e91f2d184e1eccd546d62a00677084c6a042c42a9ee3c28120596afa5ae198eb9982c80ef2a60c7c2d845695b47f99b42ebac50695ce9b20 SHA512 0b9d6a58407598413973fcbd70990f5ef656a48d76331cd5305277f8bcbef63643929df19550685bfce8cbc2cb022c4346225e70126b3b32496f5b20c39782ba EBUILD ffmpeg-5.1.4-r1.ebuild 19986 BLAKE2B 773453e422fb06b6792f9eb71d5e62f5c81deea5d380043b4ba77fcebb0c232051970626d32cd06d7adb62c4eac79ba6aa27c1d1cbf547715d8555fbd9f4faa8 SHA512 c5ce23d5b3d85a2c730bcdffb70a8affdd1135f571f13edc319a1485f5912deabee561881cc959ab431462dae57d9f0f0a3519165d8b20bd1af80d31c78b9217 EBUILD ffmpeg-5.1.4.ebuild 19781 BLAKE2B 80061e7e49495537d44aa27b25548917542f28dcdfdd54a8a8974e8ad5c76e8556610167bf90e4087773e25e41dc5a463578c9d8a99013090a6ec77206e2acbc SHA512 b74281fab04cfb11beaff244dc63594917f3e0e0f4b7ed5f072b40a4e330a4ae8f60bd155aedb2131a0719829be7eee45a987b143c2fe2eb4e3dc831007960cf -EBUILD ffmpeg-6.0-r10.ebuild 19920 BLAKE2B 7495f12ac33795a236e7cb73005fac46a368faf28805335cd45e9ce77e25be41c993ab5b451f695db1add5a4227132b65c7816ef5734cb3eaee46cb757c9b301 SHA512 9bacb22199e384518501049bdef6b3bbedcc36082c74e7dfac7c30faa0b467246df22be57212f8c258f48c0c2b3047836a030d72260c5b99458f4697e1c7e19b +EBUILD ffmpeg-6.0-r10.ebuild 19918 BLAKE2B d0d4d6cf6290bbc299f9ab60f8422d77b6d3c8b1e2684a79d1d6643547d268201d7325b051d12d80717d14694bb36c9b4b30c04a9f3107b9184ba287aea0b42f SHA512 7a34ab8d70a799bd1a46c4d75051f7471dd25a4f48027a9cdcda0291e1863308072057f4fb6967ca002f4c0faed2ba1bd8060d62401e5f56a635f18de3634052 EBUILD ffmpeg-6.0-r9.ebuild 19906 BLAKE2B 227dd2dcdd13be6ee0f31e4052b8d108baae2fbfdac7561d2023114dc470068def5cfadad549c885960f83fb7f46b43c33bd8860047efdcd53096ee25dacdfbc SHA512 05f17c841d79fae5d5a81c915e1202b57b726e3c189546e326ffcd21968d080b23a64a3c14eda1607e18877b4b14b138922005d06973cdd58ff4a304014b48ca EBUILD ffmpeg-6.0.1.ebuild 19778 BLAKE2B 7c7e7fc36f4744bafb8d410d737c121faed2d88a0e5c2a6fddc9aa92a683c1e68bf1aa30a4c3af2b730f112d5513aa9b768945035a519fcc9221de2fc5cb5cdc SHA512 fabb81140ee8941edde63ceb3c3601877ab48910c0d837113ed4900e3b840bf6611fc26b2473569353f125fec1edf6919f89e9efc61b877104ff6fbe5fff4de7 EBUILD ffmpeg-6.1-r1.ebuild 19364 BLAKE2B a5844745f821742ef4d3db2b7a5e8018f43086b211189686e92607a17a06e0b125c5e605e2582826b1f37b44da98adca1352c96c67217f9217dc5558845e396e SHA512 ab4cd55bdea1f65489f973e619e4463bb4aa0c4e5fa572ba01c11a0fa06cb5efbb0ea449e444a162117ceed5e0cf8c9e91468b7a2f9405ba8cb2df02fa87beac EBUILD ffmpeg-6.1-r2.ebuild 19411 BLAKE2B 269ac812757c136507ae22566d04d0de0e3539115ebd3127147b74c76d557d2a06960fd6ded5f47f1807e8816be6b518a4a0f374bb0f53fbb82a1fa490e20712 SHA512 6743d0481c273147142437e8410016c0348fa3803588db8e2b5dc9dc6f8327506ea1564b9f34af68472acc975c414426ab3b21a1b379ed1e4984e863859788c1 +EBUILD ffmpeg-6.1-r3.ebuild 19923 BLAKE2B ba11c69f6a0ad141b28bf5375c03a52e524de53e0ebac2dfb33f3fb5148b1ff5c48e36ba3d1c1dd3ec80574c34a8b8895f568d98823ad82f893b9ab5a79e5e61 SHA512 0ca23d9ef6e7b6600e411bccf06ecf3b04b063993a8355f50b2fa5dda7fe5eceabef79bafffdbdb2f2fe17ebbc1b4da35315358d0b709065085005821d58b508 EBUILD ffmpeg-9999.ebuild 19364 BLAKE2B a5844745f821742ef4d3db2b7a5e8018f43086b211189686e92607a17a06e0b125c5e605e2582826b1f37b44da98adca1352c96c67217f9217dc5558845e396e SHA512 ab4cd55bdea1f65489f973e619e4463bb4aa0c4e5fa572ba01c11a0fa06cb5efbb0ea449e444a162117ceed5e0cf8c9e91468b7a2f9405ba8cb2df02fa87beac MISC metadata.xml 7677 BLAKE2B a257b222b54f84f24e5df96a2902e65e791b69dab6b967096109f0a890b0638b4014b0aa96bae10ae893a08dd44aa209f96a6e399bdbf04058f2df4c37a145ff SHA512 92351d428515cc92c9a01b706e1e29a606891d2bf402fbb8a1911c8f9ef2872e5d50cfea35623e40f360edbf6eb2306ce7e3bd6b0ae0d9109f0d4ee11ca2003f diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 19f8a2283312..84e1e85687fe 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index c1788e15f04e..51acdf2ba915 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. diff --git a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild new file mode 100644 index 000000000000..b79bccb0a98f --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild @@ -0,0 +1,588 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=58.60.60 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz" + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#9999}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +fi + +# Options to use as use_enable in the foo[:bar] form. +# This will feed configure with $(use_enable foo bar) +# or $(use_enable foo foo) if no :bar is set. +# foo is added to IUSE. +FFMPEG_FLAG_MAP=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + 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 fontconfig frei0r + fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo + libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype + truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +# Same as above but for encoders, i.e. they do something only with USE=encode. +FFMPEG_ENCODER_FLAG_MAP=( + amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame + openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 + theora:libtheora twolame:libtwolame webp:libwebp x264:libx264 + x265:libx265 xvid:libxvid +) + +IUSE=" + alsa chromium doc +encode oss pic sndio static-libs test v4l + ${FFMPEG_FLAG_MAP[@]%:*} + ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} +" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( + cpu_flags_arm_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( cpu_flags_arm_thumb ) + ) +" +MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) +PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) +PPC_CPU_REQUIRED_USE=" + cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx + mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${MIPS_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${PPC_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt + graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" + +RDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amf? ( media-video/amdgpu-pro-amf:= ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) + bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) + chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) + codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) + dav1d? ( >=media-libs/dav1d-0.5.0:0=[${MULTILIB_USEDEP}] ) + encode? ( + amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + kvazaar? ( >=media-libs/kvazaar-2.0.0[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) + openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] ) + rav1e? ( >=media-video/rav1e-0.5:=[capi] ) + snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) + theora? ( + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] + ) + twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) + ) + fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) + flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] ) + fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) + glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) + gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) + gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) + iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) + iec61883? ( + >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] + ) + ieee1394? ( + >=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-2.1:2=[${MULTILIB_USEDEP}] ) + jpegxl? ( >=media-libs/libjxl-0.7.0[$MULTILIB_USEDEP] ) + lcms? ( >=media-libs/lcms-2.13: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.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}] ) + libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] ) + librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) + libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) + libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] ) + libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) + lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + mmal? ( media-libs/raspberrypi-userland ) + modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) + openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/oneVPL[${MULTILIB_USEDEP}] ) + rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) + shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) + sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh-0.6.0:=[sftp,${MULTILIB_USEDEP}] ) + svg? ( + gnome-base/librsvg:2=[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + ) + nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) + svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) + truetype? ( + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + media-libs/harfbuzz:=[${MULTILIB_USEDEP}] + ) + vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vmaf? ( >=media-libs/libvmaf-2.0.0[${MULTILIB_USEDEP}] ) + vorbis? ( + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=media-libs/vulkan-loader-1.3.255:=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] + ) + zeromq? ( >=net-libs/zeromq-4.2.1:= ) + zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) +" + +RDEPEND="${RDEPEND} + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) +" + +DEPEND="${RDEPEND} + amf? ( media-libs/amf-headers ) + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + v4l? ( sys-kernel/linux-headers ) + vulkan? ( >=dev-util/vulkan-headers-1.3.255 ) +" + +# += for verify-sig above +BDEPEND+=" + >=sys-devel/make-3.81 + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) + doc? ( sys-apps/texinfo ) + test? ( net-misc/wget sys-devel/bc ) +" + +# Code requiring FFmpeg to be built under gpl license +GPL_REQUIRED_USE=" + postproc? ( gpl ) + frei0r? ( gpl ) + cdio? ( gpl ) + rubberband? ( gpl ) + vidstab? ( gpl ) + samba? ( gpl ) + encode? ( + x264? ( gpl ) + x265? ( gpl ) + xvid? ( gpl ) + ) +" +REQUIRED_USE=" + chromium? ( opus ) + cuda? ( nvenc ) + fftools_cws2fws? ( zlib ) + glslang? ( vulkan !shaderc ) + libv4l? ( v4l ) + shaderc? ( vulkan !glslang ) + test? ( encode ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + !test? ( test ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium-r2.patch + "${FILESDIR}"/${PN}-6.1-wint-conversion.patch + "${FILESDIR}"/${PN}-6.1-0001-avcodec-fft-Use-av_mallocz-to-avoid-invalid-free-uni.patch + "${FILESDIR}"/${PN}-6.1-0002-avcoded-fft-Fix-memory-leak-if-ctx2-is-used.patch + "${FILESDIR}"/${PN}-6.1-0003-avcodec-decode-validate-hw_frames_ctx-when-AVHWAccel.patch + "${FILESDIR}"/${PN}-6.1-0004-lavc-dvdsubenc-only-check-canvas-size-when-it-is-act.patch + "${FILESDIR}"/${PN}-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch + "${FILESDIR}"/${PN}-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +pkg_setup() { + # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg. + # May cause breakage while updating, #862996, #625210, #833821. + if has_version media-libs/chromaprint[tools] && use chromaprint; then + ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which " + ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, " + ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg." + ewarn "" + ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint " + ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable " + ewarn "'tools' USE flag for chromaprint. See #862996." + fi +} + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + + default + + # -fdiagnostics-color=auto gets appended after user flags which + # will ignore user's preference. + sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + + ln -snf "${FILESDIR}"/chromium.c chromium.c || die + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +multilib_src_configure() { + local myconf=( ) + + # bug 842201 + use ia64 && tc-is-gcc && append-flags \ + -fno-tree-ccp \ + -fno-tree-dominator-opts \ + -fno-tree-fre \ + -fno-code-hoisting \ + -fno-tree-pre \ + -fno-tree-vrp + + local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) + use openssl && myconf+=( --enable-nonfree ) + use samba && myconf+=( --enable-version3 ) + + # Encoders + if use encode ; then + ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) + + # Licensing. + if use amrenc ; then + myconf+=( --enable-version3 ) + fi + else + myconf+=( --disable-encoders ) + fi + + # Indevs + use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) + for i in alsa oss jack sndio ; do + use ${i} || myconf+=( --disable-indev=${i} ) + done + + # Outdevs + for i in alsa oss sndio ; do + use ${i} || myconf+=( --disable-outdev=${i} ) + done + + # Decoders + use amr && myconf+=( --enable-version3 ) + use gmp && myconf+=( --enable-version3 ) + use libaribb24 && myconf+=( --enable-version3 ) + use fdk && use gpl && myconf+=( --enable-nonfree ) + + for i in "${ffuse[@]#+}" ; do + myconf+=( $(use_enable ${i%:*} ${i#*:}) ) + done + + if use openssl ; then + myconf+=( --disable-gnutls ) + has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 ) + fi + + # (temporarily) disable non-multilib deps + if ! multilib_is_native_abi; then + for i in librav1e libzmq ; do + myconf+=( --disable-${i} ) + done + fi + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + # Bug #917277, #917278 + myconf+=( --disable-dotprod --disable-i8mm ) + + if use pic ; then + myconf+=( --enable-pic ) + # disable asm code if PIC is required + # as the provided asm decidedly is not PIC for x86. + [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) + fi + [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # LTO support, bug #566282, bug #754654, bug #772854 + if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then + # Respect -flto value, e.g -flto=thin + local v="$(get-flag flto)" + [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) + fi + filter-lto + + # Mandatory configuration + myconf=( + --disable-libaribcaption # libaribcaption is not packaged (yet?) + --enable-avfilter + --disable-stripping + # This is only for hardcoded cflags; those are used in configure checks that may + # interfere with proper detections, bug #671746 and bug #645778 + # We use optflags, so that overrides them anyway. + --disable-optimizations + --disable-libcelt # bug #664158 + "${myconf[@]}" + ) + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + # doc + myconf+=( + $(multilib_native_use_enable doc) + $(multilib_native_use_enable doc htmlpages) + $(multilib_native_enable manpages) + ) + + # Use --extra-libs if needed for LIBS + set -- "${S}/configure" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --mandir="${EPREFIX}/usr/share/man" \ + --enable-shared \ + --cc="$(tc-getCC)" \ + --cxx="$(tc-getCXX)" \ + --ar="$(tc-getAR)" \ + --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ + --ranlib="$(tc-getRANLIB)" \ + --pkg-config="$(tc-getPKG_CONFIG)" \ + --optflags="${CFLAGS}" \ + $(use_enable static-libs static) \ + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} + echo "${@}" + "${@}" || die +} + +multilib_src_compile() { + emake V=1 + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + emake V=1 tools/${i}$(get_exeext) + fi + done + + use chromium && + emake V=1 libffmpeg + fi +} + +multilib_src_test() { + LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \ + emake V=1 fate -k +} + +multilib_src_install() { + emake V=1 DESTDIR="${D}" install install-doc + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + dobin tools/${i}$(get_exeext) + fi + done + + use chromium && + emake V=1 DESTDIR="${D}" install-libffmpeg + fi +} + +multilib_src_install_all() { + dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges + [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" + + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override +} diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-0001-avcodec-fft-Use-av_mallocz-to-avoid-invalid-free-uni.patch b/media-video/ffmpeg/files/ffmpeg-6.1-0001-avcodec-fft-Use-av_mallocz-to-avoid-invalid-free-uni.patch new file mode 100644 index 000000000000..8907cf15b00d --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-0001-avcodec-fft-Use-av_mallocz-to-avoid-invalid-free-uni.patch @@ -0,0 +1,54 @@ +From af912d80d8880797bef9f2ba9809ecd84ed9acd9 Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher <sramacher@debian.org> +Date: Sun, 12 Nov 2023 18:46:27 +0100 +Subject: [PATCH 1/6] avcodec/fft: Use av_mallocz to avoid invalid free/uninit + +Signed-off-by: James Almer <jamrial@gmail.com> +(cherry picked from commit a562cfee2e214252f8b3f516527272ae32ef9532) +--- + libavcodec/avfft.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c +index fb635abfff..3ef076d222 100644 +--- a/libavcodec/avfft.c ++++ b/libavcodec/avfft.c +@@ -46,7 +46,7 @@ FFTContext *av_fft_init(int nbits, int inverse) + { + int ret; + float scale = 1.0f; +- AVTXWrapper *s = av_malloc(sizeof(*s)); ++ AVTXWrapper *s = av_mallocz(sizeof(*s)); + if (!s) + return NULL; + +@@ -85,7 +85,7 @@ FFTContext *av_mdct_init(int nbits, int inverse, double scale) + { + int ret; + float scale_f = scale; +- AVTXWrapper *s = av_malloc(sizeof(*s)); ++ AVTXWrapper *s = av_mallocz(sizeof(*s)); + if (!s) + return NULL; + +@@ -146,7 +146,7 @@ RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans) + if (trans != IDFT_C2R && trans != DFT_R2C) + return NULL; + +- s = av_malloc(sizeof(*s)); ++ s = av_mallocz(sizeof(*s)); + if (!s) + return NULL; + +@@ -199,7 +199,7 @@ DCTContext *av_dct_init(int nbits, enum DCTTransformType inverse) + [DST_I] = AV_TX_FLOAT_DST_I, + }; + +- AVTXWrapper *s = av_malloc(sizeof(*s)); ++ AVTXWrapper *s = av_mallocz(sizeof(*s)); + if (!s) + return NULL; + +-- +2.43.0 + diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-0002-avcoded-fft-Fix-memory-leak-if-ctx2-is-used.patch b/media-video/ffmpeg/files/ffmpeg-6.1-0002-avcoded-fft-Fix-memory-leak-if-ctx2-is-used.patch new file mode 100644 index 000000000000..3799a46d84a4 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-0002-avcoded-fft-Fix-memory-leak-if-ctx2-is-used.patch @@ -0,0 +1,26 @@ +From c7fe7ee8d4dcae510453abedabae53e45135144a Mon Sep 17 00:00:00 2001 +From: Sebastian Ramacher <sramacher@debian.org> +Date: Sun, 12 Nov 2023 18:46:28 +0100 +Subject: [PATCH 2/6] avcoded/fft: Fix memory leak if ctx2 is used + +Signed-off-by: James Almer <jamrial@gmail.com> +(cherry picked from commit 250471ea1745fc703eb346a2a662304536a311b1) +--- + libavcodec/avfft.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c +index 3ef076d222..999b5ed79a 100644 +--- a/libavcodec/avfft.c ++++ b/libavcodec/avfft.c +@@ -130,6 +130,7 @@ av_cold void av_mdct_end(FFTContext *s) + { + if (s) { + AVTXWrapper *w = (AVTXWrapper *)s; ++ av_tx_uninit(&w->ctx2); + av_tx_uninit(&w->ctx); + av_free(w); + } +-- +2.43.0 + diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-0003-avcodec-decode-validate-hw_frames_ctx-when-AVHWAccel.patch b/media-video/ffmpeg/files/ffmpeg-6.1-0003-avcodec-decode-validate-hw_frames_ctx-when-AVHWAccel.patch new file mode 100644 index 000000000000..2e84b94b0475 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-0003-avcodec-decode-validate-hw_frames_ctx-when-AVHWAccel.patch @@ -0,0 +1,64 @@ +From 466799d4f570db5ed3e70239c12c96a2dc3bfc06 Mon Sep 17 00:00:00 2001 +From: Dmitry Rogozhkin <dmitry.v.rogozhkin-at-intel.com@ffmpeg.org> +Date: Mon, 20 Nov 2023 21:57:32 -0800 +Subject: [PATCH 3/6] avcodec/decode: validate hw_frames_ctx when + AVHWAccel.free_frame_priv is used + +Validate that a hw_frames_ctx is available before using it for +the AVHWAccel.free_frame_priv callback, and don't require it to +be present when the callback is not in use by the HWAccel. + +v2: check for free_frame_priv (Hendrik) +v3: return EINVAL (Christoph Reiter) +v4: better commit message (Hendrik) +v5: fix typo with missed frames_ctx (Lynne) + +See[1]: https://github.com/msys2/MINGW-packages/pull/19050 +Fixes: be07145109 ("avcodec: add AVHWAccel.free_frame_priv callback") +CC: Lynne <dev@lynne.ee> +CC: Christoph Reiter <reiter.christoph@gmail.com> +Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com> +(cherry picked from commit e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7) +--- + libavcodec/decode.c | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/libavcodec/decode.c b/libavcodec/decode.c +index ad39021354..2cfb3fcf97 100644 +--- a/libavcodec/decode.c ++++ b/libavcodec/decode.c +@@ -1838,17 +1838,26 @@ int ff_copy_palette(void *dst, const AVPacket *src, void *logctx) + int ff_hwaccel_frame_priv_alloc(AVCodecContext *avctx, void **hwaccel_picture_private) + { + const FFHWAccel *hwaccel = ffhwaccel(avctx->hwaccel); +- AVHWFramesContext *frames_ctx; + + if (!hwaccel || !hwaccel->frame_priv_data_size) + return 0; + + av_assert0(!*hwaccel_picture_private); + +- frames_ctx = (AVHWFramesContext *)avctx->hw_frames_ctx->data; +- *hwaccel_picture_private = ff_refstruct_alloc_ext(hwaccel->frame_priv_data_size, 0, +- frames_ctx->device_ctx, +- hwaccel->free_frame_priv); ++ if (hwaccel->free_frame_priv) { ++ AVHWFramesContext *frames_ctx; ++ ++ if (!avctx->hw_frames_ctx) ++ return AVERROR(EINVAL); ++ ++ frames_ctx = (AVHWFramesContext *) avctx->hw_frames_ctx->data; ++ *hwaccel_picture_private = ff_refstruct_alloc_ext(hwaccel->frame_priv_data_size, 0, ++ frames_ctx->device_ctx, ++ hwaccel->free_frame_priv); ++ } else { ++ *hwaccel_picture_private = ff_refstruct_allocz(hwaccel->frame_priv_data_size); ++ } ++ + if (!*hwaccel_picture_private) + return AVERROR(ENOMEM); + +-- +2.43.0 + diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-0004-lavc-dvdsubenc-only-check-canvas-size-when-it-is-act.patch b/media-video/ffmpeg/files/ffmpeg-6.1-0004-lavc-dvdsubenc-only-check-canvas-size-when-it-is-act.patch new file mode 100644 index 000000000000..639d13320b39 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-0004-lavc-dvdsubenc-only-check-canvas-size-when-it-is-act.patch @@ -0,0 +1,31 @@ +From 111035ccae52b448ccee889546a54594cd3fca5e Mon Sep 17 00:00:00 2001 +From: Anton Khirnov <anton@khirnov.net> +Date: Thu, 30 Nov 2023 11:21:24 +0100 +Subject: [PATCH 4/6] lavc/dvdsubenc: only check canvas size when it is + actually set + +Fixes #10650 + +(cherry picked from commit 5230257ea18e1d3761ee6b0549d56a3ca817f301) +Signed-off-by: Anton Khirnov <anton@khirnov.net> +--- + libavcodec/dvdsubenc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c +index d272b57675..06c2cf5e5a 100644 +--- a/libavcodec/dvdsubenc.c ++++ b/libavcodec/dvdsubenc.c +@@ -376,7 +376,8 @@ static int encode_dvd_subtitles(AVCodecContext *avctx, + x2 = vrect.x + vrect.w - 1; + y2 = vrect.y + vrect.h - 1; + +- if (x2 > avctx->width || y2 > avctx->height) { ++ if ((avctx->width > 0 && x2 > avctx->width) || ++ (avctx->height > 0 && y2 > avctx->height)) { + av_log(avctx, AV_LOG_ERROR, "canvas_size(%d:%d) is too small(%d:%d) for render\n", + avctx->width, avctx->height, x2, y2); + ret = AVERROR(EINVAL); +-- +2.43.0 + diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch b/media-video/ffmpeg/files/ffmpeg-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch new file mode 100644 index 000000000000..002d609fdd3e --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-0005-lavc-Makefile-build-vulkan-decode-code-if-vulkan_av1.patch @@ -0,0 +1,31 @@ +From 2c87aa0b231954d32909c0df48cb27ff89fd4506 Mon Sep 17 00:00:00 2001 +From: Lynne <dev@lynne.ee> +Date: Sun, 3 Dec 2023 21:02:13 +0100 +Subject: [PATCH 5/6] lavc/Makefile: build vulkan decode code if vulkan_av1 has + been enabled + +Forgotten. + +Reviewed-by: Neal Gompa <ngompa13@gmail.com> +Tested-by: Neal Gompa <ngompa13@gmail.com> +(cherry picked from commit 8c117b75afa3c6b824fab85ec6716dbe3ba975be) +--- + libavcodec/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/Makefile b/libavcodec/Makefile +index 580a8d6b54..ec57e53e30 100644 +--- a/libavcodec/Makefile ++++ b/libavcodec/Makefile +@@ -993,7 +993,7 @@ OBJS-$(CONFIG_AV1_DXVA2_HWACCEL) += dxva2_av1.o + OBJS-$(CONFIG_AV1_NVDEC_HWACCEL) += nvdec_av1.o + OBJS-$(CONFIG_AV1_VAAPI_HWACCEL) += vaapi_av1.o + OBJS-$(CONFIG_AV1_VDPAU_HWACCEL) += vdpau_av1.o +-OBJS-$(CONFIG_AV1_VULKAN_HWACCEL) += vulkan_av1.o ++OBJS-$(CONFIG_AV1_VULKAN_HWACCEL) += vulkan_decode.o vulkan_av1.o + OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o + OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o + OBJS-$(CONFIG_H264_D3D11VA_HWACCEL) += dxva2_h264.o +-- +2.43.0 + diff --git a/media-video/ffmpeg/files/ffmpeg-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch b/media-video/ffmpeg/files/ffmpeg-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch new file mode 100644 index 000000000000..a9d0bfa35abe --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.1-0006-hwcontext_vulkan-guard-unistd.h-include.patch @@ -0,0 +1,33 @@ +From 884a660cae23769d92d533cc1b6232d3cdfbae43 Mon Sep 17 00:00:00 2001 +From: Benjamin Cheng <ben@bcheng.me> +Date: Fri, 22 Sep 2023 12:49:22 -0400 +Subject: [PATCH 6/6] hwcontext_vulkan: guard unistd.h include + +win32 typically doesn't have unistd.h, so always including it will break +MSVC builds. The usage of those POSIX functions are already guarded by +_WIN32, so use that to guard unistd.h include as well. + +(cherry picked from commit 185871fdd39762295973c1f3db1459e04121317c) +--- + libavutil/hwcontext_vulkan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c +index 506a218a42..d288fb7ac7 100644 +--- a/libavutil/hwcontext_vulkan.c ++++ b/libavutil/hwcontext_vulkan.c +@@ -27,10 +27,10 @@ + #include "compat/w32dlfcn.h" + #else + #include <dlfcn.h> ++#include <unistd.h> + #endif + + #include "thread.h" +-#include <unistd.h> + + #include "config.h" + #include "pixdesc.h" +-- +2.43.0 + |