libnetfilter_queue: Update to 1.0.2.

[people/ms/ipfire-3.x.git] / xorg-x11-server / xorg-x11-server.nm

diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
index 7ed9a8b2a282f8caffc6f3f8a12b06c4ecd48943..f2d933c4ea8079408a99795ea037f058c2ca70fc 100644 (file)
--- a/xorg-x11-server/xorg-x11-server.nm
+++ b/xorg-x11-server/xorg-x11-server.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = xorg-x11-server
-version    = 1.8.2
-release    = 4
+version    = 1.13.2
+release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = X/Server
@@ -20,8 +20,9 @@ description
        upon.
 end
 
-sources_dl = http://ftp.x.org/pub/individual/xserver/
-sources    = xorg-server-%{version}.tar.bz2
+thisapp = xorg-server-%{version}
+
+source_dl = http://ftp.x.org/pub/individual/xserver/
 
 build
        requires
@@ -47,37 +48,33 @@ build
                libudev-devel
                libxcb-devel
                libxkbfile-devel
-               mesa-devel
+               mesa-devel >= 9.0.2
                openssl-devel
                pixman-devel
                pkg-config
                xorg-x11-font-utils-devel
                xorg-x11-util-macros
-               xorg-x11-proto-devel
+               xorg-x11-proto-devel >= 7.7
                xorg-x11-xtrans-devel
        end
 
-       DIR_APP = %{DIR_SRC}/xorg-server-%{version}
-
        CFLAGS += -Wstrict-overflow -rdynamic
 
        configure_options += \
                --enable-xvfb \
-               --enable-xsdl \
                --enable-xfake \
                --enable-xfbdev \
                --enable-xorg \
                --disable-static \
                --disable-xnest \
-               --disable-xdmx \
                --disable-xephyr \
                --with-pic \
                --enable-maintainer-mode \
                --enable-xselinux \
                --with-int10=x86emu \
                --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
-               --with-module-dir=/usr/lib/xorg/modules \
-               --with-builderstring="Build ID: $(PKG_NAME) $(PKG_VER)-$(PKG_REL)" \
+               --with-module-dir=%{libdir}/xorg/modules \
+               --with-builderstring="Build ID: %{name} %{version}-%{release}" \
                --with-os-name="$(hostname -s) $(uname -r)" \
                --with-vendor-name="$(DISTRO_NAME) Project" \
                --with-vendor-web="http://www.ipfire.org" \
@@ -100,7 +97,6 @@ build
                -e "s/^CCASFLAGS.*/& -Wl,-z,lazy/" \
                        \
                        hw/xfree86/dixmods/Makefile \
-                       hw/xfree86/dixmods/extmod/Makefile \
                        hw/xfree86/dri/Makefile \
                        hw/xfree86/dri2/Makefile \
                        hw/xfree86/exa/Makefile \
@@ -110,15 +106,14 @@ build
                        hw/xfree86/shadowfb/Makefile \
                        hw/xfree86/vbe/Makefile \
                        hw/xfree86/vgahw/Makefile \
-                       hw/xfree86/xaa/Makefile
        end
 
        make_install_targets += \
-               moduledir=/usr/lib/xorg/modules
+               moduledir=%{libdir}/xorg/modules
 
        install_cmds
-               rm -vf $(BUILDROOT)/usr/lib/xorg/modules/libxf8_16bpp.so
-               rm -vrf $(BUILDROOT)/var/log
+               rm -vf %{BUILDROOT}%{libdir}/xorg/modules/libxf8_16bpp.so
+               rm -vrf %{BUILDROOT}/var/log
 
                mkdir -pv %{BUILDROOT}/etc/X11/xorg.conf.d %{BUILDROOT}/usr/share/xorg
                install -m 0444 hw/xfree86/common/{vesa,extra}modes %{BUILDROOT}/usr/share/xorg/
@@ -133,14 +128,21 @@ end
 packages
        package %{name}
                requires
-                       mesa
                        pixman
                        udev
                        xkeyboard-config
+               end
+
+               recommends
+                       xorg-x11-drv-ati
                        xorg-x11-drv-evdev
+                       xorg-x11-drv-intel
                        xorg-x11-drv-keyboard
+                       xorg-x11-drv-modesetting
                        xorg-x11-drv-mouse
+                       xorg-x11-drv-nouveau
                        xorg-x11-drv-vesa
+                       xorg-x11-drv-vmware
                        xorg-x11-fonts
                        xorg-x11-font-utils
                        xorg-x11-xkb-utils