commit:     66fa0a96e3073071355b0e80415bb0e4c5dea58a
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 18 17:29:30 2024 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Sun Feb 18 17:29:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=66fa0a96

media-libs/amdvlk-bin: improved documentation

added legacy-si slot for very old GPUs

fixed elog/einfo

Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>

 media-libs/amdvlk-bin/Manifest                     |  2 ++
 ...-2024.1.1.ebuild => amdvlk-bin-2021.2.5.ebuild} | 39 ++++++++++++----------
 media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild   | 37 ++++++++++----------
 media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild   | 26 ++++++++-------
 4 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/media-libs/amdvlk-bin/Manifest b/media-libs/amdvlk-bin/Manifest
index 331888a2b4..131e6ecbaa 100644
--- a/media-libs/amdvlk-bin/Manifest
+++ b/media-libs/amdvlk-bin/Manifest
@@ -1,3 +1,5 @@
+DIST amdvlk-bin-2021.2.5-amd64.rpm 16616736 BLAKE2B 
091d14036fc164e15ebb138812baef104a0db51fc9e2574db4c0fa9d285cfb0a43d54e36685817a638c08b2c82ca40e5f5978791aab39d6d83bd6f59889f430f
 SHA512 
65febbdfb0aa0a6b2213d5cbe0029c7da2627d1714d5f25b2d5ccf2401872d323f6e5b0408d9ba9fc5d07b9ae69beb7015498fb2828b6ea0982431ad7f8e450e
+DIST amdvlk-bin-2021.2.5-i386.deb 23475164 BLAKE2B 
b7f7fb91d88c7a37e69f99a2a036b6e1eda1ae00f0f378eb0a245253b12ea6adbd23de70e9bc06c95438a02f2d1905eb8dd55c601ba616106e2b2e2f7db08a93
 SHA512 
1f6067c97661285f62bcd0cb8a81138943f7280ebfda3d70aa32237cea0b715131c7b8af982b62c63ef813f6c1ff54672eea61244cf3c13f1cb536edbb4a749c
 DIST amdvlk-bin-2023.3.3-amd64.rpm 16954920 BLAKE2B 
8b8d2e353a2055a823c5a7932c55a5e113036388a68c2f61a665de0209e82dd219b21e6f4a79f2ad6141381601e408b0007068140fcc2692bf5904ac289ab597
 SHA512 
827bcf885f207557b452360491187b9909279a601dff9c635561b4aa5f2c8aae9d940e880a98c7fb1482efd7fec068e8f3667729930ecd20dfa7c06be15193c9
 DIST amdvlk-bin-2023.3.3-i386.deb 25352166 BLAKE2B 
f4e3af91c2f4e7be6c447c2553ac3deed106be86ce3bd3204ac2e6734ca09dba4c59da8ffd49b52f85dfcbe5eaba09cfa2519578ececfb6f7b21ee4a3d67430d
 SHA512 
3668d701292b7283409ec2209f52b0b01cd7821754969efc4c91c74b2b075ee612f41fafd471dd92da1b204644c76bb92fd60c4c916588b7ee8961257523ba50
 DIST amdvlk-bin-2024.1.1-amd64.rpm 18242384 BLAKE2B 
f26155287dfd7c968581b5eba3a4ad4ac9e1c0d4740a9aa57e120c8a21a1638cf0f02bcf3fd51fb2b6150031b7d81a2c755095807f8afbec5727be4dd661bcaf
 SHA512 
f75b175377a9c252d564db5d99aae47d833d6ddc2c0b7c9292113e96e0635d059deae82ef54e9a88025c28b8b2271113ab468c72a0aa16c4908857b970f3634e

diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild 
b/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild
similarity index 73%
copy from media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild
copy to media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild
index dfba1714db..740c1759ae 100644
--- a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild
+++ b/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild
@@ -16,8 +16,8 @@ RESTRICT="test"
 REQUIRED_USE="abi_x86_64"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64" # The hardware is not supported x86 anymore
+SLOT="legacy-si"
+KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore
 
 RDEPEND="
        sys-libs/zlib[${MULTILIB_USEDEP}]
@@ -26,8 +26,9 @@ RDEPEND="
        x11-libs/libXrandr[${MULTILIB_USEDEP}]
        x11-libs/libxcb[${MULTILIB_USEDEP}]
        x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-       >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
+       media-libs/vulkan-loader[${MULTILIB_USEDEP}]
        !media-libs/amdvlk
+       !media-libs/amdvlk-bin:0
        !media-libs/amdvlk-bin:legacy-polaris
        "
 DEPEND="
@@ -40,29 +41,33 @@ QA_PREBUILT="
 "
 # TODO: Found a correct way to disable QA_SONAME for /usr/lib/amdvlk32.so
 # I don't know why the current value is not working
-QA_SONAME="usr/lib/*"
+QA_SONAME="usr/*"
 
 S=${WORKDIR}
 
 pkg_pretend(){
-       ewarn "Mainline AMDVLK drops support for pre-NAVI graphics cards"
-       ewarn "Such as Radeon™ RX 400/500 Series"
-       ewarn "or Radeon™ RX Vega Series"
-       einfo "Check Gentoo Wiki for further information"
-       einfo "https://wiki.gentoo.org/wiki/AMDVLK";
+       ewarn "This is extremely old version which supports AMD's legacy GPUs 
such as:"
+       ewarn "Radeon™ R5/R7/R9 200/300 Series"
+       ewarn "Radeon™ M200/M300/M400 Series"
+       ewarn "Radeon™ HD 8000M Series"
+       ewarn "Radeon™ HD 7000 Series"
+       ewarn "This is very (3 years+) deprecated, it only supports vulkan 
1.2.179"
+       ewarn "Use it at your own risk"
+       elog "Check Gentoo Wiki for further information"
+       elog "https://wiki.gentoo.org/wiki/AMDVLK";
        if use abi_x86_32; then
-       ewarn "32-bit amdvlk binary is untested"
-       ewarn "Work in progress"
+               ewarn "32-bit amdvlk binary is untested"
+               ewarn "Work in progress, use it at your risk"
        fi
 }
 
 src_unpack(){
-       elog "Unpacking abi_x86_64..."
+       einfo "Unpacking abi_x86_64..."
        mkdir -p "${S}"/amd64
        cd "${S}"/amd64 || die
        rpm_unpack ${P}-amd64.rpm
        if use abi_x86_32; then
-               elog "Unpacking abi_x86_32..."
+               einfo "Unpacking abi_x86_32..."
                mkdir -p "${S}"/i386 || die
                cd "${S}"/i386 || die
                unpacker ${P}-i386.deb
@@ -72,7 +77,7 @@ src_unpack(){
 src_prepare() {
        default
        if use abi_x86_32; then
-               elog "Changing layout of abi_x86_32 from debian/ubuntu to 
Gentoo/RHEL-alike"
+               einfo "Changing layout of abi_x86_32 from debian/ubuntu to 
Gentoo/RHEL-alike"
                mv "${S}/i386/usr/lib/i386-linux-gnu/amdvlk32.so" 
"${S}/i386/usr/lib/" || die
                rm -d "${S}/i386/usr/lib/i386-linux-gnu/" || die
                rm -r "${S}/i386/usr/share/" || die
@@ -83,7 +88,7 @@ src_prepare() {
 
 src_configure(){
        if use abi_x86_32; then
-               elog "Changing configuration of abi_x86_32 from debian/ubuntu 
to Gentoo/RHEL-alike"
+               einfo "Changing configuration of abi_x86_32 from debian/ubuntu 
to Gentoo/RHEL-alike"
                sed -i 
's/\/usr\/lib\/i386-linux-gnu\/amdvlk32.so/\/usr\/lib\/amdvlk32.so/g' \
                "${S}/i386/etc/vulkan/icd.d/amd_icd32.json" || die
                sed -i 
's/\/usr\/lib\/i386-linux-gnu\/amdvlk32.so/\/usr\/lib\/amdvlk32.so/g' \
@@ -91,7 +96,7 @@ src_configure(){
        fi
 }
 src_compile(){
-       elog "Nothing to compile..."
+       einfo "Nothing to compile..."
 }
 
 src_install(){
@@ -110,7 +115,7 @@ pkg_postinst(){
        ewarn "If you are using Wayland, it should be fine"
        elog "More information about the configuration can be found here:"
        elog "https://github.com/GPUOpen-Drivers/AMDVLK";
-       elog "See also https://wiki.gentoo.org/wiki/AMDVLK (but it might be 
outdated)"
+       elog "${GENTOO_WIKI_PAGE}#Configuration_and_features"
        elog "You can use AMD_VULKAN_ICD variable to switch to the required 
driver."
        elog "AMD_VULKAN_ICD=RADV application   - for using radv."
        elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."

diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild 
b/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild
index 43d6529345..3e53e100a5 100644
--- a/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild
+++ b/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="abi_x86_64"
 
 LICENSE="MIT"
 SLOT="legacy-polaris"
-KEYWORDS="-* ~amd64" # The hardware is not supported x86 anymore
+KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore
 
 RDEPEND="
        sys-libs/zlib[${MULTILIB_USEDEP}]
@@ -26,9 +26,10 @@ RDEPEND="
        x11-libs/libXrandr[${MULTILIB_USEDEP}]
        x11-libs/libxcb[${MULTILIB_USEDEP}]
        x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-       >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
+       >=media-libs/vulkan-loader-1.3.268[${MULTILIB_USEDEP}]
        !media-libs/amdvlk
        !media-libs/amdvlk-bin:0
+       !media-libs/amdvlk-bin:legacy-si
        "
 DEPEND="
        ${RDEPEND}
@@ -45,27 +46,27 @@ QA_SONAME="usr/lib/*"
 S=${WORKDIR}
 
 pkg_pretend(){
-       einfo "This is last version which supports AMD's legacy graphics cards 
such as:"
-       einfo "Radeon™ RX Vega Series"
-       einfo "Radeon™ RX 400/500 Series"
-       einfo "Radeon™ Pro WX 9100, x200 Series"
-       einfo "Radeon™ Pro W5700/W5500 Series"
-       einfo "Use it at your own risk"
-       einfo "Check Gentoo Wiki for further information"
-       einfo "https://wiki.gentoo.org/wiki/AMDVLK";
+       elog "This is last version which supports AMD's legacy graphics cards 
such as:"
+       elog "Radeon™ RX Vega Series"
+       elog "Radeon™ RX 400/500 Series"
+       elog "Radeon™ Pro WX 9100, x200 Series"
+       elog "Radeon™ Pro W5700/W5500 Series"
+       elog "Use it at your own risk"
+       elog "Check Gentoo Wiki for further information"
+       elog "https://wiki.gentoo.org/wiki/AMDVLK";
        if use abi_x86_32; then
-       ewarn "32-bit amdvlk binary is untested"
-       ewarn "Work in progress, use it at your risk"
+               ewarn "32-bit amdvlk binary is untested"
+               ewarn "Work in progress, use it at your risk"
        fi
 }
 
 src_unpack(){
-       elog "Unpacking abi_x86_64..."
+       einfo "Unpacking abi_x86_64..."
        mkdir -p "${S}"/amd64
        cd "${S}"/amd64 || die
        rpm_unpack ${P}-amd64.rpm
        if use abi_x86_32; then
-               elog "Unpacking abi_x86_32..."
+               einfo "Unpacking abi_x86_32..."
                mkdir -p "${S}"/i386 || die
                cd "${S}"/i386 || die
                unpacker ${P}-i386.deb
@@ -75,7 +76,7 @@ src_unpack(){
 src_prepare() {
        default
        if use abi_x86_32; then
-               elog "Changing layout of abi_x86_32 from debian/ubuntu to 
Gentoo/RHEL-alike"
+               einfo "Changing layout of abi_x86_32 from debian/ubuntu to 
Gentoo/RHEL-alike"
                mv "${S}/i386/usr/lib/i386-linux-gnu/amdvlk32.so" 
"${S}/i386/usr/lib/" || die
                rm -d "${S}/i386/usr/lib/i386-linux-gnu/" || die
                rm -r "${S}/i386/usr/share/" || die
@@ -86,7 +87,7 @@ src_prepare() {
 
 src_configure(){
        if use abi_x86_32; then
-               elog "Changing configuration of abi_x86_32 from debian/ubuntu 
to Gentoo/RHEL-alike"
+               einfo "Changing configuration of abi_x86_32 from debian/ubuntu 
to Gentoo/RHEL-alike"
                sed -i 
's/\/usr\/lib\/i386-linux-gnu\/amdvlk32.so/\/usr\/lib\/amdvlk32.so/g' \
                "${S}/i386/etc/vulkan/icd.d/amd_icd32.json" || die
                sed -i 
's/\/usr\/lib\/i386-linux-gnu\/amdvlk32.so/\/usr\/lib\/amdvlk32.so/g' \
@@ -94,7 +95,7 @@ src_configure(){
        fi
 }
 src_compile(){
-       elog "Nothing to compile..."
+       einfo "Nothing to compile..."
 }
 
 src_install(){
@@ -113,7 +114,7 @@ pkg_postinst(){
        ewarn "If you are using Wayland, it should be fine"
        elog "More information about the configuration can be found here:"
        elog "https://github.com/GPUOpen-Drivers/AMDVLK";
-       elog "See also https://wiki.gentoo.org/wiki/AMDVLK (but it might be 
outdated)"
+       elog "${GENTOO_WIKI_PAGE}#Configuration_and_features"
        elog "You can use AMD_VULKAN_ICD variable to switch to the required 
driver."
        elog "AMD_VULKAN_ICD=RADV application   - for using radv."
        elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."

diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild 
b/media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild
index dfba1714db..b709d1f79d 100644
--- a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild
+++ b/media-libs/amdvlk-bin/amdvlk-bin-2024.1.1.ebuild
@@ -7,6 +7,7 @@ MULTILIB_COMPAT=( abi_x86_{32,64} )
 inherit rpm unpacker multilib-build
 
 DESCRIPTION="AMD Open Source Driver for Vulkan: official binary version"
+GENTOO_WIKI_PAGE="https://wiki.gentoo.org/wiki/AMDVLK";
 HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK";
 MY_PV="${PV/'.'/'.Q'}"
 FETCH_URI="https://github.com/GPUOpen-Drivers/AMDVLK/releases/download";
@@ -17,7 +18,7 @@ REQUIRED_USE="abi_x86_64"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64" # The hardware is not supported x86 anymore
+KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore
 
 RDEPEND="
        sys-libs/zlib[${MULTILIB_USEDEP}]
@@ -26,9 +27,10 @@ RDEPEND="
        x11-libs/libXrandr[${MULTILIB_USEDEP}]
        x11-libs/libxcb[${MULTILIB_USEDEP}]
        x11-libs/libxshmfence[${MULTILIB_USEDEP}]
-       >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
+       >=media-libs/vulkan-loader-1.3.275[${MULTILIB_USEDEP}]
        !media-libs/amdvlk
        !media-libs/amdvlk-bin:legacy-polaris
+       !media-libs/amdvlk-bin:legacy-si
        "
 DEPEND="
        ${RDEPEND}
@@ -48,21 +50,21 @@ pkg_pretend(){
        ewarn "Mainline AMDVLK drops support for pre-NAVI graphics cards"
        ewarn "Such as Radeon™ RX 400/500 Series"
        ewarn "or Radeon™ RX Vega Series"
-       einfo "Check Gentoo Wiki for further information"
-       einfo "https://wiki.gentoo.org/wiki/AMDVLK";
+       elog "Check Gentoo Wiki for further information"
+       elog "${GENTOO_WIKI_PAGE}"
        if use abi_x86_32; then
-       ewarn "32-bit amdvlk binary is untested"
-       ewarn "Work in progress"
+               ewarn "32-bit amdvlk binary is untested"
+               ewarn "Work in progress"
        fi
 }
 
 src_unpack(){
-       elog "Unpacking abi_x86_64..."
+       einfo "Unpacking abi_x86_64..."
        mkdir -p "${S}"/amd64
        cd "${S}"/amd64 || die
        rpm_unpack ${P}-amd64.rpm
        if use abi_x86_32; then
-               elog "Unpacking abi_x86_32..."
+               einfo "Unpacking abi_x86_32..."
                mkdir -p "${S}"/i386 || die
                cd "${S}"/i386 || die
                unpacker ${P}-i386.deb
@@ -72,7 +74,7 @@ src_unpack(){
 src_prepare() {
        default
        if use abi_x86_32; then
-               elog "Changing layout of abi_x86_32 from debian/ubuntu to 
Gentoo/RHEL-alike"
+               einfo "Changing layout of abi_x86_32 from debian/ubuntu to 
Gentoo/RHEL-alike"
                mv "${S}/i386/usr/lib/i386-linux-gnu/amdvlk32.so" 
"${S}/i386/usr/lib/" || die
                rm -d "${S}/i386/usr/lib/i386-linux-gnu/" || die
                rm -r "${S}/i386/usr/share/" || die
@@ -83,7 +85,7 @@ src_prepare() {
 
 src_configure(){
        if use abi_x86_32; then
-               elog "Changing configuration of abi_x86_32 from debian/ubuntu 
to Gentoo/RHEL-alike"
+               einfo "Changing configuration of abi_x86_32 from debian/ubuntu 
to Gentoo/RHEL-alike"
                sed -i 
's/\/usr\/lib\/i386-linux-gnu\/amdvlk32.so/\/usr\/lib\/amdvlk32.so/g' \
                "${S}/i386/etc/vulkan/icd.d/amd_icd32.json" || die
                sed -i 
's/\/usr\/lib\/i386-linux-gnu\/amdvlk32.so/\/usr\/lib\/amdvlk32.so/g' \
@@ -91,7 +93,7 @@ src_configure(){
        fi
 }
 src_compile(){
-       elog "Nothing to compile..."
+       einfo "Nothing to compile..."
 }
 
 src_install(){
@@ -110,7 +112,7 @@ pkg_postinst(){
        ewarn "If you are using Wayland, it should be fine"
        elog "More information about the configuration can be found here:"
        elog "https://github.com/GPUOpen-Drivers/AMDVLK";
-       elog "See also https://wiki.gentoo.org/wiki/AMDVLK (but it might be 
outdated)"
+       elog "${GENTOO_WIKI_PAGE}#Configuration_and_features"
        elog "You can use AMD_VULKAN_ICD variable to switch to the required 
driver."
        elog "AMD_VULKAN_ICD=RADV application   - for using radv."
        elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."

Reply via email to