From cbda98a1f743e556d3e6f79c24e0394b025090b0 Mon Sep 17 00:00:00 2001
From: Dave Woodfall <dave@slackbuilds.org>
Date: Fri, 24 Jan 2020 00:33:53 +0000
Subject: system/wine-staging: Updated for version 5.0.

---
 system/wine-staging/wine-staging.SlackBuild | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'system/wine-staging/wine-staging.SlackBuild')

diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index b92c4a6ec4..c04d2e0b45 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -29,8 +29,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by Dave Woodfall <dave@slackbuilds.org>
+
 PRGNAM=wine-staging
-VERSION=${VERSION:-4.21}
+VERSION=${VERSION:-5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,6 +48,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+WIN32=${WIN32:-yes}
+WIN64=${WIN64:-no}
 
 # If your video card does not support hardware accelerated OpenGL,
 # run the script like:   OPENGL=NO ./wine.SlackBuild
@@ -54,16 +58,7 @@ if [ "${OPENGL:-YES}" = "YES" ]; then
 else
   do_opengl="without"
 fi
-
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-    *) ARCH=$(uname -m) ;;
-  esac
-fi
-
-if [ -n "$NOWIN32" ] && [ -z "$WIN64" ]; then
+if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then
   echo "Both 64 and 32 bit builds disabled. Nothing to do."
   exit 1
 fi
@@ -84,7 +79,6 @@ case "$ARCH" in
     SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
     ;;
   x86_64)
-    [ -n "$WIN64" ] && WIN64="--enable-win64"
     SLKCFLAGS="-O2 -fPIC"
     LIBDIRSUFFIX="64"
     ;;
@@ -128,7 +122,7 @@ if [ "$ARCH" == "i?86" ]; then
   patch -p1 --verbose < $CWD/x86_remove_fpic.patch
 fi
 
-if [ -n "$WIN64" ]; then
+if [ "$WIN64" = "yes" ]; then
   wine64="--with-wine64=../wine64"
   mkdir wine64
   cd wine64
@@ -157,7 +151,7 @@ if [ -n "$WIN64" ]; then
   cd ..
 fi
 
-if [ -z "$NOWIN32" ]; then
+if [ "$WIN32" = "yes" ]; then
   mkdir wine32
   cd wine32
 
-- 
cgit v1.2.3