-%define _sver %(echo %{version} | tr -d .)
+# _without_tdfx disables tdfx build
+
+%define _sver %(echo %{version} | tr -d .)
Summary: XFree86 Window System servers and basic programs
Summary(de): Xfree86 Window-System-Server und grundlegende Programme
Summary(es): Programas básicos y servidores para el sistema de ventanas XFree86
Summary(fr): Serveurs du système XFree86 et programmes de base
+Summary(ja): XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
+Summary(ko): X¿¡ ÇÊ¿äÇÑ ±âº»ÀûÀÎ ±Û²Ã°ú ÇÁ·Î±×·¥°ú ¹®¼µé
Summary(pl): XFree86 Window System wraz z podstawowymi programami
Summary(tr): XFree86 Pencereleme Sistemi sunucularý ve temel programlar
Summary(pt_BR): Programas básicos e servidores para o sistema de janelas XFree86
Summary(ru): âÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÄÌÑ ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ ÐÏÄ X
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
+Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
Version: 4.2.1
-Release: 2
+Release: 4
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-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-20020524.tar.bz2
+Source16: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch45: %{name}-i740-driver-update-cvs-20020617.patch
Patch46: %{name}-neomagic-Xv-support.patch
Patch47: %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch48: %{name}-tdfx-enable-interlaced-modes.patch
-Patch49: %{name}-tdfx-fix-compiler-warnings.patch
-Patch50: %{name}-tdfx-fix-vtswitch-font-corruption.patch
-Patch51: %{name}-tdfx-should-be-2048-not-2046.patch
+Patch48: %{name}-tdfx-should-be-2048-not-2046.patch
+Patch49: %{name}-tdfx-interlace.patch
+Patch50: %{name}-tdfx-fix-compiler-warnings.patch
+Patch51: %{name}-tdfx-fix-vtswitch-font-corruption.patch
Patch52: %{name}-sis-option-swcursor.patch
Patch53: %{name}-sis-unresolved-symbols.patch
Patch54: %{name}-sis-maxxfbmem-fixup.patch
Patch55: %{name}-Radeon9000.patch
-
+Patch56: %{name}-Xfont-Type1-large-DoS.patch
+# "strip -g libGLcore.a" left empty object debug_xform.o, which caused GLcore
+# loading failure with "debug_xform.o: no symbols"
+Patch57: %{name}-GLcore-strip-a-workaround.patch
+# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
+Patch58: %{name}-4.2.1-mit-shm-security.patch
+Patch59: %{name}-disable_glide.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: zlib-devel
BuildRequires: libstdc++-devel
%ifarch %{ix86} alpha
-BuildRequires: Glide3-DRI-devel
+%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
%endif
# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
%ifarch %{ix86}
-BuildRequires: Glide2x_SDK
+%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
%endif
Requires: xauth
Requires: %{name}-libs = %{version}
# avoid Mesa dependency in XFree86-OpenGL-libs
# Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
-%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
+%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
+
+# gcc 3.2 is still broken
+%ifarch athlon
+%define optflags -O2 -march=athlon -mno-mmx -mno-3dnow
+%endif
%description
If you want to install the X Window System (TM) on your machine,
Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
-Conflicts: XFree86-driver-ati XFree86-driver-r128 XFree86-driver-radeon
%description driver-ati.2
ATI video driver (ATI.2).
Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
Requires: XFree86-driver-ati.2
-Conflicts: XFree86-driver-nvidia XFree86-driver-ati XFree86-driver-r128 XFree86-driver-radeon
+Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
%description driver-r128.2
Requires: %{name}-Xserver = %{version}-%{release}
Requires: XFree86-driver-ati.2
Requires: OpenGL
-Conflicts: XFree86-driver-nvidia XFree86-driver-ati XFree86-driver-r128 XFree86-driver-radeon
+Conflicts: XFree86-driver-nvidia
%description driver-radeon.2
ATI Radeon video driver (ATI.2).
%ifarch ppc
%patch35
%endif
+%{?_without_tdfx:%patch35}
%patch36 -p0
%patch37 -p1
%patch38 -p1
%patch44 -p1
%patch45 -p1
%patch46 -p1
-%patch47 -p0
-# Causes build error - FIXME:
-#%patch48 -p0
-#%patch49 -p0
-%patch50 -p0
-%patch51 -p0
+%{!?_without_tdfx:%patch47 -p0}
+%{!?_without_tdfx:%patch48 -p0}
+%{!?_without_tdfx:%patch49 -p1}
+#%patch50 -p0
+%{!?_without_tdfx:%patch51 -p0}
#%patch52 -p1
#%patch53 -p1
%patch54 -p1
%patch55 -p0
+%patch56 -p1
+%{!?debug:%patch57 -p1}
+%patch58 -p0
+%{?_without_tdfx:%patch59 -p0}
rm -f xc/config/cf/host.def
install install.man
%ifnarch alpha
-install -d $RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati.2
+install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \
- $RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati.2/
+ $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
+install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
+ $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
+
%endif
# setting default X
%pre -n xfs
if [ -n "`/usr/bin/getgid xfs`" ]; then
if [ "`/usr/bin/getgid xfs`" != "56" ]; then
- echo "Error: group xfs doesn't have gid=56. Correct this before installing xfs." 1>&2
+ echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2
exit 1
fi
else
fi
if [ -n "`/bin/id -u xfs 2>/dev/null`" ]; then
if [ "`/bin/id -u xfs`" != "56" ]; then
- echo "Error: user xfs doesn't have uid=56. Corrent this before installing xfs." 1>&2
+ echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2
exit 1
fi
else
%{_libdir}/libxkbui.a
%{_libdir}/libXrandr.a
%{_libdir}/libXss.a
-%{_libdir}/libXTrap.a
+%{_libdir}/libXTrap.a
%{_libdir}/libXv.a
-%{_libdir}/libXvMC.a
+%{_libdir}/libXvMC.a
%{_libdir}/libXxf86dga.a
%{_libdir}/libXxf86misc.a
%{_libdir}/libXxf86rush.a
%endif
%ifnarch sparc sparc64 alpha ppc
-%files driver-glide
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
-%{_mandir}/man4/glide*
+%{!?_without_tdfx:%files driver-glide}
+%{!?_without_tdfx:%defattr(644,root,root,755)}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o}
+%{!?_without_tdfx:%{_mandir}/man4/glide*}
%endif
%files driver-glint
%ifnarch alpha
%files driver-ati.2
%defattr(644,root,root,755)
-%dir %{_libdir}/modules/drivers/ati.2
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/ati*_drv.o
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/[bfmt]*_drv.o
+%dir %{_libdir}/modules.gatos/drivers
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/[bfmt]*_drv.o
%endif
%ifnarch alpha
%files driver-r128.2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/r128*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/r128*_drv.o
%ifnarch sparc sparc64
-%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
+%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
%endif
%{_mandir}/man4/r128*
%endif
%ifnarch alpha
%files driver-radeon.2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/radeon*_drv.o
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/saa7114_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/radeon*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/saa7114_drv.o
%ifnarch sparc sparc64
-%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
+%attr(755,root,root) %{_libdir}/modules.gatos/dri/radeon_dri.o
%endif
%endif
%endif
%ifnarch sparc sparc64 ppc
-%files driver-tdfx
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
-%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
-%{_mandir}/man4/tdfx*
+%{!?_without_tdfx:%files driver-tdfx}
+%{!?_without_tdfx:%defattr(644,root,root,755)}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
+%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
%endif
%ifnarch sparc sparc64 ppc