system/xorg-server-xephyr: Updated for version 1.4.2

3 files changed, 18 insertions, 17 deletions

diff --git a/system/xorg-server-xephyr/xorg-server-xephyr.SlackBuild b/system/xorg-server-xephyr/xorg-server-xephyr.SlackBuild
index ddc891797bdfb..a4d8238b8dd12 100644
--- a/system/xorg-server-xephyr/xorg-server-xephyr.SlackBuild
+++ b/system/xorg-server-xephyr/xorg-server-xephyr.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xorg-server
-VERSION=1.3.0.0
+VERSION=1.4.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -37,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -52,7 +54,6 @@ chmod -R u+w,go+r-w,a-s .
 
 zcat $CWD/x11.startwithblackscreen.diff.gz | patch -p1 --verbose
 zcat $CWD/xorgconfig.diff.gz | patch -p1 --verbose
-zcat $CWD/xorg-server.dpi.diff.gz | patch -p1 --verbose
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -69,10 +70,12 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-default-font-path="/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/75dpi/:unscaled" \
   --with-module-dir=/usr/lib/xorg/modules \
   --with-dri-driver-path=/usr/lib/xorg/modules/dri \
-  --with-os-name="Slackware 12.0" \
+  --with-os-name="Slackware 12.1" \
   --with-os-vendor="Slackware Linux Project" \
   --with-xkb-path=/etc/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
+  --disable-config-dbus \
+  --disable-config-hal \
   --disable-xprint \
   --disable-xorg \
   --disable-xvfb \
@@ -80,7 +83,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-dmx \
   --enable-kdrive \
   --disable-xsdl \
-  --enable-xephyr
+  --disable-xfake \
+  --disable-xfbdev \
+  --disable-kdrive-vesa \
+  --enable-xephyr \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -88,18 +95,12 @@ make install DESTDIR=$PKG
 # Remove everthing already installed by upstream packages
 rm -rf $PKG/usr/{lib,share} $PKG/var $PKG/usr/man
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-xephyr-$VERSION
-cat $CWD/$PRGNAM-xephyr.SlackBuild > $PKG/usr/doc/$PRGNAM-xephyr-$VERSION/$PRGNAM-xephyr.SlackBuild
+cat $CWD/$PRGNAM-xephyr.SlackBuild \
+  > $PKG/usr/doc/$PRGNAM-xephyr-$VERSION/$PRGNAM-xephyr.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/xorg-server-xephyr/xorg-server-xephyr.info b/system/xorg-server-xephyr/xorg-server-xephyr.info
index 77d488d63157c..a7d690bcd3a5c 100644
--- a/system/xorg-server-xephyr/xorg-server-xephyr.info
+++ b/system/xorg-server-xephyr/xorg-server-xephyr.info
@@ -1,8 +1,8 @@
 PRGNAM="xorg-server-xephyr"
-VERSION="1.3.0.0"
+VERSION="1.4.2"
 HOMEPAGE="http://www.x.org"
-DOWNLOAD="http://slackware.osuosl.org/slackware-12.0/source/x/x11/src/xserver/xorg-server-1.3.0.0.tar.bz2"
-MD5SUM="a51a7d482e3c689394755bb17bda8526"
+DOWNLOAD="http://slackware.osuosl.org/slackware-12.1/patches/source/xorg-server/xorg-server-1.4.2.tar.bz2"
+MD5SUM="fa2915ae377f61c340a18ebef484b64b"
 MAINTAINER="ppr:kut"
 EMAIL="HMWiesinger@gmx.at"
 APPROVED="rworkman"
diff --git a/system/xorg-server-xephyr/xorg-server.dpi.diff.gz b/system/xorg-server-xephyr/xorg-server.dpi.diff.gz
deleted file mode 100644
index 4da9c9d0476e5..0000000000000
--- a/system/xorg-server-xephyr/xorg-server.dpi.diff.gz
+++ /dev/null