]> git.pld-linux.org Git - packages/xorg-driver-video-fglrx.git/commitdiff
- updated to 14.4 auto/th/xorg-driver-video-fglrx-14.4-1
authorJan Rękorajski <baggins@pld-linux.org>
Sat, 26 Apr 2014 18:29:57 +0000 (20:29 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Sat, 26 Apr 2014 18:29:57 +0000 (20:29 +0200)
linux-3.14.patch [new file with mode: 0644]
xorg-driver-video-fglrx.spec

diff --git a/linux-3.14.patch b/linux-3.14.patch
new file mode 100644 (file)
index 0000000..fce61ad
--- /dev/null
@@ -0,0 +1,16 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c.orig    2014-03-21 00:00:50.595242994 +0100
++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2014-03-21 00:05:37.344733615 +0100
+@@ -1761,7 +1761,13 @@ KCL_TYPE_Uid ATI_API_CALL KCL_GetEffecti
+ #else 
+ #ifdef current_euid
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
++    return __kuid_val(current_euid());
++#else
+     return current_euid();
++#endif
++
+ #else
+     return current->euid;
+ #endif
index c749cec8cf2eaafa92435fbcda906edf2b0ca9c6..dcae3fe404237e5a31e8f95b7b944ecb25df72e6 100644 (file)
@@ -47,23 +47,26 @@ exit 1
 %define                arch_dir        x86_64
 %endif
 
-%define                intver          13.35.1005
+%define                intver          14.10.1006
 %define                betaver         1.3
+#define                rel             0.beta%{betaver}.3
 
-%define                rel             0.beta%{betaver}.3
+%define                rel             1
 %define                pname           xorg-driver-video-fglrx
 Summary:       Linux Drivers for AMD/ATI graphics accelerators
 Summary(pl.UTF-8):     Sterowniki do akceleratorów graficznych AMD/ATI
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       14.1
+Version:       14.4
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:         1
 License:       AMD Binary (parts are GPL)
 Group:         X11
 # http://support.amd.com/ click through "download drivers", desktop -> radeon hd -> 7xxx -> linux
 #Source0:      http://www2.ati.com/drivers/linux/amd-catalyst-%{version}-linux-x86.x86_64.zip
-Source0:       amd-catalyst-%{version}-betav%{betaver}-linux-x86.x86_64.zip
-# Source0-md5: f51fc9413ab6f507d8d45995e0d48596
+#Source0:      amd-catalyst-%{version}-betav%{betaver}-linux-x86.x86_64.zip
+%define                vver    %(echo %{version} | tr . -)
+Source0:       amd-catalyst-%{vver}-linux-x86-x86-64.zip
+# Source0-md5: 00c2677c7b32520c2440b869ab34e660
 Source1:       atieventsd.init
 Source2:       atieventsd.sysconfig
 Source3:       gl.pc.in
@@ -76,6 +79,7 @@ Patch3:               %{pname}-desktop.patch
 Patch4:                %{pname}-nofinger.patch
 Patch5:                %{pname}-GPL-only.patch
 Patch7:                %{pname}-kernel-fpu.patch
+Patch8:                linux-3.14.patch
 URL:           http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_dist_kernel:%{expand:%kbrs}}
 BuildRequires: rpmbuild(macros) >= 1.678
@@ -232,6 +236,7 @@ cp -pf common/lib/modules/fglrx/build_mod/2.6.x/Makefile common/lib/modules/fglr
 %setup -q -c
 #sh %{SOURCE0} --extract .
 #sh amd-catalyst-%{version}-linux-x86.x86_64.run --extract .
+cd fglrx-%{intver}
 sh amd-driver-installer-%{intver}-x86.x86_64.run --extract .
 
 cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/
@@ -249,6 +254,7 @@ EOF
 %patch4 -p1
 %patch5 -p1
 %patch7 -p0
+%patch8 -p0
 
 install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
 cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
@@ -263,11 +269,14 @@ mv common%{_libdir}/{fglrx/fglrx-libGL.so.1.2,libGL.so.1.2}
 cp -a arch/%{arch_dir}/etc/* common/etc
 
 %build
+cd fglrx-%{intver}
 %{?with_kernel:%{expand:%bkpkg}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+cd fglrx-%{intver}
+
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT
 cp -a installed/* $RPM_BUILD_ROOT
@@ -351,7 +360,7 @@ fi
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.TXT common%{_docdir}/fglrx/*.html common%{_docdir}/fglrx/articles common%{_docdir}/fglrx/user-manual
+%doc fglrx-%{intver}/{LICENSE.TXT,common%{_docdir}/fglrx/*.html,common%{_docdir}/fglrx/articles,common%{_docdir}/fglrx/user-manual}
 %dir %{_sysconfdir}/ati
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/control
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/signature
This page took 0.048639 seconds and 4 git commands to generate.