system/wine-staging: Updated for version 8.5.

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 33 insertions, 25 deletions

diff --git a/system/wine-staging/README b/system/wine-staging/README
index 4945f04b05..daed9c4969 100644
--- a/system/wine-staging/README
+++ b/system/wine-staging/README
@@ -17,14 +17,14 @@ This SlackBuild will try to autodetect whether to build for 32 or 64
 bits or both.  WINE64 and WINE32 can be used to enable/disable each
 ARCH:
 
-  WINE64=NO ./wine.SlackBuild
-  WINE32=NO ./wine.SlackBuild
+  WINE64=no ./wine.SlackBuild
+  WINE32=no ./wine.SlackBuild
 
 The executable for 64 bit wine is named wine64.
 
 To disable OpenGL support, use:
 
-  OPENGL=NO ./wine.SlackBuild
+  OPENGL=no ./wine.SlackBuild
 
 The above options can be combined.
 
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index f4db506c04..b97897d18a 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -34,7 +34,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-8.4}
+VERSION=${VERSION:-8.5}
 # This ought to work (madcap laughter)
 WINEVERSION=${WINEVERSION:-$VERSION}
 BUILD=${BUILD:-1}
@@ -63,20 +63,27 @@ fi
 
 # If your video card does not support hardware accelerated OpenGL,
 # run the script like:   OPENGL=NO ./wine.SlackBuild
-if [ "${OPENGL:-YES}" = "YES" ]; then
+
+# Make lowercase
+OPENGL=${OPENGL@L}
+
+if [ "${OPENGL:-yes}" = "yes" ]; then
   do_opengl="with"
 else
   do_opengl="without"
 fi
 
-# auto find which ARCHs to build for
+# Find which ARCHs to build for
+# Make lowercase
+WINE32=${WINE32@L}
+WINE64=${WINE64@L}
 WINETMP="$( mktemp -d $TMP/wine-test-XXXXXX )"
 echo "int main(void) {; return(0); }" > "$WINETMP/test.c"
-gcc -m32 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE32=${WINE32:-YES}
-gcc -m64 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE64=${WINE64:-YES}
+gcc -m32 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE32=${WINE32:-yes}
+gcc -m64 "$WINETMP/test.c" -o /dev/null >/dev/null 2>&1 && WINE64=${WINE64:-yes}
 rm -rf "$WINETMP"
 
-if [ "${WINE32:-NO}${WINE64:-NO}" = "NONO" ]; then
+if [ "${WINE32:-no}${WINE64:-no}" = "nono" ]; then
  echo "Both 64 and 32 bit builds disabled. Nothing to do."
  exit 1
 fi
@@ -88,18 +95,19 @@ SLKCFLAGS="-O2"
 case "$ARCH" in
   arm)
     BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
+    SLKCFLAGS="-O2"
     ;;
   i?86)
-    # -Os was -O2, fix for:
-    # https://bugs.winehq.org/show_bug.cgi?id=42406
-    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911
-    # https://bugs.gentoo.org/613128
-    SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
-    ;;
+   # -Os was -O2, fix for:
+   # https://bugs.winehq.org/show_bug.cgi?id=42406
+   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78911
+   # https://bugs.gentoo.org/613128
+   SLKCFLAGS="-Os -march=$ARCH -mtune=i686"
+   ;;
   x86_64)
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-    ;;
+   SLKCFLAGS="-O2 -fPIC"
+   LIBDIRSUFFIX="64"
+   ;;
 esac
 
 set -e
@@ -135,7 +143,7 @@ patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
 # fix path of opencl headers.
 sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
 
-if [ "${WINE64:-NO}" = "YES" ]; then
+if [ "$WINE64" = "yes" ]; then
   wine64="--with-wine64=../wine64"
   mkdir wine64
   cd wine64
@@ -164,7 +172,7 @@ if [ "${WINE64:-NO}" = "YES" ]; then
   cd ..
 fi
 
-if [ "${WINE32:-NO}" = "YES" ]; then
+if [ "$WINE32" = "yes" ]; then
   mkdir wine32
   cd wine32
 
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index d85db1c4f5..0f5e18e958 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,10 +1,10 @@
 PRGNAM="wine-staging"
-VERSION="8.4"
+VERSION="8.5"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/8.x/wine-8.4.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v8.4/wine-staging-8.4.tar.gz"
-MD5SUM="fe71c6520788fd6753e8cd4ae9822e3d \
-        f663e2754858edd0ef0b185e23f17a61"
+DOWNLOAD="https://dl.winehq.org/wine/source/8.x/wine-8.5.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v8.5/wine-staging-8.5.tar.gz"
+MD5SUM="dba92e164ccc3720b55f7962d4188744 \
+        38b6ae980b9691d896a44c86c799571e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""