X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=X11-driver-firegl.spec;h=b8decb28df9f43702eff4ebac753b64c5f1bf092;hb=c5a234cdb15a59267f94f71158cfdfc3c503e684;hp=471f7c4a00f1a12b2e1015af53c7d8a378fd6ed1;hpb=e8dd1d9ec390315dcfc5e21436ca80e2f71629b7;p=packages%2FX11-driver-firegl.git

diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec
index 471f7c4..b8decb2 100644
--- a/X11-driver-firegl.spec
+++ b/X11-driver-firegl.spec
@@ -5,26 +5,50 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
+%bcond_without	incall		# include all sources in srpm
 
 %define		_min_x11	6.8.0
 
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+
+%ifarch %{ix86}
+%define		need_x86	1
+%else
+%define		need_x86	0%{?with_incall:1}
+%endif
+%ifarch amd64
+%define		need_amd64	1
+%else
+%define		need_amd64	0%{?with_incall:1}
+%endif
+
 Summary:	Linux Drivers for ATI graphics accelerators
 Summary(pl):	Sterowniki do akceleratorów graficznych ATI
 Name:		X11-driver-firegl
-Version:	8.8.25
-%define		_rel	1
+Version:	8.12.10
+%define		_rel	2
 Release:	%{_rel}
 License:	ATI Binary (parts are GPL)
 Vendor:		ATI
 Group:		X11/XFree86
+%if %{need_x86}
 Source0:	http://www2.ati.com/drivers/linux/fglrx_6_8_0-%{version}-1.i386.rpm
-# Source0-md5:	8245afc1a5f83634ab1b906b8107cd0c
+# Source0-md5:	9c6397047331aadaa2c379ca78245810
+%endif
+%if %{need_amd64}
+Source1:	http://www2.ati.com/drivers/linux/fglrx64_6_8_0-%{version}-1.x86_64.rpm
+# Source1-md5:	a54abd8af43d3066faccda4cecec851c
+%endif
 Patch0:		firegl-panel.patch
 Patch1:		firegl-panel-ugliness.patch
-Patch2:		%{name}-kh.patch
+Patch2:		%{name}-kernel-2_6_11.patch
+Patch3:		%{name}-kh.patch
+Patch4:		%{name}-viak8t.patch
 URL:		http://www.ati.com/support/drivers/linux/radeon-linux.html
 BuildRequires:	cpio
-%{?with_dist_kernel:BuildRequires:	kernel-source >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.153
 %{?with_userspace:BuildRequires:	qt-devel}
 #BuildRequires:	X11-devel >= %{_min_x11}	# disabled for now
@@ -39,7 +63,7 @@ Obsoletes:	Mesa
 Obsoletes:	X11-OpenGL-libGL
 Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-firegl
-ExclusiveArch:	i586 i686 athlon pentium3 pentium4
+ExclusiveArch:	i586 i686 athlon pentium3 pentium4 amd64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1
@@ -94,12 +118,18 @@ Modu
 
 %prep
 %setup -q -c -T
+%ifarch amd64
+rpm2cpio %{SOURCE1} | cpio -i -d
+%else
 rpm2cpio %{SOURCE0} | cpio -i -d
+%endif
 install -d panel_src
 tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
+
 %patch0 -p1
 %patch1 -p1
-%{?with_dist_kernel:%patch2 -p1}
+%patch2 -p1
+%{?with_dist_kernel:%patch3 -p1}
 
 %build
 %if %{with kernel}
@@ -114,6 +144,9 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 	ln -sf %{_kernelsrcdir}/config-$cfg .config
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
 	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%if %{without dist_kernel}
+	ln -sf %{_kernelsrcdir}/scripts
+%endif
 	touch include/config/MARKER
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
@@ -158,7 +191,7 @@ install usr/X11R6/bin/{fgl_glxgears,fglrxconfig,fglrxinfo} \
 	$RPM_BUILD_ROOT%{_bindir}
 install panel_src/fireglcontrol.qt3.gcc%(gcc -dumpversion) \
 	$RPM_BUILD_ROOT%{_bindir}/fireglcontrol
-cp -r usr/X11R6/lib/* $RPM_BUILD_ROOT%{_libdir}
+cp -r usr/X11R6/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
 
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so