From 8bbba244fd5c5fc5b1cab4295d546d883a73e93f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 4 Jun 2012 16:52:37 +0200 Subject: [PATCH] xf86-video-fglrx: update to xf86-video-fglrx-8.98 Signed-off-by: Stephan Raue --- .../driver/xf86-video-fglrx/config/signature | 1 + packages/x11/driver/xf86-video-fglrx/install | 2 ++ packages/x11/driver/xf86-video-fglrx/meta | 6 ++++-- ...xf86-video-fglrx-12.2-TS_USEDFPU_fix.patch | 20 ------------------- 4 files changed, 7 insertions(+), 22 deletions(-) create mode 100644 packages/x11/driver/xf86-video-fglrx/config/signature delete mode 100644 packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.2-TS_USEDFPU_fix.patch diff --git a/packages/x11/driver/xf86-video-fglrx/config/signature b/packages/x11/driver/xf86-video-fglrx/config/signature new file mode 100644 index 0000000000..670c4b4774 --- /dev/null +++ b/packages/x11/driver/xf86-video-fglrx/config/signature @@ -0,0 +1 @@ +b67d452b67e1e4baee18b65de7643cc0:8e537c1d56ccd588de2c866886490df38148761a24cca5eea7388168d3560bf9:8e1870185082d5dedb2ed53e835104f8d21877485fd7d282d62e8264d7005af38e4c711350d7d5dbdc2cd53e865159a5d74a76135fd0d2828a2b836bd7065af9 \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install index 335d5239d1..2ad83c6a17 100755 --- a/packages/x11/driver/xf86-video-fglrx/install +++ b/packages/x11/driver/xf86-video-fglrx/install @@ -61,6 +61,8 @@ mkdir -p $INSTALL/etc/ati ln -sf /storage/.config/fglrx.conf $INSTALL/etc/ati/amdpcsdb cp $PKG_BUILD/common/etc/ati/control $INSTALL/etc/ati cp $PKG_BUILD/common/etc/ati/signature $INSTALL/etc/ati +# hack around a needless warning + cp $PKG_DIR/config/signature $INSTALL/etc/ati # DRI driver mkdir -p $INSTALL/usr/lib/dri diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index b0d0a6f514..834b67fb46 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -19,12 +19,14 @@ ################################################################################ PKG_NAME="xf86-video-fglrx" -PKG_VERSION="12.4" +#PKG_VERSION="12.4" +PKG_VERSION="8.98" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.ati.com/" -PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run" +#PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run" +PKG_URL="$DISTRO_SRC/amd-driver-installer-$PKG_VERSION-x86.x86_64.run" PKG_DEPENDS="linux libX11 libXinerama libXcomposite" PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux" PKG_PRIORITY="optional" diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.2-TS_USEDFPU_fix.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.2-TS_USEDFPU_fix.patch deleted file mode 100644 index c1ff6cd495..0000000000 --- a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.2-TS_USEDFPU_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur amd-driver-installer-12-2-x86.x86_64/common/lib/modules/fglrx/build_mod/firegl_public.c amd-driver-installer-12-2-x86.x86_64.patch/common/lib/modules/fglrx/build_mod/firegl_public.c ---- amd-driver-installer-12-2-x86.x86_64/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-02-29 21:34:52.000000000 +0100 -+++ amd-driver-installer-12-2-x86.x86_64.patch/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-03-08 20:37:59.390714008 +0100 -@@ -5799,10 +5799,16 @@ - #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