From 5d2f9c13813303fc3c5f223dced4a66616f37c00 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Tue, 8 Sep 2009 01:10:16 +0200
Subject: [PATCH] xorg-server: various cleanups, remove an unneeded patch,
 change various build options

---
 packages/x11/xserver/xorg-server/build        | 11 +++++---
 packages/x11/xserver/xorg-server/install      | 16 +++++------
 .../patches/143_default_to_vesa.diff          | 27 -------------------
 3 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 packages/x11/xserver/xorg-server/patches/143_default_to_vesa.diff

diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 935c17f75b..24b81b2210 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -39,6 +39,8 @@ cd $PKG_BUILD
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
+            --localstatedir=/var \
+            --datarootdir=/usr/share \
             --disable-static \
             --enable-shared \
             --enable-shave \
@@ -49,10 +51,10 @@ cd $PKG_BUILD
             --enable-install-libxf86config \
             --disable-xselinux \
             --enable-aiglx \
-            --disable-glx-tls \
+            --enable-glx-tls \
             --enable-registry \
             --enable-composite \
-            --disable-null-root-cursor \
+            --enable-null-root-cursor \
             --enable-mitshm \
             --disable-xres \
             --disable-record \
@@ -73,7 +75,7 @@ cd $PKG_BUILD
             --disable-tslib \
             --disable-multibuffer \
             --enable-dbe \
-            --enable-xf86bigfont \
+            --disable-xf86bigfont \
             --disable-dpms \
             --enable-config-dbus \
             --enable-config-hal \
@@ -89,9 +91,10 @@ cd $PKG_BUILD
             --disable-xephyr \
             --disable-xsdl \
             --disable-xfake \
-            --disable-xfbdev \
+            --enable-xfbdev \
             --disable-install-setuid \
             --disable-secure-rpc \
+            --with-int10=x86emu \
             --disable-ipv6 \
             --with-gnu-ld \
             --enable-install-libxf86config \
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index 762f91daff..d465ece07e 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -25,23 +25,23 @@ cp $XORG_SRC/utils/gtf/gtf $INSTALL/usr/bin
 cp $XORG_SRC/utils/cvt/cvt $INSTALL/usr/bin
 
 mkdir -p $XORG_DST
-cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
-cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST
-cp $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST
-cp $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST
-cp $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST
-cp $XORG_SRC/int10/.libs/libint10.so $XORG_DST
 cp $XORG_SRC/exa/.libs/libexa.so $XORG_DST
+cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST
+cp $XORG_SRC/int10/.libs/libint10.so $XORG_DST
+cp $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST
+cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST
+cp $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST
 cp $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST
+cp $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST
 cp $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST
 cp $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST
 
 mkdir -p $XORG_DST/extensions
 cp $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
-cp $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions 
-cp $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
 cp $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
 cp $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
+cp $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
+cp $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions 
 
 mkdir -p $XORG_DST/linux
 cp $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux
diff --git a/packages/x11/xserver/xorg-server/patches/143_default_to_vesa.diff b/packages/x11/xserver/xorg-server/patches/143_default_to_vesa.diff
deleted file mode 100644
index 086b644ed8..0000000000
--- a/packages/x11/xserver/xorg-server/patches/143_default_to_vesa.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Binary files patched/.git/index and working/.git/index differ
-diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c working/hw/xfree86/common/xf86AutoConfig.c
---- patched/hw/xfree86/common/xf86AutoConfig.c	2008-10-21 09:49:35.000000000 -0700
-+++ working/hw/xfree86/common/xf86AutoConfig.c	2008-10-21 09:59:08.000000000 -0700
-@@ -422,6 +422,22 @@ matchDriverFromFiles (char** matches, ui
-         }
-         direntry = readdir(idsdir);
-     }
-+    /* If we failed to find any driver, at least try 'vesa' (LP: #261977) */
-+    if (matches[0] == NULL) {
-+        xf86Msg(X_INFO, "No matches found for this device in %s\n",  PCI_TXT_IDS_PATH);
-+
-+#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
-+        xf86Msg(X_DEFAULT, "Registering 'vesa' as fallback\n");
-+        matches[0] = xnfstrdup("vesa");
-+#elif defined(__sparc__) && !defined(sun)
-+        xf86Msg(X_DEFAULT, "Registering 'sunffb' as fallback\n");
-+        matches[0] = xnfstrdup("sunffb");
-+#else
-+        xf86Msg(X_DEFAULT, "Registering 'fbdev' as fallback\n");
-+        matches[0] = xnfstrdup("fbdev");
-+#endif
-+    }
-+
-  end:
-     xfree(line);
-     closedir(idsdir);