%bcond_without userspace # don't build userspace tools
%bcond_with verbose # verbose build (V=1)
-%define _min_xfree 4.3.0
+%define _min_x11 6.8.0
+
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
Summary: Linux Drivers for ATI graphics accelerators
Summary(pl): Sterowniki do akceleratorów graficznych ATI
-Name: XFree86-driver-firegl
-Version: 3.9.0
-Release: 1
+Name: X11-driver-firegl
+Version: 8.10.19
+%define _rel 2
+Release: %{_rel}
License: ATI Binary (parts are GPL)
Vendor: ATI
Group: X11/XFree86
-Source0: http://www2.ati.com/drivers/linux/fglrx-%{_min_xfree}-%{version}.i386.rpm
-# Source0-md5: 9f7802ee0bbdeb5172673027056e789d
+%ifarch %{ix86}
+Source0: http://www2.ati.com/drivers/linux/fglrx_6_8_0-%{version}-1.i386.rpm
+# Source0-md5: a3ddb544071b1878ed19984c60623346
+%endif
+%ifarch amd64
+Source1: http://www2.ati.com/drivers/linux/fglrx64_6_8_0-%{version}-1.x86_64.rpm
+# Source1-md5: ca724fda36ecf6c8a60a74e3a1528829
+%endif
Patch0: firegl-panel.patch
-Patch1: %{name}-kh.patch
-Patch2: %{name}-atomic.patch
+Patch1: firegl-panel-ugliness.patch
+Patch2: %{name}-kernel-2_6_11.patch
+Patch3: %{name}-kh.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}
-Requires: XFree86-Xserver
-Requires: XFree86-libs >= %{_min_xfree}
-Requires: XFree86-modules >= %{_min_xfree}
-%{?with_dist_kernel:Requires: kernel-video-firegl = %{version} }
+#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
+BuildRequires: fix_amd64_build
+Requires: X11-OpenGL-core >= %{_min_x11}
+Requires: X11-Xserver
+Requires: X11-driver-firegl(kernel)
+Requires: X11-libs >= %{_min_x11}
+Requires: X11-modules >= %{_min_x11}
+Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-libGL
Obsoletes: Mesa
+Obsoletes: X11-OpenGL-libGL
Obsoletes: XFree86-OpenGL-libGL
-ExclusiveArch: i586 i686 athlon pentium3 pentium4
+Obsoletes: XFree86-driver-firegl
+ExclusiveArch: i586 i686 athlon pentium3 pentium4 amd64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.1.2
+%define _noautoreqdep libGL.so.1
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
%package -n kernel-video-firegl
Summary: ATI kernel module for FireGL support
Summary(pl): Modu³ j±dra oferuj±cy wsparcie dla ATI FireGL
-Release: %{release}@%{_kernel_ver_str}
+Release: %{_rel}@%{_kernel_ver_str}
License: ATI
Vendor: ATI
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel_up}
Requires(post,postun): /sbin/depmod
+Provides: X11-driver-firegl(kernel)
%description -n kernel-video-firegl
ATI kernel module for FireGL support.
%package -n kernel-smp-video-firegl
Summary: ATI kernel module for FireGL support
Summary(pl): Modu³ j±dra oferuj±cy wsparcie dla ATI FireGL
-Release: %{release}@%{_kernel_ver_str}
+Release: %{_rel}@%{_kernel_ver_str}
License: ATI
Vendor: ATI
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel_smp}
Requires(post,postun): /sbin/depmod
+Provides: X11-driver-firegl(kernel)
%description -n kernel-smp-video-firegl
ATI kernel module for FireGL support.
%prep
%setup -q -c -T
+%ifarch amd64
+rpm2cpio %{SOURCE1} | cpio -i -d
+%else
rpm2cpio %{SOURCE0} | cpio -i -d
-bzip2 -d -v usr/X11R6/bin/*.bz2
+%endif
install -d panel_src
tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
+
%patch0 -p1
-%{?with_dist_kernel:%patch1 -p1}
+%patch1 -p1
%patch2 -p1
+%{?with_dist_kernel:%patch3 -p1}
%build
%if %{with kernel}
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 modules \
+ %{__make} -C %{_kernelsrcdir} clean \
RCS_FIND_IGNORE="-name '*.ko' -o" \
M=$PWD O=$PWD \
%{?with_verbose:V=1}
+ %{__make} -C %{_kernelsrcdir} modules \
+ M=$PWD O=$PWD \
+ %{?with_verbose:V=1}
mv fglrx{,-$cfg}.ko
done
cd -
%if %{with userspace}
%{__make} -C panel_src \
+ CCFLAGS="%{rpmcflags} -DFGLRX_USE_XEXTENSIONS" \
MK_QTDIR=/usr \
LIBQT_DYN=qt-mt
%endif
$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