PKGBUILD: Removing boost 1.71 patch (now included). Switching to sodeps (defined in package() and makedepends).

Simplifying the multi-arch approach by adding the special cmake arguments and CFLAGS, CXXFLAGS instead of calling cmake each time. Simplifying cmake call with -B and -S flags.

3 files changed, 73 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b32567d6b21a..3487bb69327b 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.3.r483.g36cbdde009
+	pkgver = 3.10.4.r724.g1b0e7a0092
 	pkgrel = 1
 	url = https://supercollider.github.io/
 	arch = i686
@@ -9,29 +9,27 @@ pkgbase = supercollider-git
 	arch = armv7h
 	license = GPL3
 	checkdepends = xorg-server-xvfb
+	makedepends = alsa-lib
+	makedepends = avahi
 	makedepends = boost
 	makedepends = cmake
 	makedepends = emacs
+	makedepends = fftw
 	makedepends = git
+	makedepends = jack
+	makedepends = libsndfile
 	makedepends = link
 	makedepends = qt5-tools
-	depends = alsa-lib
-	depends = avahi
-	depends = boost-libs
-	depends = desktop-file-utils
-	depends = fftw
+	makedepends = readline
+	makedepends = yaml-cpp
 	depends = gcc-libs
 	depends = glibc
-	depends = jack
-	depends = libsndfile
 	depends = libx11
 	depends = qt5-base
 	depends = qt5-svg
 	depends = qt5-webengine
 	depends = qt5-websockets
-	depends = readline
 	depends = systemd-libs
-	depends = yaml-cpp
 	optdepends = emacs: emacs interface
 	optdepends = gedit: gedit interface
 	optdepends = sc3-plugins: additional extension plugins for scsynth
@@ -39,7 +37,6 @@ pkgbase = supercollider-git
 	provides = supercollider
 	conflicts = supercollider
 	source = git+https://github.com/supercollider/supercollider.git#branch=develop
-	source = supercollider-git-boost1.71.patch::https://github.com/supercollider/supercollider/pull/4612.patch
 	source = supercollider-git-devendor-ableton-link.patch
 	source = git+https://github.com/ableton/link.git
 	source = git+https://github.com/supercollider/scel.git
@@ -50,7 +47,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 = 005d241b797083dc031dda7f192013b69887c84db6b2616176605abafc1633c06a46a58b8ad1581d4cce0650fbc1f6d479b8992dbe4bdbf5ceace77fdccbdca8
 	sha512sums = 8aa14c7bf94b69f0ffa5b6f348544c3df72083d9f39cdf509efee3997e2e93cde2a3a8f6d6a149b3fd431843fec630d22c31c0f0332f2a1fff24c79ca4c16a00
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -62,4 +58,24 @@ pkgbase = supercollider-git
 	sha512sums = SKIP
 
 pkgname = supercollider-git
+	depends = gcc-libs
+	depends = glibc
+	depends = libx11
+	depends = qt5-base
+	depends = qt5-svg
+	depends = qt5-webengine
+	depends = qt5-websockets
+	depends = systemd-libs
+	depends = libasound.so
+	depends = libavahi-common.so
+	depends = libavahi-client.so
+	depends = libboost_filesystem.so
+	depends = libboost_program_options.so
+	depends = libboost_regex.so
+	depends = libboost_thread.so
+	depends = libfftw3f.so
+	depends = libjack.so
+	depends = libreadline.so
+	depends = libsndfile.so
+	depends = libyaml-cpp.so
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..121605b8d707
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.log
+*.pkg.tar.xz
+*.pkg.tar.zst
+*/
diff --git a/PKGBUILD b/PKGBUILD
index 5e585abc7e8b..1ad6edb4ce74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 
 pkgname=supercollider-git
 _name="supercollider"
-pkgver=3.10.3.r483.g36cbdde009
+pkgver=3.10.4.r724.g1b0e7a0092
 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=('alsa-lib' 'avahi' 'boost-libs' 'desktop-file-utils' 'fftw' 'gcc-libs'
-'glibc' 'jack' 'libsndfile' 'libx11' 'qt5-base' 'qt5-svg' 'qt5-webengine'
-'qt5-websockets' 'readline' 'systemd-libs' 'yaml-cpp')
-makedepends=('boost' 'cmake' 'emacs' 'git' 'link' 'qt5-tools')
+depends=('gcc-libs' 'glibc'  'libx11' 'qt5-base' 'qt5-svg' 'qt5-webengine'
+'qt5-websockets' 'systemd-libs')
+makedepends=('alsa-lib' 'avahi' 'boost' 'cmake' 'emacs' 'fftw' 'git' 'jack'
+'libsndfile' 'link' 'qt5-tools' 'readline' 'yaml-cpp')
 checkdepends=('xorg-server-xvfb')
 optdepends=('emacs: emacs interface'
             'gedit: gedit interface'
@@ -19,7 +19,6 @@ optdepends=('emacs: emacs interface'
 conflicts=('supercollider')
 provides=('libscsynth.so' 'supercollider')
 source=("git+https://github.com/${_name}/${_name}.git#branch=develop"
-        "${pkgname}-boost1.71.patch::https://github.com/supercollider/supercollider/pull/4612.patch"
         "${pkgname}-devendor-ableton-link.patch"
         "git+https://github.com/ableton/link.git"
         "git+https://github.com/${_name}/scel.git"
@@ -30,7 +29,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'
-            '005d241b797083dc031dda7f192013b69887c84db6b2616176605abafc1633c06a46a58b8ad1581d4cce0650fbc1f6d479b8992dbe4bdbf5ceace77fdccbdca8'
             '8aa14c7bf94b69f0ffa5b6f348544c3df72083d9f39cdf509efee3997e2e93cde2a3a8f6d6a149b3fd431843fec630d22c31c0f0332f2a1fff24c79ca4c16a00'
             'SKIP'
             'SKIP'
@@ -59,57 +57,37 @@ 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"
-  patch -Np1 -i ../"${pkgname}-boost1.71.patch"
-  mkdir -p build
 }
 
 build() {
-  cd "${_name}/build"
-  _carch=$(uname -m)
+  cd "${_name}"
+  _carch="$(uname -m)"
+  _cmake_args=""
   echo "$_carch architecture detected."
   case "$_carch" in
     "armv6l")
-      export CC="gcc"
-      export CXX="g++"
-      cmake -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLIBSCSYNTH=ON \
-            -DFORTIFY=ON \
-            -DSC_VIM=OFF \
-            -DSYSTEM_BOOST=ON \
-            -DSYSTEM_YAMLCPP=ON \
-            -DSSE=OFF \
-            -DSSE2=OFF \
-            -DSUPERNOVA=OFF \
-            -DNATIVE=OFF \
-            -DSC_QT=OFF \
-            -DSC_ED=OFF \
-            -DSC_IDE=OFF \
-            -DCMAKE_C_FLAGS='-march=armv6 -mfpu=vfp -mfloat-abi=hard' \
-            -DCMAKE_CXX_FLAGS='-march=armv6 -mfpu=vfp -mfloat-abi=hard' \
-             ..
+    export CFLAGS='-march=armv6 -mfpu=vfp -mfloat-abi=hard'
+    export CXXFLAGS='-march=armv6 -mfpu=vfp -mfloat-abi=hard'
+    _cmake_args="-DSSE=OFF \
+                 -DSSE2=OFF \
+                 -DSUPERNOVA=OFF \
+                 -DNATIVE=OFF \
+                 -DSC_QT=OFF \
+                 -DSC_ED=OFF \
+                 -DSC_IDE=OFF"
     ;;
     "armv7l")
-      export CC="gcc"
-      export CXX="g++"
-      cmake -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLIBSCSYNTH=ON \
-            -DFORTIFY=ON \
-            -DSC_VIM=OFF \
-            -DSYSTEM_BOOST=ON \
-            -DSYSTEM_YAMLCPP=ON \
-            -DSSE=OFF \
-            -DSSE2=OFF \
-            -DSUPERNOVA=OFF \
-            -DNATIVE=OFF \
-            -DSC_QT=OFF \
-            -DSC_ED=OFF \
-            -DSC_IDE=OFF \
-            -DCMAKE_C_FLAGS='-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon' \
-            -DCMAKE_CXX_FLAGS='-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon' \
-            ..
+    export CFLAGS='-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon'
+    export CXXFLAGS='-march=armv7-a -mtune=cortex-a8 -mfloat-abi=hard -mfpu=neon'
+    _cmake_args="-DSSE=OFF \
+                 -DSSE2=OFF \
+                 -DSUPERNOVA=OFF \
+                 -DNATIVE=OFF \
+                 -DSC_QT=OFF \
+                 -DSC_ED=OFF \
+                 -DSC_IDE=OFF"
     ;;
     *)
     cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -119,22 +97,28 @@ build() {
           -DSC_VIM=OFF \
           -DSYSTEM_BOOST=ON \
           -DSYSTEM_YAMLCPP=ON \
-          ..
+          ${_cmake_args} \
+          -B build \
+          -S .
     ;;
   esac
-  make VERBOSE=1
+  make VERBOSE=1 -C build
 }
 
 check() {
-  cd "${_name}/build"
-  xvfb-run make test ARGS="-V" || warning "Known failing tests: https://github.com/supercollider/supercollider/issues/3555"
+  cd "${_name}"
+  xvfb-run make test VERBOSE=1 ARGS="-V" -C build || warning "Known failing tests: https://github.com/supercollider/supercollider/issues/3555"
 }
 
 
 package() {
-  cd "${_name}/build"
-  make DESTDIR="${pkgdir}/" install
-  install -t "${pkgdir}/usr/share/doc/${pkgname}/" \
-    -vDm 644 ../{AUTHORS,{CHANGELOG,README,README_LINUX}.md}
+  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')
+  cd "${_name}"
+  make DESTDIR="${pkgdir}/" install -C build
+  install -vDm 644 {AUTHORS,{CHANGELOG,README,README_LINUX}.md} \
+    -t "${pkgdir}/usr/share/doc/${pkgname}/"
 }