summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVi0L02016-12-11 20:51:11 +0100
committerVi0L02016-12-11 20:51:11 +0100
commitdb529b6b2f7976ea5d7f4f25eb7804f9e1043252 (patch)
tree61754fd7f0b1517635915152a9ab9e182b212f19
parent6e2efb17e3f9d40659c8438d9f95f65adb70ae7e (diff)
downloadaur-db529b6b2f7976ea5d7f4f25eb7804f9e1043252.tar.gz
15.9-5: libcl/opencl-icd-loader cleaning
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
2 files changed, 10 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b3548e54fffd..3770fd0a82cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-catalyst-utils
pkgver = 15.9
- pkgrel = 2
+ pkgrel = 5
url = http://www.amd.com
arch = x86_64
license = custom
@@ -42,6 +42,6 @@ pkgname = lib32-opencl-catalyst
pkgdesc = AMD/ATI drivers. OpenCL implemention for AMD Catalyst (32-bit)
depends = lib32-gcc-libs
optdepends = opencl-headers: headers necessary for OpenCL development
- provides = lib32-libcl
- conflicts = lib32-libcl
+ optdepends = lib32-opencl-icd-loader: OpenCL ICD Bindings (32-bit)
+ provides = lib32-opencl-driver
diff --git a/PKGBUILD b/PKGBUILD
index 3801e3a45712..c408d0a0cf11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,6 +3,7 @@
# Contributor: Manuel Gaul <inkaine@hotmail.com>
# Contributor: Enverex & kidoz
# Contributor: zoopp
+# Contributor: npfeiler (libcl/opencl-icd-loader cleaning)
_pkgbasename=catalyst-utils
@@ -10,7 +11,7 @@ pkgbase=lib32-$_pkgbasename
pkgname=('lib32-catalyst-utils' 'lib32-catalyst-libgl' 'lib32-opencl-catalyst')
pkgver=15.9
-pkgrel=2
+pkgrel=5
_amdver=15.201.1151
url="http://www.amd.com"
arch=(x86_64)
@@ -65,10 +66,10 @@ package_lib32-catalyst-libgl() {
package_lib32-opencl-catalyst() {
pkgdesc="AMD/ATI drivers. OpenCL implemention for AMD Catalyst (32-bit)"
- provides=('lib32-libcl')
- conflicts=('lib32-libcl')
depends=('lib32-gcc-libs')
- optdepends=('opencl-headers: headers necessary for OpenCL development')
+ optdepends=('opencl-headers: headers necessary for OpenCL development'
+ 'lib32-opencl-icd-loader: OpenCL ICD Bindings (32-bit)')
+ provides=('lib32-opencl-driver')
install -m755 -d ${pkgdir}/etc/OpenCL/vendors
install -m644 ${srcdir}/archive_files/arch/x86/etc/OpenCL/vendors/amdocl32.icd ${pkgdir}/etc/OpenCL/vendors
@@ -76,8 +77,8 @@ package_lib32-opencl-catalyst() {
cd ${srcdir}/archive_files/arch/x86
install -m755 -d ${pkgdir}/usr/lib32
install -m755 usr/lib/libamdocl*.so ${pkgdir}/usr/lib32
- install -m755 usr/lib/libOpenCL.so.1 ${pkgdir}/usr/lib32
- ln -s libOpenCL.so.1 ${pkgdir}/usr/lib32/libOpenCL.so
+# install -m755 usr/lib/libOpenCL.so.1 ${pkgdir}/usr/lib32 #lib32-opencl-icd-loader provides this
+# ln -s libOpenCL.so.1 ${pkgdir}/usr/lib32/libOpenCL.so
# License
install -m755 -d ${pkgdir}/usr/share/licenses