wine: updated to 1.8. Drop the wine-d3d9 patch.

1 files changed, 38 insertions, 21 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index c7d13ad2..0e05fc26 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -103,6 +103,11 @@
 # 1.7.52-1    07/oct/2015 by Eric Hameleers <alien@slackware.com>
 #             * Apply the wine-d3d9 patch set if mesa was compiled with support
 #               for d3dadapter. See https://wiki.ixit.cz/d3d9
+# 1.8-1       28/dec/2015 by Eric Hameleers <alien@slackware.com>
+#             * I no longer apply the wine-d3d9 patch.  First: the patch fails
+#               to generate, and second: the Wine developers think it only works
+#               for some corner cases (modern Radeon GPU's), see also
+#               https://www.phoronix.com/scan.php?page=news_item&px=Wine-D3D9-Gallium-Nine-Opposed
 # 
 # Run 'sh wine.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -112,7 +117,7 @@
 
 
 PRGNAM=wine
-SRCVER=${SRCVER:-"1.7.52"}
+SRCVER=${SRCVER:-"1.8"}
 VERSION=$(echo $SRCVER | tr '-' '.')
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -120,12 +125,13 @@ TAG=${TAG:-alien}
 # If you do not want wine64 on Slackware64, set this to "no":
 DO_WINE64=${DO_WINE64:-"yes"}
 
-# Slackware until 14.1 does not have d3dadapter aka "nine" ebabled in mesa:
-if /usr/bin/pkg-config --exists d3d ; then
-  USE_NINE=${USE_NINE:-"YES"}
-else
-  USE_NINE=${USE_NINE:-"NO"}
-fi
+## Slackware until 14.1 does not have d3dadapter aka "nine" ebabled in mesa:
+#if /usr/bin/pkg-config --exists d3d ; then
+#  USE_NINE=${USE_NINE:-"YES"}
+#else
+#  USE_NINE=${USE_NINE:-"NO"}
+#fi
+USE_NINE=${USE_NINE:-"NO"}
 
 # Add the "Gecko", Wine's own implementation of Internet Explorer.
 # For matching wine_gecko & wine versions, see http://wiki.winehq.org/Gecko
@@ -181,21 +187,32 @@ case "$ARCH" in
 esac
 
 # Download locations:
-SOURCE[0]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2"
-SRCURL[0]="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM}-${SRCVER}.tar.bz2"
+DLI=0
+SOURCE[$DLI]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2"
+SRCURL[$DLI]="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM}-${SRCVER}.tar.bz2"
 
-SOURCE[1]="$SRCDIR/${PRGNAM}-staging-${SRCVER}.tar.gz"
-SRCURL[1]="https://github.com/${PRGNAM}-compholio/${PRGNAM}-staging/archive/v${SRCVER}.tar.gz"
+DLI=$(($DLI+1))
+SOURCE[$DLI]="$SRCDIR/${PRGNAM}-staging-${SRCVER}.tar.gz"
+SRCURL[$DLI]="https://github.com/${PRGNAM}-compholio/${PRGNAM}-staging/archive/v${SRCVER}.tar.gz"
+STAGINGSRC="SOURCE[$DLI]"
 
-SOURCE[2]="$SRCDIR/patches/${PRGNAM}-d3d9-${SRCVER}.patch"
-SRCURL[2]=""
+if [ "$USE_NINE" = "YES" ]; then
+  DLI=$(($DLI+1))
+  SOURCE[$DLI]="$SRCDIR/patches/${PRGNAM}-d3d9-${SRCVER}.patch"
+  SRCURL[$DLI]=""
+  NINESRC="SOURCE[$DLI]"
+fi
 
-SOURCE[3]="$SRCDIR/wine_gecko-${GECKO}-x86.msi"
-SRCURL[3]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi"
+DLI=$(($DLI+1))
+SOURCE[$DLI]="$SRCDIR/wine_gecko-${GECKO}-x86.msi"
+SRCURL[$DLI]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86.msi"
+GECKO32SRC="SOURCE[$DLI]"
 
 if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
-  SOURCE[4]="$SRCDIR/wine_gecko-${GECKO}-x86_64.msi"
-  SRCURL[4]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86_64.msi"
+  DLI=$(($DLI+1))
+  SOURCE[$DLI]="$SRCDIR/wine_gecko-${GECKO}-x86_64.msi"
+  SRCURL[$DLI]="http://downloads.sourceforge.net/wine/wine_gecko-${GECKO}-x86_64.msi"
+  GECKO64SRC="SOURCE[$DLI]"
 fi
 
 # Use the src_checkout() function if no downloadable tarball exists.
@@ -331,14 +348,14 @@ cd ${PRGNAM}-${VERSION}
 touch $OUTPUT/patch-${PRGNAM}.log
 # Apply the wine-staging patches:
 echo -e "\n**\n** wine-staging:\n**" | tee -a $OUTPUT/patch-${PRGNAM}.log
-tar -xf ${SOURCE[1]} --strip-components 1
+tar -xf ${STAGINGSRC} --strip-components 1
 ./patches/patchinstall.sh DESTDIR="$(pwd)" --all \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 if [ "$USE_NINE" = "YES" ]; then
   # Apply the Direct3D9 patch set (some patch hunks will fail because of the
   # previously applied wine-staging patches):
   echo -e "\n**\n** direct3d9:\n**" | tee -a $OUTPUT/patch-${PRGNAM}.log
-  cat ${SOURCE[2]} | patch -p1 --verbose \
+  cat ${NINESRC} | patch -p1 --verbose \
     2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 fi
 
@@ -420,9 +437,9 @@ fi
 
 # Add the wine-gecko MSI installer(s) to the Wine package:
 mkdir -p $PKG/usr/share/wine/gecko
-install -m0644 ${SOURCE[3]} $PKG/usr/share/wine/gecko/
+install -m0644 ${GECKO32SRC} $PKG/usr/share/wine/gecko/
 if [ "$ARCH" = "x86_64" -a "$DO_WINE64" = "yes" ]; then
-  install -m0644 ${SOURCE[4]} $PKG/usr/share/wine/gecko/
+  install -m0644 ${GECKO64SRC} $PKG/usr/share/wine/gecko/
 fi
 
 # Add the font converter programs if they were created using fontforge: