Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a1a9e563168f694edf3f5c2a2c9d9c9967e770a4
commit a1a9e563168f694edf3f5c2a2c9d9c9967e770a4 Author: James Buren <[email protected]> Date: Tue Oct 30 04:06:55 2012 -0500 catalyst-12.10-1-x86_64 * version bump * remove old patches * add config file for autoloading fglrx at startup diff --git a/source/x11-extra/catalyst/3.4.patch b/source/x11-extra/catalyst/3.4.patch deleted file mode 100644 index 64ab53e..0000000 --- a/source/x11-extra/catalyst/3.4.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:33:25.044695179 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-05-26 18:28:39.692699095 +0200 -@@ -188,6 +188,12 @@ - #include <linux/swap.h> - #include "asm/i387.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) -+#ifdef CONFIG_X86_32 -+#include "asm/fpu-internal.h" -+#endif -+#endif -+ - #include "firegl_public.h" - #include "kcl_osconfig.h" - #include "kcl_io.h" -@@ -4154,7 +4160,11 @@ static int kasInitExecutionLevels(unsign - { - unsigned int p; - KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) -+ for_each_possible_cpu(p) -+#else - for_each_cpu_mask(p, cpu_possible_map) -+#endif - { - KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p); - preempt_disable(); ---- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:11:03.402987821 +0200 -+++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c 2012-05-26 19:13:00.273986422 +0200 -@@ -217,6 +217,10 @@ - * \param size [in] Number of bytes to allocate - * \return Pointer to allocated memory - */ -+#ifndef CONFIG_X86_X32 -+DEFINE_PER_CPU(unsigned long, old_rsp); -+#endif -+ - void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size) - { - void __user *ret = COMPAT_ALLOC_USER_SPACE(size); \ No newline at end of file diff --git a/source/x11-extra/catalyst/3.5.patch b/source/x11-extra/catalyst/3.5.patch deleted file mode 100644 index 04248eb..0000000 --- a/source/x11-extra/catalyst/3.5.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 -@@ -2106,6 +2106,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+# define NO_DO_MMAP -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) -+# define do_munmap(a,b,c) vm_munmap(b, c) -+#endif -+ - unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( - KCL_IO_FILE_Handle file, - unsigned long addr, -@@ -2117,10 +2123,13 @@ - - flags = MAP_SHARED; - prot = PROT_READ|PROT_WRITE; -- -+#ifdef NO_DO_MMAP -+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); -+#else - down_write(¤t->mm->mmap_sem); - vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); -+#endif - if (IS_ERR(vaddr)) - return 0; - else -@@ -2131,7 +2140,9 @@ - { - int retcode = 0; - -+#ifndef NO_DO_MMAP - down_write(¤t->mm->mmap_sem); -+#endif - #ifdef FGL_LINUX_RHEL_MUNMAP_API - retcode = do_munmap(current->mm, - addr, -@@ -2142,7 +2153,9 @@ - addr, - len); - #endif -+#ifndef NO_DO_MMAP - up_write(¤t->mm->mmap_sem); -+#endif - return retcode; - } - diff --git a/source/x11-extra/catalyst/FrugalBuild b/source/x11-extra/catalyst/FrugalBuild index 9801a66..c43066a 100644 --- a/source/x11-extra/catalyst/FrugalBuild +++ b/source/x11-extra/catalyst/FrugalBuild @@ -2,9 +2,8 @@ # Maintainer: James Buren <[email protected]> pkgname=catalyst -pkgver=12.6 -_ver="8.98" -pkgrel=9 +pkgver=12.10 +pkgrel=1 pkgdesc="The proprietary driver for ATI graphics drivers." url="http://www.amd.com" rodepends=('xorg-server' 'libqtgui') @@ -13,21 +12,23 @@ archs=('i686' 'x86_64' '!arm') options=('nodocs') # Disable up2date for now, as there's no reliable way to check this. up2date="$pkgver" -source=(http://www2.ati.com/drivers/hotfix/catalyst_${pkgver}_hotfixes/amd-driver-installer-${_ver}-x86.x86_64.zip $pkgname.install $pkgname.conf 3.4.patch 3.5.patch) +source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-$pkgver-x86.x86_64.zip \ + $pkgname.install \ + $pkgname.blacklist \ + $pkgname.modload) conflicts=('libgl' 'libglx' 'xf86-video-ati' 'xf86-video-mach64' 'xf86-video-r128') provides=('libgl' 'libglx') _F_kernelmod_scriptlet="$pkgname.install" Finclude kernel-module -sha1sums=('c29f47c9c77d3c44e30ee7cf7e6c339e5c56d61e' \ +sha1sums=('2e0341940bb5e2440c49e00c4027b0d380b9355d' \ '136fa6c693337189f7280ead54aec4d0ad02ebff' \ '2ca17ca649b4389786d0611c6fef4e41f5dfbd43' \ - '3471dafbd92ee34d21821e9d2f7d2dd298c8239a' \ - 'ea72791e5a9d79bc1ef7cc586ea479b6c9442acc') + 'c9ef23aeee9d40ee53059f3fdfb92a72679e2219') build() { # Run the script to extract the contents. - Fexec sh amd-driver-installer-${_ver}-x86.x86_64.run --extract $pkgname || Fdie + Fexec sh amd-driver-installer-catalyst-$pkgver-x86.x86_64.run --extract $pkgname || Fdie Fcd $pkgname @@ -106,6 +107,7 @@ build() Fbuild_kernelmod_scriptlet - Ffile /etc/modprobe.d/$pkgname.conf + Ffile $pkgname.blacklist /etc/modprobe.d/$pkgname.conf + Ffile $pkgname.modload /etc/modules-load.d/$pkgname.conf Fkernelver_compress_modules } diff --git a/source/x11-extra/catalyst/catalyst.conf b/source/x11-extra/catalyst/catalyst.blacklist similarity index 100% rename from source/x11-extra/catalyst/catalyst.conf rename to source/x11-extra/catalyst/catalyst.blacklist diff --git a/source/x11-extra/catalyst/catalyst.modload b/source/x11-extra/catalyst/catalyst.modload new file mode 100644 index 0000000..6737302 --- /dev/null +++ b/source/x11-extra/catalyst/catalyst.modload @@ -0,0 +1 @@ +fglrx _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
