Remove unneeded xorg-server changes.

Both with and without GLX OpenGL is slow, while we can make the
difference from Arch's PKGBUILDs smaller.

1 files changed, 5 insertions, 15 deletions

diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index fa2ea0add..6a3af4d42 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -11,8 +11,7 @@ url="http://xorg.freedesktop.org"
 makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
              'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
              'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'libgcrypt')
-[ "$CARCH" != "mips64el" ] && makedepends+=('dri2proto')
+             'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
@@ -54,15 +53,9 @@ build() {
   patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch"
 
   autoreconf -fi
-
-  if [ "$CARCH" = "mips64el" ]; then
-    extra="--disable-dri --disable-dri2 --disable-glx --disable-glx-tls"
-  else
-    extra="--enable-dri --enable-glx-tls"
-  fi
-
   ./configure --prefix=/usr \
       --enable-ipv6 \
+      --enable-dri \
       --enable-dmx \
       --enable-xvfb \
       --enable-xnest \
@@ -70,6 +63,7 @@ build() {
       --enable-xcsecurity \
       --enable-xorg \
       --enable-xephyr \
+      --enable-glx-tls \
       --enable-kdrive \
       --enable-kdrive-evdev \
       --enable-kdrive-kbd \
@@ -85,8 +79,7 @@ build() {
       --localstatedir=/var \
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts \
-      $extra
+      --with-fontrootdir=/usr/share/fonts
   make
 
   # Disable subdirs for make install rule to make splitting easier
@@ -132,11 +125,9 @@ package_xorg-server() {
 
   rmdir "${pkgdir}/usr/share/X11"
 
-  if [ "$CARCH" != "mips64el" ]; then
   # Needed for non-mesa drivers, libgl will restore it
   mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
      "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-  fi
 
   rm -rf "${pkgdir}/var"
 
@@ -203,12 +194,11 @@ package_xorg-server-devel() {
   depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
            xproto randrproto renderproto xextproto inputproto kbproto 
            fontsproto pixman videoproto xf86driproto glproto 
-           mesa xineramaproto libpciaccess
+           mesa dri2proto xineramaproto libpciaccess
            # see FS#32146
            resourceproto scrnsaverproto
            # not technically required but almost every Xorg pkg needs it to build
            xorg-util-macros)
-[ "$CARCH" = "mips64el" ] || depends+=('dri2proto')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install