22.40_1518373-1

1 files changed, 68 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 659ddc293e44..bf67af048469 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,37 +4,61 @@
 # Autogenerated from AMD's Packages file
 # with https://github.com/Ashark/archlinux-amdgpu-pro/blob/master/gen-PKGBUILD.py
 
-repo_ver=5.4.1
-major=22.40.0
+major=22.40
 major_short=22.40
 minor=1518373
 ubuntu_ver=22.04
+repo_folder_ver=5.4.1
 
 pkgbase=amdgpu-pro-installer
 pkgname=(
 amf-amdgpu-pro
-amdgpu-pro-libgl
-lib32-amdgpu-pro-libgl
+amdgpu-pro-oglp
+lib32-amdgpu-pro-oglp
 vulkan-amdgpu-pro
 lib32-vulkan-amdgpu-pro
 )
 pkgver=${major}_${minor}
-pkgrel=2
+pkgrel=1
 arch=('x86_64')
-url=https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-20
+url=https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-40
 license=('custom: multiple')
 groups=('Radeon_Software_for_Linux')
 
 source=(progl::https://raw.githubusercontent.com/Ashark/archlinux-amdgpu-pro/master/progl
 	progl.bash-completion::https://raw.githubusercontent.com/Ashark/archlinux-amdgpu-pro/master/progl.bash-completion
-	https://repo.radeon.com/amdgpu/${repo_ver}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.29-${minor}.${ubuntu_ver}_amd64.deb
-	https://repo.radeon.com/amdgpu/${repo_ver}/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-${minor}.${ubuntu_ver}_amd64.deb
-	https://repo.radeon.com/amdgpu/${repo_ver}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_i386.deb
-	https://repo.radeon.com/amdgpu/${repo_ver}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_amd64.deb)
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.29-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libegl1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libegl1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-dri_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-dri_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-ext_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-gbm_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-glx_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-glx_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles2-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles2-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+	https://repo.radeon.com/amdgpu/${repo_folder_ver}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_amd64.deb)
 sha256sums=(feb74796c3152cbafaba89d96e68a152f209bd3058c7eb0413cbe1ab0764e96f
 	e32801c38b475cd8df17a407726b86db3de26410f563d688325b4d4314fc5354
 	9b7814d8f3b32aef4bf4550b51b38096b5cc28e1a1cf6d3318e42c044070ef6e
 	02bdb1eb1cae28794e6892b0892ce9d3e43ef6f7dd7d853b74a91f2ba49fab1c
+	343f98824a01e3a40081eba37b58d8e7bd611bd63b4a0e36a8dbc6a246e5283f
+	9b4cd2b0efd710c1679ca121b13eb18a36950c2342ef5fe8e3eb804e43341c0f
+	ec57ad22fa0bc100d13bcde32a556dc5868040ad684ebee2607661722e3d6a8a
+	49220c52a6c1d76ee8dc96a9874fdf2459b873e3df6523d6a9d63751101f94c7
+	df7032f54121147b8948413648e6d05dcac6fd657c36df95b44cbdccad79f771
+	a5349f7ea40034c72bd4b60541c20c5acbe3ebb93c906b421748808ac27c9e96
+	5e5410a0f53111c1af45a58360c17cdf3d97367ed3defd1deb8c07f67373b0ea
+	087f6044498c6e61650a7eee29248da2c913992bd271612145c4cc816cc9d884
+	d292baef8495b73300bb671532a8ea92916ed9f367ae130dcacc479c56ecc3ba
+	49db99f83d753d18b076fcf9dc1a1633f2a11ba2110268e7f7c0defdfd809301
+	b6c856043dddfb9af2af733a0972a4b5ceafa380496f1db9339875b730ea3ba9
+	d9a8a0c8e0a92a8031fceb1307723a5ac86db0f0bb471026aa750b6f881dab2f
 	68e025b363aa97b9dde6c957d7906157fdaf11f28ee2a94d4ee98cc3fd93234a
 	1754591537448202728d592c7f9af7f1acf5ccf8cbbca413ef9a00206e248267)
 
@@ -71,7 +95,7 @@ move_copyright() {
     mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
     find ${pkgdir}/usr/share/doc -name "copyright" -exec mv {} ${pkgdir}/usr/share/licenses/${pkgname} \;
     find ${pkgdir}/usr/share/doc -type d -empty -delete
-    }
+}
 
 package_amf-amdgpu-pro () {
     pkgdesc="AMDGPU Pro Advanced Multimedia Framework"
@@ -85,10 +109,21 @@ package_amf-amdgpu-pro () {
     move_copyright
 }
 
-package_amdgpu-pro-libgl () {
+package_amdgpu-pro-oglp () {
     pkgdesc="AMDGPU Pro OpenGL driver"
+    license=('custom: AMDGPU-PRO EULA')
     provides=('libgl')
-
+    depends=("libdrm" "libglvnd" "libx11")
+
+    extract_deb "${srcdir}"/libegl1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+    extract_deb "${srcdir}"/libgl1-amdgpu-pro-oglp-dri_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+    extract_deb "${srcdir}"/libgl1-amdgpu-pro-oglp-ext_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+    extract_deb "${srcdir}"/libgl1-amdgpu-pro-oglp-gbm_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+    extract_deb "${srcdir}"/libgl1-amdgpu-pro-oglp-glx_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+    extract_deb "${srcdir}"/libgles1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+    extract_deb "${srcdir}"/libgles2-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
+    move_libdir "opt/amdgpu-pro/lib/x86_64-linux-gnu" "usr/lib"
+    move_copyright
 
     # extra_commands:
     move_libdir "usr/lib/x86_64-linux-gnu" "usr/lib"
@@ -97,23 +132,40 @@ package_amdgpu-pro-libgl () {
     move_libdir "opt/amdgpu/share/drirc.d" "usr/share/drirc.d"
     install -Dm755 "${srcdir}"/progl "${pkgdir}"/usr/bin/progl
     install -Dm644 "${srcdir}"/progl.bash-completion "${pkgdir}"/usr/share/bash-completion/completions/progl
+    # For some reason, applications started with normal OpenGL (i.e. without ag pro) crashes at launch if this conf file is presented, so hide it for now, until I find out the reason of that.
+    mv "${pkgdir}"/usr/share/drirc.d/10-amdgpu-pro.conf "${pkgdir}"/usr/share/drirc.d/10-amdgpu-pro.conf.hide
+    # For some reason, libs no more moved to the pro folder. Do it manually.
+    mv -v -t "${pkgdir}/usr/lib/amdgpu-pro" "${pkgdir}/usr/lib/lib"*
 }
 
-package_lib32-amdgpu-pro-libgl () {
+package_lib32-amdgpu-pro-oglp () {
     pkgdesc="AMDGPU Pro OpenGL driver (32-bit)"
+    license=('custom: AMDGPU-PRO EULA')
     provides=('lib32-libgl')
+    depends=("lib32-libx11")
 
+    extract_deb "${srcdir}"/libegl1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+    extract_deb "${srcdir}"/libgl1-amdgpu-pro-oglp-dri_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+    extract_deb "${srcdir}"/libgl1-amdgpu-pro-oglp-glx_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+    extract_deb "${srcdir}"/libgles1-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+    extract_deb "${srcdir}"/libgles2-amdgpu-pro-oglp_${major_short}-${minor}.${ubuntu_ver}_i386.deb
+    move_libdir "opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+    move_copyright
 
     # extra_commands:
+    rm "${pkgdir}"/opt/amdgpu/share/drirc.d/10-amdgpu-pro.conf
     move_libdir "usr/lib/i386-linux-gnu" "usr/lib32"
     move_libdir "opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32/amdgpu-pro"
+    # For some reason, libs no more moved to the pro folder. Do it manually.
+    mkdir "${pkgdir}/usr/lib32/amdgpu-pro"
+    mv -v -t "${pkgdir}/usr/lib32/amdgpu-pro" "${pkgdir}/usr/lib32/lib"*
 }
 
 package_vulkan-amdgpu-pro () {
     pkgdesc="AMDGPU Pro Vulkan driver"
     license=('custom: AMDGPU-PRO EULA')
     provides=('vulkan-driver')
-    depends=("vulkan-icd-loader" "zlib")
+    depends=("vulkan-icd-loader" "wayland" "zlib")
     optdepends=("openssl-1.1: Warning unspecified optdep description")
 
     extract_deb "${srcdir}"/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
@@ -132,7 +184,7 @@ package_lib32-vulkan-amdgpu-pro () {
     pkgdesc="AMDGPU Pro Vulkan driver (32-bit)"
     license=('custom: AMDGPU-PRO EULA')
     provides=('lib32-vulkan-driver')
-    depends=("lib32-vulkan-icd-loader" "lib32-zlib")
+    depends=("lib32-vulkan-icd-loader" "lib32-wayland" "lib32-zlib")
     optdepends=("lib32-openssl-1.1: Warning unspecified optdep description")
 
     extract_deb "${srcdir}"/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_i386.deb