audio/SuperCollider: Updated for version 3.10.2.

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

4 files changed, 11 insertions, 179 deletions

diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild
index 5028954082..0fae6c23bf 100644
--- a/audio/SuperCollider/SuperCollider.SlackBuild
+++ b/audio/SuperCollider/SuperCollider.SlackBuild
@@ -6,7 +6,7 @@
 # contact: pfeifer[dot]felix[at]googlemail[dot]com
 
 PRGNAM=SuperCollider
-VERSION=${VERSION:-3.6.6}
+VERSION=${VERSION:-3.10.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -23,13 +23,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
@@ -55,13 +49,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-  patch -p1 < $CWD/fixups_for_x86_64.diff
-fi
-
-# Fix build failure with gcc-4.9 (thanks to Debian)
-patch -p1 < $CWD/ftbfs-gcc-4.9.patch
-
 # Pass AVAHI=yes to the script to enable avahi support
 if [ "${AVAHI:-no}" = "yes" ]; then avahi="OFF"; else avahi="ON"; fi
 
@@ -96,19 +83,19 @@ cd -
 # install scvim
 cd editors/scvim
   mkdirhier $PKG/usr/share/scvim/vim
-  cp bin/* $PKG/usr/bin
+  cp -rf bin/* $PKG/usr/bin
   cp -r ftplugin $PKG/usr/share/scvim/vim # copy this and the 2 following to
   cp -r indent $PKG/usr/share/scvim/vim   # the vim runtimepath
   cp -r syntax $PKG/usr/share/scvim/vim   # any idea where this might be globally?
-  cp scvimrc $PKG/usr/share/scvim
+  #cp scvimrc $PKG/usr/share/scvim
 cd -
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mv $PKG/usr/share/doc $PKG/usr
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING README_LINUX.txt $PKG/usr/doc/$PRGNAM-$VERSION
+#mv $PKG/usr/share/doc $PKG/usr
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG* COPYING README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/SuperCollider/SuperCollider.info b/audio/SuperCollider/SuperCollider.info
index 2a7f53f4c9..5560666676 100644
--- a/audio/SuperCollider/SuperCollider.info
+++ b/audio/SuperCollider/SuperCollider.info
@@ -1,10 +1,10 @@
 PRGNAM="SuperCollider"
-VERSION="3.6.6"
+VERSION="3.10.2"
 HOMEPAGE="http://supercollider.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/supercollider/SuperCollider-3.6.6-Source-linux.tar.bz2"
-MD5SUM="14d6063933230c74e42f5923a811e7c6"
+DOWNLOAD="https://github.com/supercollider/supercollider/releases/download/Version-3.10.2/SuperCollider-3.10.2-Source-linux.tar.bz2"
+MD5SUM="43734d9e761e6f8023b76d2823c8193b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit yaml-cpp0.3"
+REQUIRES="jack-audio-connection-kit yaml-cpp0.3 qt5"
 MAINTAINER="Felix Pfeifer"
 EMAIL="pfeifer[dot]felix[at]googlemail[dot]com"
diff --git a/audio/SuperCollider/fixups_for_x86_64.diff b/audio/SuperCollider/fixups_for_x86_64.diff
deleted file mode 100644
index 2f4fc83919..0000000000
--- a/audio/SuperCollider/fixups_for_x86_64.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Nur SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake SuperCollider-Source/cmake_modules/FindFFTW3f.cmake
---- SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake	2012-12-07 10:38:09.000000000 -0600
-+++ SuperCollider-Source/cmake_modules/FindFFTW3f.cmake	2013-02-17 19:25:40.179025178 -0600
-@@ -11,9 +11,9 @@
- FIND_LIBRARY(
-     FFTW3F_LIBRARY
-     NAMES fftw3f libfftw3f fftw3f-3
--    HINTS $ENV{FFTW3_DIR}/lib
-+    HINTS $ENV{FFTW3_DIR}/lib64
-     PATHS /usr/local/lib
--          /usr/lib
-+          /usr/lib64
- )
- 
- SET(FFTW3F_FOUND "NO")
-diff -Nur SuperCollider-Source.orig/cmake_modules/FindJack.cmake SuperCollider-Source/cmake_modules/FindJack.cmake
---- SuperCollider-Source.orig/cmake_modules/FindJack.cmake	2011-05-11 04:52:03.000000000 -0500
-+++ SuperCollider-Source/cmake_modules/FindJack.cmake	2013-02-17 19:26:09.253703065 -0600
-@@ -45,7 +45,7 @@
-       jack
-     PATHS
-       ${_JACK_LIBDIR}
--      /usr/lib
-+      /usr/lib64
-       /usr/local/lib
-       /opt/local/lib
-       /sw/lib
-diff -Nur SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake SuperCollider-Source/cmake_modules/FindPortaudio.cmake
---- SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake	2011-05-11 04:52:03.000000000 -0500
-+++ SuperCollider-Source/cmake_modules/FindPortaudio.cmake	2013-02-17 19:26:45.942296599 -0600
-@@ -53,7 +53,7 @@
-       NAMES
-         portaudio
-       PATHS
--        /usr/lib
-+        /usr/lib64
-         /usr/local/lib
-         /opt/local/lib
-         /sw/lib
-@@ -63,7 +63,7 @@
-       NAMES
-         portaudio
-       PATHS
--        /usr/lib
-+        /usr/lib64
-         /usr/local/lib
-         /opt/local/lib
-         /sw/lib
-diff -Nur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-Source/editors/sced/CMakeLists.txt
---- SuperCollider-Source.orig/editors/sced/CMakeLists.txt	2012-12-07 10:38:09.000000000 -0600
-+++ SuperCollider-Source/editors/sced/CMakeLists.txt	2013-02-17 19:27:46.569624922 -0600
-@@ -14,10 +14,10 @@
-             DESTINATION share/gtksourceview-2.0/language-specs)
- 
-     install(FILES data/sced.gedit-plugin
--            DESTINATION lib/gedit-2/plugins)
-+            DESTINATION lib64/gedit-2/plugins)
- 
-     install(DIRECTORY sced
--            DESTINATION lib/gedit-2/plugins)
-+            DESTINATION lib64/gedit-2/plugins)
- 
- elseif(NOT WIN32 AND SC_ED EQUAL 3)
- 
-@@ -29,7 +29,7 @@
-             DESTINATION share/gtksourceview-3.0/language-specs)
- 
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
--            DESTINATION lib/gedit/plugins)
-+            DESTINATION lib64/gedit/plugins)
- 
- elseif(WIN32)
- 
-diff -Nur SuperCollider-Source.orig/external_libraries/oscpack/Makefile SuperCollider-Source/external_libraries/oscpack/Makefile
---- SuperCollider-Source.orig/external_libraries/oscpack/Makefile	2011-05-11 04:52:03.000000000 -0500
-+++ SuperCollider-Source/external_libraries/oscpack/Makefile	2013-02-17 19:29:13.509661735 -0600
-@@ -71,12 +71,12 @@
- 
- #Installs the library on a system global location
- install: lib
--	@$(INSTALL) -m 755 $(LIBFILENAME) $(PREFIX)/lib/$(LIBFILENAME)
--	@ln -s -f $(PREFIX)/lib/$(LIBFILENAME) $(PREFIX)/lib/$(LIBSONAME) 
-+	@$(INSTALL) -m 755 $(LIBFILENAME) $(PREFIX)/lib64/$(LIBFILENAME)
-+	@ln -s -f $(PREFIX)/lib64/$(LIBFILENAME) $(PREFIX)/lib64/$(LIBSONAME) 
- 	@mkdir  -p $(PREFIX)/include/oscpack/ip $(PREFIX)/include/oscpack/osc
- 	@$(INSTALL) -m 644 ip/*.h $(PREFIX)/include/oscpack/ip
- 	@$(INSTALL) -m 644 osc/*.h $(PREFIX)/include/oscpack/osc
--	@echo "SUCCESS! oscpack has been installed in $(PREFIX)/lib and $(PREFIX)/include/ospack/"
-+	@echo "SUCCESS! oscpack has been installed in $(PREFIX)/lib64 and $(PREFIX)/include/ospack/"
- 	@echo "now doing ldconfig..."
- 	@ldconfig
- 
-diff -Nur SuperCollider-Source.orig/server/plugins/CMakeLists.txt SuperCollider-Source/server/plugins/CMakeLists.txt
---- SuperCollider-Source.orig/server/plugins/CMakeLists.txt	2012-12-07 10:38:09.000000000 -0600
-+++ SuperCollider-Source/server/plugins/CMakeLists.txt	2013-02-17 19:31:54.557877532 -0600
-@@ -263,6 +263,6 @@
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- else()
- 	install(TARGETS ${plugins} ${supernova_plugins}
--			DESTINATION "lib/SuperCollider/plugins"
-+			DESTINATION "lib64/SuperCollider/plugins"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-diff -Nur SuperCollider-Source.orig/server/scsynth/CMakeLists.txt SuperCollider-Source/server/scsynth/CMakeLists.txt
---- SuperCollider-Source.orig/server/scsynth/CMakeLists.txt	2012-12-18 06:03:55.000000000 -0600
-+++ SuperCollider-Source/server/scsynth/CMakeLists.txt	2013-02-17 19:32:38.951385712 -0600
-@@ -169,7 +169,7 @@
- endif(SNDFILE_FOUND)
- 
- if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
--	add_definitions(-DSC_PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins")
-+	add_definitions(-DSC_PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/lib64/SuperCollider/plugins")
- endif()
- 
- if (AUDIOAPI STREQUAL jack)
-@@ -247,6 +247,6 @@
- else()
- 	install(TARGETS ${INSTALL_TARGETS}
- 			RUNTIME DESTINATION "bin"
--			LIBRARY DESTINATION "lib"
-+			LIBRARY DESTINATION "lib64"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-diff -Nur SuperCollider-Source.orig/server/supernova/server/main.cpp SuperCollider-Source/server/supernova/server/main.cpp
---- SuperCollider-Source.orig/server/supernova/server/main.cpp	2012-12-18 06:03:55.000000000 -0600
-+++ SuperCollider-Source/server/supernova/server/main.cpp	2013-02-17 19:33:08.666056514 -0600
-@@ -196,7 +196,7 @@
- #ifdef __linux__
-         path home = resolve_home();
-         sc_factory->load_plugin_folder("/usr/local/lib/SuperCollider/plugins");
--        sc_factory->load_plugin_folder("/usr/lib/SuperCollider/plugins");
-+        sc_factory->load_plugin_folder("/usr/lib64/SuperCollider/plugins");
-         sc_factory->load_plugin_folder(home / "/.local/share/SuperCollider/plugins");
-         sc_factory->load_plugin_folder(home / "share/SuperCollider/plugins");
- #else
diff --git a/audio/SuperCollider/ftbfs-gcc-4.9.patch b/audio/SuperCollider/ftbfs-gcc-4.9.patch
deleted file mode 100644
index 1b124f7277..0000000000
--- a/audio/SuperCollider/ftbfs-gcc-4.9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Felipe Sateler <fsateler@debian.org>
-Date: Fri, 6 Jun 2014 13:15:18 -0400
-Subject: Fix implementation of aligned_allocator::construct<U>.
-
-Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L.
-
-A typo, apparently. This patch can be dropped in the next upstream release.
-Index: supercollider/server/supernova/utilities/malloc_aligned.hpp
-===================================================================
---- supercollider.orig/server/supernova/utilities/malloc_aligned.hpp	2014-09-11 09:15:20.399357542 +0100
-+++ supercollider/server/supernova/utilities/malloc_aligned.hpp	2014-09-11 09:15:20.399357542 +0100
-@@ -243,7 +243,7 @@
-     template< class U, class... Args >
-     void construct(U * p, Args&& ... args)
-     {
--        ::new(p) T(std::forward<Args>(args)...);
-+        ::new(p) U(std::forward<Args>(args)...);
-     }
- #endif
-