catalyst: update to 14.201 (from Ubuntu); theoretically this works with xorg-server-1.16.

srcpkgs/catalyst/files/lano1106_fglrx-13.8_proc.patch

@@ -1,50 +0,0 @@
---- 13.8/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-09-26 00:59:28.292596334 -0400
-+++ 13.8/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-09-26 01:02:35.036252455 -0400
-@@ -821,7 +821,7 @@ static struct proc_dir_entry *firegl_pro
-     KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
-     if (!minor)
-     {
--        root = KCL_create_proc_dir(NULL, "ati", S_IRUGO|S_IXUGO);
-+        root = KCL_create_proc_dir(NULL, "ati", 0);
-     }
-
-     if (!root)
-@@ -835,7 +835,7 @@ static struct proc_dir_entry *firegl_pro
-         // Global major debice number entry and Global debug entry
-         while (globallist->rp || globallist->fops)
-         {
--            ent = KCL_create_proc_entry(root, globallist->name, S_IFREG|S_IRUGO, globallist->fops, globallist->rp, globallist->wp, dev);
-+            ent = KCL_create_proc_entry(root, globallist->name, 0, globallist->fops, globallist->rp, globallist->wp, dev);
-             if (!ent)
-             {
-                 KCL_remove_proc_dir_entry(NULL, "ati");
-@@ -847,7 +847,7 @@ static struct proc_dir_entry *firegl_pro
-     }
-
-     sprintf(name, "%d", minor);
--    *dev_root = KCL_create_proc_dir(root, name, S_IRUGO|S_IXUGO);
-+    *dev_root = KCL_create_proc_dir(root, name, 0);
-     if (!*dev_root) {
-         KCL_remove_proc_dir_entry(root, "major");
-         KCL_remove_proc_dir_entry(NULL, "ati");
-@@ -857,7 +857,7 @@ static struct proc_dir_entry *firegl_pro
-
-     while (list->rp || list->fops)
-     {
--        ent = KCL_create_proc_entry(*dev_root, list->name, S_IFREG|S_IRUGO, list->fops, list->rp, list->wp,
-+        ent = KCL_create_proc_entry(*dev_root, list->name, 0, list->fops, list->rp, list->wp,
-                                     ((dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev)));
-         if (!ent)
-         {
-@@ -6358,9 +6358,9 @@ void * KCL_create_proc_dir(void *root_di
-          dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
- #else
-     if (root_dir == NULL)
--         dir = proc_mkdir_mode(name, S_IFDIR | access, NULL);
-+         dir = proc_mkdir_mode(name, access, NULL);
-     else
--         dir = proc_mkdir_mode(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
-+         dir = proc_mkdir_mode(name, access, (struct proc_dir_entry *)root_dir);
- #endif
-
-     return dir;

srcpkgs/catalyst/files/lano1106_fglrx_intel_iommu.patch

@@ -1,11 +0,0 @@
---- 13.4/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-04-16 23:29:55.000000000 +0200
-+++ 13.4/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-05-21 17:05:34.726681102 +0200
-@@ -93,7 +93,7 @@
-    and they use different config options. These options can only be enabled
-    on x86_64 with newer 2.6 kernels (2.6.23 for intel, 2.6.26 for amd).
- */
--#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_DMAR)
-+#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_INTEL_IOMMU)
-     #define FIREGL_DMA_REMAPPING
- #endif
-

srcpkgs/catalyst/files/signature.from.12.9

@@ -1 +0,0 @@
-9777c589791007f4aeef06c922ad54a2:ae59f5b9572136d99fdd36f0109d358fa643f2bd4a2644d9efbb4fe91a9f6590a145:f612f0b01f2565cd9bd834f8119b309bae11a1ed4a2661c49fdf3fad11986cc4f641f1ba1f2265909a8e34ff1699309bf211a7eb4d7662cd9f8e3faf14986d92f646f1bc

srcpkgs/catalyst/template

@@ -2,17 +2,15 @@
 _desc="AMD catalyst driver for Linux"
 
 pkgname=catalyst
-_distver=14.2
+version=14.201
-_patchver=betav1.3
+revision=1
-version=${_distver}${_patchver}
-revision=3
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary AMD license"
 homepage="http://www.amd.com"
 
 only_for_archs="i686 x86_64"
 hostmakedepends="unzip wget"
-depends="xserver-abi-video<16 ${pkgname}-dkms-${version}_${revision}"
+depends="virtual?xserver-abi-video<19_1 ${pkgname}-dkms-${version}_${revision}"
 conflicts="nvidia>=0"
 provides="libGL-${version}_${revision}"
 replaces="libGL>=0"
@@ -20,10 +18,8 @@ short_desc="${_desc} - Libraries and Utilities"
 nonfree=yes
 create_wrksrc=yes
 
-XBPS_FETCH_CMD="wget --referer='http://support.amd.com/en-us/download/desktop?os=Linux+x86' "
+distfiles="http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_${version}.orig.tar.gz"
-
+checksum=b9064fb5e15c0094162c18d0db9135c061d0e1fde31b2e63de5d3cd455a19e40
-distfiles="http://www2.ati.com/drivers/beta/amd-catalyst-${_distver}-${_patchver}-linux-x86.x86_64.zip"
-checksum=b729fa327fbc030d9e73266997cbbba3186c6ba3f2d3059b9adf6bf9ab5d63cd
 
 if [ "$XBPS_MACHINE" = "i686" ]; then
 	_ARCHDIR="x86"
@@ -33,22 +29,7 @@ elif [ "$XBPS_MACHINE" = "x86_64" ]; then
 	_ARCHXPIC="_64a"
 fi
 
-do_build() {
-	chmod 755 *.run
-	./amd-driver-*.run --extract fglrx
-}
-
-post_build() {
-	cd ${wrksrc}/fglrx
-
-	for f in ${FILESDIR}/*.patch; do
-		patch -Np1 -i $f
-	done
-}
-
 do_install() {
-	cd ${wrksrc}/fglrx
-
 	install -dm755 ${DESTDIR}/usr/{bin,sbin}
 	install -dm755 ${DESTDIR}/usr/lib/{dri,xorg/modules/{drivers,extensions/fglrx,linux},systemd/system}
 	install -dm755 ${DESTDIR}/usr/include/GL
@@ -56,13 +37,13 @@ do_install() {
 	install -dm755 ${DESTDIR}/usr/share/{applications,ati/amdcccle,man/man8,pixmaps}
   
 	# binaries
-	install -m755 common/usr/sbin/* ${DESTDIR}/usr/sbin/
+	install -m755 usr/sbin/* ${DESTDIR}/usr/sbin/
-	install -m755 common/usr/X11R6/bin/* ${DESTDIR}/usr/bin/
+	install -m755 usr/X11R6/bin/* ${DESTDIR}/usr/bin/
 	install -m755 arch/${_ARCHDIR}/usr/sbin/* ${DESTDIR}/usr/sbin/
 	install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* ${DESTDIR}/usr/bin/
 
 	# headers
-	install -m644 common/usr/include/GL/* ${DESTDIR}/usr/include/GL/
+	install -m644 usr/include/GL/* ${DESTDIR}/usr/include/GL/
 
 	# xorg/dri/gl/... drivers
 	cd xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules
@@ -73,7 +54,7 @@ do_install() {
 	ln -sf fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
 	ln -sf fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so.1
 
-	cd ${wrksrc}/fglrx/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
+	cd ${wrksrc}/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
 
 	install -m755 modules/dri/fglrx_dri.so ${DESTDIR}/usr/lib/xorg/modules/drivers/
 	ln -sfr ${DESTDIR}/usr/lib/xorg/modules/drivers/fglrx_dri.so ${DESTDIR}/usr/lib/dri/fglrx_dri.so
@@ -83,7 +64,7 @@ do_install() {
 	install -m755 *.so* ${DESTDIR}/usr/lib/
 	install -m644 libAMDXvBA.cap ${DESTDIR}/usr/lib/
 
-	cd ${wrksrc}/fglrx/arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
+	cd ${wrksrc}/arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
 
 	install -m755 *.so* ${DESTDIR}/usr/lib/
 	# needed symlinks
@@ -93,32 +74,28 @@ do_install() {
 	ln -s libfglrx_dm.so.1.0 ${DESTDIR}/usr/lib/libfglrx_dm.so.1
                                                               
 	# various files 
-	cd ${wrksrc}/fglrx/common
+	cd ${wrksrc}
 
 	install -m644 usr/share/man/man8/* ${DESTDIR}/usr/share/man/man8/
 	install -m644 usr/share/applications/* ${DESTDIR}/usr/share/applications/
 	install -m644 usr/share/icons/* ${DESTDIR}/usr/share/pixmaps/
 	install -m644 usr/share/ati/amdcccle/* ${DESTDIR}/usr/share/ati/amdcccle/
 	install -m644 etc/ati/* ${DESTDIR}/etc/ati/
-	install -m755 ${wrksrc}/fglrx/packages/Ubuntu/dists/source/replacements/authatieventsd.sh ${DESTDIR}/etc/ati/
-	install -m644 etc/security/console.apps/amdcccle-su ${DESTDIR}/etc/security/console.apps/
 	install -m644 usr/share/applications/*.desktop ${DESTDIR}/usr/share/applications/
 	# use ACPI example files
 	install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh ${DESTDIR}/etc/acpi/
 	install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* ${DESTDIR}/etc/acpi/events/
-	# systemd scripts
-	install -m644 ${FILESDIR}/atieventsd.service ${DESTDIR}/usr/lib/systemd/system/
 
 	# provided in catalyst-opencl package
 	rm ${DESTDIR}/usr/lib/lib{amdocl*,OpenCL}.so*
 
 	# we remove the watermark
-	install -m644 ${FILESDIR}/signature.from.12.9 ${DESTDIR}/etc/ati/signature
+	install -m644 etc/ati/* ${DESTDIR}/etc/ati/
 
 	# licenses
-	install -Dm644 ${wrksrc}/fglrx/common/usr/share/doc/fglrx/LICENSE.TXT \
+	install -Dm644 ${wrksrc}/usr/share/doc/fglrx/LICENSE.TXT \
 		${DESTDIR}/usr/share/licenses/${pkgname}/LICENSE.TXT
-	install -Dm644 ${wrksrc}/fglrx/common/usr/share/doc/amdcccle/ccc_copyrights.txt \
+	install -Dm644 ${wrksrc}/usr/share/doc/amdcccle/ccc_copyrights.txt \
 		${DESTDIR}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt
 }
 
@@ -135,8 +112,8 @@ catalyst-dkms_package() {
 		vmkdir usr/lib/modules-load.d
 		vmkdir usr/src/${_fglrx}
 
-		cd ${wrksrc}/fglrx
+		cd ${wrksrc}
-		cp -r common/lib/modules/fglrx/build_mod/* ${PKGDESTDIR}/usr/src/${_fglrx}
+		cp -r lib/modules/fglrx/build_mod/* ${PKGDESTDIR}/usr/src/${_fglrx}
 
 		vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 644 usr/src/${_fglrx}
 
@@ -153,17 +130,14 @@ catalyst-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="libOpenCL"
 	nonfree=yes
-	noverifyrdeps=yes
 	pkg_install() {
-		cd ${wrksrc}/fglrx/arch/${_ARCHDIR}
+		cd ${wrksrc}/arch/${_ARCHDIR}
-
-		vinstall usr/bin/clinfo 755 usr/bin
 
 		vmkdir usr/lib
 		vmkdir etc/OpenCL/vendors
 
+		vbin usr/bin/clinfo
 		install -m644 etc/OpenCL/vendors/amdocl*.icd ${PKGDESTDIR}/etc/OpenCL/vendors
-
 		install -m755 usr/lib${_ARCHLIB}/libamdocl*.so ${PKGDESTDIR}/usr/lib/
 	}
 }