commit:     03fd84caec409a954d3556672b2dab9d8d58ce9a
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Mon Jan  8 12:29:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 12:40:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fd84ca

media-video/ffmpeg: not create 99amf-env-vulkan-override in /etc/env.d

* This prevent setting the AMDGPU PRO Vulkan ICD Loader system wide
* In some system can prevent some vulkan app from open
* update elog message for amf use

Closes: https://bugs.gentoo.org/917447
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33851
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/ffmpeg/{ffmpeg-5.1.4-r1.ebuild => ffmpeg-5.1.4-r2.ebuild} | 2 +-
 media-video/ffmpeg/{ffmpeg-6.0-r10.ebuild => ffmpeg-6.0-r11.ebuild}   | 2 +-
 media-video/ffmpeg/{ffmpeg-6.0.1.ebuild => ffmpeg-6.0.1-r1.ebuild}    | 2 +-
 media-video/ffmpeg/{ffmpeg-6.1-r3.ebuild => ffmpeg-6.1-r4.ebuild}     | 2 +-
 media-video/ffmpeg/{ffmpeg-6.1.1.ebuild => ffmpeg-6.1.1-r1.ebuild}    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild 
b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild
rename to media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
index 9c78a326da8e..0a1efa6009aa 100644
--- a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
@@ -604,5 +604,5 @@ 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
+       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.0-r10.ebuild 
b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-6.0-r10.ebuild
rename to media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
index 6e294de3fdcd..cf5c06b3132e 100644
--- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
@@ -603,5 +603,5 @@ 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
+       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.0.1.ebuild 
b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-6.0.1.ebuild
rename to media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
index e6368716e0cb..7e84ef874d15 100644
--- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
@@ -600,5 +600,5 @@ 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
+       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-r3.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-6.1-r3.ebuild
rename to media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
index 7fdd234ffc36..3fcc5394ed43 100644
--- a/media-video/ffmpeg/ffmpeg-6.1-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
@@ -584,5 +584,5 @@ 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
+       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.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-6.1.1.ebuild
rename to media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
index 877b70377d04..9c44868b697f 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
@@ -578,5 +578,5 @@ 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
+       use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' 
wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`"
 }

Reply via email to