wineasio: updated to 1.0.0

1 files changed, 40 insertions, 68 deletions

diff --git a/wineasio/build/wineasio.SlackBuild b/wineasio/build/wineasio.SlackBuild
index 4d68b52b..4ef2eeed 100755
--- a/wineasio/build/wineasio.SlackBuild
+++ b/wineasio/build/wineasio.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2019  Eric Hameleers, Eindhoven, NL
+# Copyright 2019, 2020  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -27,9 +27,10 @@
 # By:          Eric Hameleers <alien@slackware.com>
 # For:         wineasio
 # Descr:       ASIO to JACK driver for WINE
-# URL:         https://sourceforge.net/projects/wineasio/
+# URL:         https://github.com/wineasio/wineasio
 # Build needs: 
 # Needs:       jack2, wine
+#              and on 64bit, also jack2-compat32
 # Changelog:   
 # 0.9.2-1:     29/Nov/2019 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
@@ -41,7 +42,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=wineasio
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-1.0.0}
 ASIOSDK=${ASIOSDK:-"2.3.3_2019-06-14"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -49,19 +50,15 @@ TAG=${TAG:-alien}
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
-DOCS="COPYING.LIB README $SRCDIR/README.1st"
+DOCS="COPYING* README* $SRCDIR/README.1st"
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL[0]="https://sourceforge.net/projects/${PRGNAM}/files/${PRGNAM}-${VERSION}.tar.gz"
-
-# Generic link for the ASIO SDK: https://www.steinberg.net/asiosdk
-SOURCE[1]="$SRCDIR/asiosdk_${ASIOSDK}.zip"
-SRCURL[1]="https://download.steinberg.net/sdk_downloads/asiosdk_${ASIOSDK}.zip"
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="https://github.com/${PRGNAM}/${PRGNAM}/releases/download/v${VERSION}/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -116,26 +113,24 @@ rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
                           # remove old log files
 
 # Source file availability:
-for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
-  if ! [ -f ${SOURCE[$i]} ]; then
-    echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
-    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
-    if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
-    if ! [ "x${SRCURL[$i]}" == "x" ]; then
-      echo "Will download file to $(dirname $SOURCE[$i])"
-      wget --no-check-certificate -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
-      if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
-        echo "Fail to download '$(basename ${SOURCE[$i]})'. Aborting the build."
-        mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
-        exit 1
-      fi
-    else
-      echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
+if ! [ -f ${SOURCE} ]; then
+  echo "Source '$(basename ${SOURCE})' not available yet..."
+  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
+  if ! [ "x${SRCURL}" == "x" ]; then
+    echo "Will download file to $(dirname $SOURCE)"
+    wget --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
+      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
+      mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
     fi
+  else
+    echo "File '$(basename ${SOURCE})' not available... aborting the build."
+    exit 1
   fi
-done
+fi
 
 if [ "$P1" == "--download" ]; then
   echo "Download complete."
@@ -150,60 +145,37 @@ echo "++"
 
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
-for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
-  if $(file ${SOURCE[$i]} | grep -qi ": 7-zip"); then
-    7za x ${SOURCE[$i]}
-  elif $(file ${SOURCE[$i]} | grep -qi ": zip"); then
-    unzip ${SOURCE[$i]}
-  else
-    tar -xvf ${SOURCE[$i]}
-  fi
-done
-cd ${PRGNAM}
-# Move the Steinberg SDK header into position:
-cp ../asiosdk_${ASIOSDK}/common/asio.h .
-# Allow compiling against Wine 4.x:
-cat $SRCDIR/patches/wineasio_wine4.patch | patch -p1 --verbose \
-    2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+tar -xvf ${SOURCE}
+cd ${PRGNAM}-${VERSION}
 # Fix the paths for Slackware:
-sed -i Makefile -e 's,/lib32,/lib,g'
-sed -i Makefile64 -e 's,/lib,/lib64,g'
+sed Makefile.mk -e 's,/lib$(M),/lib,g' > Makefile.mk.32
+sed Makefile.mk -e 's,/lib$(M),/lib'${LIBDIRSUFFIX}',g' > Makefile.mk.64
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
-
-# First prepare the environment for 32bit vs. 64bit wine:
-if [ "$ARCH" = "x86_64" ]; then
-  cp asio.h asio.h.i686
-  ./prepare_64bit_asio \
-    2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-fi
-
 export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
 
+# 32bit build first:
+cat Makefile.mk.32 > Makefile.mk
+make 32 2>&1 | tee $OUTPUT/make-${PRGNAM}_32.log
 if [ "$ARCH" = "x86_64" ]; then
-  make -f Makefile64 PKG_CONFIG_PATH="$OLD_PKG_CONFIG_PATH" \
-    2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-  mv $PRGNAM.dll.so $PRGNAM.dll.so.x86_64
-  cp asio.h.i686 asio.h
-  make clean 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-  make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-else
-  make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+  # Conditional 64bit build:
+  cat Makefile.mk.64 > Makefile.mk
+  make 64 2>&1 | tee $OUTPUT/make-${PRGNAM}_64.log
 fi
 
-# Install manually:
+# Install manually; first the 32bit library:
+install -D -m0755 build32/$PRGNAM.dll.so \
+  $PKG/usr/lib/wine/$PRGNAM.dll.so \
+  2>&1 | tee $OUTPUT/install-${PRGNAM}_32.log
 if [ "$ARCH" = "x86_64" ]; then
-  install -D -m0755 $PRGNAM.dll.so.x86_64 $PKG/usr/lib64/wine/$PRGNAM.dll.so \
-    2>&1 | tee $OUTPUT/install-${PRGNAM}.log
-  install -D -m0755 $PRGNAM.dll.so $PKG/usr/lib/wine/$PRGNAM.dll.so \
-    2>&1 | tee -a $OUTPUT/install-${PRGNAM}.log
-else
-  install -D -m0755 $PRGNAM.dll.so $PKG/usr/lib/wine/$PRGNAM.dll.so \
-    2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+  # Conditional install of the 64bit library
+  install -D -m0755 build64/$PRGNAM.dll.so \
+    $PKG/usr/lib64/wine/$PRGNAM.dll.so \
+    2>&1 | tee $OUTPUT/install-${PRGNAM}_64.log
 fi
 
 # Add documentation: