summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD62
-rw-r--r--catalyst-firepro-compute.install (renamed from catalyst-firepro.install)2
3 files changed, 15 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 52da0c4aa427..14cbef9dd40d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,11 @@
-pkgbase = catalyst-firepro
- pkgdesc = AMD/ATI drivers for FirePro/GL/MV brand cards. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport.
+# Generated by mksrcinfo v8
+# Tue Dec 20 06:34:09 UTC 2016
+pkgbase = catalyst-firepro-compute
+ pkgdesc = A copy of catalyst-firepro with libgl support removed.
pkgver = 15.302.2301
pkgrel = 3
url = http://www.amd.com
- install = catalyst-firepro.install
+ install = catalyst-firepro-compute.install
arch = i686
arch = x86_64
license = custom
@@ -11,8 +13,6 @@ pkgbase = catalyst-firepro
depends = linux>=3.0
depends = linux<4.10
depends = linux-headers
- depends = xorg-server>=1.7.0
- depends = xorg-server<1.18.0
depends = libxrandr
depends = libsm
depends = fontconfig
@@ -30,27 +30,21 @@ pkgbase = catalyst-firepro
optdepends = acpid: acpi event support / atieventsd
optdepends = procps-ng: brings pgrep used in acpi event support
optdepends = opencl-icd-loader: OpenCL ICD Bindings
- provides = libgl
provides = libatical=15.302.2301
provides = catalyst=15.302.2301
provides = catalyst-utils=15.302.2301
provides = catalyst-dkms=15.302.2301
- provides = catalyst-libgl=15.302.2301
provides = opencl-catalyst=15.302.2301
provides = dri
provides = libtxc_dxtn
- provides = mesa-libgl
- provides = mesa-libgl-git
provides = opencl-driver
- conflicts = libgl
conflicts = catalyst
conflicts = catalyst-daemon
conflicts = catalyst-generator
conflicts = catalyst-dkms
conflicts = catalyst-utils
+ conflicts = libcl,
conflicts = catalyst-dkms
- conflicts = mesa-libgl
- conflicts = mesa-libgl-git
options = staticlibs
options = libtool
options = !strip
@@ -110,5 +104,5 @@ pkgbase = catalyst-firepro
md5sums = 37eef5103a11d8136979463e7bc31091
md5sums = 194cb44e9e2ab0e65b6267aca66d0400
-pkgname = catalyst-firepro
+pkgname = catalyst-firepro-compute
diff --git a/PKGBUILD b/PKGBUILD
index 12f6cf928d51..09c0926ea909 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,25 +26,23 @@
# PKGEXT='.pkg.tar.gz' # imho time to pack this pkg into tar.xz is too long, unfortunatelly yaourt got problems when ext is different from .pkg.tar.xz - V
-pkgname=catalyst-firepro
+pkgname=catalyst-firepro-compute
pkgver=15.302.2301
pkgrel=3
-# _betano=1.0
-# _amdver=15.302
-pkgdesc="AMD/ATI drivers for FirePro/GL/MV brand cards. catalyst-dkms + catalyst-utils + lib32-catalyst-utils + experimental powerXpress suppport."
+pkgdesc="A copy of catalyst-firepro with libgl support removed."
arch=('i686' 'x86_64')
url="http://www.amd.com"
license=('custom')
options=('staticlibs' 'libtool' '!strip' '!upx')
-depends=('dkms' 'linux>=3.0' 'linux<4.10' 'linux-headers' 'xorg-server>=1.7.0' 'xorg-server<1.18.0' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'libxinerama' 'mesa>=10.1.0-4')
+depends=('dkms' 'linux>=3.0' 'linux<4.10' 'linux-headers' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'libxinerama' 'mesa>=10.1.0-4')
optdepends=('qt4: to run ATi Catalyst Control Center (amdcccle)'
'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)'
'opencl-headers: headers necessary for OpenCL development'
'acpid: acpi event support / atieventsd'
'procps-ng: brings pgrep used in acpi event support'
'opencl-icd-loader: OpenCL ICD Bindings')
-conflicts=('libgl' 'catalyst' 'catalyst-daemon' 'catalyst-generator' 'catalyst-dkms' 'catalyst-utils' 'catalyst-dkms' 'mesa-libgl' 'mesa-libgl-git')
-provides=('libgl' "libatical=${pkgver}" "catalyst=${pkgver}" "catalyst-utils=${pkgver}" "catalyst-dkms=${pkgver}" "catalyst-libgl=${pkgver}" "opencl-catalyst=${pkgver}" 'dri' 'libtxc_dxtn' 'mesa-libgl' 'mesa-libgl-git' 'opencl-driver')
+conflicts=('catalyst' 'catalyst-daemon' 'catalyst-generator' 'catalyst-dkms' 'catalyst-utils' 'libcl', 'catalyst-dkms')
+provides=("libatical=${pkgver}" "catalyst=${pkgver}" "catalyst-utils=${pkgver}" "catalyst-dkms=${pkgver}" "opencl-catalyst=${pkgver}" 'dri' 'libtxc_dxtn' 'opencl-driver')
if [ "${CARCH}" = "x86_64" ]; then
warning "x86_64 system detected"
@@ -52,8 +50,8 @@ if [ "${CARCH}" = "x86_64" ]; then
if [[ `cat /etc/pacman.conf | grep -c "#\[multilib]"` = 0 ]]; then
warning "OK, lib32-catalyst-utils will be added to the package"
depends+=('lib32-libxext' 'lib32-libdrm' 'lib32-libxinerama' 'lib32-mesa>=10.1.0-4')
- conflicts+=('lib32-libgl' 'lib32-catalyst-utils' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git')
- provides+=('lib32-libgl' "lib32-catalyst-utils=${pkgver}" "lib32-catalyst-libgl=${pkgver}" "lib32-opencl-catalyst=${pkgver}" 'lib32-dri' 'lib32-libtxc_dxtn' 'lib32-mesa-libgl' 'lib32-mesa-libgl-git' 'lib32-opencl-driver')
+ conflicts+=('lib32-catalyst-utils')
+ provides+=("lib32-catalyst-utils=${pkgver}" "lib32-opencl-catalyst=${pkgver}" 'lib32-dri' 'lib32-libtxc_dxtn' 'lib32-opencl-driver')
optdepends+=('lib32-opencl-icd-loader: OpenCL ICD Bindings (32-bit)')
else
warning "lib32-catalyst-utils will NOT be added to the package"
@@ -178,8 +176,6 @@ package() {
install -m755 *.so ${pkgdir}/usr/lib/xorg/modules
install -m755 drivers/*.so ${pkgdir}/usr/lib/xorg/modules/drivers
install -m755 linux/*.so ${pkgdir}/usr/lib/xorg/modules/linux
- install -m755 extensions/fglrx/fglrx-libglx.so ${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so
- ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so ${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so
# Controlcenter / libraries
if [ "${CARCH}" = "i686" ]; then
@@ -219,28 +215,6 @@ package() {
ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so.1
ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so
- ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1.2.0
- ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1
- ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so
- ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so.1.2.0
- ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so.1
- ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so
-
-
- # We have to provide symlinks to mesa, as catalyst doesn't ship them
- ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so
-
- ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so
-
- ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so
-
-
cd ${srcdir}/archive_files/common
patch -Np2 -i ${srcdir}/arch-fglrx-authatieventsd_new.patch
install -m644 etc/ati/* ${pkgdir}/etc/ati
@@ -368,28 +342,6 @@ package() {
ln -sf /usr/lib32/libatiuki.so.1.0 ${pkgdir}/usr/lib32/libatiuki.so.1
ln -sf /usr/lib32/libatiuki.so.1.0 ${pkgdir}/usr/lib32/libatiuki.so
- ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so.1.2.0
- ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so.1
- ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/fglrx/libGL.so
- ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/libGL.so.1.2.0
- ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/libGL.so.1
- ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib32/libGL.so
-
-
- # We have to provide symlinks to lib32-mesa, as catalyst doesn't ship them
- ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so
-
- ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so
-
- ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so
-
-
# OpenCL
install -m755 -d ${pkgdir}/etc/OpenCL/vendors
install -m644 ${srcdir}/archive_files/arch/x86/etc/OpenCL/vendors/amdocl32.icd ${pkgdir}/etc/OpenCL/vendors
diff --git a/catalyst-firepro.install b/catalyst-firepro-compute.install
index 62094ecde3cc..2bd2c3b19f0c 100644
--- a/catalyst-firepro.install
+++ b/catalyst-firepro-compute.install
@@ -88,4 +88,4 @@ post_remove(){
echo "----------------------------------------------------------------"
echo " Don't forget to recover your original xorg.conf file."
echo "----------------------------------------------------------------"
-} \ No newline at end of file
+}