X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=X11-driver-firegl.spec;h=be146b942dc41e619910a68e4378e021a1dddf98;hb=bd94ef8fb8e86c55cf8707e197412b5a8f74e53a;hp=f1f7a8531da5b4318e58bb4451615b75df7a3a44;hpb=c8bdf4d619bd6a07ac56d1e5f1fd9ac1743ac635;p=packages%2FX11-driver-firegl.git diff --git a/X11-driver-firegl.spec b/X11-driver-firegl.spec index f1f7a85..be146b9 100644 --- a/X11-driver-firegl.spec +++ b/X11-driver-firegl.spec @@ -5,43 +5,72 @@ %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_xfree 4.3.0 -%define _min_x11 6.7.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 +%endif + +%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} +%define need_amd64 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: 3.9.0 -Release: 1 +Version: 8.22.5 +%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 +Group: X11 +%if %{need_x86} +Source0: http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}-i386.run +# Source0-md5: 283eb8b53dbd0887fff3277d4bf0b3f9 +%endif +%if %{need_amd64} +Source1: http://dlmdownloads.ati.com/drivers/linux/64bit/ati-driver-installer-%{version}-x86_64.run +# Source1-md5: a24571ecb45b2a26092ef103d8eecefd +%endif Patch0: firegl-panel.patch -Patch1: %{name}-kh.patch -Patch2: %{name}-atomic.patch +Patch1: firegl-panel-ugliness.patch +Patch2: %{name}-kh.patch +Patch3: %{name}-viak8t.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-source >= 2.6.7} -BuildRequires: rpmbuild(macros) >= 1.153 +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.14} %{?with_userspace:BuildRequires: qt-devel} +BuildRequires: rpmbuild(macros) >= 1.213 +Requires: X11-OpenGL-core >= %{_min_eq_x11} Requires: X11-Xserver -Requires: X11-libs >= %{_min_x11} -Requires: X11-modules >= %{_min_x11} -%{?with_dist_kernel:Requires: kernel-video-firegl = %{version} } +%{?with_kernel:Requires: X11-driver-firegl(kernel)} +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 -Provides: XFree86-driver-firegl 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 %{x8664} 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 @@ -60,12 +89,13 @@ akcelerowany OpenGL. %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. @@ -76,12 +106,13 @@ Modu %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. @@ -91,31 +122,49 @@ Modu %prep %setup -q -c -T -rpm2cpio %{SOURCE0} | cpio -i -d -bzip2 -d -v usr/X11R6/bin/*.bz2 + +%ifarch %{x8664} +sh %{SOURCE1} --extract . +%else +sh %{SOURCE0} --extract . +%endif + +cp arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod + install -d panel_src -tar -xzf usr/src/ATI/fglrx_panel_sources.tgz -C panel_src +tar -xzf common/usr/src/ATI/fglrx_panel_sources.tgz -C panel_src %patch0 -p1 -%{?with_dist_kernel:%patch1 -p1} -%patch2 -p1 +%patch1 -p1 +cd common +%{?with_dist_kernel:%patch2 -p1} +%patch3 -p1 +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 exit 1 fi - rm -rf include - install -d include/{linux,config} - 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 - touch include/config/MARKER - %{__make} -C %{_kernelsrcdir} clean modules \ + install -d o/include/linux + ln -sf %{_kernelsrcdir}/config-$cfg o/.config + ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h + %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts + %{__make} -C %{_kernelsrcdir} clean \ RCS_FIND_IGNORE="-name '*.ko' -o" \ - M=$PWD O=$PWD \ + M=$PWD O=$PWD/o \ + %{?with_verbose:V=1} + %{__make} -C %{_kernelsrcdir} modules \ + M=$PWD O=$PWD/o \ %{?with_verbose:V=1} mv fglrx{,-$cfg}.ko done @@ -124,6 +173,9 @@ cd - %if %{with userspace} %{__make} -C panel_src \ + C="%{__cc}" \ + CC="%{__cxx}" \ + CCFLAGS="%{rpmcflags} -DFGLRX_USE_XEXTENSIONS" \ MK_QTDIR=/usr \ LIBQT_DYN=qt-mt %endif @@ -132,7 +184,7 @@ cd - 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 \ @@ -148,11 +200,11 @@ cd - 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 @@ -160,8 +212,8 @@ 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 @@ -188,22 +240,28 @@ rm -rf $RPM_BUILD_ROOT %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}