diff --git a/.SRCINFO b/.SRCINFO index d22e9ad..50b8eae 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = amdgpu-pro-installer - pkgver = 23.30_1697785 + pkgver = 23.40_1710631 pkgrel = 1 url = https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-40 arch = x86_64 @@ -7,47 +7,48 @@ pkgbase = amdgpu-pro-installer license = custom: multiple source = progl::https://raw.githubusercontent.com/Ashark/archlinux-amdgpu-pro/master/progl source = progl.bash-completion::https://raw.githubusercontent.com/Ashark/archlinux-amdgpu-pro/master/progl.bash-completion - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.32-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libegl1-amdgpu-pro-oglp_23.30-1697785.22.04_i386.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libegl1-amdgpu-pro-oglp_23.30-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-dri_23.30-1697785.22.04_i386.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-dri_23.30-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-ext_23.30-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-gbm_23.30-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-glx_23.30-1697785.22.04_i386.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-glx_23.30-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles1-amdgpu-pro-oglp_23.30-1697785.22.04_i386.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles1-amdgpu-pro-oglp_23.30-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles2-amdgpu-pro-oglp_23.30-1697785.22.04_i386.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles2-amdgpu-pro-oglp_23.30-1697785.22.04_amd64.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_23.30-1697785.22.04_i386.deb - source = https://repo.radeon.com/amdgpu/5.7.3/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_23.30-1697785.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.33-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libegl1-amdgpu-pro-oglp_23.40-1710631.22.04_i386.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libegl1-amdgpu-pro-oglp_23.40-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-dri_23.40-1710631.22.04_i386.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-dri_23.40-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-ext_23.40-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-gbm_23.40-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-glx_23.40-1710631.22.04_i386.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgl1-amdgpu-pro-oglp-glx_23.40-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles1-amdgpu-pro-oglp_23.40-1710631.22.04_i386.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles1-amdgpu-pro-oglp_23.40-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles2-amdgpu-pro-oglp_23.40-1710631.22.04_i386.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/o/oglp-amdgpu-pro/libgles2-amdgpu-pro-oglp_23.40-1710631.22.04_amd64.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_23.40-1710631.22.04_i386.deb + source = https://repo.radeon.com/amdgpu/6.0.1/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_23.40-1710631.22.04_amd64.deb sha256sums = feb74796c3152cbafaba89d96e68a152f209bd3058c7eb0413cbe1ab0764e96f sha256sums = e32801c38b475cd8df17a407726b86db3de26410f563d688325b4d4314fc5354 - sha256sums = 2c47944530b7f2dd282ff13fb77f11e30baee92df0396218fb587a783dfce56f - sha256sums = e692be10e1b5b5d80f54049c5821605fb4f3f0f3e1c277a43515116a6b528935 - sha256sums = 7a8c2077304c6640a23785634d8051130131ef3f515cda6a7c9186c229b25fcc - sha256sums = a071f5b7d715b7868d45806d3347cd271fa5623a81565c190140c08fba31c9b2 - sha256sums = 952970c9615183bad04f18e60106b9bd4243d74536c2b5517319ace024e31724 - sha256sums = d82cdf426c3ea04d2771e7a8c742e2eb7cdf2dd6637f6b11190a4af8d43d6600 - sha256sums = 8c422c62c323a43656fac6054e39d1d1986ccb01735967dc09c074d7855451a8 - sha256sums = 89b1ee47e77bdf54fb0d12867fc00757bd150207297c90851da046355fe859f0 - sha256sums = e186895fd49d53479c4205e99ea4e47b859fae2a54b241bf124987b3575400fc - sha256sums = 64ef89f88f690788baf62f40509bd0a75255f6f977c4094e0252d739367d8085 - sha256sums = 92601e8b5f6bbbfa440dcb1122b6900bf1615b2dad9969c64ad6d31c20b0e952 - sha256sums = c81e7c04970812def5b013ecc424b888583c1996852c624f07013ba6dbe2d138 - sha256sums = 63186e3a99f1f7c47d17a5a3d237bf35742cb87830d3d918fc401be84784eeb4 - sha256sums = 820d6f8acae0484626c81959502358daa44525fae67db895287f96f872f51687 - sha256sums = 0917adb9be8e0f471ca94a1bf35c511731f24741164cd1077d5126b80ef7b97f - sha256sums = 100f41d2937e9b9244f41c722c56615e641fe6fe9c8040c1a0e606b07421a09b + sha256sums = b1d0c6770087a346253a2ef682c36e63adc9e0142e214cdbe948c7646cd69a09 + sha256sums = 547e314b9896b323b3f0324b07035af8f3d4945bd0e87433fe23fd91a41a8e5f + sha256sums = 12717a49746fa62d2b5fdfc85d30a26038b0e5f52f5985ced5139dacc4659e73 + sha256sums = 1d87e8f385c8c308691d918274e32862f80c09023069194d7b8172ace54cadb8 + sha256sums = 95a66d0dffb2be645cf991dfc60fdc18cc3870629953606c89878870c2bc5658 + sha256sums = 945f8d31560b98a34074fb10163aa8970e8da5f7dd81c53f5380d51c799981d4 + sha256sums = eb379cb64365e3437025702c8d1661d6e2c652ccd46a08ece96d8fb216d18f93 + sha256sums = d7a44fcdca5d3410318713d2a3c2cca33d1e399eaf7fb8d3eb58b69851f90111 + sha256sums = f0235039ce37e340ccc8c552fd9ac26bd0c6e74b3dc6222bf9e4813a9e7ff524 + sha256sums = e9d84a5ef9ed7e1885de51e7d9fe2a32f1635896628daaa1c0fcb83057cd5515 + sha256sums = 5bbcedbc7ab1f37792e6e70f52c6910a74983bef6d53f4c47dc3a4813e89b01c + sha256sums = cf1e748dd328e1900bd78c4c9dc140dcb2517fb1848a2cafd585c9782eb4dea8 + sha256sums = ba71cc6055a0133ed245bd818c72682f11f4641c6ee6b9a3627fcb808d16ac75 + sha256sums = 076eeefef404d5e1f801f12ecf2abed727b0fcd15728133ca3623052f499ffd2 + sha256sums = c9bb91690a3e0da9b0de4127be0d876040ac3eab4c8c8eccae5c3bfcc60bd3ff + sha256sums = 30705b6bb9b00b760eba4459488e865d525cfee7d768f269e913c1463b5f54a5 pkgname = amf-amdgpu-pro pkgdesc = AMDGPU Pro Advanced Multimedia Framework license = custom: AMDGPU-PRO EULA depends = libdrm - depends = vulkan-amdgpu-pro=23.30_1697785-1 + depends = vulkan-icd-loader optdepends = rocm-opencl-runtime: Warning unspecified optdep description + optdepends = vulkan-radeon: Warning unspecified optdep description pkgname = amdgpu-pro-oglp pkgdesc = AMDGPU Pro OpenGL driver diff --git a/PKGBUILD b/PKGBUILD index d398a08..7698751 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,11 +4,11 @@ # Autogenerated from AMD's Packages file # with https://github.com/Ashark/archlinux-amdgpu-pro/blob/master/gen-PKGBUILD.py -major=23.30 -major_short=23.30 -minor=1697785 +major=23.40 +major_short=23.40 +minor=1710631 ubuntu_ver=22.04 -repo_folder_ver=5.7.3 +repo_folder_ver=6.0.1 pkgbase=amdgpu-pro-installer pkgname=( @@ -27,7 +27,7 @@ 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_folder_ver}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.32-${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.33-${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 @@ -45,22 +45,22 @@ source=(progl::https://raw.githubusercontent.com/Ashark/archlinux-amdgpu-pro/mas 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 - 2c47944530b7f2dd282ff13fb77f11e30baee92df0396218fb587a783dfce56f - e692be10e1b5b5d80f54049c5821605fb4f3f0f3e1c277a43515116a6b528935 - 7a8c2077304c6640a23785634d8051130131ef3f515cda6a7c9186c229b25fcc - a071f5b7d715b7868d45806d3347cd271fa5623a81565c190140c08fba31c9b2 - 952970c9615183bad04f18e60106b9bd4243d74536c2b5517319ace024e31724 - d82cdf426c3ea04d2771e7a8c742e2eb7cdf2dd6637f6b11190a4af8d43d6600 - 8c422c62c323a43656fac6054e39d1d1986ccb01735967dc09c074d7855451a8 - 89b1ee47e77bdf54fb0d12867fc00757bd150207297c90851da046355fe859f0 - e186895fd49d53479c4205e99ea4e47b859fae2a54b241bf124987b3575400fc - 64ef89f88f690788baf62f40509bd0a75255f6f977c4094e0252d739367d8085 - 92601e8b5f6bbbfa440dcb1122b6900bf1615b2dad9969c64ad6d31c20b0e952 - c81e7c04970812def5b013ecc424b888583c1996852c624f07013ba6dbe2d138 - 63186e3a99f1f7c47d17a5a3d237bf35742cb87830d3d918fc401be84784eeb4 - 820d6f8acae0484626c81959502358daa44525fae67db895287f96f872f51687 - 0917adb9be8e0f471ca94a1bf35c511731f24741164cd1077d5126b80ef7b97f - 100f41d2937e9b9244f41c722c56615e641fe6fe9c8040c1a0e606b07421a09b) + b1d0c6770087a346253a2ef682c36e63adc9e0142e214cdbe948c7646cd69a09 + 547e314b9896b323b3f0324b07035af8f3d4945bd0e87433fe23fd91a41a8e5f + 12717a49746fa62d2b5fdfc85d30a26038b0e5f52f5985ced5139dacc4659e73 + 1d87e8f385c8c308691d918274e32862f80c09023069194d7b8172ace54cadb8 + 95a66d0dffb2be645cf991dfc60fdc18cc3870629953606c89878870c2bc5658 + 945f8d31560b98a34074fb10163aa8970e8da5f7dd81c53f5380d51c799981d4 + eb379cb64365e3437025702c8d1661d6e2c652ccd46a08ece96d8fb216d18f93 + d7a44fcdca5d3410318713d2a3c2cca33d1e399eaf7fb8d3eb58b69851f90111 + f0235039ce37e340ccc8c552fd9ac26bd0c6e74b3dc6222bf9e4813a9e7ff524 + e9d84a5ef9ed7e1885de51e7d9fe2a32f1635896628daaa1c0fcb83057cd5515 + 5bbcedbc7ab1f37792e6e70f52c6910a74983bef6d53f4c47dc3a4813e89b01c + cf1e748dd328e1900bd78c4c9dc140dcb2517fb1848a2cafd585c9782eb4dea8 + ba71cc6055a0133ed245bd818c72682f11f4641c6ee6b9a3627fcb808d16ac75 + 076eeefef404d5e1f801f12ecf2abed727b0fcd15728133ca3623052f499ffd2 + c9bb91690a3e0da9b0de4127be0d876040ac3eab4c8c8eccae5c3bfcc60bd3ff + 30705b6bb9b00b760eba4459488e865d525cfee7d768f269e913c1463b5f54a5) @@ -100,10 +100,11 @@ move_copyright() { package_amf-amdgpu-pro () { pkgdesc="AMDGPU Pro Advanced Multimedia Framework" license=('custom: AMDGPU-PRO EULA') - depends=("libdrm" "vulkan-amdgpu-pro=${major}_${minor}-${pkgrel}") - optdepends=("rocm-opencl-runtime: Warning unspecified optdep description") + depends=("libdrm" "vulkan-icd-loader") + optdepends=("rocm-opencl-runtime: Warning unspecified optdep description" + "vulkan-radeon: Warning unspecified optdep description") - extract_deb "${srcdir}"/amf-amdgpu-pro_1.4.32-${minor}.${ubuntu_ver}_amd64.deb + extract_deb "${srcdir}"/amf-amdgpu-pro_1.4.33-${minor}.${ubuntu_ver}_amd64.deb extract_deb "${srcdir}"/libamdenc-amdgpu-pro_1.0-${minor}.${ubuntu_ver}_amd64.deb move_libdir "opt/amdgpu-pro/lib/x86_64-linux-gnu" "usr/lib" move_copyright diff --git a/gen-PKGBUILD.py b/gen-PKGBUILD.py index ef1ec35..08e81b6 100755 --- a/gen-PKGBUILD.py +++ b/gen-PKGBUILD.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 +from replace_deps import replace_deps +from packages_map import packages_map from debian import deb822 from debian import debfile import re @@ -27,7 +29,9 @@ url_ref = "https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-40" -source_repo_url = "https://repo.radeon.com/amdgpu/{0}/ubuntu/".format(repo_folder_ver) +source_repo_url = "https://repo.radeon.com/amdgpu/{0}/ubuntu/".format( + repo_folder_ver) + def gen_arch_packages(): pkgbuild_packages = { @@ -40,19 +44,19 @@ def gen_arch_packages(): # bash make_pkgbuild_pkgs_template.sh > tmp_pkgbuild_pkgs_template.txt # To show packages with their conffiles I used this: - #for file in $(ls *deb); - #do - #tmpdir=tmpdir; rm -rf "$tmpdir"; mkdir "$tmpdir"; cd "$tmpdir" - #ar x ../$file control.tar.xz - #files=$(tar -tf control.tar.xz | grep -vE "control|md5sums|./$" | grep conffiles) - #if [[ $files != "" ]]; then - #echo -e "$file:\n backup = [" - #tar -xf control.tar.xz ./conffiles -O | sed 's/^\// '\''/' | sed 's/$/'\'',/' - #echo " ]," - #fi - #files=""; cd .. - #done - #rm -rf tmpdir + # for file in $(ls *deb); + # do + # tmpdir=tmpdir; rm -rf "$tmpdir"; mkdir "$tmpdir"; cd "$tmpdir" + # ar x ../$file control.tar.xz + # files=$(tar -tf control.tar.xz | grep -vE "control|md5sums|./$" | grep conffiles) + # if [[ $files != "" ]]; then + # echo -e "$file:\n backup = [" + # tar -xf control.tar.xz ./conffiles -O | sed 's/^\// '\''/' | sed 's/$/'\'',/' + # echo " ]," + # fi + # files=""; cd .. + # done + # rm -rf tmpdir # They are added automatically, but you can override a backup array as shown in the example: # 'overriding-example': Package( @@ -88,11 +92,11 @@ def gen_arch_packages(): # ], # ), 'amdgpu-pro-oglp': Package( - desc = "AMDGPU Pro OpenGL driver", - provides = ['libgl'], - extra_commands = [ - # # This is instead of libgl1-amdgpu-pro-ext-hwe_19.20-812932_amd64.deb/postinst and libgl1-amdgpu-pro-ext-hwe_19.20-812932_amd64.deb/prerm - # 'mv "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx-ext-hwe.so "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx.so', + desc="AMDGPU Pro OpenGL driver", + provides=['libgl'], + extra_commands=[ + # # This is instead of libgl1-amdgpu-pro-ext-hwe_19.20-812932_amd64.deb/postinst and libgl1-amdgpu-pro-ext-hwe_19.20-812932_amd64.deb/prerm + # 'mv "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx-ext-hwe.so "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/libglx.so', 'move_libdir "usr/lib/x86_64-linux-gnu" "usr/lib"', 'move_libdir "opt/amdgpu-pro/lib/x86_64-linux-gnu" "usr/lib/amdgpu-pro"', 'move_libdir "opt/amdgpu-pro/lib/xorg" "usr/lib/amdgpu-pro/xorg"', @@ -113,7 +117,7 @@ def gen_arch_packages(): ] ), 'lib32-amdgpu-pro-oglp': Package( - desc = "AMDGPU Pro OpenGL driver (32-bit)", + desc="AMDGPU Pro OpenGL driver (32-bit)", provides=['lib32-libgl'], extra_commands=[ # # This is instead of libgl1-amdgpu-pro-ext-hwe_19.20-812932_i386.deb/postinst and libgl1-amdgpu-pro-ext-hwe_19.20-812932_i386.deb/prerm @@ -132,23 +136,23 @@ def gen_arch_packages(): 'mv -v -t "${pkgdir}/usr/lib32/amdgpu-pro" "${pkgdir}/usr/lib32/lib"*', ] ), - #'opencl-amdgpu-pro-comgr': Package( desc = "Code object manager (COMGR)" ), - #'opencl-amdgpu-pro-dev': Package( ), - #'opencl-amdgpu-pro-pal': Package( - #desc = "AMDGPU Pro OpenCL driver PAL", - #provides=['opencl-driver'] - #), - #'opencl-amdgpu-pro-orca': Package( - #desc = "AMDGPU Pro OpenCL driver ORCA aka legacy", - #provides=['opencl-driver'] - #), - #'lib32-opencl-amdgpu-pro-orca': Package( - #desc="AMDGPU Pro OpenCL driver ORCA aka legacy (32-bit)", - #provides=['lib32-opencl-driver'] - #), + # 'opencl-amdgpu-pro-comgr': Package( desc = "Code object manager (COMGR)" ), + # 'opencl-amdgpu-pro-dev': Package( ), + # 'opencl-amdgpu-pro-pal': Package( + # desc = "AMDGPU Pro OpenCL driver PAL", + # provides=['opencl-driver'] + # ), + # 'opencl-amdgpu-pro-orca': Package( + # desc = "AMDGPU Pro OpenCL driver ORCA aka legacy", + # provides=['opencl-driver'] + # ), + # 'lib32-opencl-amdgpu-pro-orca': Package( + # desc="AMDGPU Pro OpenCL driver ORCA aka legacy (32-bit)", + # provides=['lib32-opencl-driver'] + # ), 'vulkan-amdgpu-pro': Package( provides=['vulkan-driver'], - extra_commands = [ + extra_commands=[ # This is instead of vulkan-amdgpu-pro_19.20-812932_amd64.deb/postinst and vulkan-amdgpu-pro_19.20-812932_amd64.deb/prerm 'mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/', 'mv "${pkgdir}"/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/amd_pro_icd64.json', @@ -159,7 +163,7 @@ def gen_arch_packages(): ), 'lib32-vulkan-amdgpu-pro': Package( provides=['lib32-vulkan-driver'], - extra_commands = [ + extra_commands=[ # This is instead of vulkan-amdgpu-pro_19.20-812932_i386.deb/postinst and vulkan-amdgpu-pro_19.20-812932_i386.deb/prerm 'mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/', 'mv "${pkgdir}"/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd32.json "${pkgdir}"/usr/share/vulkan/icd.d/amd_pro_icd32.json', @@ -176,26 +180,24 @@ def gen_arch_packages(): # This maps which deb packages should go into specific arch package -from packages_map import packages_map # This maps debian dependencies to arch linux dependencies -from replace_deps import replace_deps # Almost every pro package depends on these two, but I omited them (hoping they are not needed, but not tested), so disabling these dependencies globally replace_deps['libwayland-amdgpu-client0'] = None replace_deps['libwayland-amdgpu-server0'] = None -## do not convert the dependencies listed to lib32 variants +# do not convert the dependencies listed to lib32 variants no_lib32_convert = [ # "some_debian_package_name", ] -## override the version requirement extracted from deb +# override the version requirement extracted from deb replace_version = { # "some-debian-package-name": "=redefinedVersion", } -## maps debians archs to arch's archs +# maps debians archs to arch's archs architectures_map = { "amd64": "x86_64", "i386": "i686", @@ -203,10 +205,10 @@ def gen_arch_packages(): } # To see list of uniq licences files and packages that uses them, I used this: - # cd unpacked_debs - # for dir in $(ls -d *); do - # md5sum $dir/copyright - # done | sort +# cd unpacked_debs +# for dir in $(ls -d *); do +# md5sum $dir/copyright +# done | sort # Then I mapped each copyright hash to its short licence name: licenses_hashes_map = { @@ -238,6 +240,7 @@ def gen_arch_packages(): "libglide3": "TODO_some_description", "linux-firmware": "TODO_some_description", "llvm-amdgpu-7.1-doc": "TODO_some_description", + "vulkan-icd-loader": "Vulkan Installable Client Driver (ICD) Loader", } @@ -251,9 +254,10 @@ def hashFile(file): buf = f.read(block) return hash.hexdigest() -sources = [ "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" ] -sha256sums = [ hashFile("progl"), hashFile("progl.bash-completion") ] + +sources = ["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"] +sha256sums = [hashFile("progl"), hashFile("progl.bash-completion")] patches = sorted(glob.glob("*.patch")) @@ -261,8 +265,8 @@ def hashFile(file): sources.append(patch) sha256sums.append(hashFile(patch)) -#sources.append("20-amdgpu.conf") -#sha256sums.append(hashFile("20-amdgpu.conf")) +# sources.append("20-amdgpu.conf") +# sha256sums.append(hashFile("20-amdgpu.conf")) header_tpl = """# Author: Janusz Lewandowski @@ -357,6 +361,7 @@ def hashFile(file): def quote(string): return "\"" + string.replace("\\", "\\\\").replace("\"", "\\\"") + "\"" + class Package: def __init__(self, **kwargs): for arg in kwargs: @@ -381,8 +386,8 @@ def fill_arch_info(self, deb_info): self.arch = ['x86_64'] else: import sys - sys.stderr.write("ERROR: There is a bug in this script, package '%s' is i386 (came from %s) and should start with 'lib32'. Check packages_map!\n" % (self.arch_pkg_name, deb_info["Package"])) - + sys.stderr.write("ERROR: There is a bug in this script, package '%s' is i386 (came from %s) and should start with 'lib32'. Check packages_map!\n" % ( + self.arch_pkg_name, deb_info["Package"])) try: deb_deps = deb_info["Depends"].split(', ') @@ -390,8 +395,8 @@ def fill_arch_info(self, deb_info): deb_deps = None domap = True - #if self.arch_pkg_name == "amdgpu-pro" or self.arch_pkg_name == "lib32-amdgpu-pro": - #domap = False + # if self.arch_pkg_name == "amdgpu-pro" or self.arch_pkg_name == "lib32-amdgpu-pro": + # domap = False # Removing unneeded dependencies # if self.arch_pkg_name == "amdgpu-pro-meta" or self.arch_pkg_name == "lib32-amdgpu-pro-meta": @@ -402,25 +407,34 @@ def fill_arch_info(self, deb_info): # deb_deps.remove('amdgpu (= %s-%s) | amdgpu-hwe (= %s-%s)' % (pkgver_base, pkgver_build, pkgver_base, pkgver_build)) # deb_deps.remove('amdgpu-lib32 (= %s-%s)' % (pkgver_base, pkgver_build)) if self.arch_pkg_name == "opencl-amdgpu-pro-dev": - deb_deps.remove('ocl-icd-libopencl1-amdgpu-pro (= %s-%s)' % (pkgver_base, pkgver_build)) + deb_deps.remove('ocl-icd-libopencl1-amdgpu-pro (= %s-%s)' % + (pkgver_base, pkgver_build)) if self.arch_pkg_name == "opencl-amdgpu-pro-meta": - deb_deps.remove('amdgpu-dkms (= %s-%s)' % (pkgver_base, pkgver_build)) # I do not know why it wants amdgpu-dkms, but I did not built it, so just rm this dep for now - deb_deps.remove('clinfo-amdgpu-pro (= %s-%s)' % (pkgver_base, pkgver_build)) - deb_deps.remove('ocl-icd-libopencl1-amdgpu-pro (= %s-%s)' % (pkgver_base, pkgver_build)) - #if self.arch_pkg_name == "amf-amdgpu-pro": - #deb_deps.remove('opencl-amdgpu-pro-icd') # looks like amf works ok even without opencl part + # I do not know why it wants amdgpu-dkms, but I did not built it, so just rm this dep for now + deb_deps.remove('amdgpu-dkms (= %s-%s)' % + (pkgver_base, pkgver_build)) + deb_deps.remove('clinfo-amdgpu-pro (= %s-%s)' % + (pkgver_base, pkgver_build)) + deb_deps.remove('ocl-icd-libopencl1-amdgpu-pro (= %s-%s)' % + (pkgver_base, pkgver_build)) + # if self.arch_pkg_name == "amf-amdgpu-pro": + # deb_deps.remove('opencl-amdgpu-pro-icd') # looks like amf works ok even without opencl part # if self.arch_pkg_name == "vulkan-amdgpu-pro": # deb_deps.remove('amdgpu-pro-core') # already removed, as I dropped ag-core-meta # if self.arch_pkg_name == "lib32-vulkan-amdgpu-pro": # deb_deps.remove('amdgpu-pro-core') # already removed, as I dropped ag-core-meta if deb_deps: - deb_deps = [ depWithAlt_to_singleDep(dep) if dependencyWithAltRE.search(dep) else dep for dep in deb_deps ] - deb_deps = [ dependencyNameWithVersionRE.match(dep).groups() for dep in deb_deps ] - deb_deps = [(replace_deps[deb_pkg_name] if deb_pkg_name in replace_deps else deb_pkg_name, version) for deb_pkg_name, version in deb_deps] - deb_deps = ["\"" + convertName(deb_pkg_name, deb_info, domap) + convertVersionSpecifier(deb_pkg_name, version) + "\"" for deb_pkg_name, version in deb_deps if deb_pkg_name] - deb_deps = [ dep for dep in deb_deps if dep != "\"\"" ] - deb_deps = [ dep for dep in deb_deps if not dep.startswith("\"=")] + deb_deps = [depWithAlt_to_singleDep(dep) if dependencyWithAltRE.search( + dep) else dep for dep in deb_deps] + deb_deps = [dependencyNameWithVersionRE.match( + dep).groups() for dep in deb_deps] + deb_deps = [(replace_deps[deb_pkg_name] if deb_pkg_name in replace_deps else deb_pkg_name, version) + for deb_pkg_name, version in deb_deps] + deb_deps = ["\"" + convertName(deb_pkg_name, deb_info, domap) + convertVersionSpecifier( + deb_pkg_name, version) + "\"" for deb_pkg_name, version in deb_deps if deb_pkg_name] + deb_deps = [dep for dep in deb_deps if dep != "\"\""] + deb_deps = [dep for dep in deb_deps if not dep.startswith("\"=")] # if self.arch_pkg_name == "opencl-amdgpu-pro-orca": # deb_deps.append('\"libdrm-amdgpu=${major}_${minor}-${pkgrel}\"') @@ -431,12 +445,14 @@ def fill_arch_info(self, deb_info): # deb_deps.append('\"libdrm-amdgpu=${major}_${minor}-${pkgrel}\"') # remove all dependencies on itself - deb_deps = [ dep for dep in deb_deps if dep[1:len(self.arch_pkg_name)+1] != self.arch_pkg_name ] + deb_deps = [dep for dep in deb_deps if dep[1:len( + self.arch_pkg_name)+1] != self.arch_pkg_name] if hasattr(self, 'depends') and self.depends: deb_deps += self.depends - self.depends = list(sorted(set( deb_deps ))) # remove duplicates and append to already existing dependencies + # remove duplicates and append to already existing dependencies + self.depends = list(sorted(set(deb_deps))) try: deb_suggs = deb_info["Suggests"].split(', ') @@ -455,15 +471,19 @@ def fill_arch_info(self, deb_info): deb_optdeps = deb_optdeps + deb_recomms if deb_optdeps: - deb_optdeps = [depWithAlt_to_singleDep(dep) if dependencyWithAltRE.search(dep) else dep for dep in deb_optdeps] - deb_optdeps = [dependencyNameWithVersionRE.match(dep).groups() for dep in deb_optdeps] - deb_optdeps = [(replace_deps[deb_pkg_name] if deb_pkg_name in replace_deps else deb_pkg_name, version) for deb_pkg_name, version in deb_optdeps] + deb_optdeps = [depWithAlt_to_singleDep(dep) if dependencyWithAltRE.search( + dep) else dep for dep in deb_optdeps] + deb_optdeps = [dependencyNameWithVersionRE.match( + dep).groups() for dep in deb_optdeps] + deb_optdeps = [(replace_deps[deb_pkg_name] if deb_pkg_name in replace_deps else deb_pkg_name, version) + for deb_pkg_name, version in deb_optdeps] deb_optdeps = ["\"" + convertName(deb_pkg_name, deb_info, domap) + convertVersionSpecifier(deb_pkg_name, version) + ": " - + (optdepends_descriptions[deb_pkg_name] if deb_pkg_name in optdepends_descriptions else "Warning unspecified optdep description" ) + + (optdepends_descriptions[deb_pkg_name] if deb_pkg_name in optdepends_descriptions else "Warning unspecified optdep description") + "\"" for deb_pkg_name, version in deb_optdeps if deb_pkg_name] # remove all optional dependencies on itself - deb_optdeps = [dep for dep in deb_optdeps if dep[1:len(self.arch_pkg_name) + 1] != self.arch_pkg_name] + deb_optdeps = [dep for dep in deb_optdeps if dep[1:len( + self.arch_pkg_name) + 1] != self.arch_pkg_name] self.optdepends = self.optdepends + list(sorted(set(deb_optdeps))) @@ -479,33 +499,37 @@ def fill_arch_info(self, deb_info): self.desc = desc - sources.append(source_repo_url.replace(repo_folder_ver, "${repo_folder_ver}") + deb_info["Filename"].replace("/"+pkgver_base, "/"+"${major}")\ + sources.append(source_repo_url.replace(repo_folder_ver, "${repo_folder_ver}") + deb_info["Filename"].replace("/"+pkgver_base, "/"+"${major}") .replace("_"+pkgver_base_short, "_${major_short}").replace(pkgver_build, "${minor}").replace("."+ubuntu_ver, ".${ubuntu_ver}")) sha256sums.append(deb_info["SHA256"]) - deb_file = debfile.DebFile(os.path.expanduser("~/.aptly/public/%s" % (deb_info["Filename"]))) + deb_file = debfile.DebFile(os.path.expanduser( + "~/.aptly/public/%s" % (deb_info["Filename"]))) if not hasattr(self, 'license'): - copyright_md5 = deb_file.md5sums()[b'usr/share/doc/%s/copyright' % (str.encode(deb_info["Package"]))] + copyright_md5 = deb_file.md5sums( + )[b'usr/share/doc/%s/copyright' % (str.encode(deb_info["Package"]))] if copyright_md5 in licenses_hashes_map: self.license = "('%s')" % licenses_hashes_map[copyright_md5] else: self.license = "('NOT_IN_MAP')" - if not hasattr(self,'backup'): + if not hasattr(self, 'backup'): if deb_file.control.has_file("conffiles"): - self.backup = [ line.decode('utf-8').replace("\n","") for line in deb_file.control.get_file("conffiles") if line.decode('utf-8') ] - self.backup = [ re.sub("^/", "", line) for line in self.backup ] # removing leading slash + self.backup = [line.decode('utf-8').replace("\n", "") + for line in deb_file.control.get_file("conffiles") if line.decode('utf-8')] + # removing leading slash + self.backup = [re.sub("^/", "", line) for line in self.backup] if not hasattr(self, 'install'): if Path("%s.install" % self.arch_pkg_name).is_file(): self.install = "%s.install" % self.arch_pkg_name - def toPKGBUILD(self): ret = package_header_tpl.format( NAME=self.arch_pkg_name, - DESC=quote(self.desc) if hasattr(self, 'desc') else quote("No description for package %s" % self.arch_pkg_name), + DESC=quote(self.desc) if hasattr(self, 'desc') else quote( + "No description for package %s" % self.arch_pkg_name), ) if hasattr(self, 'license'): @@ -514,13 +538,14 @@ def toPKGBUILD(self): ret += " install=%s\n" % self.install if hasattr(self, 'arch'): - if self.arch != default_arch: # omitting default arch for making pkgbuild cleaner + if self.arch != default_arch: # omitting default arch for making pkgbuild cleaner ret += " arch=('%s')\n" % " ".join(self.arch) # add any given list/array with one of those names to the pkgbuild for array in ('provides', 'conflicts', 'replaces', 'groups'): - if(hasattr(self, array)): - ret += " %s=('%s')\n" % (array, "' '".join(getattr(self, array))) + if (hasattr(self, array)): + ret += " %s=('%s')\n" % (array, + "' '".join(getattr(self, array))) if hasattr(self, 'depends'): ret += " depends=(%s)\n" % " ".join(self.depends) @@ -529,26 +554,28 @@ def toPKGBUILD(self): if hasattr(self, 'backup'): ret += " backup=(%s)\n" % " ".join(self.backup) - ret += "\n" # separating variables and functions with empty line + ret += "\n" # separating variables and functions with empty line for info in self.deb_source_infos: - tmp_str=package_deb_extract_tpl.format(BaseFilename=os.path.basename(info["Filename"])) - ret += tmp_str.replace("/"+str(pkgver_base), "/"+"${major}").replace(str(pkgver_build), "${minor}").replace(str(pkgver_base_short), "${major_short}").replace(str(ubuntu_ver), "${ubuntu_ver}") + tmp_str = package_deb_extract_tpl.format( + BaseFilename=os.path.basename(info["Filename"])) + ret += tmp_str.replace("/"+str(pkgver_base), "/"+"${major}").replace(str(pkgver_build), "${minor}").replace( + str(pkgver_base_short), "${major_short}").replace(str(ubuntu_ver), "${ubuntu_ver}") if self.arch_pkg_name != "amdgpu-pro-libgl" and self.arch_pkg_name != "lib32-amdgpu-pro-libgl": # for ag-p-lgl and l32-ag-p-lgl I have temporary disabled movelibdir function (because it requires further investigation) - PRO="" - DEBDIR="" - ARCHDIR="" + PRO = "" + DEBDIR = "" + ARCHDIR = "" if "amdgpu-pro" in self.arch_pkg_name: - PRO="-pro" + PRO = "-pro" if self.arch_pkg_name.startswith('lib32-'): - DEBDIR="i386" - ARCHDIR="32" + DEBDIR = "i386" + ARCHDIR = "32" else: - DEBDIR="x86_64" - ARCHDIR="" + DEBDIR = "x86_64" + ARCHDIR = "" ret += package_move_libdir_tpl.format( PRO=PRO, DEBDIR=DEBDIR, @@ -559,7 +586,7 @@ def toPKGBUILD(self): if hasattr(self, 'extra_commands'): ret += "\n # extra_commands:\n " - ret += "\n ".join( self.extra_commands ) + ret += "\n ".join(self.extra_commands) ret += "\n" # if self.arch_pkg_name.startswith('lib32-'): @@ -577,44 +604,57 @@ def toPKGBUILD(self): # regex for detecting dependency with alternative dependencyWithAltRE = re.compile(r" \| ") + def depWithAlt_to_singleDep(depWithAlt): # I (Ashark) used this to get a list of dependencies with alternatives: # cat Packages | grep -vE "Filename|Size|MD5sum|SHA1|SHA256|Priority|Maintainer|Version|Description|^ +" > Packages-short-nodesc # cat Packages-short-nodesc | egrep "Depends|Suggests|Recommends" | grep "|" | sed 's/Depends: //' | sed 's/Suggests: //' | sed 's/Recommends: //' | sed "s/, /\n/g" | grep "|" | sort -u # And I got this list: - # amdgpu (= 19.20-812932) | amdgpu-hwe (= 19.20-812932) - # amdgpu-lib (= 19.20-812932) | amdgpu-lib-hwe (= 19.20-812932) - # amdgpu-pro (= 19.20-812932) | amdgpu-pro-hwe (= 19.20-812932) - # libtxc-dxtn-s2tc0 | libtxc-dxtn0 - # libudev1 | libudev0 - # libva1-amdgpu | libva2-amdgpu | libva1 | libva2 - # libvdpau1-amdgpu | libvdpau1 + # amdgpu (= 19.20-812932) | amdgpu-hwe (= 19.20-812932) + # amdgpu-lib (= 19.20-812932) | amdgpu-lib-hwe (= 19.20-812932) + # amdgpu-pro (= 19.20-812932) | amdgpu-pro-hwe (= 19.20-812932) + # libtxc-dxtn-s2tc0 | libtxc-dxtn0 + # libudev1 | libudev0 + # libva1-amdgpu | libva2-amdgpu | libva1 | libva2 + # libvdpau1-amdgpu | libvdpau1 splitted_alts = dependencyWithAltRE.split(depWithAlt) - splitted_name_and_ver = [dependencyNameWithVersionRE.match(dep).groups() for dep in splitted_alts] + splitted_name_and_ver = [dependencyNameWithVersionRE.match( + dep).groups() for dep in splitted_alts] if splitted_name_and_ver[0][0] + "-hwe" == splitted_name_and_ver[1][0]: - return splitted_alts[1] # use hwe variant (i.e. latest) - if splitted_name_and_ver[0][0] == "libtxc-dxtn-s2tc0" and splitted_name_and_ver[1][0] == "libtxc-dxtn0": # from libgl1-amdgpu-mesa-dri Recommends array - return splitted_alts[0] # use libtxc-dxtn-s2tc0. libtxc-dxtn0 is a virtual package, which is provided by libtxc-dxtn-s2tc0 + return splitted_alts[1] # use hwe variant (i.e. latest) + # from libgl1-amdgpu-mesa-dri Recommends array + if splitted_name_and_ver[0][0] == "libtxc-dxtn-s2tc0" and splitted_name_and_ver[1][0] == "libtxc-dxtn0": + # use libtxc-dxtn-s2tc0. libtxc-dxtn0 is a virtual package, which is provided by libtxc-dxtn-s2tc0 + return splitted_alts[0] if splitted_name_and_ver[0][0] == "libudev1" and splitted_name_and_ver[1][0] == "libudev0": - return splitted_alts[0] # use libudev1 (i.e. latest) + return splitted_alts[0] # use libudev1 (i.e. latest) if splitted_name_and_ver[0][0] == "libva1-amdgpu" and splitted_name_and_ver[1][0] == "libva2-amdgpu" and splitted_name_and_ver[2][0] == "libva1" and splitted_name_and_ver[3][0] == "libva2": - return splitted_alts[3] # use libva2. libva*-amdgpu doesn't exist in repos and not provided in bundle. Probably amd's mistake + # use libva2. libva*-amdgpu doesn't exist in repos and not provided in bundle. Probably amd's mistake + return splitted_alts[3] if splitted_name_and_ver[0][0] == "libvdpau1-amdgpu" and splitted_name_and_ver[1][0] == "libvdpau1": - return splitted_alts[1] # use libvdpau1. libvdpau1-amdgpu doesn't exist in repos and not provided in bundle. Probably amd's mistake + # use libvdpau1. libvdpau1-amdgpu doesn't exist in repos and not provided in bundle. Probably amd's mistake + return splitted_alts[1] if splitted_name_and_ver[0][0] == "libwayland-amdgpu-client0" and splitted_name_and_ver[1][0] == "libwayland-client0": - return "wayland" # they both resolves to wayland (automatically) in Arch + # they both resolves to wayland (automatically) in Arch + return "wayland" + + if splitted_name_and_ver[0][0] == "mesa-vulkan-drivers": + return splitted_alts[0] # use mesa-vulkan-drivers (i.e. latest) return "Warning_Do_not_know_which_alt_to_choose" -deb_pkgs_avail_archs={} + +deb_pkgs_avail_archs = {} dep32RE = re.compile(r"(.*):i386") + + def convertName(name, deb_info, domap=True): ret = name match = dep32RE.match(name) - if match: # explicit :i386 dependency + if match: # explicit :i386 dependency ret = match.group(1) if not ret in no_lib32_convert: ret = 'lib32-%s' % ret @@ -629,17 +669,20 @@ def convertName(name, deb_info, domap=True): if unambiguous_name in packages_map: if domap: - if packages_map[unambiguous_name]: # this is to prevent returning None type, because we want to concatenate with str type + # this is to prevent returning None type, because we want to concatenate with str type + if packages_map[unambiguous_name]: return packages_map[unambiguous_name] return "" return "" if ret in packages_map: - if packages_map[ret]: # this is to prevent returning None type, because we want to concatenate with str type + # this is to prevent returning None type, because we want to concatenate with str type + if packages_map[ret]: return packages_map[ret] return "" return ret + def convertVersionSpecifier(name, spec): if name in replace_version: return replace_version[name] @@ -655,18 +698,19 @@ def convertVersionSpecifier(name, spec): sign, spec = spec.split(" ", 1) spec = spec.strip() - if sign == ">" or sign == ">=": # assume Arch users have latest versions of all packages + if sign == ">" or sign == ">=": # assume Arch users have latest versions of all packages return "" - if ":" in spec: # debian epochs means nothing in arch context, so strip them + if ":" in spec: # debian epochs means nothing in arch context, so strip them deb_epoch, spec = spec.rsplit(":", 1) # also would be good to omit debian-revision, as it has nothing to do with arch's pkgrel # but anyway we omit > and >= deps, so I did not implemented it yet return sign + spec + # get list of unique arch packages from package map -arch_package_names=list(pkgbuild_packages.keys()) -deb_package_names=[] +arch_package_names = list(pkgbuild_packages.keys()) +deb_package_names = [] # f = open("Packages-debugging", "r") f = open("Packages-extracted", "r") @@ -680,7 +724,8 @@ def convertVersionSpecifier(name, spec): deb_pkgs_avail_archs[deb_info["Package"]].add(deb_info["Architecture"]) deb_package_list.append(deb_info) -deb_package_names = [info["Package"] + ":i386" if info["Architecture"] == "i386" else info["Package"] for info in deb_package_list] +deb_package_names = [info["Package"] + ":i386" if info["Architecture"] + == "i386" else info["Package"] for info in deb_package_list] f.close() @@ -690,7 +735,8 @@ def convertVersionSpecifier(name, spec): if deb_info["Architecture"] == "i386": name = deb_info["Package"] + ":i386" if name in packages_map: # to allow temporary commenting out mappings from packages_map while using full Packages file - if packages_map[name] in pkgbuild_packages: # to allow temporary commenting out packages from pkgbuild_packages + # to allow temporary commenting out packages from pkgbuild_packages + if packages_map[name] in pkgbuild_packages: arch_pkg = pkgbuild_packages[packages_map[name]] if arch_pkg: @@ -698,7 +744,7 @@ def convertVersionSpecifier(name, spec): if not debugging: print(header_tpl.format( - package_names="(\n" + "\n".join( arch_package_names ) + "\n)", + package_names="(\n" + "\n".join(arch_package_names) + "\n)", pkgrel=pkgrel, url=url_ref, pkgver_base=pkgver_base, diff --git a/gen_replace_deps.sh b/gen_replace_deps.sh index 30f8693..960b616 100755 --- a/gen_replace_deps.sh +++ b/gen_replace_deps.sh @@ -38,7 +38,9 @@ function dep_convert { linux-firmware) arch_str="'linux-firmware', #manually_mapped" ;; # debtap takes very long time and finally faulty auto translates to None. libgbm1-amdgpu) arch_str="None, #manually_Do_not_know_what_it_is" ;; libssl1.1) arch_str="'openssl-1.1', #manually_mapped" ;; #for libssl1.1 to have correct dependency + mesa-vulkan-drivers) arch_str="'vulkan-radeon', #manually_mapped" ;; #for now it works with mesa rocm-opencl-runtime) arch_str="'rocm-opencl-runtime', #manually_mapped" ;; # we anyway do not use it, but let's keep the dependency + zlib1g) arch_str="'zlib', #manually_mapped" ;; # it seems to need the zlib, so we put it #---) arch_str="'---', #manually_mapped" ;; # templpate *) diff --git a/packages_map.py b/packages_map.py index 0523c0c..839ab90 100644 --- a/packages_map.py +++ b/packages_map.py @@ -1,5 +1,5 @@ # Generated with ./gen_packages_map.sh > packages_map.py -# for driver version 23.30-1697785.22.04 +# for driver version 23.40-1710631.22.04 packages_map = { 'amdgpu-pro': None, #we_have_already_combined_libgl_to_single_package diff --git a/replace_deps.py b/replace_deps.py index 2e5619a..cb115a6 100644 --- a/replace_deps.py +++ b/replace_deps.py @@ -2,19 +2,21 @@ # for driver version optional replace_deps = { - 'amdgpu-core': 'amdgpu-core', #could_not_auto_translate - 'amdgpu-lib32': 'amdgpu-lib32', #could_not_auto_translate - 'libc6': None, #manually_mapped - 'libdrm2-amdgpu': 'libdrm', #auto_translated - 'libgbm1-amdgpu': None, #manually_Do_not_know_what_it_is - 'libgcc-s1': None, #manually_mapped - 'libgl1': 'libglvnd', #manually_mapped - 'libssl1.1': 'openssl-1.1', #manually_mapped - 'libstdc++6': None, #manually_mapped - 'libvulkan1': 'vulkan-icd-loader', #manually_mapped - 'libwayland-amdgpu-client0': 'wayland', #auto_translated - 'libwayland-client0': 'wayland', #auto_translated - 'libx11-6': 'libx11', #auto_translated - 'rocm-opencl-runtime': 'rocm-opencl-runtime', #manually_mapped - 'zlib1g': 'zlib', #auto_translated + 'amdgpu-core': 'amdgpu-core', #could_not_auto_translate + 'amdgpu-lib32': 'amdgpu-lib32', #could_not_auto_translate + 'libc6': None, #manually_mapped + 'libdrm2-amdgpu': 'libdrm', #auto_translated + 'libgbm1-amdgpu': None, #manually_Do_not_know_what_it_is + 'libgcc-s1': None, #manually_mapped + 'libgl1': 'libglvnd', #manually_mapped + 'libssl1.1': 'openssl-1.1', #manually_mapped + 'libstdc++6': None, #manually_mapped + 'libvulkan1': 'vulkan-icd-loader', #manually_mapped + 'libwayland-amdgpu-client0': 'wayland', #auto_translated + 'libwayland-client0': 'wayland', #auto_translated + 'libx11-6': 'libx11', #auto_translated + 'mesa-amdgpu-vulkan-drivers': 'mesa', #auto_translated + 'mesa-vulkan-drivers': 'vulkan-radeon', #manually_mapped + 'rocm-opencl-runtime': 'rocm-opencl-runtime', #manually_mapped + 'zlib1g': 'zlib', #manually_mapped } diff --git a/versions b/versions index 6797588..7313185 100755 --- a/versions +++ b/versions @@ -1,9 +1,9 @@ # This file is interpreted by both python and bash -pkgver_base="23.30" -pkgver_build="1697785" +pkgver_base="23.40" +pkgver_build="1710631" ubuntu_ver="22.04" -repo_folder_ver="5.7.3" +repo_folder_ver="6.0.1" # Old version is specified for use in extract_transaction_scripts_and_triggers.sh # I stopped checking transaction script and triggers, it seems it's rather safe to ignore that step. But if some day I want to check it again, I need to uncomment and fill in the old versions too.