Summary(pt_BR): Programas básicos e servidores para o sistema de janelas XFree86
Name: XFree86
Version: 4.2.0
-Release: 1
+Release: 2.3
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-1.tgz
Source13: xterm.desktop
Source14: xlogo64.png
Source15: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
+Source16: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20020310.tar.bz2
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch31: %{name}-alpha_GLX_align_fix.patch
Patch32: %{name}-XftConfig_in_correct_place.patch
Patch33: %{name}-PEX+XIE.patch
+Patch34: %{name}-ati.old-rename.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
+BuildRequires: libstdc++-devel
%ifarch %{ix86} alpha
BuildRequires: Glide3-DRI-devel
%endif
%description driver-ati -l pl
Sterownik do kart ATI.
+%package driver-r128
+Summary: ATI Rage 128 video driver
+Summary(pl): Sterownik do kart ATI Rage 128
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-driver-ati = %{version}-%{release}
+Requires: OpenGL
+Obsoletes: XFree86-Rage128
+
+%description driver-r128
+ATI Rage 128 video driver.
+
+%description driver-r128 -l pl
+Sterownik do kart ATI Rage 128.
+
+%package driver-radeon
+Summary: ATI Radeon video driver
+Summary(pl): Sterownik do kart ATI Radeon
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-driver-ati = %{version}-%{release}
+Requires: OpenGL
+
+%description driver-radeon
+ATI Radeon video driver.
+
+%description driver-radeon -l pl
+Sterownik do kart ATI Radeon.
+
%package driver-chips
Summary: Chips and Technologies video driver
Summary(pl): Sterownik do kart na uk³adach Chips and Technologies
%description driver-nv -l pl
Sterownik do kart na uk³adach firmy nVidia: Riva128, RivaTNT, GeForce.
-%package driver-r128
-Summary: ATI Rage 128 video driver
-Summary(pl): Sterownik do kart ATI Rage 128
-Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: OpenGL
-Obsoletes: XFree86-Rage128
-
-%description driver-r128
-ATI Rage 128 video driver.
-
-%description driver-r128 -l pl
-Sterownik do kart ATI Rage 128.
-
-%package driver-radeon
-Summary: ATI Radeon video driver
-Summary(pl): Sterownik do kart ATI Radeon
-Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: OpenGL
-
-%description driver-radeon
-ATI Radeon video driver.
-
-%description driver-radeon -l pl
-Sterownik do kart ATI Radeon.
-
%package driver-rendition
Summary: Rendition video driver
Summary(pl): Sterownik do kart Rendition
rm -f xc/config/cf/host.def
+# New ATI drivers
+cd xc/programs/Xserver/hw/xfree86/drivers
+bzcat %{SOURCE16} | tar x
+mv ati ati.old
+mv ati.2 ati
+cd ati.old
+%patch34 -p1
+
#--- %build --------------------------
%build
"CXXOPTIONS=%{rpmcflags}" \
"CXXDEBUGFLAGS=" "CDEBUGFLAGS="
+%ifnarch alpha
+%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.old" Makefiles
+%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.old" all \
+ "BOOTSTRAPCFLAGS=%{rpmcflags}" \
+ "CCOPTIONS=%{rpmcflags}" \
+ "CXXOPTIONS=%{rpmcflags}" \
+ "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
+%endif
+
#--- %install ------------------------
%install
"CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
install install.man
+%ifnarch alpha
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/ati_drv.o \
+ $RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati_old_drv.o
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/atimisc_drv.o \
+ $RPM_BUILD_ROOT%{_libdir}/modules/drivers/atimisc_old_drv.o
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/r128_drv.o \
+ $RPM_BUILD_ROOT%{_libdir}/modules/drivers/r128_old_drv.o
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/radeon_drv.o \
+ $RPM_BUILD_ROOT%{_libdir}/modules/drivers/radeon_old_drv.o
+%endif
+
# setting default X
rm -f $RPM_BUILD_ROOT%{_bindir}/X
ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X
%attr(755,root,root) %{_libdir}/X11/lbxproxy
%attr(755,root,root) %{_libdir}/X11/proxymngr
%attr(755,root,root) %{_libdir}/X11/rstart
-%attr(755,root,root) %{_libdir}/X11/xserver
%attr(755,root,root) %{_libdir}/X11/fonts
%attr(755,root,root) %{_libdir}/X11/xinit
%attr(755,root,root) %{_libdir}/X11/xsm
%attr(755,root,root) /etc/X11/rstart/commands/x11r6/*
%dir /etc/X11/rstart/contexts
/etc/X11/rstart/contexts/*
-%dir /etc/X11/xserver
-/etc/X11/xserver/SecurityPolicy
%dir /etc/X11/xsm
/etc/X11/xsm/*
%attr(755,root,root) %{_bindir}/xhost
%attr(755,root,root) %{_bindir}/xinit
%attr(755,root,root) %{_bindir}/xkbbell
-%attr(755,root,root) %{_bindir}/xkbcomp
%attr(755,root,root) %{_bindir}/xkbevd
%attr(755,root,root) %{_bindir}/xkbprint
%attr(755,root,root) %{_bindir}/xkbvleds
%{_mandir}/man1/xgamma.1*
%{_mandir}/man1/xhost.1*
%{_mandir}/man1/xinit.1*
-%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man1/xkbevd.1*
%{_mandir}/man1/xkbprint.1*
%{_mandir}/man1/xlsatoms.1*
%{_mandir}/man1/xmkmf.1*
%{_mandir}/man3/[A-EH-Z]*
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-apm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
%{_mandir}/man4/apm*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-ark
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
-%ifnarch alpha
-%files driver-ati
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
-#%{_mandir}/man4/ati*
-%endif
-
%ifnarch sparc sparc64 alpha
%files driver-chips
%defattr(644,root,root,755)
%{_mandir}/man4/chips*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-cirrus
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
%{_mandir}/man4/cirrus*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-cyrix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
%{_mandir}/man4/fbdev*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-glide
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
%endif
%{_mandir}/man4/glint*
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-i128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
%{_mandir}/man4/i128*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-i740
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
%{_mandir}/man4/i740*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-i810
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
%{_mandir}/man4/mga*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-neomagic
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
%{_mandir}/man4/neomagic*
%endif
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
%{_mandir}/man4/nv*
%endif
-%ifnarch sparc sparc64
-%files driver-r128
-%defattr(644,root,root,755)
%ifnarch alpha
-%attr(755,root,root) %{_libdir}/modules/drivers/r128_drv.o
+%files driver-ati
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules/multimedia/*.o
%endif
+
+%ifnarch alpha
+%files driver-r128
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
%ifnarch sparc sparc64
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
-%ifnarch alpha
%{_mandir}/man4/r128*
%endif
-%endif
+%ifnarch alpha
%files driver-radeon
%defattr(644,root,root,755)
-%ifnarch alpha
-%attr(755,root,root) %{_libdir}/modules/drivers/radeon_drv.o
-%endif
+%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
%ifnarch sparc sparc64
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%endif
+%endif
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
%{_mandir}/man4/savage*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-siliconmotion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
%{_mandir}/man4/siliconmotion*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-sis
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
%{_mandir}/man4/tdfx*
%endif
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
%files driver-tga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
%{_mandir}/man4/trident*
%endif
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
%files modules
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xkbcomp
%{_libdir}/X11/xkb
%{_sysconfdir}/X11/xkb
/var/lib/xkb
%ifnarch alpha
%dir %{_libdir}/modules/dri
%endif
+%dir %{_libdir}/modules/multimedia
%dir %{_libdir}/modules/drivers
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
%{_libdir}/modules/*.uc
%endif
%attr(755,root,root) %{_libdir}/modules/*.a
%attr(755,root,root) %{_libdir}/modules/drivers/linux
%ifnarch sparc sparc64
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
-%ifnarch alpha
+%ifnarch alpha ppc
%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%endif
%attr(755,root,root) %{_libdir}/modules/fonts
%attr(755,root,root) %{_libdir}/modules/input
%attr(755,root,root) %{_libdir}/modules/linux
+%attr(755,root,root) %{_libdir}/X11/xserver
+%dir /etc/X11/xserver
+/etc/X11/xserver/SecurityPolicy
+%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man4/citron*
%{_mandir}/man4/dynapro*
%{_mandir}/man4/keyboard*
%{_mandir}/man4/v4l*
%ifnarch sparc sparc64
%{_mandir}/man4/vga*
-%ifnarch alpha
+%ifnarch alpha ppc
%{_mandir}/man4/vesa*
%endif
%endif
%files setup
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pcitweak
+%ifnarch ppc
%attr(755,root,root) %{_bindir}/scanpci
+%endif
%attr(755,root,root) %{_bindir}/xf86cfg
%attr(755,root,root) %{_bindir}/xf86config
+%ifnarch ppc
%{_mandir}/man1/scanpci.1*
+%endif
%{_mandir}/man1/pcitweak.1*
%{_mandir}/man1/xf86cfg.1*
%{_mandir}/man1/xf86config.1*