audio/SuperCollider: Updated for version 3.6.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 65 insertions, 86 deletions

diff --git a/audio/SuperCollider/README b/audio/SuperCollider/README
index 1b9b55d6bd16..bf46c1d5ffa5 100644
--- a/audio/SuperCollider/README
+++ b/audio/SuperCollider/README
@@ -6,8 +6,8 @@ realtime sound synthesis server.
 To use scvim editor copy the contents of /usr/share/scvim/vim to ~/.vim/
 
 This will perform setcap cap_ipc_lock,cap_sys_nice=ep to /usr/bin/sclang,
-/usr/bin/scsynth and /usr/bin/scvim. If you don't want this behaviour pass
-CAPS="no" to the script.
+/usr/bin/scsynth, /usr/bin/scide and /usr/bin/scvim. If you don't want this
+behaviour pass CAPS="no" to the script.
 
-avahi (enabled with the switch AVAHI=yes), cwiid and gedit are optional
+avahi (enabled with the switch AVAHI=yes), cwiid, and gedit are optional
 dependencies.
diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild
index 7af6391aecba..ea5c0a767770 100644
--- a/audio/SuperCollider/SuperCollider.SlackBuild
+++ b/audio/SuperCollider/SuperCollider.SlackBuild
@@ -6,13 +6,15 @@
 # contact: pfeifer[dot]felix[at]googlemail[dot]com
 
 PRGNAM=SuperCollider
-VERSION=${VERSION:-3.5.7}
+VERSION=${VERSION:-3.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i486) ARCH=i486 ;;
+    i586) ARCH=i586 ;;
+    i686) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -26,6 +28,9 @@ 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
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -73,7 +78,7 @@ mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+	  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DNO_AVAHI="$avahi" \
     -DSC_WII="$cwiid" \
@@ -102,13 +107,14 @@ cp -a AUTHORS ChangeLog COPYING README_LINUX.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 if [ "${CAPS:-yes}" = "yes" ]; then
   echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/sclang" >> $PKG/install/doinst.sh
   echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/scsynth" >> $PKG/install/doinst.sh
   echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/scvim" >> $PKG/install/doinst.sh
+  echo "setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/scide" >> $PKG/install/doinst.sh
 fi
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/SuperCollider/SuperCollider.info b/audio/SuperCollider/SuperCollider.info
index 80d1d1c62387..b18ed4a4708c 100644
--- a/audio/SuperCollider/SuperCollider.info
+++ b/audio/SuperCollider/SuperCollider.info
@@ -1,8 +1,8 @@
 PRGNAM="SuperCollider"
-VERSION="3.5.7"
+VERSION="3.6.2"
 HOMEPAGE="http://supercollider.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/supercollider/SuperCollider-3.5.7-Source-linux.tar.bz2"
-MD5SUM="3eb38f88363563224c857a613414cb32"
+DOWNLOAD="http://downloads.sourceforge.net/supercollider/SuperCollider-3.6.2-Source-linux.tar.bz2"
+MD5SUM="b160930f01c2b00df303f8112bbe2f3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jack-audio-connection-kit"
diff --git a/audio/SuperCollider/doinst.sh b/audio/SuperCollider/doinst.sh
index aa30ae34d7a7..e4e6459838cb 100644
--- a/audio/SuperCollider/doinst.sh
+++ b/audio/SuperCollider/doinst.sh
@@ -1,3 +1,8 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
+
diff --git a/audio/SuperCollider/fixups_for_x86_64.diff b/audio/SuperCollider/fixups_for_x86_64.diff
index 0973385deae0..2f4fc8391997 100644
--- a/audio/SuperCollider/fixups_for_x86_64.diff
+++ b/audio/SuperCollider/fixups_for_x86_64.diff
@@ -1,10 +1,10 @@
-diff -Naur SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake SuperCollider-Source/cmake_modules/FindFFTW3f.cmake
---- SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake	2012-01-23 15:05:09.000000000 +0100
-+++ SuperCollider-Source/cmake_modules/FindFFTW3f.cmake	2012-09-24 10:05:11.828461684 +0200
+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
+     NAMES fftw3f libfftw3f fftw3f-3
 -    HINTS $ENV{FFTW3_DIR}/lib
 +    HINTS $ENV{FFTW3_DIR}/lib64
      PATHS /usr/local/lib
@@ -13,9 +13,9 @@ diff -Naur SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake SuperCollide
  )
  
  SET(FFTW3F_FOUND "NO")
-diff -Naur SuperCollider-Source.orig/cmake_modules/FindJack.cmake SuperCollider-Source/cmake_modules/FindJack.cmake
---- SuperCollider-Source.orig/cmake_modules/FindJack.cmake	2012-01-23 15:05:09.000000000 +0100
-+++ SuperCollider-Source/cmake_modules/FindJack.cmake	2012-09-24 10:05:11.828461684 +0200
+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
@@ -25,9 +25,9 @@ diff -Naur SuperCollider-Source.orig/cmake_modules/FindJack.cmake SuperCollider-
        /usr/local/lib
        /opt/local/lib
        /sw/lib
-diff -Naur SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake SuperCollider-Source/cmake_modules/FindPortaudio.cmake
---- SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake	2012-01-04 00:09:36.000000000 +0100
-+++ SuperCollider-Source/cmake_modules/FindPortaudio.cmake	2012-09-24 10:05:11.832459176 +0200
+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
@@ -46,11 +46,11 @@ diff -Naur SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake SuperColl
          /usr/local/lib
          /opt/local/lib
          /sw/lib
-diff -Naur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-Source/editors/sced/CMakeLists.txt
---- SuperCollider-Source.orig/editors/sced/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
-+++ SuperCollider-Source/editors/sced/CMakeLists.txt	2012-09-24 10:21:37.405264362 +0200
-@@ -17,10 +17,10 @@
-             DESTINATION share/mime/packages)
+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)
@@ -62,8 +62,8 @@ diff -Naur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-S
  
  elseif(NOT WIN32 AND SC_ED EQUAL 3)
  
-@@ -35,7 +35,7 @@
-             DESTINATION share/mime/packages)
+@@ -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)
@@ -71,21 +71,9 @@ diff -Naur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-S
  
  elseif(WIN32)
  
-diff -Naur SuperCollider-Source.orig/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2 SuperCollider-Source/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2
---- SuperCollider-Source.orig/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2	2012-08-12 16:43:59.000000000 +0200
-+++ SuperCollider-Source/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2	2012-09-24 10:05:11.832459176 +0200
-@@ -4,7 +4,7 @@
- 
- project boost/lockfree/example
-     : requirements
--       <library>/usr/lib/libboost_thread.so # temporary hack
-+       <library>/usr/lib64/libboost_thread.so # temporary hack
-     ;
- 
- exe fifo : fifo.cpp ;
-diff -Naur SuperCollider-Source.orig/external_libraries/oscpack/Makefile SuperCollider-Source/external_libraries/oscpack/Makefile
---- SuperCollider-Source.orig/external_libraries/oscpack/Makefile	2012-01-04 00:09:36.000000000 +0100
-+++ SuperCollider-Source/external_libraries/oscpack/Makefile	2012-09-24 10:05:11.832459175 +0200
+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
@@ -102,40 +90,21 @@ diff -Naur SuperCollider-Source.orig/external_libraries/oscpack/Makefile SuperCo
  	@echo "now doing ldconfig..."
  	@ldconfig
  
-diff -Naur SuperCollider-Source.orig/lang/CMakeLists.txt SuperCollider-Source/lang/CMakeLists.txt
---- SuperCollider-Source.orig/lang/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
-+++ SuperCollider-Source/lang/CMakeLists.txt	2012-09-24 10:06:58.587243029 +0200
-@@ -307,7 +307,7 @@
+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 sclang
--			LIBRARY DESTINATION "lib"
-+			LIBRARY DESTINATION "lib64"
- 			RUNTIME DESTINATION "bin"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif()
-diff -Naur SuperCollider-Source.orig/server/plugins/CMakeLists.txt SuperCollider-Source/server/plugins/CMakeLists.txt
---- SuperCollider-Source.orig/server/plugins/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
-+++ SuperCollider-Source/server/plugins/CMakeLists.txt	2012-09-24 10:05:54.339310317 +0200
-@@ -259,12 +259,12 @@
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- else()
- 	install(TARGETS ${plugins}
+ 	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)
- 
- 	if (SUPERNOVA)
- 		install(TARGETS ${supernova_plugins}
--			DESTINATION "lib/supernova/plugins"
-+			DESTINATION "lib64/supernova/plugins"
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 	endif()
  endif()
-diff -Naur SuperCollider-Source.orig/server/scsynth/CMakeLists.txt SuperCollider-Source/server/scsynth/CMakeLists.txt
---- SuperCollider-Source.orig/server/scsynth/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
-+++ SuperCollider-Source/server/scsynth/CMakeLists.txt	2012-09-24 10:07:21.145304431 +0200
-@@ -160,7 +160,7 @@
+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")
@@ -144,24 +113,23 @@ diff -Naur SuperCollider-Source.orig/server/scsynth/CMakeLists.txt SuperCollider
  endif()
  
  if (AUDIOAPI STREQUAL jack)
-@@ -229,7 +229,7 @@
- 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+@@ -247,6 +247,6 @@
  else()
- 	install(TARGETS libscsynth scsynth
+ 	install(TARGETS ${INSTALL_TARGETS}
+ 			RUNTIME DESTINATION "bin"
 -			LIBRARY DESTINATION "lib"
 +			LIBRARY DESTINATION "lib64"
- 			RUNTIME DESTINATION "bin"
  			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  endif()
-diff -Naur SuperCollider-Source.orig/server/supernova/server/main.cpp SuperCollider-Source/server/supernova/server/main.cpp
---- SuperCollider-Source.orig/server/supernova/server/main.cpp	2012-09-02 14:59:36.000000000 +0200
-+++ SuperCollider-Source/server/supernova/server/main.cpp	2012-09-24 10:05:11.833458554 +0200
-@@ -190,7 +190,7 @@
- 
+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__
-         sc_factory->load_plugin_folder("/usr/local/lib/supernova/plugins");
--        sc_factory->load_plugin_folder("/usr/lib/supernova/plugins");
-+        sc_factory->load_plugin_folder("/usr/lib64/supernova/plugins");
-         sc_factory->load_plugin_folder(home / "/.local/share/SuperCollider/supernova_plugins");
-         sc_factory->load_plugin_folder(home / "share/SuperCollider/supernova_plugins");
- #elif defined(__APPLE__)
+         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