wine: updated to 4.0 and removed the d3d9 support, this has moved into independent sources now (https://github.com/iXit/wine-nine-standalone)

1 files changed, 6 insertions, 35 deletions

diff --git a/wine/build/wine.SlackBuild b/wine/build/wine.SlackBuild
index 15179a61..f5190b9d 100755
--- a/wine/build/wine.SlackBuild
+++ b/wine/build/wine.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2006-2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2006-2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -118,6 +118,8 @@
 #             * Update.
 # 2.21-1      28/dec/2017 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 4.0-1       05/feb/2019 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 #
 # Run 'sh wine.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -127,7 +129,7 @@
 
 
 PRGNAM=wine
-SRCVER=${SRCVER:-"2.21"}
+SRCVER=${SRCVER:-"4.0"}
 VERSION=$(echo $SRCVER | tr '-' '.')
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -135,14 +137,6 @@ 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
-  echo "-- Adding d3dadapter"
-  USE_NINE=${USE_NINE:-"YES"}
-else
-  USE_NINE=${USE_NINE:-"NO"}
-fi
-
 # Add the "Gecko", Wine's own implementation of Internet Explorer.
 # For matching wine_gecko & wine versions, see http://wiki.winehq.org/Gecko
 GECKO=${GECKO:-2.47}
@@ -154,7 +148,7 @@ GECKO=${GECKO:-2.47}
 # In a 64 bit wineprefix, substitute wine64 for wine in the above command.
 # If you do not want to add mono, define MONO=NO instead of a number.
 # See https://wiki.winehq.org/Mono
-MONO=${MONO:-4.7.1}
+MONO=${MONO:-4.7.5}
 
 DOCS="ANNOUNCE AUTHORS COPYING.LIB ChangeLog LICENSE* README VERSION"
 
@@ -212,16 +206,9 @@ SRCURL[$DLI]="http://downloads.sourceforge.net/project/${PRGNAM}/Source/${PRGNAM
 
 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"
+SRCURL[$DLI]="https://github.com/${PRGNAM}-staging/${PRGNAM}-staging/archive/v${SRCVER}.tar.gz"
 STAGINGSRC="${SOURCE[$DLI]}"
 
-if [ "$USE_NINE" = "YES" ]; then
-  DLI=$(($DLI+1))
-  SOURCE[$DLI]="$SRCDIR/${PRGNAM}-d3d9-${SRCVER}.tar.gz"
-  SRCURL[$DLI]="https://github.com/sarnex/wine-d3d9-patches/archive/${PRGNAM}-d3d9-${SRCVER}.tar.gz"
-  NINESRC="${SOURCE[$DLI]}"
-fi
-
 DLI=$(($DLI+1))
 SOURCE[$DLI]="$SRCDIR/wine_gecko-${GECKO}-x86.msi"
 SRCURL[$DLI]="http://dl.winehq.org/wine/wine-gecko/${GECKO}/wine_gecko-${GECKO}-x86.msi"
@@ -332,15 +319,6 @@ echo -e "\n**\n** wine-staging:\n**" | tee -a $OUTPUT/patch-${PRGNAM}.log
 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:
-  echo -e "\n**\n** direct3d9:\n**" | tee -a $OUTPUT/patch-${PRGNAM}.log
-  tar xvf ${NINESRC} --strip-components 1
-  cat staging-helper.patch | patch -p1 --verbose \
-    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-  cat wine-d3d9.patch | patch -p1 --verbose \
-    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-fi
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
@@ -357,12 +335,6 @@ else
     DO_GL="--without-opengl"
 fi
 
-if [ "$USE_NINE" = "YES" -o "$USE_NINE" = "yes" ]; then
-    DO_NINE="--with-d3d9-nine"
-else
-    DO_NINE=""
-fi
-
 export CCAS="as"
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -381,7 +353,6 @@ function wineconfigure ()
     --mandir=/usr/man \
     --with-x \
     ${DO_GL} \
-    ${DO_NINE} \
     --program-prefix= \
     --program-suffix= \
     --build=$TARGET \