system/wine-staging: Updated for version 8.18.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

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

4 files changed, 38 insertions, 56 deletions

diff --git a/system/wine-staging/README b/system/wine-staging/README
index daed9c4969..08813881e7 100644
--- a/system/wine-staging/README
+++ b/system/wine-staging/README
@@ -1,39 +1,40 @@
 wine-staging (Wine Staging is the testing area of winehq.org)
 
+This is a current development branch of wine appended with full patches
+of the staging branch.
+
 It contains bug fixes and features, which have not been integrated into
-the development branch yet. The idea of Wine Staging is to provide
+the development branch yet. The idea of wine-staging is to provide
 experimental features faster to end users and to give developers the
 possibility to discuss and improve their patches before they are
 integrated into the main branch.
 
-This is a current development branch of Wine appended with full patches
-of the Staging branch.
-
 ============================================================
 
-OPTIONS
+OPTIONAL DEPENDENCIES
 
-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:
+fontforge:     To build tahoma, tahomabd, and marlett fonts.
+webcore-fonts: For MS fonts for the web and Windows Vista.
 
-  WINE64=no ./wine.SlackBuild
-  WINE32=no ./wine.SlackBuild
+============================================================
 
-The executable for 64 bit wine is named wine64.
+OPTIONS
 
-To disable OpenGL support, use:
+If your video card does not support hardware accelerated OpenGL,
+you may disable OpenGL support by using:
 
   OPENGL=no ./wine.SlackBuild
 
 The above options can be combined.
 
-============================================================
+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:
 
-OPTIONAL DEPENDENCIES
+  WINE64=no ./wine.SlackBuild
+  WINE32=no ./wine.SlackBuild
 
-fontforge:     To build tahoma, tahomabd, and marlett fonts.
-webcore-fonts: For MS fonts for the web and Windows Vista.
+The executable for 64 bit wine is named wine64.
 
 ============================================================
 
diff --git a/system/wine-staging/README.SLACKWARE b/system/wine-staging/README.SLACKWARE
index 5b02735897..1885540021 100644
--- a/system/wine-staging/README.SLACKWARE
+++ b/system/wine-staging/README.SLACKWARE
@@ -15,11 +15,11 @@ List:
  |      |------ + glib2-compat32
  |      |       |------ + libffi-compat32
  |      |------ + pixman-compat32
- |      |------ + gtk+3-compat32  (Self conversion)
+ |      |------ + gtk+3-compat32
  |      |       |------ + atk-compat32
- |      |       |------ + at-spi2-atk (current only)
+ |      |       |------ + at-spi2-atk
  |      |       |------ + gdk-pixbuf2-compat32
- |      |       |------ + libepoxy-compat32  (current only)
+ |      |       |------ + libepoxy-compat32
  |      |       |------ + libICE-compat32
  |      |       |------ + libSM-compat32
  |      |       |       |------ + at-spi2-atk-compat32
@@ -29,7 +29,6 @@ List:
  |      |       |------ + pango-compat32
  |      |       |       |------ + harfbuzz-compat32
  |      |       |       |------ + libXft-compat32
- |      |       |------ + udev-compat32
  |      |------ ? This is only needed if you care about GTK3 theme support.
  |----- x dbus-compat32
  |----- + fontconfig-compat32
@@ -40,7 +39,7 @@ List:
  |      |         to spit out error messages of it missing.
  |----- + gnutls-compat32
  |      |------ + gmp-compat32
- |      |------ + libidn-compat32  (current only)
+ |      |------ + libidn-compat32
  |      |------ + nettle-compat32
  |      |------ + p11-kit-compat32
  |      |------ + zlib-compat32
@@ -53,6 +52,8 @@ List:
  |      |------ ? Needed by some programs but compiles without it.
  |----- + libjpeg-turbo-compat32
  |----- + libpng-compat32
+ |----- x libva-compat32
+ |      |------ ? VAAPI backend for DXVA2 GPU decoding.
  |----- + libXcomposite-compat32
  |----- + libXcursor-compat32
  |      |------ + libXfixes-compat32
@@ -68,14 +69,12 @@ List:
  |----- + libXxf86dga-compat32
  |----- + libXxf86vm-compat32
  |----- x libxml2-compat32
- |      |------ + aaa_elflibs-compat32
+ |      |------ + aaa_libraries-compat32
  |      |------ ? This is needed for .NET to work correctly.
- |----- x libva-compat32
- |      |------ ? VAAPI backend for DXVA2 GPU decoding.
  |----- + mesa-compat32
  |----- + mpg123-compat32
  |      |------ + libtool-compat32
- |----- + OpenAL-compat32
- |----- x oss
+ |----- + openal-soft-compat32
+ |----- x oss (self conversion)
  |----- + openjpeg-compat32
- |----- x PulseAudio
+ |----- x pulseaudio
diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild
index 3c4e7b2e0b..c77e6fda48 100644
--- a/system/wine-staging/wine-staging.SlackBuild
+++ b/system/wine-staging/wine-staging.SlackBuild
@@ -2,7 +2,8 @@
 #
 # Slackware build script for wine-staging.
 #
-# Copyright 2016-2019  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2023 Steven Voges <Oregon, USA>
+# Copyright 2016-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
 #
 # All rights reserved.
@@ -29,13 +30,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>
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wine-staging
-VERSION=${VERSION:-8.8}
-# This ought to work (madcap laughter)
+VERSION=${VERSION:-8.18}
 WINEVERSION=${WINEVERSION:-$VERSION}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -53,28 +51,18 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
 fi
 
-# If your video card does not support hardware accelerated OpenGL,
-# run the script like:   OPENGL=NO ./wine.SlackBuild
-
-# Make lowercase
 OPENGL=${OPENGL@L}
-
 if [ "${OPENGL:-yes}" = "yes" ]; then
   do_opengl="with"
 else
   do_opengl="without"
 fi
 
-# Find which ARCHs to build for
-# Make lowercase
 WINE32=${WINE32@L}
 WINE64=${WINE64@L}
 WINETMP="$( mktemp -d $TMP/wine-test-XXXXXX )"
@@ -88,10 +76,8 @@ if [ "${WINE32:-no}${WINE64:-no}" = "nono" ]; then
  exit 1
 fi
 
-# These should work for anything not specified below
 BUILD_ARCH="$ARCH-slackware-linux"
 SLKCFLAGS="-O2"
-
 case "$ARCH" in
   arm)
     BUILD_ARCH="$ARCH-slackware-linux-gnueabi"
@@ -128,7 +114,6 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd $TMP/wine-$WINEVERSION
-# the old patchinstall.sh has been replaced
 python3 $TMP/$PRGNAM-$VERSION/staging/patchinstall.py --all
 chown -R root:root .
 find -L . \
@@ -139,8 +124,7 @@ find -L . \
 
 # Fix for flex.
 patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch
-
-# fix path of opencl headers.
+# Fix path of opencl headers.
 sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
 
 if [ "$WINE64" = "yes" ]; then
@@ -165,7 +149,6 @@ if [ "$WINE64" = "yes" ]; then
     --program-suffix= \
     --disable-tests \
     --build=$BUILD_ARCH
-
   make depend
   make
   make install DESTDIR=$PKG
@@ -195,7 +178,6 @@ if [ "$WINE32" = "yes" ]; then
     --program-suffix= \
     --disable-tests \
     --build=$BUILD_ARCH
-
   make depend
   make
   make install DESTDIR=$PKG
diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info
index d5229066c9..53472e2f51 100644
--- a/system/wine-staging/wine-staging.info
+++ b/system/wine-staging/wine-staging.info
@@ -1,12 +1,12 @@
 PRGNAM="wine-staging"
-VERSION="8.8"
+VERSION="8.18"
 HOMEPAGE="https://wiki.winehq.org/Wine-Staging"
-DOWNLOAD="https://dl.winehq.org/wine/source/8.x/wine-8.8.tar.xz \
-          https://github.com/wine-staging/wine-staging/archive/v8.8/wine-staging-8.8.tar.gz"
-MD5SUM="955db89d6a6db587e0787a0851d9c163 \
-        7411057cf79d616fc0409afb6f6e85e2"
+DOWNLOAD="https://dl.winehq.org/wine/source/8.x/wine-8.18.tar.xz \
+          https://github.com/wine-staging/wine-staging/archive/v8.18/wine-staging-8.18.tar.gz"
+MD5SUM="d2c9b142b3c569280ebf09c59967c0c4 \
+        e204b17854853ab633a2464a45a0f409"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="D Woodfall"
-EMAIL="dave@slackbuilds.org"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"