[arch-commits] Commit in supercollider/trunk (2 files)

[David Runge]

    Date: Saturday, March 21, 2020 @ 13:30:35
  Author: dvzrv
Revision: 602597

upgpkg: supercollider 3.11.0-1: Upgrading to 3.11.0. Adding patch to devendor ableton link.
Removing macOS based hidden files that were shipped in the source tarball.
Moving all sodeps to package() and their respective packages to makedepends. Adding link to makedepends.

Added:
  supercollider/trunk/supercollider-3.11.0-devendor_ableton_link.patch
Modified:
  supercollider/trunk/PKGBUILD

--------------------------------------------------+
 PKGBUILD                                         |   38 +++++++++++-------
 supercollider-3.11.0-devendor_ableton_link.patch |   43 +++++++++++++++++++++
 2 files changed, 66 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-21 13:29:17 UTC (rev 602596)
+++ PKGBUILD	2020-03-21 13:30:35 UTC (rev 602597)
@@ -4,36 +4,39 @@
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.10.4
-pkgrel=2
+pkgver=3.11.0
+pkgrel=1
 pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('x86_64')
 url="https://supercollider.github.io"
 license=('GPL3')
 groups=('pro-audio')
-depends=('avahi' 'desktop-file-utils' 'fftw' 'gcc-libs' 'glibc' 'libasound.so'
-'libboost_filesystem.so' 'libboost_program_options.so' 'libboost_regex.so'
-'libboost_thread.so' 'libjack.so' 'libsndfile.so' 'libx11' 'libyaml-cpp.so'
-'qt5-base' 'qt5-svg' 'qt5-webengine' 'qt5-websockets' 'libreadline.so'
-'systemd-libs')
-makedepends=('boost' 'cmake' 'emacs' 'qt5-tools')
+depends=('gcc-libs' 'glibc'  'libx11' 'qt5-base' 'qt5-svg' 'qt5-webengine'
+'qt5-websockets')
+makedepends=('alsa-lib' 'avahi' 'boost' 'cmake' 'emacs' 'fftw' 'libsndfile'
+'link' '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')
 provides=("libscsynth.so" "sclang=${pkgver}" "scsynth=${pkgver}")
-# fixes for system boost were not backported:
-# https://github.com/supercollider/supercollider/issues/4743
 source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2"
-        "${pkgname}-3.10.4-system_boost.patch::https://github.com/dvzrv/supercollider/commit/21f5c7f765223a77621c9a46beb95d0ac00115a4.patch")
+        "${pkgname}-3.11.0-devendor_ableton_link.patch")
 install="${pkgname}.install"
-sha512sums=('8d414e036899ed2c8f1e6852cf325d85f2b99b0fa98dc1bd832be6106c8ec4d71f130a3280a86abc24ff71606e98242899319f1c7ed782fbf02af375e0477f6b'
-            'e460e53c425bcd15d26214d9e4d5d16aa5ab9b9922ed0b6ad74ad4d62baff7666110da80e9b488a6c60905fe6cc5845da67ec246a3e00139b570bdbda372b683')
+sha512sums=('8c93395231caf3617c3dae07e7c94e2253e24ab1a822b64904d5bc67f62fb12e9837ed0cd7210fbbe10cb5a7ff277e80e5f2ec85d6b51026c920851d4fda59a4'
+            'f42f2eb9c61b20b6313f9351e0528c397718bccafd094095d7d1d810eee55efd7b47126be8ef3ba56d6e752dbd270d11111f188c4a88282405af489993b3051d')
 
+
 prepare() {
   mv -v "${_name}-Source" "${pkgname}-${pkgver}"
   cd "${pkgname}-${pkgver}"
-  patch -Np1 -i "../${pkgname}-3.10.4-system_boost.patch"
+  # devendoring Ableton Link:
+  # https://github.com/supercollider/supercollider/issues/4818
+  # https://github.com/supercollider/supercollider/issues/4818
+  patch -Np1 -i "../${pkgname}-3.11.0-devendor_ableton_link.patch"
+  # removing macOS hidden files (due to release tarball issues):
+  # https://github.com/supercollider/supercollider/issues/4545
+  find . -type f -iname "*\._*" -delete
 }
 
 build() {
@@ -43,8 +46,9 @@
         -DBoost_NO_BOOST_CMAKE=ON \
         -DLIBSCSYNTH=ON \
         -DFORTIFY=ON \
+        -DSYSTEM_ABLETON_LINK=ON \
+        -DSYSTEM_BOOST=ON \
         -DSYSTEM_YAMLCPP=ON \
-        -DSYSTEM_BOOST=ON \
         -DSC_VIM=OFF \
         -B build \
         .
@@ -57,6 +61,10 @@
 }
 
 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' 'libsndfile.so'
+  'libreadline.so' 'libudev.so' 'libyaml-cpp.so')
   cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install -C build
   install -vDm 644 {AUTHORS,{CHANGELOG,README,README_LINUX}.md} \

Added: supercollider-3.11.0-devendor_ableton_link.patch
===================================================================
--- supercollider-3.11.0-devendor_ableton_link.patch	                        (rev 0)
+++ supercollider-3.11.0-devendor_ableton_link.patch	2020-03-21 13:30:35 UTC (rev 602597)
@@ -0,0 +1,43 @@
+diff --git c/CMakeLists.txt w/CMakeLists.txt
+index 30d9c8d1a..5e1e9cb89 100644
+--- c/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -228,6 +228,7 @@ endif()
+ 
+ option(SC_SYMLINK_CLASSLIB "Place a symlink of SCCLassLibrary instead of copying" OFF)
+ 
++option(SYSTEM_ABLETON_LINK "Use link from system" OFF)
+ option(SYSTEM_BOOST   "Use boost libraries from system" OFF)
+ option(SYSTEM_YAMLCPP "Use yaml-cpp library from system" OFF)
+ 
+diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt
+index 9b5095d11..5374fb29f 100644
+--- c/lang/CMakeLists.txt
++++ w/lang/CMakeLists.txt
+@@ -252,7 +252,25 @@ endif()
+ 
+ if (SC_ABLETON_LINK)
+ 	message(STATUS "Compiling with Ableton Link support")
+-	include(../external_libraries/link/AbletonLinkConfig.cmake)
++	if(SYSTEM_ABLETON_LINK)
++		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
++		)
++	else()
++		include(../external_libraries/link/AbletonLinkConfig.cmake)
++	endif()
++
+ 	target_link_libraries(libsclang Ableton::Link)
+ 
+ 	add_definitions(-DSC_ABLETON_LINK)