xorg-x11-server-1.7.99.901-1.20100304

update to git snapshot


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@585 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -1,54 +1,69 @@
 %define pkgname xorg-server
 
+%define gitdate 20100304
+
 Summary:   X.Org X11 X server
 Summary(ja):   X.Org X11 X サーバ
 Name:      xorg-x11-server
-Version:   1.7.5
-Release:   1%{?_dist_release}
+Version:   1.7.99.901
+Release:   1.%{gitdate}%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
 
+%if 0%{?gitdate}
+Source0:  ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{gitdate}.tar.xz
+%else
 Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
+%endif
+
+Source3:   00-evdev.conf
+Source4:   10-quirks.conf
 
 Source10:  xserver.pamd
 
-# general bug fixes
-Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch
+Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
+
+Patch5: xserver-1.7.1-pic-libxf86config.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch103:  xserver-1.5.0-bg-none-root.patch
 
-Patch1001: xorg-x11-server-1.4.99-extramodes.patch
-Patch1003: xserver-1.7.1-pic-libxf86config.patch
+Patch2014:  xserver-1.5.0-projector-fb-size.patch
+
+# Trivial things to never merge upstream ever:
+# This really could be done prettier.
+Patch5002:  xserver-1.4.99-ssh-isnt-local.patch
+
+# force mode debugging on for randr 1.2 drivers
+Patch6002: xserver-1.5.1-mode-debug.patch
 
 # don't build the (broken) acpi code
 Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
 
-# don't try intel on poulsbo
-# Patch6012: xserver-1.5.99.902-sod-off-poulsbo.patch
-# try vesa for poulsbo
-#Patch6012: xorg-x11-server-1.6.3-psb.patch
-
 # needs to upstream this
 Patch6027: xserver-1.6.0-displayfd.patch
+Patch6028: xserver-1.6.99-randr-error-debugging.patch
+Patch6030: xserver-1.6.99-right-of.patch
+Patch6033: xserver-1.6.99-default-modes.patch
+Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 
-Patch6032: xserver-1.7.0-randr-gamma-restore.patch
+Patch6049: xserver-1.7.1-multilib.patch
+Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 
-# autodetect nvidia driver
-Patch6040: xorg-x11-server-1.7.1-nvidia.patch
 
+## Vine Patch
+# autodetect nvidia driver
+Patch10010: xorg-x11-server-1.7.1-nvidia.patch
 # autodetect fglrx driver
-Patch6041: xorg-x11-server-1.6.3-fglrx.patch
-
+Patch10020: xorg-x11-server-1.6.3-fglrx.patch
 # autodetect virtual video device (qemu) driver
-Patch6042: xorg-x11-server-1.7.1-qemu.patch
-
+Patch10030: xorg-x11-server-1.7.1-qemu.patch
 # finally fallback to vesa driver
-Patch6050: xorg-x11-server-1.6.3-vesa-fallback.patch
+Patch10040: xorg-x11-server-1.6.3-vesa-fallback.patch
 
 # do not disable kbd driver even if AllowEmptyInput option is on.
-Patch10000: xorg-x11-server-1.6.0-dont-dsiable-kbd-if-AEI-on.patch
+Patch20000: xorg-x11-server-1.6.0-dont-dsiable-kbd-if-AEI-on.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -66,8 +81,8 @@ Patch10000: xorg-x11-server-1.6.0-dont-dsiable-kbd-if-AEI-on.patch
 %define enable_xorg --disable-xorg
 %endif
 
-%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-kdrive-vesa
-%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx
+%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
+%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -75,7 +90,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: automake autoconf libtool
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-util-macros
+BuildRequires: xorg-x11-util-macros >= 1.6.0
 
 BuildRequires: xorg-x11-proto-devel >= 7.4-9
 
@@ -116,8 +131,8 @@ BuildRequires: libXfixes-devel
 BuildRequires: libXdamage-devel
 BuildRequires: libXv-devel
 
-BuildRequires: mesa-libGL-devel >= 7.6-1
-BuildRequires: mesa-source >= 7.6-1
+BuildRequires: mesa-libGL-devel >= 7.8
+BuildRequires: mesa-source >= 7.8
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0-3
 %if %{with_hw_servers}
@@ -155,6 +170,8 @@ Requires: xorg-x11-drv-void xorg-x11-drv-evdev
 # virtuals.  XXX fix the xkbcomp fork() upstream.
 Requires: xkbdata xkbcomp
 Requires: xorg-x11-server-common >= %{version}-%{release}
+Requires: libdrm
+Requires: system-setup-keyboard
 Obsoletes: XFree86, XOrg
 
 %description Xorg
@@ -263,65 +280,72 @@ Group: Development/Libraries
 Xserver source code needed to build VNC server (Xvnc)
 
 %prep
-%setup -q -n %{pkgname}-%{version}
-%patch0 -p0 -b .init-origins-fix
+#%setup -q -n %{pkgname}-%{version}
+%setup -q -n %{pkgname}-%{gitdate}
+
+%patch5 -p1 -b .pic-libxf86config
 
 # OpenGL compositing manager feature/optimization patches.
 %patch103 -p1 -b .bg-none-root
 
-%patch1001 -p1 -b .extramodes
-%patch1003 -p1 -b .pic-libxf86config
+%patch2014 -p1 -b .projector-fb-size
+
+%patch5002 -p1 -b .ssh-isnt-local
+
+%patch6002 -p1 -b .mode-debug
 
 # don't build the (broken) acpi code
 %patch6011 -p1 -b .less-acpi-brokenness
 
-# don't try intel on poulsbo
-#%patch6012 -p1 -b .poulsbo
-
 # needs to upstream this
 %patch6027 -p1 -b .displayfd
+%patch6028 -p1 -b .randr-error-debugging
+%patch6030 -p1 -b .right-of
+%patch6033 -p1 -b .default-modes
+%patch6045 -p1 -b .randr-gamma-restore
 
-%patch6032 -p1 -b .randr-gamma-restore
+%patch6049 -p1 -b .multilib.patch
+%patch6051 -p1 -b .gamma-kdm-fix.patch
 
-%patch6040 -p1 -b .nvidia
-%patch6041 -p1 -b .fglrx
-%patch6042 -p1 -b .virtual-device
-%patch6050 -p1 -b .vesa-fallback
+# Vine patch
+%patch10010 -p1 -b .nvidia
+%patch10020 -p1 -b .fglrx
+%patch10030 -p1 -b .virtual-device
+%patch10040 -p1 -b .vesa-fallback
 
 # Vine 
-%patch10000 -p1 -b .dont-disable-kbd
+%patch20000 -p1 -b .dont-disable-kbd
 
 %build
 
 %define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
 
+%if %{with_hw_servers}
+%define dri_flags --with-dri-driver-path=%{drimoduledir}
+%else
+%define dri_flags --disable-dri
+%endif
+
 # --with-pie ?
 autoreconf -v --install
+export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
 %configure \
 	%{xservers} \
-	--disable-xprint \
 	--disable-static \
 	--with-pic \
-	--enable-composite \
-	--enable-xtrap \
-	--enable-xcsecurity \
-	--enable-xevie \
 	--with-int10=x86emu \
 	--with-default-font-path=%{default_font_path} \
 	--with-module-dir=%{moduledir} \
 	--with-os-name="Vine Linux 5" \
-	--with-os-vendor="Project Vine" \
+	--with-vendor-web="http://vinelinux.org/" \
+	--with-vendor-name="Project Vine" \
 	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--with-rgb-path=%{_datadir}/X11/rgb \
-	--disable-xorgcfg \
 	--enable-install-libxf86config \
-	--with-mesa-source=%{_datadir}/mesa/source \
-%if %{with_hw_servers}
-	--enable-dri \
-	--enable-dri2 \
-	--with-dri-driver-path=%{drimoduledir} \
-%endif
+	--disable-xselinux --enable-record \
+	--enable-config-udev \
+	%{dri_flags} \
 	${CONFIGURE}
 
 make -s %{?_smp_mflags}
@@ -332,6 +356,7 @@ make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
 
 
 %if %{with_hw_servers}
+rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/libxf8_16bpp.so
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
@@ -339,6 +364,10 @@ install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/x
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
 %endif
 
 # Make the source package
@@ -351,14 +380,14 @@ cp xkb/README.compiled %{inst_srcdir}/xkb
 cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
 
+install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run
+
 find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |
 xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
+find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 # Remove unwanted files/dirs
 {
-    rm -f $RPM_BUILD_ROOT%{_bindir}/xorgconfig
-    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1*
-    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Cards
     rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options
     rm -f $RPM_BUILD_ROOT%{_bindir}/in?
     rm -f $RPM_BUILD_ROOT%{_bindir}/ioport
@@ -366,22 +395,9 @@ xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
     rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
     find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
-
-%ifarch s390 s390x
-    # FIXME: The following files get installed on s390/s390x and we don't
-    # want some of them on s390 at all, and others should be in a -common
-    # subpackage, but it's not worth doing that for 3 files right now.
-    # error: Installed (but unpackaged) file(s) found:
-    #	   /randrstr.h
-    #	   /usr/lib/pkgconfig/xorg-server.pc
-    #	      /usr/share/aclocal/xorg-server.m4
-    #	      /usr/share/man/man1/Xserver.1x.gz
-    #	      /var/lib/xkb/README.compiled
-
-    rm -f $RPM_BUILD_ROOT/randrstr.h
-    rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-    rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
-    rm -rf $RPM_BUILD_ROOT/var/lib/xkb
+%if !%{with_hw_servers}
+    rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc
+    rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4
 %endif
 }
 
@@ -440,18 +456,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/xorg/modules
 %dir %{_libdir}/xorg/modules/drivers
 %dir %{_libdir}/xorg/modules/extensions
-#%{_libdir}/xorg/modules/extensions/libGLcore.so
 %{_libdir}/xorg/modules/extensions/libglx.so
 %{_libdir}/xorg/modules/extensions/libdri.so
 %{_libdir}/xorg/modules/extensions/libdri2.so
 %{_libdir}/xorg/modules/extensions/libdbe.so
 %{_libdir}/xorg/modules/extensions/libextmod.so
-#%{_libdir}/xorg/modules/extensions/librecord.so
-#%{_libdir}/xorg/modules/extensions/libxtrap.so
+%{_libdir}/xorg/modules/extensions/librecord.so
 %dir %{_libdir}/xorg/modules/input
-#%dir %{_libdir}/xorg/modules/fonts
-#%{_libdir}/xorg/modules/fonts/libfreetype.so
-#%{_libdir}/xorg/modules/fonts/libtype1.so
 %dir %{_libdir}/xorg/modules/linux
 %{_libdir}/xorg/modules/linux/libfbdevhw.so
 %dir %{_libdir}/xorg/modules/multimedia
@@ -462,32 +473,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xorg/modules/multimedia/tda9850_drv.so
 %{_libdir}/xorg/modules/multimedia/tda9885_drv.so
 %{_libdir}/xorg/modules/multimedia/uda1380_drv.so
-#%{_libdir}/xorg/modules/libafb.so
-#%{_libdir}/xorg/modules/libcfb.so
-#%{_libdir}/xorg/modules/libcfb32.so
 %{_libdir}/xorg/modules/libexa.so
 %{_libdir}/xorg/modules/libfb.so
 %{_libdir}/xorg/modules/libint10.so
-#%{_libdir}/xorg/modules/libmfb.so
 %{_libdir}/xorg/modules/libshadow.so
 %{_libdir}/xorg/modules/libshadowfb.so
 %{_libdir}/xorg/modules/libvbe.so
 %{_libdir}/xorg/modules/libvgahw.so
 %{_libdir}/xorg/modules/libwfb.so
 %{_libdir}/xorg/modules/libxaa.so
-#%{_libdir}/xorg/modules/libxf1bpp.so
-#%{_libdir}/xorg/modules/libxf4bpp.so
-%{_libdir}/xorg/modules/libxf8_16bpp.so
-#%{_libdir}/xorg/modules/libxf8_32bpp.so
-#%dir %{_libdir}/xserver
-#%{_libdir}/xserver/SecurityPolicy
 %{_mandir}/man1/gtf.1*
 %{_mandir}/man1/Xorg.1*
 %{_mandir}/man1/cvt.1*
 %{_mandir}/man4/fbdevhw.4*
 %{_mandir}/man4/exa.4*
 %{_mandir}/man5/xorg.conf.5*
-#%{_mandir}/man5/SecurityPolicy.5*
+%dir %{_sysconfdir}/xorg.conf.d
+%{_sysconfdir}/xorg.conf.d/00-evdev.conf
+%{_sysconfdir}/xorg.conf.d/10-quirks.conf
 %endif
 
 
@@ -520,11 +523,8 @@ rm -rf $RPM_BUILD_ROOT
 %files Xvfb
 %defattr(-,root,root,-)
 %{_bindir}/Xvfb
+%{_bindir}/xvfb-run
 %{_mandir}/man1/Xvfb.1*
-%if !%{with_hw_servers}
-%dir %{_libdir}/xserver
-%{_libdir}/xserver/SecurityPolicy
-%endif
 
 
 %files Xephyr
@@ -549,6 +549,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 16 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.99.901-2.20100304
+- update to new git snapshot
+- cleanup spec file
+- import patch2014,6028,6049,6051 from fedora
+
+* Thu Mar 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.99.901-1
+- update to 1.8rc1 (1.7.99.901)
+- import patch5002,6002,6030,6033 from fedora
+- add 00-evdev.conf, 10-quirks.conf
+- build against mesa-7.8(git snapshot)
+
 * Fri Feb 19 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.5-1
 - new upstream release