Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=46e80e7c592449c5835685bea7604917115f16e7
commit 46e80e7c592449c5835685bea7604917115f16e7 Author: James Buren <[email protected]> Date: Thu Jun 21 04:24:05 2012 -0500 catalyst-12.6-1-x86_64 * version bump * restore to active building diff --git a/source/x11-extra/catalyst/3.2.8.patch b/source/x11-extra/catalyst/3.2.8.patch deleted file mode 100644 index 3812502..0000000 --- a/source/x11-extra/catalyst/3.2.8.patch +++ /dev/null @@ -1,21 +0,0 @@ -Signed-off-by: Gianluca Gennari <[email protected]> ---- ---- 12.1/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ 12.1/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void) - #ifdef CONFIG_X86_64 - kernel_fpu_begin(); - #else -+#ifndef TS_USEDFPU -+ preempt_disable(); -+ if (__thread_has_fpu(current)) -+ __save_init_fpu(current); -+#else - struct thread_info *cur_task = current_thread_info(); - preempt_disable(); - if (cur_task->status & TS_USEDFPU) - __save_init_fpu(cur_task->task); -+#endif - else - clts(); - #endif diff --git a/source/x11-extra/catalyst/3.4.patch b/source/x11-extra/catalyst/3.4.patch new file mode 100644 index 0000000..64ab53e --- /dev/null +++ b/source/x11-extra/catalyst/3.4.patch @@ -0,0 +1,40 @@ +--- 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/FrugalBuild b/source/x11-extra/catalyst/FrugalBuild index 8c1f70b..2fea0bd 100644 --- a/source/x11-extra/catalyst/FrugalBuild +++ b/source/x11-extra/catalyst/FrugalBuild @@ -2,29 +2,31 @@ # Maintainer: James Buren <[email protected]> pkgname=catalyst -pkgver=12.4 -pkgrel=3 +pkgver=12.6 +_ver="8.98" +pkgrel=1 pkgdesc="The proprietary driver for ATI graphics drivers." url="http://www.amd.com"; rodepends=('xorg-server' 'libqtgui') groups=('x11-extra') archs=('i686' 'x86_64' '!arm') -options=('nodocs' 'nobuild') -up2date="Fwcat 'http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx?lang=English' | sed -nr 's|.*amd-driver-installer-([0-9]+-[0-9]+)-x86\.x86_64\.run.*|\1|p' | tr '-' '.'" -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.run $pkgname.install $pkgname.conf 3.2.8.patch) +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) conflicts=('libgl' 'libglx' 'xf86-video-ati' 'xf86-video-mach64' 'xf86-video-r128') provides=('libgl' 'libglx') _F_kernelmod_scriptlet="$pkgname.install" Finclude kernel-module -sha1sums=('7db947ee20929ba24da03bad2624538cb55589b6' \ +sha1sums=('c29f47c9c77d3c44e30ee7cf7e6c339e5c56d61e' \ '136fa6c693337189f7280ead54aec4d0ad02ebff' \ '2ca17ca649b4389786d0611c6fef4e41f5dfbd43' \ - 'ecb1807f45ed9c5ce1ac6b365704f3aef3671bed') + '3471dafbd92ee34d21821e9d2f7d2dd298c8239a') build() { # Run the script to extract the contents. - Fexec sh amd-driver-installer-${pkgver/./-}-x86.x86_64.run --extract $pkgname || Fdie + Fexec sh amd-driver-installer-${_ver}-x86.x86_64.run --extract $pkgname || Fdie Fcd $pkgname _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
