]> git.pld-linux.org Git - packages/xorg-xserver-server.git/blobdiff - xorg-xserver-server.spec
- obsolete
[packages/xorg-xserver-server.git] / xorg-xserver-server.spec
index 93412f5f2aadd86ed2b7d4639fb0cd4648eb212b..b03450d5f68c0bd655cc1beb8d760217b57cd06a 100644 (file)
@@ -2,7 +2,7 @@ Summary:        X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
 Version:       1.4
-Release:       0.1
+Release:       1
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -24,7 +24,7 @@ BuildRequires:        automake
 BuildRequires: cpp
 BuildRequires: dbus-devel
 BuildRequires: hal-devel
-BuildRequires: libdrm-devel >= 2.2.0
+BuildRequires: libdrm-devel >= 2.3.0
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
@@ -55,7 +55,7 @@ BuildRequires:        xorg-lib-libxkbfile-devel
 BuildRequires: xorg-lib-libxkbui-devel >= 1.0.2
 BuildRequires: xorg-lib-xtrans-devel
 BuildRequires: xorg-proto-bigreqsproto-devel
-BuildRequires: xorg-proto-compositeproto-devel >= 0.3
+BuildRequires: xorg-proto-compositeproto-devel >= 0.4
 BuildRequires: xorg-proto-damageproto-devel >= 1.1
 BuildRequires: xorg-proto-dmxproto-devel
 BuildRequires: xorg-proto-evieext-devel
@@ -63,7 +63,7 @@ BuildRequires:        xorg-proto-fixesproto-devel >= 4.0
 BuildRequires: xorg-proto-fontcacheproto-devel
 BuildRequires: xorg-proto-fontsproto-devel
 BuildRequires: xorg-proto-glproto-devel >= 1.4.8
-BuildRequires: xorg-proto-inputproto-devel >= 1.4
+BuildRequires: xorg-proto-inputproto-devel >= 1.4.2
 BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires: xorg-proto-printproto-devel
 BuildRequires: xorg-proto-randrproto-devel >= 1.2
@@ -81,22 +81,28 @@ BuildRequires:      xorg-proto-xf86driproto-devel
 BuildRequires: xorg-proto-xf86miscproto-devel
 BuildRequires: xorg-proto-xf86vidmodeproto-devel
 BuildRequires: xorg-proto-xineramaproto-devel
-BuildRequires: xorg-proto-xproto-devel
+BuildRequires: xorg-proto-xproto-devel >= 7.0.9
 BuildRequires: xorg-util-util-macros >= 0.99.2
 # xcalibrateproto, tslib (for KDRIVE only)
+Requires:      xkeyboard-config
 # glitz-devel >= 0.4.3 (for XGL and EGL only)
 # for rgb.txt
 Requires:      xorg-app-rgb >= 0.99.3
 Requires:      xorg-app-xkbcomp
 # just for %{_includedir}/bitmaps dir
 Requires:      xorg-data-xbitmaps
-Requires:      xkeyboard-config
 # xserver requires fixed and cursor fonts
 Requires:      xorg-font-font-alias
 Requires:      xorg-font-font-cursor-misc
 Requires:      xorg-font-font-misc-misc-base >= 1.0.0-0.3
 # for new app-defaults location
 Requires:      xorg-lib-libXt >= 1.0.0
+# see hw/xfree86/common/xf86Module.h
+Provides:      xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi}
+Provides:      xorg-xserver-server(extension-abi) = %{xorg_xserver_server_extension_abi}
+Provides:      xorg-xserver-server(font-abi) = %{xorg_xserver_server_font_abi}
+Provides:      xorg-xserver-server(videodrv-abi) = %{xorg_xserver_server_videodrv_abi}
+Provides:      xorg-xserver-server(xinput-abi) = %{xorg_xserver_server_xinput_abi}
 Obsoletes:     X11-Xserver < 1:7.0.0
 Obsoletes:     X11-driver-i2c < 1:7.0.0
 Obsoletes:     X11-modules < 1:7.0.0
@@ -213,12 +219,13 @@ serwera X, ale odmawiają uruchomienia bez niego.
 Summary:       Header files for X.org server
 Summary(pl.UTF-8):     Pliki nagłówkowe dla servera X.org
 Group:         X11/Development/Libraries
-Requires:      libdrm-devel >= 2.2.0
-Requires:      pixman-devel
+Requires:      libdrm-devel >= 2.3.0
+Requires:      pixman-devel >= 0.9.5
 Requires:      xorg-proto-fontsproto-devel
-Requires:      xorg-proto-renderproto-devel
+Requires:      xorg-proto-renderproto-devel >= 0.9.3
 Requires:      xorg-proto-videoproto-devel
 Requires:      xorg-proto-xextproto-devel
+Requires:      xorg-proto-xproto-devel >= 7.0.9
 Obsoletes:     X11-Xserver-devel < 1:7.0.0
 Obsoletes:     XFree86-Xserver-devel < 1:7.0.0
 
@@ -245,6 +252,12 @@ GLX extension library fo X.org server.
 %description -n xorg-xserver-libglx -l pl.UTF-8
 Biblioteka rozszerzenia GLX dla serwera X.org.
 
+%define        xorg_xserver_server_ansic_abi           0.3
+%define        xorg_xserver_server_extension_abi       0.3
+%define        xorg_xserver_server_font_abi            0.5
+%define        xorg_xserver_server_videodrv_abi        2.0
+%define        xorg_xserver_server_xinput_abi          2.0
+
 %prep
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
@@ -254,7 +267,39 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %endif
 %patch3 -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
+
 %build
+if API=$(awk '/#define ABI_ANSIC_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+       [ $API != %{xorg_xserver_server_ansic_abi} ]; then
+        echo "Set %%define xorg_xserver_server_ansic_abi to $API and rerun."
+        exit 1
+fi
+
+if API=$(awk '/#define ABI_EXTENSION_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+        [ $API != %{xorg_xserver_server_extension_abi} ]; then
+        echo "Set %%define xorg_xserver_server_extension_abi to $API and rerun."
+        exit 1
+fi
+
+if API=$(awk '/#define ABI_FONT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+        [ $API != %{xorg_xserver_server_font_abi} ]; then
+        echo "Set %%define xorg_xserver_server_font_abi to $API and rerun."
+        exit 1
+fi
+if API=$(awk '/#define ABI_VIDEODRV_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+        [ $API != %{xorg_xserver_server_videodrv_abi} ]; then
+        echo "Set %%define xorg_xserver_server_videodrv_abi to $API and rerun."
+        exit 1
+fi
+if API=$(awk '/#define ABI_XINPUT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+        [ $API != %{xorg_xserver_server_xinput_abi} ]; then
+        echo "Set %%define xorg_xserver_server_xinput_abi to $API and rerun."
+        exit 1
+fi
+
+
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -264,12 +309,12 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
        --with-os-name="PLD/Linux" \
        --with-os-vendor="PLD/Team" \
        --enable-aiglx \
-       --enable-glx-tls \
-       --enable-dga \
        --enable-builddocs \
+       --enable-dga \
+       --enable-dmx \
+       --enable-glx-tls \
        --enable-lbx \
        --enable-xevie \
-       --enable-dmx \
        --enable-xprint \
        --with-dri-driver-path=%{_libdir}/xorg/modules/dri \
        --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
This page took 0.035935 seconds and 4 git commands to generate.