commit: 74578fb542a96e65f3eb04b8454ce5b348e0a319 Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> AuthorDate: Sun Sep 22 22:57:41 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Sep 26 07:14:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74578fb5
media-video/ffmpeg: drop legacy workaround / message about amf AMF now works with both radv and amdgpu-pro-vulkan, no need for the icd file envvar override nor the use of vk_pro wrapper Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> Closes: https://github.com/gentoo/gentoo/pull/38733 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-video/ffmpeg/{ffmpeg-4.4.4-r10.ebuild => ffmpeg-4.4.4-r11.ebuild} | 2 -- media-video/ffmpeg/{ffmpeg-4.4.5.ebuild => ffmpeg-4.4.5-r1.ebuild} | 2 -- media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild | 2 -- media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 2 -- media-video/ffmpeg/ffmpeg-6.1.2.ebuild | 2 -- media-video/ffmpeg/{ffmpeg-7.0.1.ebuild => ffmpeg-7.0.1-r1.ebuild} | 2 -- media-video/ffmpeg/{ffmpeg-7.0.2.ebuild => ffmpeg-7.0.2-r1.ebuild} | 2 -- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 -- media-video/ffmpeg/files/amf-env-vulkan-override | 1 - 9 files changed, 17 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r11.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild rename to media-video/ffmpeg/ffmpeg-4.4.4-r11.ebuild index 9af70b3d9d2d..875c7a9c72f7 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r11.ebuild @@ -608,6 +608,4 @@ multilib_src_install() { 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/ffmpeg-4.4.5.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-4.4.5.ebuild rename to media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild index 967d1006b22a..1786ce09a903 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5-r1.ebuild @@ -604,6 +604,4 @@ multilib_src_install() { 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/ffmpeg-6.0.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild index 306184007849..d29404297015 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild @@ -594,6 +594,4 @@ multilib_src_install() { multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - - use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" } diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild index e52ecc7d7a50..906e3e77d5e4 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild @@ -609,6 +609,4 @@ multilib_src_install() { multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - - use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" } diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild index d33ded5d48b7..c913e481816f 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild @@ -607,6 +607,4 @@ multilib_src_install() { multilib_src_install_all() { dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" - - use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" } diff --git a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-7.0.1.ebuild rename to media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild index 604fbe7ce570..a4d91f76c9bf 100644 --- a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild @@ -609,6 +609,4 @@ multilib_src_install() { 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/ffmpeg-7.0.2.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-7.0.2.ebuild rename to media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild index 604fbe7ce570..a4d91f76c9bf 100644 --- a/media-video/ffmpeg/ffmpeg-7.0.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild @@ -609,6 +609,4 @@ multilib_src_install() { 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/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index d1734392b1eb..357a04d67a61 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -610,6 +610,4 @@ multilib_src_install() { 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/amf-env-vulkan-override b/media-video/ffmpeg/files/amf-env-vulkan-override deleted file mode 100644 index 41ee27911178..000000000000 --- a/media-video/ffmpeg/files/amf-env-vulkan-override +++ /dev/null @@ -1 +0,0 @@ -VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json
