Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting11.git;a=commitdiff;h=395277c3bb6c7f456cd4c99f00ba69438618978b
commit 395277c3bb6c7f456cd4c99f00ba69438618978b Author: James Buren <[email protected]> Date: Mon May 13 08:00:25 2013 -0500 catalyst-13.4-1-x86_64 * version bump * rebuild with kernel 3.9 * drop kernel 3.7 patch diff --git a/source/x11-extra/catalyst/FrugalBuild b/source/x11-extra/catalyst/FrugalBuild index 2c5892b..a15d1bf 100644 --- a/source/x11-extra/catalyst/FrugalBuild +++ b/source/x11-extra/catalyst/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren <[email protected]> pkgname=catalyst -pkgver=13.1 -pkgrel=5 +pkgver=13.4 +pkgrel=1 pkgdesc="The proprietary driver for ATI graphics drivers." url="http://www.amd.com"; rodepends=('xorg-server' 'libqtgui') @@ -12,8 +12,7 @@ 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/linux/amd-driver-installer-catalyst-$pkgver-linux-x86.x86_64.zip \ - kernel-3.7.patch +source=(http://www2.ati.com/drivers/linux/amd-catalyst-$pkgver-linux-x86.x86_64.zip \ $pkgname.install \ $pkgname.blacklist \ $pkgname.modload) @@ -21,8 +20,7 @@ conflicts=('libgl' 'libglx' 'xf86-video-ati' 'xf86-video-mach64' 'xf86-video-r12 provides=('libgl' 'libglx') _F_kernelmod_scriptlet="$pkgname.install" Finclude kernel-module -sha1sums=('7cba6c28ce88cfeb45777040b043dec0073f416b' \ - 'f3d259c74c4e1713625b521154516a3599fc5c39' \ +sha1sums=('85611a4ac5efe64a40e936ee248458590f34aa26' \ '136fa6c693337189f7280ead54aec4d0ad02ebff' \ '2ca17ca649b4389786d0611c6fef4e41f5dfbd43' \ 'c9ef23aeee9d40ee53059f3fdfb92a72679e2219') @@ -30,7 +28,7 @@ sha1sums=('7cba6c28ce88cfeb45777040b043dec0073f416b' \ build() { # Run the script to extract the contents. - Fexec sh amd-driver-installer-catalyst-$pkgver-linux-x86.x86_64.run --extract $pkgname || Fdie + Fexec sh amd-catalyst-$pkgver-linux-x86.x86_64.run --extract $pkgname || Fdie Fcd $pkgname diff --git a/source/x11-extra/catalyst/kernel-3.7.patch b/source/x11-extra/catalyst/kernel-3.7.patch deleted file mode 100644 index 47cd425..0000000 --- a/source/x11-extra/catalyst/kernel-3.7.patch +++ /dev/null @@ -1,132 +0,0 @@ ---- 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-09-26 15:04:28.000000000 +0200 -+++ 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-10-16 20:30:42.146523753 +0200 -@@ -3892,7 +3892,11 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - break; - -@@ -3922,14 +3926,22 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - } - break; - #endif - - case __KE_SHM: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_shm_ops; - break; - -@@ -3937,7 +3949,11 @@ - - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - - //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ - //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ -@@ -3946,14 +3962,22 @@ - - case __KE_CTX: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_ctx_ops; - break; - - case __KE_PCI_BQS: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_pci_bq_ops; - break; -@@ -3984,9 +4008,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_ops; - } -@@ -4015,9 +4047,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_agp_bq_ops; - } -@@ -4025,7 +4065,11 @@ - #endif /* __AGP__BUILTIN__ */ - - case __KE_KMAP: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_kmap_ops; - if (readonly && (vma->vm_flags & VM_WRITE)) - { -@@ -4046,7 +4090,11 @@ - #endif - // fall through - case __KE_GART_CACHEABLE: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_gart_ops; - break; - default: _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
