PKGBUILD: Adding link to makedepends. Removing patch to use system boost (upstreamed). Adding patch to devendor link. Cleaning up included submodules.

4 files changed, 55 insertions, 175 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 446fac982bc5..7153a7a0e64b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = supercollider-git
 	pkgdesc = Environment and programming language for real time audio synthesis and algorithmic composition
-	pkgver = 3.10.0.r218.g794a842c86
+	pkgver = 3.10.2.r399.g63783aeca0
 	pkgrel = 1
 	url = https://supercollider.github.io/
 	arch = i686
@@ -13,6 +13,7 @@ pkgbase = supercollider-git
 	makedepends = cmake
 	makedepends = emacs
 	makedepends = git
+	makedepends = link
 	makedepends = qt5-tools
 	depends = boost-libs
 	depends = desktop-file-utils
@@ -28,14 +29,20 @@ pkgbase = supercollider-git
 	provides = supercollider
 	conflicts = supercollider
 	source = git+https://github.com/supercollider/supercollider.git#branch=develop
-	source = use-system-boost.patch
-	source = git+https://github.com/timblechmann/nova-simd.git
-	source = git+https://github.com/timblechmann/nova-tt.git
+	source = supercollider-git-devendor-ableton-link.patch
+	source = git+https://github.com/ableton/link.git
+	source = git+https://github.com/supercollider/scel.git
+	source = git+https://github.com/supercollider/scvim.git
 	source = git+https://github.com/supercollider/hidapi.git
 	source = git+https://github.com/supercollider/portaudio.git
 	source = git+https://github.com/supercollider/yaml-cpp.git
+	source = git+https://github.com/timblechmann/nova-simd.git
+	source = git+https://github.com/timblechmann/nova-tt.git
+	sha512sums = SKIP
+	sha512sums = 8aa14c7bf94b69f0ffa5b6f348544c3df72083d9f39cdf509efee3997e2e93cde2a3a8f6d6a149b3fd431843fec630d22c31c0f0332f2a1fff24c79ca4c16a00
+	sha512sums = SKIP
+	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = 0126a81b410c40bcbfaaaf07ecc8ce292b8eaf5d814eb5ad7c36c76e24b1a39d7b5bd607833b6082f92dd5a9aded7d8360b86a77021ead4a1860f548607e80bf
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8bbb5524f93f..3e88ce89f4a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=supercollider-git
 _name="supercollider"
-pkgver=3.10.0.r218.g794a842c86
+pkgver=3.10.2.r399.g63783aeca0
 pkgrel=1
 pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -10,7 +10,7 @@ url="https://supercollider.github.io/"
 license=('GPL3')
 depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg'
 'qt5-webengine' 'qt5-websockets' 'yaml-cpp')
-makedepends=('boost' 'cmake' 'emacs' 'git' 'qt5-tools')
+makedepends=('boost' 'cmake' 'emacs' 'git' 'link' 'qt5-tools')
 checkdepends=('xorg-server-xvfb')
 optdepends=('emacs: emacs interface'
             'gedit: gedit interface'
@@ -18,14 +18,20 @@ optdepends=('emacs: emacs interface'
 conflicts=('supercollider')
 provides=('supercollider')
 source=("git+https://github.com/${_name}/${_name}.git#branch=develop"
-        "use-system-boost.patch"
-        "git+https://github.com/timblechmann/nova-simd.git"
-        "git+https://github.com/timblechmann/nova-tt.git"
+        "${pkgname}-devendor-ableton-link.patch"
+        "git+https://github.com/ableton/link.git"
+        "git+https://github.com/${_name}/scel.git"
+        "git+https://github.com/${_name}/scvim.git"
         "git+https://github.com/${_name}/hidapi.git"
         "git+https://github.com/${_name}/portaudio.git"
-        "git+https://github.com/${_name}/yaml-cpp.git")
+        "git+https://github.com/${_name}/yaml-cpp.git"
+        "git+https://github.com/timblechmann/nova-simd.git"
+        "git+https://github.com/timblechmann/nova-tt.git")
 sha512sums=('SKIP'
-            '0126a81b410c40bcbfaaaf07ecc8ce292b8eaf5d814eb5ad7c36c76e24b1a39d7b5bd607833b6082f92dd5a9aded7d8360b86a77021ead4a1860f548607e80bf'
+            '8aa14c7bf94b69f0ffa5b6f348544c3df72083d9f39cdf509efee3997e2e93cde2a3a8f6d6a149b3fd431843fec630d22c31c0f0332f2a1fff24c79ca4c16a00'
+            'SKIP'
+            'SKIP'
+            'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -40,16 +46,17 @@ pkgver() {
 prepare() {
   cd "${_name}"
   git submodule init
+  git config submodule.editors/sc-el.url "${srcdir}/scel"
+  git config submodule.editors/scvim.url "${srcdir}/scvim"
   git config submodule.external_libraries/nova-simd.url "${srcdir}/nova-simd"
   git config submodule.external_libraries/nova-tt.url "${srcdir}/nova-tt"
   git config submodule.external_libraries/hidapi.url "${srcdir}/hidapi"
   git config submodule.external_libraries/portaudio_sc_org.url "${srcdir}/portaudio"
   git config submodule.external_libraries/portaudio_sc_org.branch "${_name}"
   git config submodule.external_libraries/yaml-cpp.url "${srcdir}/yaml-cpp"
+  git config submodule.external_libraries/link.url "${srcdir}/link"
   git submodule update
-  # make sure system boost is used:
-  # https://github.com/supercollider/supercollider/issues/4096
-  patch -Np1 -i ../use-system-boost.patch
+  patch -Np1 -i ../"${pkgname}-devendor-ableton-link.patch"
   mkdir -p build
 }
 
diff --git a/supercollider-git-devendor-ableton-link.patch b/supercollider-git-devendor-ableton-link.patch
new file mode 100644
index 000000000000..f786037277d1
--- /dev/null
+++ b/supercollider-git-devendor-ableton-link.patch
@@ -0,0 +1,26 @@
+diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt
+index 47dfa2fe4..9b483ae7a 100644
+--- c/lang/CMakeLists.txt
++++ w/lang/CMakeLists.txt
+@@ -219,7 +219,20 @@ endif()
+ 
+ if (SC_ABLETON_LINK)
+ 	message(STATUS "Compiling with Ableton Link support")
+-	include(../external_libraries/link/AbletonLinkConfig.cmake)
++  find_path(ABLETON_LINK_INCLUDE ableton Link.hpp)
++  add_library(Ableton::Link IMPORTED INTERFACE)
++  set_property(TARGET Ableton::Link APPEND PROPERTY
++    INTERFACE_INCLUDE_DIRECTORIES
++    ${ABLETON_LINK_INCLUDE}/ableton
++  )
++  set_property(TARGET Ableton::Link APPEND PROPERTY
++    INTERFACE_COMPILE_DEFINITIONS
++    LINK_PLATFORM_LINUX=1
++  )
++  set_property(TARGET Ableton::Link APPEND PROPERTY
++    INTERFACE_SOURCES
++    ${ABLETON_LINK_INCLUDE}/ableton/Link.hpp
++  )
+ 	target_link_libraries(libsclang Ableton::Link)
+ 
+ 	add_definitions(-DSC_ABLETON_LINK)
diff --git a/use-system-boost.patch b/use-system-boost.patch
deleted file mode 100644
index f8c48eaee43a..000000000000
--- a/use-system-boost.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git c/CMakeLists.txt w/CMakeLists.txt
-index 063028774..be3e0aebc 100644
---- c/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -253,14 +253,15 @@ if (NOT WIN32)
- endif()
- 
- if(SYSTEM_BOOST)
--  set(Boost_USE_MULTITHREADED      ON)
--  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
--endif()
--
--if (Boost_FOUND)
--	link_directories(${Boost_LIBRARY_DIRS})
--else()
--	message(STATUS "building boost libraries manually")
-+    set(Boost_USE_MULTITHREADED ON)
-+    find_package( Boost 1.50.0 COMPONENTS  thread system filesystem program_options regex test_exec_monitor )
-+    if (Boost_FOUND)
-+    	  link_directories(${Boost_LIBRARY_DIRS})
-+    else()
-+        set(SYSTEM_BOOST OFF)
-+        set(Boost_USE_MULTITHREADED OFF)
-+        message(WARNING "Not using SYSTEM_BOOST because none was found.")
-+    endif()
- endif()
- 
- if(SYSTEM_YAMLCPP)
-diff --git c/editors/sc-ide/CMakeLists.txt w/editors/sc-ide/CMakeLists.txt
-index 50059bc2f..ba30f857f 100644
---- c/editors/sc-ide/CMakeLists.txt
-+++ w/editors/sc-ide/CMakeLists.txt
-@@ -219,7 +219,6 @@ endif()
- include_directories(${CMAKE_SOURCE_DIR}/include/common)
- include_directories(${CMAKE_SOURCE_DIR}/common)
- include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface)
--include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
- include_directories(${YAMLCPP_INCLUDE_DIR})
- # For QtCollider headers:
- include_directories(${CMAKE_SOURCE_DIR})
-@@ -299,11 +298,12 @@ target_link_libraries( SuperCollider
-     oscpack
- )
- 
--if(Boost_FOUND)
-+if(${SYSTEM_BOOST})
-     target_link_libraries( SuperCollider ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
- else()
-     # in-house-built boost system
-     target_link_libraries( SuperCollider boost_system boost_filesystem )
-+    include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
- endif()
- 
- if(APPLE)
-diff --git c/external_libraries/CMakeLists.txt w/external_libraries/CMakeLists.txt
-index df33dc6f1..b850657eb 100644
---- c/external_libraries/CMakeLists.txt
-+++ w/external_libraries/CMakeLists.txt
-@@ -2,7 +2,8 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/nova-simd/vec.hpp)
- 	message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree")
- endif()
- 
--if(NOT Boost_FOUND) # we compile boost ourselves
-+if(NOT SYSTEM_BOOST) # we compile boost ourselves
-+	message(STATUS "building boost libraries manually")
- 	# boost thread
- 	aux_source_directory(boost/libs/thread/src/ boost_thread_src )
- 
-@@ -84,10 +85,10 @@ set_property(TARGET tlsf PROPERTY POSITION_INDEPENDENT_CODE TRUE)
- 
- #oscpack
- add_library(oscpack STATIC EXCLUDE_FROM_ALL "oscpack_build.cpp")
--target_include_directories(oscpack PRIVATE boost)
-+target_include_directories(oscpack
-+  PRIVATE $<IF:$<STREQUAL:${SYSTEM_BOOST},"ON">,${Boost_INCLUDE_DIRS},${CMAKE_SOURCE_DIR}/external_libraries/boost>)
- target_include_directories(oscpack INTERFACE oscpack_1_1_0 )
- 
--
- if(LTO)
- 	set_property(TARGET oscpack tlsf
- 				 APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report")
-@@ -104,7 +105,11 @@ if(NOT YAMLCPP_FOUND)
-   CREATE_FINAL_FILE(${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp ${yaml_src})
- 
-   add_library(yaml STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp)
--  target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost)
-+  if(SYSTEM_BOOST)
-+    target_include_directories(yaml PUBLIC ${Boost_INCLUDE_DIRS})
-+  else()
-+    target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost)
-+  endif()
-   set_property( TARGET yaml PROPERTY FOLDER 3rdparty )
-   set(YAMLCPP_LIBRARY yaml)
-   set(YAMLCPP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include)
-diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt
-index c68b32fdc..ca4f7a4f1 100644
---- c/lang/CMakeLists.txt
-+++ w/lang/CMakeLists.txt
-@@ -202,7 +202,7 @@ if(SC_HIDAPI)
-   endif()
- endif()
- 
--if (Boost_FOUND)
-+if (SYSTEM_BOOST)
- 	target_include_directories(libsclang PUBLIC ${Boost_INCLUDE_DIRS})
- 	target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY})
- else()
-diff --git c/server/CMakeLists.txt w/server/CMakeLists.txt
-index 2622b4e36..ba28c9b49 100644
---- c/server/CMakeLists.txt
-+++ w/server/CMakeLists.txt
-@@ -12,7 +12,7 @@ include_directories(${CMAKE_SOURCE_DIR}/external_libraries
- 					${CMAKE_SOURCE_DIR}/external_libraries/nova-tt
- 					)
- 
--if (Boost_FOUND)
-+if(SYSTEM_BOOST)
- 	include_directories(${Boost_INCLUDE_DIRS})
- else()
- 	include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost)
-diff --git c/server/scsynth/CMakeLists.txt w/server/scsynth/CMakeLists.txt
-index 17c09f262..d95378c54 100644
---- c/server/scsynth/CMakeLists.txt
-+++ w/server/scsynth/CMakeLists.txt
-@@ -176,7 +176,7 @@ elseif(AUDIOAPI STREQUAL coreaudio)
- 	target_link_libraries(libscsynth "-framework CoreAudio")
- endif()
- 
--if (Boost_FOUND)
-+if (SYSTEM_BOOST)
- 	target_link_libraries(libscsynth ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} )
- else()
- 	target_link_libraries(libscsynth boost_system boost_filesystem)
-diff --git c/server/supernova/CMakeLists.txt w/server/supernova/CMakeLists.txt
-index cfe128880..59e5a444a 100644
---- c/server/supernova/CMakeLists.txt
-+++ w/server/supernova/CMakeLists.txt
-@@ -147,7 +147,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- endif()
- 
- 
--if(Boost_FOUND)
-+if(SYSTEM_BOOST)
-     target_link_libraries(libsupernova ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY})
-     target_include_directories(libsupernova PUBLIC ${Boost_INCLUDE_DIRS})
- else()
-diff --git c/testsuite/server/CMakeLists.txt w/testsuite/server/CMakeLists.txt
-index 38ce4b486..9c611a9ad 100644
---- c/testsuite/server/CMakeLists.txt
-+++ w/testsuite/server/CMakeLists.txt
-@@ -5,4 +5,8 @@ if (SUPERNOVA)
- endif()
- 
- add_library(boost_test STATIC boost_test.cpp)
--target_include_directories(boost_test PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-+if (SYSTEM_BOOST)
-+  target_include_directories(boost_test PUBLIC ${Boost_INCLUDE_DIRS})
-+else()
-+  target_include_directories(boost_test PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost)
-+endif()