%bcond_with verbose # verbose build (V=1)
%bcond_without incall # include all sources in srpm
-%define _min_x11 6.8.0
+%define _min_eq_x11 1:6.9.0
+%define _max_x11 1:7.0.0
+%define x11ver x690
%if %{without kernel}
%undefine with_dist_kernel
%ifarch %{ix86}
%define need_x86 1
+%define need_amd64 0%{?with_incall:1}
+%define arch_sufix ""
+%define arch_dir x86
%else
%define need_x86 0%{?with_incall:1}
-%endif
-%ifarch %{x8664}
%define need_amd64 1
-%else
-%define need_amd64 0%{?with_incall:1}
+%define arch_sufix _64a
+%define arch_dir x86_64
%endif
Summary: Linux Drivers for ATI graphics accelerators
Summary(pl): Sterowniki do akceleratorów graficznych ATI
Name: X11-driver-firegl
-Version: 8.18.8
-%define _rel 1.1
+Version: 8.22.5
+%define _rel 1
Release: %{_rel}
License: ATI Binary (parts are GPL)
Vendor: ATI
-Group: X11/XFree86
+Group: X11
%if %{need_x86}
-Source0: fglrx_6_8_0-%{version}-1.i386.rpm
-# Source0-md5: f8f7a47f19f362aeb1e2a94fe3b798f7
+Source0: http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}-i386.run
+# Source0-md5: 283eb8b53dbd0887fff3277d4bf0b3f9
%endif
%if %{need_amd64}
-Source1: fglrx64_6_8_0-%{version}-1.x86_64.rpm
-# Source1-md5: 593413ab824ff902c8defd240933128c
+Source1: http://dlmdownloads.ati.com/drivers/linux/64bit/ati-driver-installer-%{version}-x86_64.run
+# Source1-md5: a24571ecb45b2a26092ef103d8eecefd
%endif
Patch0: firegl-panel.patch
Patch1: firegl-panel-ugliness.patch
Patch2: %{name}-kh.patch
Patch3: %{name}-viak8t.patch
-Patch4: %{name}-verify_area.patch
-Patch5: %{name}-ioctl32.patch
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
+#BuildRequires: X11-devel >= %{_min_eq_x11} # disabled for now
BuildRequires: cpio
-%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.213
+%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.14}
%{?with_userspace:BuildRequires: qt-devel}
-#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
-Requires: X11-OpenGL-core >= %{_min_x11}
+BuildRequires: rpmbuild(macros) >= 1.213
+Requires: X11-OpenGL-core >= %{_min_eq_x11}
Requires: X11-Xserver
%{?with_kernel:Requires: X11-driver-firegl(kernel)}
-Requires: X11-libs >= %{_min_x11}
-Requires: X11-modules >= %{_min_x11}
+Requires: X11-libs < %{_max_x11}
+Requires: X11-libs >= %{_min_eq_x11}
+Requires: X11-modules < %{_max_x11}
+Requires: X11-modules >= %{_min_eq_x11}
Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-libGL
Obsoletes: Mesa
%prep
%setup -q -c -T
+
%ifarch %{x8664}
-rpm2cpio %{SOURCE1} | cpio -i -d
+sh %{SOURCE1} --extract .
%else
-rpm2cpio %{SOURCE0} | cpio -i -d
+sh %{SOURCE0} --extract .
%endif
-install -d panel_src
-tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
+cp arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
+
+install -d panel_src
+tar -xzf common/usr/src/ATI/fglrx_panel_sources.tgz -C panel_src
%patch0 -p1
%patch1 -p1
+cd common
%{?with_dist_kernel:%patch2 -p1}
%patch3 -p1
-%patch4 -p1
-%ifarch %{x8664}
-%patch5 -p1
-%endif
+cd -
+
+install -d common%{_prefix}/{%{_lib},bin}
+cp -r %{x11ver}%{arch_sufix}%{_prefix}/%{_lib}/* common%{_prefix}/%{_lib}
+cp -r %{x11ver}%{arch_sufix}%{_bindir}/* common%{_bindir}
+cp -r arch/%{arch_dir}%{_prefix}/%{_lib}/* common%{_prefix}/%{_lib}
+cp -r arch/%{arch_dir}%{_bindir}/* common%{_bindir}
%build
%if %{with kernel}
-cd lib/modules/fglrx/build_mod
+cd common/lib/modules/fglrx/build_mod
cp -f 2.6.x/Makefile .
for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
%if %{with userspace}
%{__make} -C panel_src \
+ C="%{__cc}" \
+ CC="%{__cxx}" \
CCFLAGS="%{rpmcflags} -DFGLRX_USE_XEXTENSIONS" \
MK_QTDIR=/usr \
LIBQT_DYN=qt-mt
rm -rf $RPM_BUILD_ROOT
%if %{with kernel}
-cd lib/modules/fglrx/build_mod
+cd common/lib/modules/fglrx/build_mod
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
install fglrx-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/X11/extensions} \
$RPM_BUILD_ROOT/usr/{%{_lib},include/GL}
-install usr/X11R6/bin/{fgl_glxgears,fglrxconfig,fglrxinfo} \
+install common%{_bindir}/{fgl_glxgears,fglrxinfo,aticonfig} \
$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 common%{_prefix}/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.1
ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
-install usr/include/GL/*.h $RPM_BUILD_ROOT/usr/include/GL
-install usr/X11R6/include/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
+install common/usr/include/GL/*.h $RPM_BUILD_ROOT/usr/include/GL
+install common%{_includedir}/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
%endif
%clean
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%attr(755,root,root) %{_libdir}/libGL.so
+%attr(755,root,root) %{_libdir}/libfglrx_dm.so.*.*
%attr(755,root,root) %{_libdir}/libfglrx_gamma.so.*.*
+%attr(755,root,root) %{_libdir}/libfglrx_pp.so.*.*
# Linux OpenGL ABI compatibility symlinks
%attr(755,root,root) /usr/%{_lib}/libGL.so.1
%attr(755,root,root) /usr/%{_lib}/libGL.so
%attr(755,root,root) %{_libdir}/modules/dri/atiogl_a_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/fglrx_dri.so
-%attr(755,root,root) %{_libdir}/modules/drivers/fglrx_drv.o
-%{_libdir}/modules/linux/libfglrxdrm.a
+%attr(755,root,root) %{_libdir}/modules/drivers/fglrx_drv.so
+%attr(755,root,root) %{_libdir}/modules/linux/libfglrxdrm.so
+%doc ATI_LICENSE.TXT common%{_docdir}/fglrx/*.html common%{_docdir}/fglrx/articles common%{_docdir}/fglrx/release-notes common%{_docdir}/fglrx/user-manual
# -devel
#%attr(755,root,root) %{_libdir}/libfglrx_gamma.so
#%{_includedir}/X11/include/libfglrx_gamma.h
+#/usr/include/GL/glATI.h
#/usr/include/GL/glxATI.h
# -static
#%{_libdir}/libfglrx_gamma.a
+#%{_libdir}/libfglrx_pp.a
%endif
%if %{with kernel}
projects / packages / X11-driver-firegl.git / blobdiff