This commit was manufactured by cvs2git to create branch 'XORG_XSERVER_1_8'.

[packages/xorg-xserver-server.git] / xorg-xserver-server.spec

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 300670377abf7166beb2153a90b65547dbcffc1c..f4f3873b11c9f61afd04191a12b1a767571540ac 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -2,38 +2,38 @@
 # Conditional build:
 %bcond_with    multigl # package libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_without dri2    # DRI2 support
-%bcond_without dbus    # D-BUS support
-%bcond_without hal     # HAL support
+%bcond_with    dbus    # D-BUS support
+%bcond_with    hal     # HAL support
+%bcond_without udev    # UDEV support
 %bcond_without dmx     # DMX support
-%bcond_with    record  # RECORD extension
+%bcond_without record  # RECORD extension
 #
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %define        xorg_xserver_server_ansic_abi           0.4
-%define        xorg_xserver_server_extension_abi       2.0
+%define        xorg_xserver_server_extension_abi       3.0
 %define        xorg_xserver_server_font_abi            0.6
-%define        xorg_xserver_server_videodrv_abi        5.0
-%define        xorg_xserver_server_xinput_abi          4.0
+%define        xorg_xserver_server_videodrv_abi        7.0
+%define        xorg_xserver_server_xinput_abi          9.0
 
+%define                rel     1
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.6.3
-Release:       2%{?with_multigl:.mgl}
+Version:       1.8.1.901
+Release:       %{rel}%{?with_multigl:.mgl}
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 0af168abeefa6579cab20387f75c0c7a
+# Source0-md5: fb5fa2229a4dee151f4525b2f5747c8c
+Source1:       10-quirks.conf                
 Source2:       xserver.pamd
 Patch0:                %{name}-xwrapper.patch
 Patch1:                %{name}-pic-libxf86config.patch
 Patch2:                %{name}-fb-size.patch
-Patch3:                %{name}-exa.patch
-Patch5:                %{name}-xinerama-cursors.patch
-Patch6:                %{name}-less-acpi-brokenness.patch
-Patch7:                %{name}-ac.patch
-Patch8:                %{name}-idletime.patch
+Patch3:                %{name}-less-acpi-brokenness.patch
+Patch4:                %{name}-builtin-SHA1.patch
 URL:           http://xorg.freedesktop.org/
-BuildRequires: Mesa-libGL-devel >= 7.3
+BuildRequires: Mesa-libGL-devel >= 7.8.1
 # for glx headers
 BuildRequires: OpenGL-GLX-devel
 BuildRequires: autoconf >= 2.57
@@ -48,12 +48,15 @@ BuildRequires:      libtool
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
 BuildRequires: perl-base
-BuildRequires: pixman-devel >= 0.14.0
+BuildRequires: pixman-devel >= 0.16.0
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: udev-devel
 BuildRequires: xorg-app-mkfontscale
+BuildRequires: xorg-font-font-util >= 1.1
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xorg-lib-libXaw-devel
+BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXdmcp-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXfont-devel
@@ -63,38 +66,37 @@ BuildRequires:      xorg-lib-libXpm-devel
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXres-devel
 BuildRequires: xorg-lib-libXt-devel >= 1.0.0
-BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: xorg-lib-libXtst-devel >= 1.0.99.2
 BuildRequires: xorg-lib-libXv-devel
 BuildRequires: xorg-lib-libXxf86dga-devel
 BuildRequires: xorg-lib-libXxf86misc-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
-%{?with_dmx:BuildRequires:     xorg-lib-libdmx-devel}
+%{?with_dmx:BuildRequires:     xorg-lib-libdmx-devel >= 1.0.99.1}
 BuildRequires: xorg-lib-libfontenc-devel
 BuildRequires: xorg-lib-libpciaccess-devel
 BuildRequires: xorg-lib-libxkbfile-devel
 BuildRequires: xorg-lib-libxkbui-devel >= 1.0.2
 BuildRequires: xorg-lib-xtrans-devel >= 1.2.2
-BuildRequires: xorg-proto-bigreqsproto-devel
+BuildRequires: xorg-proto-bigreqsproto-devel >= 1.1.0
 BuildRequires: xorg-proto-compositeproto-devel >= 0.4
 BuildRequires: xorg-proto-damageproto-devel >= 1.1
 %{?with_dmx:BuildRequires:     xorg-proto-dmxproto-devel}
 %{?with_dri2:BuildRequires:    xorg-proto-dri2proto-devel >= 2.1}
-BuildRequires: xorg-proto-evieext-devel
-BuildRequires: xorg-proto-fixesproto-devel >= 4.0
+BuildRequires: xorg-proto-fixesproto-devel >= 4.1
 BuildRequires: xorg-proto-fontcacheproto-devel
 BuildRequires: xorg-proto-fontsproto-devel
 BuildRequires: xorg-proto-glproto-devel >= 1.4.8
-BuildRequires: xorg-proto-inputproto-devel >= 1.5.0
+BuildRequires: xorg-proto-inputproto-devel >= 1.9.99.902
 BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires: xorg-proto-printproto-devel
 BuildRequires: xorg-proto-randrproto-devel >= 1.2.99.3
 %{?with_record:BuildRequires:  xorg-proto-recordproto-devel}
-BuildRequires: xorg-proto-renderproto-devel >= 0.9.3
+BuildRequires: xorg-proto-renderproto-devel >= 0.11
 BuildRequires: xorg-proto-resourceproto-devel
 BuildRequires: xorg-proto-scrnsaverproto-devel >= 1.1.0
 BuildRequires: xorg-proto-videoproto-devel
-BuildRequires: xorg-proto-xcmiscproto-devel
-BuildRequires: xorg-proto-xextproto-devel >= 7.0.3
+BuildRequires: xorg-proto-xcmiscproto-devel >= 1.2.0
+BuildRequires: xorg-proto-xextproto-devel >= 1:7.0.99.3
 BuildRequires: xorg-proto-xf86bigfontproto-devel
 BuildRequires: xorg-proto-xf86dgaproto-devel
 BuildRequires: xorg-proto-xf86driproto-devel >= 2.0.4
@@ -102,18 +104,19 @@ BuildRequires:    xorg-proto-xf86miscproto-devel
 BuildRequires: xorg-proto-xf86vidmodeproto-devel
 BuildRequires: xorg-proto-xineramaproto-devel
 BuildRequires: xorg-proto-xproto-devel >= 7.0.13
-BuildRequires: xorg-util-util-macros >= 0.99.2
+BuildRequires: xorg-util-util-macros >= 1.5
 #BR: xcalibrateproto, tslib (for KDRIVE only)
 #BR: glitz-devel >= 0.4.3 (for XGL and EGL only)
 Requires(triggerpostun):       sed >= 4.0
-Requires:      pixman >= 0.14.0
+Requires:      pixman >= 0.16.0
 Requires:      xkeyboard-config
 # for rgb.txt
 Requires:      xorg-app-rgb >= 0.99.3
 Requires:      xorg-app-xkbcomp
-# xserver default config expects evdev+dbus+hald
-Suggests:      dbus
-Suggests:      hal
+%{?with_hal:Suggests:  dbus}
+%{?with_hal:Suggests:  hal}
+%{?with_udev:Suggests: udev-core}
+Suggests:      udev-acl
 Suggests:      xorg-driver-input-evdev
 # xserver requires fixed and cursor fonts
 Requires:      xorg-font-font-alias
@@ -193,6 +196,7 @@ Xnest - це сервер X Window System, який працює у вікні X
 Summary:       Xephyr - nested X server
 Summary(pl.UTF-8):     Xephyr - zagnieżdżony serwer X
 Group:         X11/Servers
+Requires:      pixman >= 0.15.0
 
 %description -n xorg-xserver-Xephyr
 Xephyr is a a kdrive server that outputs to a window on a pre-existing
@@ -262,14 +266,16 @@ Summary:  Header files for X.org server
 Summary(pl.UTF-8):     Pliki nagłówkowe dla serwera X.org
 Group:         X11/Development/Libraries
 Requires:      libdrm-devel >= 2.4.5
-Requires:      pixman-devel >= 0.14.0
+Requires:      pixman-devel >= 0.16.0
 Requires:      xorg-lib-libpciaccess-devel
 Requires:      xorg-lib-libxkbfile-devel
 Requires:      xorg-proto-dri2proto-devel >= 2.1
 Requires:      xorg-proto-fontsproto-devel
+Requires:      xorg-proto-inputproto-devel >= 1.9.99.902
+Requires:      xorg-proto-randrproto-devel >= 1.2.99.3
 Requires:      xorg-proto-renderproto-devel >= 0.9.3
 Requires:      xorg-proto-videoproto-devel
-Requires:      xorg-proto-xextproto-devel >= 7.0.3
+Requires:      xorg-proto-xextproto-devel >= 1:7.0.99.3
 Requires:      xorg-proto-xproto-devel >= 7.0.13
 Obsoletes:     X11-Xserver-devel < 1:7.0.0
 Obsoletes:     XFree86-Xserver-devel < 1:7.0.0
@@ -325,10 +331,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
+%patch4 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
@@ -363,7 +366,7 @@ if [ $API != %{xorg_xserver_server_xinput_abi} ]; then
 fi
 
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -372,6 +375,7 @@ fi
        --with-os-vendor="PLD/Team" \
        --%{?with_dbus:en}%{!?with_dbus:dis}able-config-dbus \
        %{!?with_hal:--disable-config-hal} \
+       --%{?with_udev:en}%{!?with_udev:dis}able-config-udev \
        --enable-aiglx \
        --enable-builddocs \
        --enable-dga \
@@ -382,6 +386,7 @@ fi
        --enable-kdrive \
        --enable-xephyr \
        --enable-xfbdev \
+       --enable-glx-tls \
        --disable-xsdl \
        --disable-xfake \
        --enable-secure-rpc \
@@ -399,13 +404,17 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
-install -d $RPM_BUILD_ROOT/etc/security/console.apps
+install -d $RPM_BUILD_ROOT/etc/{security/console.apps,X11/xorg.conf.d}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
+install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+
 :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
 :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/10-quirks.conf
+
 %if %{with multigl}
 cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
 mv -f libglx.so libglx.so.%{version}
@@ -440,7 +449,6 @@ fi
 %attr(4755,root,root) %{_bindir}/Xwrapper
 %attr(755,root,root) %{_bindir}/cvt
 %attr(755,root,root) %{_bindir}/gtf
-%{_libdir}/X11/Options
 %dir %{_libdir}/xorg
 %{_libdir}/xorg/protocol.txt
 %dir %{_libdir}/xorg/modules
@@ -463,6 +471,10 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
 %config(missingok) /etc/security/console.apps/xserver
 %{?with_dbus:/etc/dbus-1/system.d/xorg-server.conf}
+%dir /etc/X11/xorg.conf.d
+%dir %{_datadir}/X11/xorg.conf.d
+# overwrite these settings with local configs in /etc/X11/xorg.conf.d
+%verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/*.conf
 %{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*
 %{_mandir}/man1/cvt.1*
@@ -477,6 +489,7 @@ fi
 %attr(755,root,root) %{_bindir}/Xdmx
 %attr(755,root,root) %{_bindir}/dmxaddinput
 %attr(755,root,root) %{_bindir}/dmxaddscreen
+%attr(755,root,root) %{_bindir}/dmxinfo
 %attr(755,root,root) %{_bindir}/dmxreconfig
 %attr(755,root,root) %{_bindir}/dmxresize
 %attr(755,root,root) %{_bindir}/dmxrminput
@@ -484,7 +497,6 @@ fi
 %attr(755,root,root) %{_bindir}/dmxtodmx
 %attr(755,root,root) %{_bindir}/dmxwininfo
 %attr(755,root,root) %{_bindir}/vdltodmx
-%attr(755,root,root) %{_bindir}/xdmx
 %attr(755,root,root) %{_bindir}/xdmxconfig
 %{_mandir}/man1/Xdmx.1x*
 %{_mandir}/man1/dmxtodmx.1x*