20.45_1188099-4

4 files changed, 6 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd17f26ece7e..4bf669296106 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = amdgpu-pro-installer
 	pkgver = 20.45_1188099
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-20-30
 	arch = x86_64
 	groups = Radeon_Software_for_Linux
@@ -9,30 +9,16 @@ pkgbase = amdgpu-pro-installer
 	source = https://drivers.amd.com/drivers/linux/amdgpu-pro-20.45-1188099-ubuntu-20.04.tar.xz
 	sha256sums = a4040db7822cde36c0783912428e1b4897ecdacb9b3d21d716357dae6e4fc6b7
 
-pkgname = amdgpu-core-meta
-	pkgdesc = Config file /etc/ld.so.conf.d/20-amdgpu.conf
-	install = amdgpu-core-meta.install
-	arch = any
-	license = MIT
-
-pkgname = amdgpu-pro-core-meta
-	pkgdesc = Config file /etc/ld.so.conf.d/10-amdgpu-pro.conf
-	install = amdgpu-pro-core-meta.install
-	arch = any
-	license = custom: AMDGPU-PRO EULA
-	depends = amdgpu-core-meta=20.45_1188099-3
-
 pkgname = amf-amdgpu-pro
 	pkgdesc = AMDGPU Pro Advanced Multimedia Framework
 	license = custom: AMDGPU-PRO EULA
 	depends = libglvnd
 	depends = libx11
-	depends = vulkan-amdgpu-pro=20.45_1188099-3
+	depends = vulkan-amdgpu-pro=20.45_1188099-4
 
 pkgname = amdgpu-pro-libgl
 	pkgdesc = AMDGPU Pro OpenGL driver
 	license = custom: AMDGPU-PRO EULA
-	depends = amdgpu-pro-core-meta=20.45_1188099-3
 	depends = libdrm
 	depends = libx11
 	depends = libxcb
@@ -47,8 +33,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-core-meta=20.45_1188099-3
-	depends = amdgpu-pro-libgl=20.45_1188099-3
+	depends = amdgpu-pro-libgl=20.45_1188099-4
 	depends = lib32-libdrm
 	depends = lib32-libx11
 	depends = lib32-libxcb
diff --git a/PKGBUILD b/PKGBUILD
index 6fc37a599caf..9fe169ec5b1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,6 @@ ubuntu_ver=20.04
 
 pkgbase=amdgpu-pro-installer
 pkgname=(
-amdgpu-core-meta
-amdgpu-pro-core-meta
 amf-amdgpu-pro
 amdgpu-pro-libgl
 lib32-amdgpu-pro-libgl
@@ -19,7 +17,7 @@ vulkan-amdgpu-pro
 lib32-vulkan-amdgpu-pro
 )
 pkgver=${major}_${minor}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url=https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-linux-20-30
 license=('custom: multiple')
@@ -66,27 +64,6 @@ move_copyright() {
     find ${pkgdir}/usr/share/doc -type d -empty -delete
 }
 
-package_amdgpu-core-meta () {
-    pkgdesc="Config file /etc/ld.so.conf.d/20-amdgpu.conf"
-    license=('MIT')
-    install=amdgpu-core-meta.install
-    arch=('any')
-
-    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/amdgpu-core_${major}-${minor}_all.deb
-    move_copyright
-}
-
-package_amdgpu-pro-core-meta () {
-    pkgdesc="Config file /etc/ld.so.conf.d/10-amdgpu-pro.conf"
-    license=('custom: AMDGPU-PRO EULA')
-    install=amdgpu-pro-core-meta.install
-    arch=('any')
-    depends=("amdgpu-core-meta=${major}_${minor}-${pkgrel}")
-
-    extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/amdgpu-pro-core_${major}-${minor}_all.deb
-    move_copyright
-}
-
 package_amf-amdgpu-pro () {
     pkgdesc="AMDGPU Pro Advanced Multimedia Framework"
     license=('custom: AMDGPU-PRO EULA')
@@ -101,7 +78,7 @@ package_amdgpu-pro-libgl () {
     pkgdesc="AMDGPU Pro OpenGL driver"
     license=('custom: AMDGPU-PRO EULA')
     provides=('libgl')
-    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "libdrm" "libx11" "libxcb" "libxdamage" "libxext" "libxfixes" "libxxf86vm" "wayland")
+    depends=("libdrm" "libx11" "libxcb" "libxdamage" "libxext" "libxfixes" "libxxf86vm" "wayland")
     backup=(etc/amd/amdapfxx.blb)
 
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libegl1-amdgpu-pro_${major}-${minor}_amd64.deb
@@ -118,7 +95,7 @@ package_lib32-amdgpu-pro-libgl () {
     pkgdesc="AMDGPU Pro OpenGL driver (32-bit)"
     license=('custom: AMDGPU-PRO EULA')
     provides=('lib32-libgl')
-    depends=("amdgpu-pro-core-meta=${major}_${minor}-${pkgrel}" "amdgpu-pro-libgl=${major}_${minor}-${pkgrel}" "lib32-libdrm" "lib32-libx11" "lib32-libxcb" "lib32-libxdamage" "lib32-libxext" "lib32-libxfixes" "lib32-libxxf86vm" "lib32-wayland")
+    depends=("amdgpu-pro-libgl=${major}_${minor}-${pkgrel}" "lib32-libdrm" "lib32-libx11" "lib32-libxcb" "lib32-libxdamage" "lib32-libxext" "lib32-libxfixes" "lib32-libxxf86vm" "lib32-wayland")
     backup=(etc/amd/amdrc etc/ld.so.conf.d/10-amdgpu-pro-i386.conf)
 
     extract_deb "${srcdir}"/amdgpu-pro-${major}-${minor}-ubuntu-${ubuntu_ver}/libegl1-amdgpu-pro_${major}-${minor}_i386.deb
diff --git a/amdgpu-core-meta.install b/amdgpu-core-meta.install
deleted file mode 100755
index 9befaa7a484b..000000000000
--- a/amdgpu-core-meta.install
+++ /dev/null
@@ -1,19 +0,0 @@
-# 3f5f1e12af4667a5522a0d5862c92a3d  amdgpu-core_19.20-812932_all.deb/postinst
-# Converted for arch linux:
-post_install() {
-    prefix=/opt/amdgpu
-    lib=lib/x86_64-linux-gnu
-    conf=/etc/ld.so.conf.d/20-amdgpu.conf
-    
-    echo "$prefix/lib/x86_64-linux-gnu" >$conf
-    echo "$prefix/lib/i386-linux-gnu" >>$conf
-}
-
-# e66513716fefe727886eadb5b95923f9  amdgpu-core_19.20-812932_all.deb/preinst
-# There is nothing but checking Ubuntu version there. So did not use it.
-
-# 9f9130053049b57ee04a078ddf71e927  amdgpu-core_19.20-812932_all.deb/prerm
-# Converted for arch linux:
-pre_remove() {
-    rm -f /etc/ld.so.conf.d/20-amdgpu.conf && /sbin/ldconfig
-}
diff --git a/amdgpu-pro-core-meta.install b/amdgpu-pro-core-meta.install
deleted file mode 100644
index ef439a24e347..000000000000
--- a/amdgpu-pro-core-meta.install
+++ /dev/null
@@ -1,15 +0,0 @@
-# 995d510d3099f2be343b1d6445a85bdc  amdgpu-pro-core_19.20-812932_all.deb/postinst
-# Converted for arch linux:
-post_install() {
-    prefix=/opt/amdgpu-pro
-    conf=/etc/ld.so.conf.d/10-amdgpu-pro.conf
-
-    echo "$prefix/lib/x86_64-linux-gnu" >$conf
-    echo "$prefix/lib/i386-linux-gnu" >>$conf
-}
-
-# 41e43dfaf280600942eab53da384100d  amdgpu-pro-core_19.20-812932_all.deb/prerm
-# Converted for arch linux:
-pre_remove() {
-    rm -f /etc/ld.so.conf.d/10-amdgpu-pro.conf && /sbin/ldconfig
-}