- add new S3 driver

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index cf5478cffc3c7a128203822ed4244e81c22d1972..5ec268cdebd7e3d60699661b2a2dc7c9c3437b36 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -8,7 +8,7 @@
 #
 
 %define                _sver   %(echo %{version} | tr -d .)
-%define                _synaptics_ver  0.11.3p7
+%define                _synaptics_ver  0.11.3p11
 
 Summary:       XFree86 Window System servers and basic programs
 Summary(de):   Xfree86 Window-System-Server und grundlegende Programme
@@ -23,12 +23,12 @@ Summary(ru):        
 Summary(uk):   âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):        XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          XFree86
-Version:       4.3.99.9
-Release:       0.1
+Version:       4.3.99.11
+Release:       0.2
 License:       MIT
 Group:         X11/XFree86
 Source0:       ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: 7e8241baed829f7a23cf5e99b61cbdec
+# Source0-md5: 0aa6cbc6ee19d38f3ab916929f283ac7
 #Source1:      ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz
 #Source2:      ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz
 Source3:       ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
@@ -62,7 +62,9 @@ Source38:     http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-X
 #Source39:     cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
 # http://w1.894.telia.com/~u89404340/touchpad/index.html
 Source40:      http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver}.tar.bz2
-# Source40-md5:        2a034c949435a53cd71dd45a2ae9680e
+# Source40-md5:        4dabd4c8ce8968eba6cde1dd6265c9c7
+Source41:      http://www.linux.org.uk/~alan/S3.zip
+# Source41-md5:        8b754fc6bbded60b683563b945e384b0
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-HasZlib.patch
 Patch2:                %{name}-DisableDebug.patch
@@ -113,8 +115,6 @@ Patch45:    %{name}-spencode-nowarning.patch
 # Small (maybe buggy) patch to resolve problems with totem 0.97.0
 Patch46:       %{name}-lock.patch
 Patch47:       %{name}-linux-version.patch
-Patch48:       %{name}-XF86_VERSION_SNAP.patch
-Patch49:       %{name}-compile_fix.patch
 URL:           http://www.xfree86.org/
 BuildRequires: %{_bindir}/perl
 BuildRequires: bison
@@ -1932,7 +1932,7 @@ System. 
 #--- %prep ---------------------------
 
 %prep
-%setup -q -c -b3 -a40
+%setup -q -c -b3 -a40 -a41
 #-b1 -b2 -a3
 %patch0 -p0
 %patch1 -p1
@@ -1981,8 +1981,6 @@ System. 
 %patch45 -p1
 %patch46 -p0
 %patch47 -p1
-%patch48 -p0
-%patch49 -p1
 
 rm -f xc/config/cf/host.def
 
@@ -2018,6 +2016,25 @@ rm -rf xc/fonts
 #      "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
 %endif
 
+%ifarch %{ix86} mips alpha ppc arm
+olddir=$(pwd)
+tar xfz *.tar.gz
+cd LinuxDriver/2D
+sed -i -e 's#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g' Imakefile
+xmkmf $olddir/xc .
+%{__make} -S savage_drv.o \
+       DEFAULT_OS_CPU_FROB=%{_target_cpu} \
+       CC="%{__cc}" \
+       BOOTSTRAPCFLAGS="%{rpmcflags}" \
+       CCOPTIONS="%{rpmcflags}" \
+       CXXOPTIONS="%{rpmcflags}" \
+       CXXDEBUGFLAGS="" \
+       CDEBUGFLAGS="" \
+       ICONDIR="%{_icondir}" \
+       LINUXDIR="%{_kernelsrcdir}"
+cd $olddir
+%endif
+
 %ifnarch sparc sparc64
 TOPDIR=$(pwd)/xc
 %{__make} -S -C synaptics clean all \
@@ -2076,6 +2093,9 @@ install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input
 #      $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
 %endif
 
+install -d $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers
+install LinuxDriver/2D/savage_drv.o $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers
+
 # setting default X
 rm -f $RPM_BUILD_ROOT%{_bindir}/X
 ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X
@@ -2224,6 +2244,11 @@ else
        echo "found"
 fi
 
+%pre modules
+if [ -d /etc/X11/xkb/geometry/hp ]; then
+       rm -rf /etc/X11/xkb/geometry/hp
+fi
+
 %triggerpostun modules -- XFree86-modules < 4.0.2
 if [ -d /usr/X11R6/lib/X11/xkb ]; then
        rm -rf /usr/X11R6/lib/X11/xkb
@@ -2962,6 +2987,8 @@ fi
 %files driver-savage
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
+%dir %{_libdir}/modules.s3
+%attr(755,root,root) %{_libdir}/modules.s3/savage_drv.o
 %{_mandir}/man4/savage*
 %endif