Skip to content

Commit

Permalink
Merge pull request #88 from Ashark/23.10-1595145.22.04
Browse files Browse the repository at this point in the history
23.10-1595145.22.04
  • Loading branch information
mesmerx authored May 28, 2023
2 parents 3a1ed95 + 39183ee commit 7132dda
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 30 deletions.
48 changes: 24 additions & 24 deletions PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
# Autogenerated from AMD's Packages file
# with https://github.com/Ashark/archlinux-amdgpu-pro/blob/master/gen-PKGBUILD.py

major=22.40
major_short=22.40
minor=1577631
major=23.10
major_short=23.10
minor=1595145
ubuntu_ver=22.04
repo_folder_ver=5.4.5
repo_folder_ver=5.5.1

pkgbase=amdgpu-pro-installer
pkgname=(
Expand All @@ -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.29-${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.30-${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
Expand All @@ -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
a597ac10158fa40b49fa254faab3e78dda81ddc97d55211e2dc89628691a0d0d
fa03586eee7214f706c7e0b0c1eae52c3f2aa8edc831346509163aaf44730b50
86d73a874f50beb1a29b12cf10eeda5b36a98d4dca796f9d3424a19adf25a798
5cd743c0ed1fbd447201e389e1976ce01eb648220b0f7a7b648303eebd629ad4
0fb6c095e1c81adf4fb7992cd928a6ff807aed74dd8c24d6be250e2ab22f53c5
d28c781956863f64a588a87c980cbcbd7af951c0cf6d739e244dbac5b4e5dc17
f04b30f354171bd75950cdbddd4a99297552f58bd9dbbbaa11ba2de8e9d4dc70
d16ac7965519136d35e3748243b519adc8b27096632adfa551678fb30f87ebc4
77a779edf2e59e4fe9f0130360a1e987d9052b033308234d60cd0974b895381a
44d28c6dc63f8523c16685f52967d982ecdaa726aa952a07a5cc4317c168ea6a
458c28bc43c49175a948ff0833db1fb1ec7e38523b8110cc2a56fef35eeff226
f3599795ff9de1878e0a45d2ac31cc6f831e0893e87d7ec4b8f98b5e4f367966
af108f668ec86e5d2346b7c7344720d575e2ae61f13e90fa3bdc7634a8a3870b
9d602e62e3222fd405ff4573c18cfbaaaf1bc19ccb08f2fdd7ee8da7743f8ce5
d9d46e001e9e10bad88cad4ef4043c877a4b0f7a3cf9c15332dac085d92e7990
890e104a769e525bce7af8f213f6fb33dc020045c2849dc0c7b931c6badd6a0a)
f1825098d8ea4efa3999094761ae5e26005eebfc3481011f4723f1cfb514b89f
c0101de4551d50e1874a25f3130843dc2d01fd5e007b4be4db4468c66a66f605
8961a5a19a5b8c84d54df6be125f494fe238aa28267ff1778c9e4e5384281182
3533c597e6e16d3e2d25726c51f1bad1b7ee8f083e72b13b6365ba0807f44a6c
d633fb5c54956a8247cffe9f69f9ad57fa2aaaf4c273f8b1fdca4717ea2c41c4
e694fdd17c0abf6aa4bd11737d97eab0792c611fcab3a283dc9740ca18fdc725
61def861b132d76d5a9ac43c3f13a39d0206a3f409ccd450c4788351ef5c9777
13e4f5f77fbf43a9dd1c0ab595ff233ecc45299ff4489c10fd70498e0555058b
114a225282cf6f7e2a1d0ab84f716ca6a93dac6c2cc186cd3f61aa32a5061af0
5ba1faceb840ccc0cd235e01efc54b984028520083ba41ef0a4392acb56da81e
ab3f9016b66940f6cc04544da8c576ca2d5d7482da570637b40c0a0d0be1365e
9c0b42db7a0cd0372cf7ca43b1ddfa75d0a0b9584d7ea22c964bd3a2f1b3182d
5cb48db10863235c56313bc18a0867d8ee1ca04d46b5ff072c8fdbca586eb395
4754d1663625fd93d1dafb88c5ecd2b22bc3a818cdfbeec865c4e61c3bc750e5
7e3dab457a37bade8306038c8f126ddd3438d31e5eb44bc5566ab41e7291870f
3af060309f6da74b901a6adc4acc622bc73d36b6086fc77f7d69872a6229ac52)



Expand Down Expand Up @@ -103,7 +103,7 @@ package_amf-amdgpu-pro () {
depends=("libdrm" "vulkan-amdgpu-pro=${major}_${minor}-${pkgrel}")
optdepends=("rocm-opencl-runtime: Warning unspecified optdep description")

extract_deb "${srcdir}"/amf-amdgpu-pro_1.4.29-${minor}.${ubuntu_ver}_amd64.deb
extract_deb "${srcdir}"/amf-amdgpu-pro_1.4.30-${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
Expand Down Expand Up @@ -166,7 +166,7 @@ package_vulkan-amdgpu-pro () {
license=('custom: AMDGPU-PRO EULA')
provides=('vulkan-driver')
depends=("vulkan-icd-loader" "wayland" "zlib")
optdepends=("libssl1.1: Warning unspecified optdep description")
optdepends=("openssl-1.1: Warning unspecified optdep description")

extract_deb "${srcdir}"/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_amd64.deb
move_libdir "opt/amdgpu-pro/lib/x86_64-linux-gnu" "usr/lib"
Expand All @@ -185,7 +185,7 @@ package_lib32-vulkan-amdgpu-pro () {
license=('custom: AMDGPU-PRO EULA')
provides=('lib32-vulkan-driver')
depends=("lib32-vulkan-icd-loader" "lib32-wayland" "lib32-zlib")
optdepends=("lib32-libssl1.1: Warning unspecified optdep description")
optdepends=("lib32-openssl-1.1: Warning unspecified optdep description")

extract_deb "${srcdir}"/vulkan-amdgpu-pro_${major_short}-${minor}.${ubuntu_ver}_i386.deb
move_libdir "opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
Expand Down
2 changes: 2 additions & 0 deletions gen_replace_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function dep_convert {
case $line in

libc6) arch_str="None, #manually_mapped" ;; # It maps to 'glibc', which is required by base, so no need to explicitly depend on it
libvulkan1) arch_str="'vulkan-icd-loader', #manually_mapped" ;; # It maps to 'vulkan-icd-loader', because the automatic sets to use dicord for this lib
libgcc-s1) arch_str="None, #manually_mapped" ;; # It maps to 'gcc', but I doubt it depends on gcc, the compiler
libgl1) arch_str="'libglvnd', #manually_mapped" ;;
libjs-jquery) arch_str="'jquery', #manually_mapped" ;;
Expand All @@ -36,6 +37,7 @@ function dep_convert {
libudev0) arch_str="None, #manually_mapped" ;; # have alternative libudev1
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
rocm-opencl-runtime) arch_str="'rocm-opencl-runtime', #manually_mapped" ;; # we anyway do not use it, but let's keep the dependency
#---) arch_str="'---', #manually_mapped" ;; # templpate

Expand Down
2 changes: 1 addition & 1 deletion packages_map.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated with ./gen_packages_map.sh > packages_map.py
# for driver version 22.40-1577631.22.04
# for driver version 23.10-1595145.22.04

packages_map = {
'amdgpu-pro': None, #we_have_already_combined_libgl_to_single_package
Expand Down
4 changes: 2 additions & 2 deletions replace_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
'libgbm1-amdgpu': None, #manually_Do_not_know_what_it_is
'libgcc-s1': None, #manually_mapped
'libgl1': 'libglvnd', #manually_mapped
'libssl1.1': 'libssl1.1', #could_not_auto_translate
'libssl1.1': 'openssl-1.1', #manually_mapped
'libstdc++6': None, #manually_mapped
'libvulkan1': 'vulkan-icd-loader', #auto_translated
'libvulkan1': 'vulkan-icd-loader', #manually_mapped
'libwayland-amdgpu-client0': 'wayland', #auto_translated
'libwayland-client0': 'wayland', #auto_translated
'libx11-6': 'libx11', #auto_translated
Expand Down
6 changes: 3 additions & 3 deletions versions
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This file is interpreted by both python and bash

pkgver_base="22.40"
pkgver_build="1577631"
pkgver_base="23.10"
pkgver_build="1595145"
ubuntu_ver="22.04"
repo_folder_ver="5.4.5"
repo_folder_ver="5.5.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.
Expand Down

0 comments on commit 7132dda

Please sign in to comment.