Skip to content

Commit

Permalink
Merge pull request #103 from Ashark/v24.10_1787253-1
Browse files Browse the repository at this point in the history 
v24.10_1787253-1
  • Loading branch information
@mesmerx
mesmerx authored Jul 2, 2024
2 parents b2fda37 + 2cf536c commit c35572e
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 88 deletions.
50 changes: 26 additions & 24 deletions PKGBUILD
View file
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=23.40
major_short=23.40
minor=1741713
major=24.10
major_short=24.10
minor=1787253
ubuntu_ver=22.04
repo_folder_ver=6.0.3
repo_folder_ver=6.1.3

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.33-${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.34-${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
92cecf496059b7ae4658ca6f85fdad11821f000d85760832a414997978ecb2d2
3258c9963de671be769ef959ac105c4757900ee8cb68d125043a52e5c8da6e20
8aef213cad78eace33393dddd7b8abcc3ccdad8ccd7e81f9788d7f331aa47f26
8b6de9d866c6ff40296697d6d1bc7635b97e133f9d238807fd50079f0754a505
a02e63dc2f1c8d21c37f108ebc496c84bfbe34a6d6ab47723a2484f677c977e8
7411f60e1e7859977461386f411d0321c7799dbfe4a0160a8b4dc14ea5b0e7b9
541bb5e14bde7e507f023eeeb8987811e0f736cd1f66c77cebc369df0a56a33f
f001bf9a6722fc420f90897adbcba626384e4e14201b554055a34192fac93694
5c4e4a5d54e654e3a443821ac4e40e05fab000309cf6924858da34332646511f
7019408bbacbd9a4de4a44b20ee8c56c5a6b085970b2be3517f6aeb9ebc0a753
27aa6e424589bc7698489fa293802fc17345a6fa5e698123d2763188f6b47920
c639080e1e97348f8ece493b5f983177845b013decfd9a651c10062523b6b44e
1692c5f9b8ce86d89789febb4139ebc746596cbd79cc95535bfbb6f38f9458a7
b40413b762c424f70e87ed77f120adc5ad8d4652341809fbffc484b9aa839018
4b23681d370a5dc8bf5d2a029a8e5ea074468dbbe569f60b529a7a4ab9250ccc
8956de5ab6e2f66dd8b1cc805f6b8b8a74642ac76eedfa73da3a6925a2c284e8)
e6c308d24b6a4034eee7138a3fd4fdbe3692207422cc5d701e1a897159d8e347
45291643783efae295ae4e49f51f1603aa8bd1ff81db3f3f9a57e543f71065c8
151da11e9aaf7811ff6a0137153564edea0b89851a41b724e50c4068dbba4172
7e3619650a25acc50b8d767769e41ee01c6bd95d443a9d3c425494e43e8159fb
1cc76d62422ba91eccb07208639835a86a2a8a208e24148c5a00ab8dadbe03f5
96f4cab0a1f41ce48494c241fd3f5f688a2dd7ac1fe73a0314a2bc69b80b50bb
89307f78bf12f562274026790c0be8aff87116cce92f1130820345f46fd687ed
7863304a9a1238275e8fd3e39ff44c836e072898b583e6c56fda6310453ff174
8c58d20c416ab44d5fdaa37e5195deb2a964e0c8130ab22764bf2ab3518f2548
32f29d6f08101edcbb1d5552c7917bc30e4265dba5a1af7f972306fab735b613
419f33e582fe36a09b8af210ed653f60de6a0546dc4e0f1c83cd27e83ddd6861
0fb8081d1d223d9e6395662f4477ce0a9c4c87f9bb585ea8dddc18fa78197a07
4c4a97b519cad2ee6eed4589a04da2a4bcbb66601685327735728a8bde3cc6cc
c069add0f178944376468ae6fa15e26bb39d0b56d192b8686e3dd9d8c00c7475
11d2da8381c21bf48977d27298751a44ba22dbd581c7afe1376747a38b44b140
c5a619537aebfebad77bfc55a1ba2fc451c56de8407e54f937250d5639256e5a)



Expand Down Expand Up @@ -102,9 +102,11 @@ package_amf-amdgpu-pro () {
license=('custom: AMDGPU-PRO EULA')
depends=("libdrm" "vulkan-icd-loader")
optdepends=("rocm-opencl-runtime: Warning unspecified optdep description"
"vulkan-radeon: Warning unspecified optdep description")
"vulkan-radeon: Warning unspecified optdep description"
"amdgpu-dkms-firmware: Warning unspecified optdep description"
"amdgpu-dkms: Warning unspecified optdep description")

extract_deb "${srcdir}"/amf-amdgpu-pro_1.4.33-${minor}.${ubuntu_ver}_amd64.deb
extract_deb "${srcdir}"/amf-amdgpu-pro_1.4.34-${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 All @@ -114,7 +116,7 @@ package_amdgpu-pro-oglp () {
pkgdesc="AMDGPU Pro OpenGL driver"
license=('custom: AMDGPU-PRO EULA')
provides=('libgl')
depends=("libdrm" "libglvnd" "libx11")
depends=("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
Expand Down
92 changes: 49 additions & 43 deletions gen_replace_deps.sh
View file
Original file line number Diff line number Diff line change
@@ -1,67 +1,73 @@
#!/bin/bash
# This script generates a dependencies map of debian packages to arch linux packages dict for using in gen-PKGBUILD.py

cat Packages-extracted | egrep "Depends|Suggests|Recommends" | sed 's/Depends: //' | sed 's/Suggests: //' | sed 's/Recommends: //'| sed 's/, /\n/g' | sort -u | grep -v "amdgpu" | sed "s/ | /\n/g" > tmp_extra_deps_in_debian.txt
cat tmp_extra_deps_in_debian.txt | cut -f1 -d" " | sort -u > tmp_extra_deps_in_debian_removed_versions.txt # removed versions
cat Packages-extracted | egrep "Depends|Suggests|Recommends" | sed 's/Depends: //' | sed 's/Suggests: //' | sed 's/Recommends: //' | sed 's/, /\n/g' | sort -u | grep -v "amdgpu" | sed "s/ | /\n/g" >tmp_extra_deps_in_debian.txt
cat tmp_extra_deps_in_debian.txt | cut -f1 -d" " | sort -u >tmp_extra_deps_in_debian_removed_versions.txt # removed versions

# Detecting dependencies, named with amdgpu (and their alternatives), that are not provided in bundled amd archive
cat Packages-extracted | egrep "Depends|Suggests|Recommends" | sed 's/Pre-Depends: //' | sed 's/Depends: //' | sed 's/Suggests: //' | sed 's/Recommends: //'| sed 's/, /\n/g' | sort -u | grep "amdgpu" | sed "s/ | /\n/g" > tmp_deps_in_debian_amdgpu.txt
cat tmp_deps_in_debian_amdgpu.txt | cut -f1 -d" " | sort -u > tmp_removed_versions_amdgpu.txt # removed versions
cat tmp_removed_versions_amdgpu.txt | sed "s/:i386$//g" | sort -u > tmp_amdgpu_deps_in_debian.txt
> tmp_extra_deps_in_debian_amdgpu.txt # clear file
cat Packages-extracted | egrep "Depends|Suggests|Recommends" | sed 's/Pre-Depends: //' | sed 's/Depends: //' | sed 's/Suggests: //' | sed 's/Recommends: //' | sed 's/, /\n/g' | sort -u | grep "amdgpu" | sed "s/ | /\n/g" >tmp_deps_in_debian_amdgpu.txt
cat tmp_deps_in_debian_amdgpu.txt | cut -f1 -d" " | sort -u >tmp_removed_versions_amdgpu.txt # removed versions
cat tmp_removed_versions_amdgpu.txt | sed "s/:i386$//g" | sort -u >tmp_amdgpu_deps_in_debian.txt
>tmp_extra_deps_in_debian_amdgpu.txt # clear file
for line in $(cat tmp_amdgpu_deps_in_debian.txt); do
if grep -q "Package: $line" Packages-extracted; then continue; fi
echo $line >> tmp_extra_deps_in_debian_amdgpu.txt
if grep -q "Package: $line" Packages-extracted; then continue; fi
echo $line >>tmp_extra_deps_in_debian_amdgpu.txt
done

sed -i 's/-hwe//g' tmp_extra_deps_in_debian_amdgpu.txt


echo > tmp_translated_deps.txt # clear file
echo >tmp_translated_deps.txt # clear file

function dep_convert {
line=$1
case $line in
line=$1
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" ;;
libjs-underscore) arch_str="'underscorejs', #manually_mapped" ;;
libstdc++6) arch_str="None, #manually_mapped" ;; # It maps to 'gcc-libs', which is required by base, so no need to explicitly depend on it
libtxc-dxtn-s2tc0) arch_str="'libtxc_dxtn', #manually_mapped" ;;
libtxc-dxtn0) arch_str="None, #manually_mapped" ;; # have alternative libtxc-dxtn-s2tc0
libtinfo5) arch_str="'ncurses5-compat-libs', #manually_mapped" ;;
libtinfo-dev) arch_str="'ncurses', #manually_mapped" ;;
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
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
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" ;;
libjs-underscore) arch_str="'underscorejs', #manually_mapped" ;;
libstdc++6) arch_str="None, #manually_mapped" ;; # It maps to 'gcc-libs', which is required by base, so no need to explicitly depend on it
libtxc-dxtn-s2tc0) arch_str="'libtxc_dxtn', #manually_mapped" ;;
libtxc-dxtn0) arch_str="None, #manually_mapped" ;; # have alternative libtxc-dxtn-s2tc0
libtinfo5) arch_str="'ncurses5-compat-libs', #manually_mapped" ;;
libwayland-amdgpu-client0) arch_str="'wayland', #manually_mapped" ;;
libtinfo-dev) arch_str="'ncurses', #manually_mapped" ;;
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
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

*)
arch_dep=`bash ./translate_deb_to_arch_dependency.sh $line`; # https://github.com/helixarch/debtap/issues/41#issuecomment-489166020
if [[ $arch_dep == "could_not_translate" ]]; then arch_str="'$line', #could_not_auto_translate";
elif [[ $arch_dep == "" ]]; then arch_str="None, #auto_translated";
else arch_str="'$arch_dep', #auto_translated"
fi
esac
str="'$line': "; str="$str $arch_str"; echo $str >> tmp_translated_deps.txt;
*)
arch_dep=$(bash ./translate_deb_to_arch_dependency.sh $line) # https://github.com/helixarch/debtap/issues/41#issuecomment-489166020
if [[ $arch_dep == "could_not_translate" ]]; then
arch_str="'$line', #could_not_auto_translate"
elif [[ $arch_dep == "" ]]; then
arch_str="None, #auto_translated"
else
arch_str="'$arch_dep', #auto_translated"
fi
;;
esac
str="'$line': "
str="$str $arch_str"
echo $str >>tmp_translated_deps.txt
}

for line in $(cat tmp_extra_deps_in_debian_removed_versions.txt tmp_extra_deps_in_debian_amdgpu.txt | sort); do
echo now processing $line >&2;
dep_convert $line &
echo now processing $line >&2
dep_convert $line &
done
wait
cat tmp_translated_deps.txt | sort -k2,2 -t "'" | column -t | sed 's/^'\''/ '\''/' > tmp_prepared_columns.txt
cat tmp_translated_deps.txt | sort -k2,2 -t "'" | column -t | sed 's/^'\''/ '\''/' >tmp_prepared_columns.txt

echo -e "# Generated with ./gen_replace_deps.sh > replace_deps.py\n\
# for driver version `sed -n 2p Packages-extracted | cut -f 2 -d " "`\n"
# for driver version $(sed -n 2p Packages-extracted | cut -f 2 -d " ")\n"
echo "replace_deps = {"
cat tmp_prepared_columns.txt
echo "}"
Expand Down
2 changes: 1 addition & 1 deletion packages_map.py
View file
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 23.40-1741713.22.04
# for driver version 24.10-1787253.22.04

packages_map = {
'amdgpu-pro': None, #we_have_already_combined_libgl_to_single_package
Expand Down
36 changes: 19 additions & 17 deletions replace_deps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@
# 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
'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
'amdgpu-core': 'amdgpu-core', #could_not_auto_translate
'amdgpu-dkms': 'amdgpu-dkms', #could_not_auto_translate
'amdgpu-dkms-firmware': 'amdgpu-dkms-firmware', #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', #manually_mapped
'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
}
6 changes: 3 additions & 3 deletions versions
View file
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="23.40"
pkgver_build="1741713"
pkgver_base="24.10"
pkgver_build="1787253"
ubuntu_ver="22.04"
repo_folder_ver="6.0.3"
repo_folder_ver="6.1.3"

# 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 c35572e

Please sign in to comment.