From da2a857070e6bcf8eda986a2f1dc304c9d9794e2 Mon Sep 17 00:00:00 2001 From: Dave Woodfall Date: Fri, 9 Dec 2022 10:47:42 +0000 Subject: system/wine: Use uppercase options. Updated BUILD. Signed-off-by: Willy Sudiarto Raharjo --- system/wine/README | 6 +++--- system/wine/wine.SlackBuild | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/system/wine/README b/system/wine/README index 27aeeee797..fcddb6cdae 100644 --- a/system/wine/README +++ b/system/wine/README @@ -10,14 +10,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/wine.SlackBuild b/system/wine/wine.SlackBuild index da033dbbb3..60ad1adf27 100644 --- a/system/wine/wine.SlackBuild +++ b/system/wine/wine.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wine VERSION=${VERSION:-7.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -53,7 +53,7 @@ fi # If your video card does not support hardware accelerated OpenGL, # then run the script like: OPENGL=NO ./wine.SlackBuild -if [ "${OPENGL:-yes}" = "yes" ]; then +if [ "${OPENGL:-YES}" = "YES" ]; then do_opengl="with" else do_opengl="without" @@ -61,11 +61,11 @@ fi 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 @@ -109,7 +109,7 @@ find -L . \ # Fix for flex patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch -if [ "${WINE64:-no}" = "yes" ]; then +if [ "${WINE64:-NO}" = "YES" ]; then wine64="--with-wine64=../wine64" mkdir wine64 cd wine64 @@ -138,7 +138,7 @@ if [ "${WINE64:-no}" = "yes" ]; then cd .. fi -if [ "${WINE32:-no}" = "yes" ]; then +if [ "${WINE32:-NO}" = "YES" ]; then mkdir wine32 cd wine32 export PKG_CONFIG_PATH="/usr/lib/pkgconfig:$PKG_CONFIG_PATH" -- cgit v1.2.3-65-gdbad