Merge pull request #1156 from ayhanyalcinsoy/master

module-fglrx:version bump

kernel/drivers/module-fglrx/actions.py

@@ -23,7 +23,6 @@ else:
 
 XDir = "xpic" + ("_64a" if Target == "x86_64" else "")
 
-
 def setup():
     shelltools.makedirs("%s/common" % get.workDIR())
     shelltools.move("lib", "%s/common/" % get.workDIR())
@@ -50,15 +49,17 @@ def setup():
     #shelltools.system("patch -p1 < lano1106_fglrx_intel_iommu.patch")
     #shelltools.system("patch -p1 < lano1106_kcl_agp_13_4.patch")
     shelltools.system("patch -p1 < makefile_compat.patch")
+    #shelltools.system("patch -p1 < 4.4-manjaro-xstate.patch")
 
 
 
 def build():
+    shelltools.export("SHELL", "/bin/sh")
     if get.buildTYPE() == "emul32":
         return
 
     shelltools.cd(BuildDir)
-    shelltools.system("sh make.sh")
+    shelltools.system("sh ./make.sh")
 
 def install():
     # Controlcenter binaries

kernel/drivers/module-fglrx/files/4.4-manjaro-xstate.patch

@@ -0,0 +1,22 @@
+--- 15.12/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-12-18 19:47:41.000000000 +0100
++++ b/firegl_public.c	2015-12-19 20:48:13.223261632 +0100
+@@ -6450,12 +6450,15 @@
+    struct fpu *fpu = &tsk->thread.fpu;
+ 
+    if(static_cpu_has(X86_FEATURE_XSAVE)) {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+-      fpu_xsave(fpu);
+-      if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
+-#else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
++	  copy_xregs_to_kernel(&fpu->state.xsave);
++      if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP))
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
+ 	  copy_xregs_to_kernel(&fpu->state.xsave);
+       if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
++#else
++      fpu_xsave(fpu);
++      if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
+ #endif
+          return 1;
+    } else if (static_cpu_has(X86_FEATURE_FXSR)) {

kernel/drivers/module-fglrx/pspec.xml

@@ -11,7 +11,7 @@
         <License>ATI</License>
         <Summary>ATI display drivers.</Summary>
         <Description>Fglrx is a driver written by AMD(ATI) for ATI graphics cards.Radeons HD 2 3 4 X series are not supported</Description>
-        <Archive sha1sum="723fa01252b03e4649513db37ed3955af9d84114" type="targz">http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_15.200.orig.tar.gz</Archive>
+        <Archive sha1sum="cafe3419525a8ecc517c4192888f84df1abaa41b" type="targz">http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_15.201.orig.tar.gz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="desktop-files.patch">desktop-files.patch</AdditionalFile>
             <AdditionalFile target="makefile_compat.patch">makefile_compat.patch</AdditionalFile>
@@ -20,9 +20,11 @@
             <AdditionalFile target="lano1106_fglrx_intel_iommu.patch">lano1106_fglrx_intel_iommu.patch</AdditionalFile>
             <AdditionalFile target="lano1106_kcl_agp_13_4.patch">lano1106_kcl_agp_13_4.patch</AdditionalFile>
             <AdditionalFile target="LICENSE.TXT">LICENSE.TXT</AdditionalFile>
+            <AdditionalFile target="4.4-manjaro-xstate.patch">4.4-manjaro-xstate.patch</AdditionalFile><!--support kernel 4.x-->
         </AdditionalFiles>
         <BuildDependencies>
             <Dependency version="4.4.1">kernel-module-headers</Dependency>
+            <Dependency vesion="4.4.1">kernel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -140,7 +142,7 @@
     <History>
         <Update release="40">
             <Date>2016-02-04</Date>
-            <Version>15.20</Version>
+            <Version>15.201</Version>
             <Comment>Rebuild for kernel-4.4.1</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>