xf86-video-fglrx: update to xf86-video-fglrx-12.10

packages/x11/driver/xf86-video-fglrx/build

@@ -34,7 +34,7 @@ fi
 
 INSTALL_DIR=".install/usr/lib/fglrx/"
 
-cd $PKG_BUILD/lib/modules/fglrx/build_mod
+cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
   ln -sf $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
 
   cd 2.6.x
@@ -45,9 +45,9 @@ cd $ROOT/$PKG_BUILD
 
 # config files
   mkdir -p $INSTALL_DIR/etc/ati
-    cp etc/ati/amdpcsdb.default $INSTALL_DIR/etc/ati
+    cp common/etc/ati/amdpcsdb.default $INSTALL_DIR/etc/ati
-    cp etc/ati/control $INSTALL_DIR/etc/ati
+    cp common/etc/ati/control $INSTALL_DIR/etc/ati
-    cp etc/ati/signature $INSTALL_DIR/etc/ati
+    cp common/etc/ati/signature $INSTALL_DIR/etc/ati
     ln -sf /storage/.config/fglrx.conf $INSTALL_DIR/etc/ati/amdpcsdb
 
 (

packages/x11/driver/xf86-video-fglrx/install

@@ -26,7 +26,7 @@ VER=`ls $BUILD/linux*/modules/lib/modules`
 
 # ATI kernel driver
 mkdir -p $INSTALL/lib/modules/$VER/ati
-  cp $PKG_BUILD/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $INSTALL/lib/modules/$VER/ati
+  cp $PKG_BUILD/common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $INSTALL/lib/modules/$VER/ati
 
 mkdir -p $INSTALL/etc/X11
   cp $PKG_DIR/config/*.conf $INSTALL/etc/X11

packages/x11/driver/xf86-video-fglrx/meta

@@ -19,14 +19,12 @@
 ################################################################################
 
 PKG_NAME="xf86-video-fglrx"
-PKG_VERSION="12.9-ubuntu"
+PKG_VERSION="12.10"
 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-catalyst-$PKG_VERSION-x86.x86_64.zip"
-# use ubuntus package from http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_9.000.orig.tar.gz
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
 PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux"
 PKG_PRIORITY="optional"

packages/x11/driver/xf86-video-fglrx/patches.upstream/3.4.patch

@@ -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);

packages/x11/driver/xf86-video-fglrx/patches.upstream/3.5-do_mmap.patch

@@ -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(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2131,7 +2140,9 @@
- {
-     int retcode = 0;
- 
-+#ifndef NO_DO_MMAP
-     down_write(&current->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(&current->mm->mmap_sem);
-+#endif
-     return retcode;
- }
- 

packages/x11/driver/xf86-video-fglrx/unpack

@@ -24,10 +24,13 @@
 
 require_eglibc $1
 
-ATI_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
 [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
 
-sh $SOURCES/$1/$ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
+mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+  unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
+  ATI_PKG=`ls -d $BUILD/${PKG_NAME}-${PKG_VERSION}/amd-driver-installer-*.run`
+  sh $ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
 
 echo "### Applying upstream patches ###"