Skip to content

Commit

Permalink
remove dlagents, use https sources, use github source instead aur source
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ashark
Ashark committed Dec 6, 2022
1 parent 129e884 commit fafdf99
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 58 deletions.
45 changes: 22 additions & 23 deletions .SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
pkgbase = amdgpu-pro-installer
pkgver = 22.20.5_1511376
pkgrel = 1
pkgrel = 2
url = https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-20
arch = x86_64
groups = Radeon_Software_for_Linux
license = custom: multiple
makedepends = wget
source = progl
source = progl.bash-completion
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.26-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_22.20-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/a/appprofiles-amdgpu-pro/libgl1-amdgpu-pro-appprofiles_22.20-1511376~22.04_all.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_22.20-1511376~22.04_i386.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_22.20-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_22.20-1511376~22.04_i386.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_22.20-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_22.20-1511376~22.04_i386.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_22.20-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_22.20-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_22.20-1511376~22.04_amd64.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = http://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_22.20-1511376~22.04_amd64.deb
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/22.20.5/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.26-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_22.20-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/a/appprofiles-amdgpu-pro/libgl1-amdgpu-pro-appprofiles_22.20-1511376~22.04_all.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_22.20-1511376~22.04_i386.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_22.20-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_22.20-1511376~22.04_i386.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_22.20-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_22.20-1511376~22.04_i386.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_22.20-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_22.20-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_22.20-1511376~22.04_amd64.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_22.20-1511376~22.04_i386.deb
source = https://repo.radeon.com/amdgpu/22.20.5/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_22.20-1511376~22.04_amd64.deb
sha256sums = feb74796c3152cbafaba89d96e68a152f209bd3058c7eb0413cbe1ab0764e96f
sha256sums = e32801c38b475cd8df17a407726b86db3de26410f563d688325b4d4314fc5354
sha256sums = f41d6a763f297407658e9b753863a7ec9a9c835e7a3567f6191523fdfeb912bc
Expand All @@ -49,7 +48,7 @@ pkgname = amf-amdgpu-pro
pkgdesc = AMDGPU Pro Advanced Multimedia Framework
license = custom: AMDGPU-PRO EULA
depends = libdrm
depends = vulkan-amdgpu-pro=22.20.5_1511376-1
depends = vulkan-amdgpu-pro=22.20.5_1511376-2
optdepends = rocm-opencl-runtime: Warning unspecified optdep description

pkgname = amdgpu-pro-libgl
Expand All @@ -68,7 +67,7 @@ pkgname = amdgpu-pro-libgl
pkgname = lib32-amdgpu-pro-libgl
pkgdesc = AMDGPU Pro OpenGL driver (32-bit)
license = custom: AMDGPU-PRO EULA
depends = amdgpu-pro-libgl=22.20.5_1511376-1
depends = amdgpu-pro-libgl=22.20.5_1511376-2
depends = lib32-libdrm
depends = lib32-libx11
depends = lib32-libxcb
Expand Down
47 changes: 22 additions & 25 deletions PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,31 @@ vulkan-amdgpu-pro
lib32-vulkan-amdgpu-pro
)
pkgver=${major}_${minor}
pkgrel=1
pkgrel=2
arch=('x86_64')
url=https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-20
license=('custom: multiple')
groups=('Radeon_Software_for_Linux')
makedepends=('wget')

DLAGENTS='https::/usr/bin/wget --referer https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-20 -N %u'

source=(progl
progl.bash-completion
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.26-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/a/appprofiles-amdgpu-pro/libgl1-amdgpu-pro-appprofiles_${major_short}-${minor}~${ubuntu_ver}_all.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${major_short}-${minor}~${ubuntu_ver}_i386.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${major_short}-${minor}~${ubuntu_ver}_i386.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${major_short}-${minor}~${ubuntu_ver}_i386.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
http://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb)

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/${major}/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.26-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/liba/libamdenc-amdgpu-pro/libamdenc-amdgpu-pro_1.0-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libegl1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/a/appprofiles-amdgpu-pro/libgl1-amdgpu-pro-appprofiles_${major_short}-${minor}~${ubuntu_ver}_all.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${major_short}-${minor}~${ubuntu_ver}_i386.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-dri_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${major_short}-${minor}~${ubuntu_ver}_i386.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-ext_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${major_short}-${minor}~${ubuntu_ver}_i386.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgl1-amdgpu-pro-glx_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libglapi1-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/o/opengl-amdgpu-pro/libgles2-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_i386.deb
https://repo.radeon.com/amdgpu/${major}/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_${major_short}-${minor}~${ubuntu_ver}_amd64.deb)
sha256sums=(feb74796c3152cbafaba89d96e68a152f209bd3058c7eb0413cbe1ab0764e96f
e32801c38b475cd8df17a407726b86db3de26410f563d688325b4d4314fc5354
f41d6a763f297407658e9b753863a7ec9a9c835e7a3567f6191523fdfeb912bc
Expand Down Expand Up @@ -136,7 +133,7 @@ package_amdgpu-pro-libgl () {
move_libdir "opt/amdgpu/share/drirc.d" "usr/share/drirc.d"
sed -i "s|/opt/amdgpu-pro/lib/x86_64-linux-gnu|#/usr/lib/amdgpu-pro # commented to prevent problems of booting with amdgpu-pro, use progl script|" "${pkgdir}"/etc/ld.so.conf.d/10-amdgpu-pro-x86_64.conf
install -Dm755 "${srcdir}"/progl "${pkgdir}"/usr/bin/progl
install -Dm755 "${srcdir}"/progl.bash-completion "${pkgdir}"/usr/share/bash-completion/completions/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
}
Expand Down
15 changes: 5 additions & 10 deletions gen-PKGBUILD.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@
pkgver_base_short = ".".join(pkgver_base.split(".")[0:2])
pkgver_build = versions.pkgver_build
ubuntu_ver = versions.ubuntu_ver
pkgrel = 1
pkgrel = 2

debugging = False

debug_pkgext = True if debugging else False

url_ref = "https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-22-20"
dlagents = "https::/usr/bin/wget --referer {0} -N %u".format(url_ref)
# TODO: remove dlagents?

source_repo_url = "http://repo.radeon.com/amdgpu/{0}/ubuntu/".format(pkgver_base)
source_repo_url = "https://repo.radeon.com/amdgpu/{0}/ubuntu/".format(pkgver_base)

def gen_arch_packages():
pkgbuild_packages = {
Expand Down Expand Up @@ -101,7 +99,7 @@ def gen_arch_packages():
'sed -i "s|/opt/amdgpu-pro/lib/x86_64-linux-gnu|#/usr/lib/amdgpu-pro # commented to prevent problems of booting with amdgpu-pro, use progl script|" "${pkgdir}"/etc/ld.so.conf.d/10-amdgpu-pro-x86_64.conf',

'install -Dm755 "${srcdir}"/progl "${pkgdir}"/usr/bin/progl',
'install -Dm755 "${srcdir}"/progl.bash-completion "${pkgdir}"/usr/share/bash-completion/completions/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',
Expand Down Expand Up @@ -240,7 +238,8 @@ def hashFile(file):
buf = f.read(block)
return hash.hexdigest()

sources = [ "progl", "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"))
Expand Down Expand Up @@ -272,9 +271,6 @@ def hashFile(file):
url={url}
license=('custom: multiple')
groups=('Radeon_Software_for_Linux')
makedepends=('wget')
DLAGENTS='{dlagents}'
source=({source})
sha256sums=({sha256sums})
Expand Down Expand Up @@ -689,7 +685,6 @@ def convertVersionSpecifier(name, spec):
package_names="(\n" + "\n".join( arch_package_names ) + "\n)",
pkgrel=pkgrel,
url=url_ref,
dlagents=dlagents,
pkgver_base=pkgver_base,
pkgver_base_short=pkgver_base_short,
pkgver_build=pkgver_build,
Expand Down

0 comments on commit fafdf99

Please sign in to comment.