This version compiles a package on Slackware 14. Now, to test if it still works for Slackware 13.37 ...

1 files changed, 27 insertions, 12 deletions

diff --git a/tigervnc/build/tigervnc.SlackBuild b/tigervnc/build/tigervnc.SlackBuild
index f0e2a9ef..ba4f8018 100755
--- a/tigervnc/build/tigervnc.SlackBuild
+++ b/tigervnc/build/tigervnc.SlackBuild
@@ -61,7 +61,7 @@ TAG=${TAG:-alien}
 # TigerVNC needs to use source of the X.Org server whose version matches
 # that of your installed X.Org package:
 XORG=${XORG:-$(X -version 2>&1 | grep "^X.Org X Server " | cut -f4 -d' ')}
-PATCHVER="$(echo $XORG | cut -f1,2 -d. | tr -d '.')"
+#PATCHVER="$(echo $XORG | cut -f1,2 -d. | tr -d '.')"
 
 # OS Stamp into the binaries:
 OSNAME="$(head -1 /etc/slackware-version)"
@@ -229,16 +229,29 @@ mv unix/xserver/hw/vnc ../xorg-server-${XORG}/hw/
 rm -rf unix/xserver/hw
 mv ../xorg-server-${XORG}/* unix/xserver/
 
-# Do we have a patch for X.Org which tigervnc does not have?
-if [ ! -f unix/xserver${PATCHVER}.patch -a -f $SRCDIR/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch ]
-then
-  cp $SRCDIR/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch unix/xserver${PATCHVER}.patch
-fi
+touch $OUTPUT/patch-$PRGNAM.log
+
+# The sed magic in the hw/vnc Makefile needs some love:
+# ... taken care of in the xserver113 patch if we ever move to X.Org 1.13.
+cat $SRCDIR/xorg_headers_fix_reservedwords.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+
+# We have patches for X.Org later than 1.10 which tigervnc does not have:
+for PATCHVER in 111 112 113 ; do
+  if [ -e $SRCDIR/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch ]; then
+    cp $SRCDIR/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch unix/xserver${PATCHVER}.patch
+  fi
+done
 
-# Patch the xorg-server source to include building vnc driver:
+# Patch the xorg-server source to include building the vnc driver
+# (these patches are incremental and must be applied in order):
 cd unix/xserver
-  cat ../xserver${PATCHVER}.patch | patch -p1 --verbose \
-    2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+  for PATCHVER in 110 111 112 ; do
+    if [ -e ../xserver${PATCHVER}.patch ]; then
+      cat ../xserver${PATCHVER}.patch | patch -p1 --verbose \
+        2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+    fi
+  done
 cd -
 
 # Explicitly put the java applet into a directory named 'tigervnc':
@@ -248,7 +261,7 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
-export LDFLAGS="$SLKLDFLAGS"
+export LDFLAGS="$SLKLDFLAGS -lpthread"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
 
@@ -272,6 +285,7 @@ make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
 cd unix/xserver
   echo -e "\n*** Building xserver ***\n"
+  export CXXFLAGS="$SLKCFLAGS -fpermissive"
   autoreconf -vif 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
   # Default font paths to be used by the X server
@@ -283,6 +297,7 @@ cd unix/xserver
     --sysconfdir=/etc \
     --localstatedir=/var \
     --mandir=/usr/man \
+    --disable-dri \
     --disable-static \
     --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
     --disable-xwin --disable-xephyr --disable-kdrive \
@@ -290,7 +305,7 @@ cd unix/xserver
     --enable-composite \
     --enable-install-libxf86config \
     --enable-xcsecurity \
-    --enable-glx-tls \
+    --enable-glx-tls --enable-dri2 \
     --with-pic \
     --with-int10=x86emu \
     --with-default-font-path="${DEF_FONTPATH}" \
@@ -304,7 +319,7 @@ cd unix/xserver
     --with-os-name="$OSNAME" \
     --with-os-vendor="$OSVENDOR" \
     --with-builderstring="$BUILDER" \
-    --build=$ARCH-slackware-linux \
+    --build=$TARGET \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
   make $NUMJOBS 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log