Upgrading to > 3.11.0

PKGBUILD:
Renaming link dependency to abletonlink and removing devendoring patch
for abletonlink (now included).
Removing libscsynth.so from provides (building without LIBSCSYNTH=ON due
to upstream issues
https://github.com/supercollider/supercollider/issues/4992).
Applying latest cmake packaging guidelines.
Adding all available sodeps in package() and adding the respective
packages to makedepends.

3 files changed, 13 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3487bb69327b..adf0333b7212 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.4.r724.g1b0e7a0092
+	pkgver = 3.11.0.r371.g504ce0537b
 	pkgrel = 1
 	url = https://supercollider.github.io/
 	arch = i686
@@ -18,9 +18,10 @@ pkgbase = supercollider-git
 	makedepends = git
 	makedepends = jack
 	makedepends = libsndfile
-	makedepends = link
+	makedepends = abletonlink
 	makedepends = qt5-tools
 	makedepends = readline
+	makedepends = systemd-libs
 	makedepends = yaml-cpp
 	depends = gcc-libs
 	depends = glibc
@@ -29,15 +30,12 @@ pkgbase = supercollider-git
 	depends = qt5-svg
 	depends = qt5-webengine
 	depends = qt5-websockets
-	depends = systemd-libs
 	optdepends = emacs: emacs interface
 	optdepends = gedit: gedit interface
 	optdepends = sc3-plugins: additional extension plugins for scsynth
-	provides = libscsynth.so
 	provides = supercollider
 	conflicts = supercollider
 	source = git+https://github.com/supercollider/supercollider.git#branch=develop
-	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
@@ -47,7 +45,6 @@ pkgbase = supercollider-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
@@ -65,7 +62,6 @@ pkgname = supercollider-git
 	depends = qt5-svg
 	depends = qt5-webengine
 	depends = qt5-websockets
-	depends = systemd-libs
 	depends = libasound.so
 	depends = libavahi-common.so
 	depends = libavahi-client.so
@@ -77,5 +73,6 @@ pkgname = supercollider-git
 	depends = libjack.so
 	depends = libreadline.so
 	depends = libsndfile.so
+	depends = libudev.so
 	depends = libyaml-cpp.so
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ad6edb4ce74..5ddbd6de5a84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,23 @@
 
 pkgname=supercollider-git
 _name="supercollider"
-pkgver=3.10.4.r724.g1b0e7a0092
+pkgver=3.11.0.r371.g504ce0537b
 pkgrel=1
 pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://supercollider.github.io/"
 license=('GPL3')
 depends=('gcc-libs' 'glibc'  'libx11' 'qt5-base' 'qt5-svg' 'qt5-webengine'
-'qt5-websockets' 'systemd-libs')
+'qt5-websockets')
 makedepends=('alsa-lib' 'avahi' 'boost' 'cmake' 'emacs' 'fftw' 'git' 'jack'
-'libsndfile' 'link' 'qt5-tools' 'readline' 'yaml-cpp')
+'libsndfile' 'abletonlink' 'qt5-tools' 'readline' 'systemd-libs' 'yaml-cpp')
 checkdepends=('xorg-server-xvfb')
 optdepends=('emacs: emacs interface'
             'gedit: gedit interface'
             'sc3-plugins: additional extension plugins for scsynth')
 conflicts=('supercollider')
-provides=('libscsynth.so' 'supercollider')
+provides=('supercollider')
 source=("git+https://github.com/${_name}/${_name}.git#branch=develop"
-        "${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"
@@ -29,7 +28,6 @@ source=("git+https://github.com/${_name}/${_name}.git#branch=develop"
         "git+https://github.com/timblechmann/nova-simd.git"
         "git+https://github.com/timblechmann/nova-tt.git")
 sha512sums=('SKIP'
-            '8aa14c7bf94b69f0ffa5b6f348544c3df72083d9f39cdf509efee3997e2e93cde2a3a8f6d6a149b3fd431843fec630d22c31c0f0332f2a1fff24c79ca4c16a00'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -57,8 +55,6 @@ prepare() {
   git config submodule.external_libraries/yaml-cpp.url "${srcdir}/yaml-cpp"
   git config submodule.external_libraries/link.url "${srcdir}/link"
   git submodule update
-  # devendor ableton link
-  patch -Np1 -i ../"${pkgname}-devendor-ableton-link.patch"
 }
 
 build() {
@@ -90,14 +86,15 @@ build() {
                  -DSC_IDE=OFF"
     ;;
     *)
-    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_BUILD_TYPE=Release \
-          -DLIBSCSYNTH=ON \
+    cmake -DCMAKE_INSTALL_PREFIX='/usr' \
+          -DCMAKE_BUILD_TYPE='None' \
           -DFORTIFY=ON \
           -DSC_VIM=OFF \
+          -DSYSTEM_ABLETON_LINK=ON \
           -DSYSTEM_BOOST=ON \
           -DSYSTEM_YAMLCPP=ON \
           ${_cmake_args} \
+          -Wno-dev \
           -B build \
           -S .
     ;;
@@ -115,7 +112,7 @@ package() {
   depends+=('libasound.so' 'libavahi-common.so' 'libavahi-client.so'
   'libboost_filesystem.so' 'libboost_program_options.so' 'libboost_regex.so'
   'libboost_thread.so' 'libfftw3f.so' 'libjack.so' 'libreadline.so'
-  'libsndfile.so' 'libyaml-cpp.so')
+  'libsndfile.so' 'libudev.so' 'libyaml-cpp.so')
   cd "${_name}"
   make DESTDIR="${pkgdir}/" install -C build
   install -vDm 644 {AUTHORS,{CHANGELOG,README,README_LINUX}.md} \
diff --git a/supercollider-git-devendor-ableton-link.patch b/supercollider-git-devendor-ableton-link.patch
deleted file mode 100644
index f786037277d1..000000000000
--- a/supercollider-git-devendor-ableton-link.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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)