From 8c816f446fb00e2911c24afdb2a0e2720ff8c757 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 17 Sep 2019 20:15:24 +0000
Subject: supercollider: update to 3.10.3

---
 supercollider/build/supercollider.SlackBuild | 32 +++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to 'supercollider')

diff --git a/supercollider/build/supercollider.SlackBuild b/supercollider/build/supercollider.SlackBuild
index aab44dc5..0ffc7a54 100755
--- a/supercollider/build/supercollider.SlackBuild
+++ b/supercollider/build/supercollider.SlackBuild
@@ -33,6 +33,10 @@
 # Changelog:   
 # 3.10.2-1:    13/Mar/2019 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 3.10.2-2:    17/jul/2019 by Eric Hameleers <alien@slackware.com>
+#              * Rebuilt against newer boost in -current.
+# 3.10.3-1:    17/sep/2019 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh supercollider.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -42,14 +46,14 @@
 
 PRGNAM=supercollider
 SRCNAM=SuperCollider
-VERSION=${VERSION:-3.10.2}
+VERSION=${VERSION:-3.10.3}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
 DOCS="AUTHORS CHANGELOG.md README.md README_LINUX.md"
 
-SYSTEM_BOOST=${SYSTEM_BOOST:-"YES"}
+SYSTEM_BOOST=${SYSTEM_BOOST:-"NO"}
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -154,15 +158,27 @@ tar -xvf ${SOURCE}
 cd ${SRCNAM}-Source
 
 if [ "$SYSTEM_BOOST" = "YES" ]; then
-  # We need to patch to allow compilation against a more recent boost:
-  cat $SRCDIR/patches/supercollder_boost_167.patch | patch -p1 --verbose \
-    2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+  touch $OUTPUT/patch-${PRGNAM}.log
   # Don't fail when linking against system-boost:
+  #cat $SRCDIR/patches/supercollder_system_boost.patch | patch -p1 --verbose \
+  #  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
   rm -rf external_libraries/boost
+  # We need to patch to allow compilation against a more recent boost:
+  cat $SRCDIR/patches/supercollder_boost_167.patch | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+  cat $SRCDIR/patches/supercollder_boost_170.patch | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
   # cmake variable:
-  BOOSTVAR="ON"
+  BOOSTVAR=" \
+    -DBoost_NO_BOOST_CMAKE=ON \
+    -DBoost_USE_STATIC_LIBS=OFF \
+    -DBUILD_SHARED_LIBS=ON \
+    -DSYSTEM_BOOST=ON \
+  "
 else
-  BOOSTVAR="OFF"
+  BOOSTVAR=" \
+    -DSYSTEM_BOOST=OFF \
+  "
 fi
 
 chown -R root:root .
@@ -186,10 +202,10 @@ cd build-${PRGNAM}
     -DLIBSCSYNTH=ON \
     -DNO_AVAHI=ON \
     -DSYSTEM_YAMLCPP=OFF \
-    -DSYSTEM_BOOST=${BOOSTVAR} \
     -DSC_ED=OFF \
     -DSC_EL=OFF \
     -DSC_VIM=OFF \
+    ${BOOSTVAR} \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
   make $NUMJOBS verbose=1 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
   make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
-- 
cgit v1.2.3