gentoo auto-resync : 27:09:2024 - 01:25:47

5 files changed, 34 insertions, 126 deletions

diff --git a/media-video/amdgpu-pro-amf/Manifest b/media-video/amdgpu-pro-amf/Manifest
index 3bfcb74720d1..a365586ef506 100644
--- a/media-video/amdgpu-pro-amf/Manifest
+++ b/media-video/amdgpu-pro-amf/Manifest
@@ -1,7 +1,4 @@
-DIST amdgpu-pro-amf-1.4.24.1452059.deb 1307216 BLAKE2B 2ecae593da961e2ff86e807c017a85fda5459458434c491e538f3845a12b0354e65da568550bbdebb47685aad6b7d22607b5f2a281b49718154ead6f92d30058 SHA512 9e3611ad3cad50da4aeeec2b14ad944e2ff7d83b9b104f65acf5e5915f74644fb25f74bfa51a5802dac828fa6c84e01351fbe58f14e1dde1145ba908d6a0445d
-DIST amdgpu-pro-amf-1.4.29.1580631.deb 1653852 BLAKE2B 5af5250c07e1b99ae8c1ee28507927e28ee7811929c789b5939a06f631b81155d6795e1392830945bf377f5298a5153e9af3541b2d94533661db394a059fb715 SHA512 07568c5e2f92f10274f7ac25a9d68539b8ce2e5d24c87e9b6a3aec2b8d5a32980c8fd802394dfa6eb421d3321dd60e07929e7f481578d23afcf623c5c9aa2fcc
-DIST amdgpu-pro-amf-1.4.33.1718238.deb 3311972 BLAKE2B 549ab0cae83e6014ef79ef70981cdb296cebee1cdeeb7d07258523018d9efa89e174fbabe537896e524b69064806dc12bf24aae29f291d76b5bddb3d2e203639 SHA512 ec5771eebe30d749e5fa753600a9fc02ca97b5023cbbd9f58ffbf657a5f6c4d1e2066da1974ad759c6d9089b233c25654fbb0ec019b34232445f9e4f53720388
-EBUILD amdgpu-pro-amf-1.4.24.1452059.ebuild 1194 BLAKE2B 27c6a17b1fc3c6f32585c8fb8f71890a7d1b3e0bc9d77e2c439396a32b3814537b210fdd9c77dcce388af871ff6ad5c64e34738b6b087b96fea5c8e3ba920a1a SHA512 b26d38722238628fc31cfb8c8b2d91438d9d844bd89a129555b4541db66d39322ee1341b08cd5d85788b2a58b331a89931325daa35bb27bd5cea977d30094831
-EBUILD amdgpu-pro-amf-1.4.29.1580631.ebuild 1213 BLAKE2B 977ac2026b66681d94437fd80e610e10381862b64d8d14a53a395b3620bc90fa7bb61581672b4a49694d4205b1df8c77ac5ba05ce58d48a25eb76491d8f42a62 SHA512 0b569f4007191ef310928aeba52193293f4d90a2a7dca982bff30bb6b63098d1fcd8f268013d28104d2b13e1dc202dc63c7678e533df52a6286823d0ef5ac2fa
-EBUILD amdgpu-pro-amf-1.4.33.1718238.ebuild 1215 BLAKE2B 63bcf450992b322798b3f31fa81ee7061b06e91c22a2cc0618ace7f05e9d5dbd45f4018ae178829f96baf96da81248e1e4dfd0bb2b8fa26f2309da43b3528597 SHA512 38a08a6f9769171b53ea8b613d3855cdf94aeea285393dfc833d71acedc5af2e6e93e5292a0d3b4aeeafecf7f7f043e6e2474af0d502099000bfcdbded8e0d72
-MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3
+DIST amdgpu-pro-amf-1.4.34.1787253-enc.deb 256792 BLAKE2B 91948608c6f298eb3757d12f3bd60f10c28a81cbfe973d4a025ebb9d1806efbc7d36e647f7fbd7d4d6f5cfdb36f54e21066bdf040762070b5f30ed7bb8f7c739 SHA512 38b0ac921326d9b9aa47c9c281bb8708f6cbc1de82b979eb4491fde3d78205898e638ca4704fa00c1d0b0d73291efc85e818762cd0880d0ce6672172e09402ef
+DIST amdgpu-pro-amf-1.4.34.1787253.deb 3203792 BLAKE2B 3dc70fd3b68f7a2d2ba0706cc2203afeca28b297c2e7c1cd60fdcba373d0b32553e6630c537cbfeed8c849873ebc41cac2868ace9c9fc1764aee03b04f94a0a8 SHA512 d6773b3dfb1176ea14663b4a1f2827fb7b4ce2baeed1a9b457382c5cbe2536673a9729215586177819be26e8272c8db22a663880a0366194057bb957aa6f8e76
+EBUILD amdgpu-pro-amf-1.4.34.1787253.ebuild 1773 BLAKE2B 260da57e4771eeb9de06e6c0842cc9c012b64dd88057d05a83052a284f45f3dc002cc937dcb13279c4cc8db97e24e4313a432f1f0f9df54c93a15c889b8bb976 SHA512 b9842678bdaddc9e761f8dfe1865d5c2bea1fcdce41e9a84322b51b813ac2c3a63932be5fe5ad0f8ecc80bc0e03e6d088a3911438c59415204abeffccd358766
+MISC metadata.xml 553 BLAKE2B aabdedaa41497b0def773a110de65422f043902d9a4940c4e956dfcc16d0d15584dc679de8b4010ab22e8f9a14450fbd5331e69b0b992be68bc5b0f334c7a8a1 SHA512 067a87e2c54764589ab6ba64ee93165687c5a3b678afa38dd50ff02dcd736189912ab6d663306ae52e7142b62cefae7c7b8394b4441c360827bb67e843a65dda
diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1452059.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1452059.ebuild
deleted file mode 100644
index 2ae162b65fcb..000000000000
--- a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1452059.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-MY_PV_HIGH=$(ver_cut 1)
-MY_PV_MIDDLE=$(ver_cut 2)
-MY_PV_LOW=$(ver_cut 3)
-MY_PV_REV=$(ver_cut 4)
-
-MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
-MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
-
-MY_PN="amf-amdgpu-pro"
-
-PRO_VULKAN_PKG_VER="22.10.4"
-
-DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver"
-HOMEPAGE="https://www.amd.com/en/support"
-SRC_URI="https://repo.radeon.com/amdgpu/${PRO_VULKAN_PKG_VER}/ubuntu/pool/proprietary/a/${MY_PN}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}.deb"
-
-S="${WORKDIR}"
-
-RESTRICT="bindist mirror"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	media-libs/amdgpu-pro-vulkan
-	media-libs/libglvnd
-	x11-libs/libdrm
-	x11-libs/libX11
-"
-
-QA_PREBUILT="
-	usr/lib64/libamfrt64.so*
-"
-
-src_unpack() {
-	mkdir "${S}/${PN}-amd64" || die
-	cd "${S}/${PN}-amd64" || die
-	unpack_deb "${DISTDIR}/${P}.deb"
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)"
-
-	# AMF
-	doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}"
-	dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1"
-}
diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.29.1580631.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.29.1580631.ebuild
deleted file mode 100644
index aeace360442d..000000000000
--- a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.29.1580631.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-MY_PV_HIGH=$(ver_cut 1)
-MY_PV_MIDDLE=$(ver_cut 2)
-MY_PV_LOW=$(ver_cut 3)
-MY_PV_REV=$(ver_cut 4)
-
-MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
-MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
-
-MY_PN="amf-amdgpu-pro"
-
-INTERNAL_VER="5.4.6"
-UBUNTU_VER="22.04"
-
-DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver"
-HOMEPAGE="https://www.amd.com/en/support"
-SRC_URI="https://repo.radeon.com/amdgpu/${INTERNAL_VER}/ubuntu/pool/proprietary/a/${MY_PN}/${MY_PN}_${MY_PV_FULL}.${UBUNTU_VER}_amd64.deb -> ${P}.deb"
-
-S="${WORKDIR}"
-
-RESTRICT="bindist mirror"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	media-libs/amdgpu-pro-vulkan
-	media-libs/libglvnd
-	x11-libs/libdrm
-	x11-libs/libX11
-"
-
-QA_PREBUILT="
-	usr/lib64/libamfrt64.so*
-"
-
-src_unpack() {
-	mkdir "${S}/${PN}-amd64" || die
-	cd "${S}/${PN}-amd64" || die
-	unpack_deb "${DISTDIR}/${P}.deb"
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)"
-
-	# AMF
-	doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}"
-	dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1"
-}
diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.33.1718238.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.34.1787253.ebuild
index 79a35e7579e0..fa004817f5f6 100644
--- a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.33.1718238.ebuild
+++ b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.34.1787253.ebuild
@@ -14,43 +14,61 @@ MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
 MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
 
 MY_PN="amf-amdgpu-pro"
+MY_PN_ENC="libamdenc-amdgpu-pro"
 
-INTERNAL_VER="6.0.2"
+INTERNAL_VER="6.1.3"
 UBUNTU_VER="22.04"
 
-DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver"
+DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver for AMD GPUs"
 HOMEPAGE="https://www.amd.com/en/support"
-SRC_URI="https://repo.radeon.com/amdgpu/${INTERNAL_VER}/ubuntu/pool/proprietary/a/${MY_PN}/${MY_PN}_${MY_PV_FULL}.${UBUNTU_VER}_amd64.deb -> ${P}.deb"
 
-S="${WORKDIR}"
+URI_PREFIX="repo.radeon.com/amdgpu/${INTERNAL_VER}/ubuntu/pool/proprietary"
 
-RESTRICT="bindist mirror"
+SRC_URI="
+	https://${URI_PREFIX}/a/${MY_PN}/${MY_PN}_${MY_PV_FULL}.${UBUNTU_VER}_amd64.deb -> ${P}.deb
+	https://${URI_PREFIX}/liba/${MY_PN_ENC}/${MY_PN_ENC}_1.0-${MY_PV_REV}.${UBUNTU_VER}_amd64.deb -> ${P}-enc.deb
+"
+
+S="${WORKDIR}"
 
 LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0/31"
+SLOT="0"
 KEYWORDS="-* amd64"
 
+IUSE="+radv pro video_cards_amdgpu"
+REQUIRED_USE="
+	video_cards_amdgpu
+	|| ( radv  pro )
+"
+
+RESTRICT="bindist mirror"
+
 RDEPEND="
-	media-libs/amdgpu-pro-vulkan
 	media-libs/libglvnd
 	x11-libs/libdrm
 	x11-libs/libX11
+	pro? ( media-libs/amdgpu-pro-vulkan )
+	radv? ( media-libs/mesa[proprietary-codecs,vulkan] )
 "
 
 QA_PREBUILT="
 	usr/lib64/libamfrt64.so*
+	usr/lib64/libamdenc64.so*
 "
 
 src_unpack() {
 	mkdir "${S}/${PN}-amd64" || die
 	cd "${S}/${PN}-amd64" || die
 	unpack_deb "${DISTDIR}/${P}.deb"
+	unpack_deb "${DISTDIR}/${P}-enc.deb"
 }
 
 src_install() {
 	insinto "/usr/$(get_libdir)"
 
-	# AMF
 	doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}"
 	dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1"
+
+	doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamdenc64.so.1.0"
+	doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamdenc64.so"
 }
diff --git a/media-video/amdgpu-pro-amf/metadata.xml b/media-video/amdgpu-pro-amf/metadata.xml
index 6d07c8aa6259..fbd4c6cd9424 100644
--- a/media-video/amdgpu-pro-amf/metadata.xml
+++ b/media-video/amdgpu-pro-amf/metadata.xml
@@ -9,4 +9,8 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="radv">Pull media-libs/amdgpu-pro-vulkan as dependency</flag>
+		<flag name="pro">Pull media-libs/mesa as dependency</flag>
+	</use>
 </pkgmetadata>