Update to wine-1.7.15 and add WoW64

1 files changed, 76 insertions, 30 deletions

diff --git a/wine-pipelight/build/wine-pipelight.SlackBuild b/wine-pipelight/build/wine-pipelight.SlackBuild
index 61b48a4f..27f36329 100755
--- a/wine-pipelight/build/wine-pipelight.SlackBuild
+++ b/wine-pipelight/build/wine-pipelight.SlackBuild
@@ -42,6 +42,8 @@
 #            Update to wine 1.7.11 plus compholio patch set.
 # 1.7.13-1   22/feb/2014 by Eric Hameleers <alien@slackware.com>
 #            Update to wine 1.7.13 plus compholio patch set.
+# 1.7.15-1   08/apr/2014 by Eric Hameleers <alien@slackware.com>
+#            Update to wine 1.7.15 plus compholio patch set.
 # 
 # Run 'sh wine-pipelight.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -51,11 +53,14 @@
 
 PRGNAM=wine-pipelight
 SRCNAM=wine
-SRCVER=${SRCVER:-"1.7.13"}
+SRCVER=${SRCVER:-"1.7.15"}
 VERSION=$(echo $SRCVER | tr '-' '.')
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
+# If you do not want wine64 on Slackware64, set this to "no":
+DO_WINE64=${DO_WINE64:-"yes"}
+
 # For matching wine_gecko & wine versions, see http://wiki.winehq.org/Gecko
 GECKO=${GECKO:-2.24}
 
@@ -78,15 +83,6 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE[0]="$SRCDIR/${SRCNAM}-${SRCVER}.tar.bz2"
-SRCURL[0]="http://downloads.sourceforge.net/project/${SRCNAM}/Source/${SRCNAM}-${SRCVER}.tar.bz2"
-
-SOURCE[1]="$SRCDIR/${SRCNAM}-${VERSION}-patches.tar.gz"
-SRCURL[1]="http://fds-team.de/mirror/wine-patches.tar.gz"
-
-SOURCE[2]="$SRCDIR/wine_gecko-${GECKO}-x86.msi"
-SRCURL[2]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi"
-
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
@@ -117,6 +113,21 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+# Download locations:
+SOURCE[0]="$SRCDIR/${SRCNAM}-${SRCVER}.tar.bz2"
+SRCURL[0]="http://downloads.sourceforge.net/project/${SRCNAM}/Source/${SRCNAM}-${SRCVER}.tar.bz2"
+
+SOURCE[1]="$SRCDIR/${SRCNAM}-${VERSION}-patches.tar.gz"
+SRCURL[1]="http://fds-team.de/mirror/wine-patches.tar.gz"
+
+SOURCE[2]="$SRCDIR/wine_gecko-${GECKO}-x86.msi"
+SRCURL[2]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi"
+
+if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
+  SOURCE[3]="$SRCDIR/wine_gecko-${GECKO}-x86_64.msi"
+  SRCURL[3]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86_64.msi"
+fi
+
 # Exit the script on errors:
 set -e
 trap 'echo "$0 FAILED on line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
@@ -211,6 +222,10 @@ chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
 
+if [ "${DO_WINE64}" = "yes" ]; then
+  echo  "Also building wine64 (shared support, aka WoW64)"
+fi
+
 if [ "${OPENGL}" = "YES" -o "${OPENGL}" = "yes" ]; then
   do_opengl=""
 else
@@ -229,28 +244,59 @@ if [ "$ARCH" = "x86_64" ]; then
   export PKG_CONFIG_PATH="/usr/lib/pkgconfig:PKG_CONFIG_PATH"
 fi
 
+function wineconfigure ()
+{
+  ../configure \
+    --prefix=${WPREFIX} \
+    --bindir=${WPREFIX}/bin \
+    --libdir=${WPREFIX}/lib \
+    --localstatedir=${WPREFIX}/var \
+    --sysconfdir=${WPREFIX}/etc \
+    --mandir=${WPREFIX}/man \
+    --with-x \
+    --with${do_opengl}-opengl \
+    --program-prefix= \
+    --program-suffix= \
+    --build=$TARGET \
+    $*
+}
+
 autoreconf -vif 2>&1 | tee $OUTPUT/autoreconf-${PRGNAM}.log
-./configure \
-  --prefix=${WPREFIX} \
-  --bindir=${WPREFIX}/bin \
-  --libdir=${WPREFIX}/lib \
-  --localstatedir=${WPREFIX}/var \
-  --sysconfdir=${WPREFIX}/etc \
-  --mandir=${WPREFIX}/man \
-  --with-x \
-  --with${do_opengl}-opengl \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$TARGET \
-  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-
-make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-
-# Add the wine-gecko MSI installer to the Wine package:
+
+if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
+  # First, wine64:
+  mkdir wine64
+  cd wine64
+    wineconfigure --enable-win64 CC=/usr/bin/gcc 2>&1 | tee $OUTPUT/configure64-${PRGNAM}.log
+    make depend 2>&1 | tee $OUTPUT/make64-${PRGNAM}.log
+    make 2>&1 | tee -a $OUTPUT/make64-${PRGNAM}.log
+    make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install64-${PRGNAM}.log
+  cd -
+  # Next, wine:
+  mkdir wine32
+  cd wine32
+    wineconfigure --with-wine64=../wine64 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+    make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+    make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+    make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+  cd -
+else
+  # No 64-bit wine requested, or we are on 32-bit Slackware:
+  mkdir wine32
+  cd wine32
+    wineconfigure 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+    make depend 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+    make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+    make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+  cd -
+fi
+
+# Add the wine-gecko MSI installer(s) to the Wine package:
 mkdir -p $PKG/usr/share/wine/gecko
-cp -a ${SOURCE[2]} $PKG/usr/share/wine/gecko/
+install -m0644 ${SOURCE[2]} $PKG/usr/share/wine/gecko/
+if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
+  install -m0644 ${SOURCE[3]} $PKG/usr/share/wine/gecko/
+fi
 
 # Add some documentation to the package:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION