diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index 1b1e080bb..9c2f55c6c 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -7,27 +7,27 @@ _name=SuperCollider pkgname=supercollider -pkgver=3.6.6 -pkgrel=2 +pkgver=3.7.2 +pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') url="http://supercollider.sourceforge.net/" license=('GPL3') -depends=('jack' 'fftw' 'cwiid' 'qtwebkit') -makedepends=('cmake' 'ruby' 'vim' 'emacs') +depends=('jack' 'fftw' 'cwiid' 'qt5-webkit') +makedepends=('cmake' 'ruby' 'vim' 'emacs' 'qt5-tools' 'boost') optdepends=('emacs: emacs interface' 'gedit: gedit interface' 'vim: vim interface' 'ruby: vim support') -install="$pkgname.install" -source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2" - "ftbfs-gcc-4.9.patch") -md5sums=('14d6063933230c74e42f5923a811e7c6' - '257a9198e650638a9a43bad2812760f7') +source=("https://github.com/supercollider/supercollider/releases/download/Version-$pkgver/SuperCollider-$pkgver-Source-linux.tar.bz2" + supercollider-cxxflags.patch) +md5sums=('cb89a68bf599205d3c33ee1ee1e13ea0' + '4f62489286fe8008d6013fc59047c20b') prepare() { - cd "$srcdir/$_name-Source" - patch -Np1 -i ../ftbfs-gcc-4.9.patch + cd $_name-Source +# Fix CXXFLAGS + patch -p1 -i ../supercollider-cxxflags.patch } build() { @@ -36,8 +36,9 @@ build() { cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DLIBSCSYNTH=ON \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -DBOOST_MATH_DISABLE_FLOAT128" \ -DSSE=OFF -DSSE2=OFF -DSUPERNOVA=OFF -DNOVA_SIMD=ON -DNATIVE=OFF \ - -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" + -DCMAKE_C_FLAGS="${CFLAGS}" make } diff --git a/community/supercollider/ftbfs-gcc-4.9.patch b/community/supercollider/ftbfs-gcc-4.9.patch deleted file mode 100644 index 6e1ce5909..000000000 --- a/community/supercollider/ftbfs-gcc-4.9.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Felipe Sateler -Date: Fri, 6 Jun 2014 13:15:18 -0400 -Subject: Fix implementation of aligned_allocator::construct. - -Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L. - -A typo, apparently. This patch can be dropped in the next upstream release. -Index: supercollider/server/supernova/utilities/malloc_aligned.hpp -=================================================================== ---- supercollider.orig/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100 -+++ supercollider/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100 -@@ -243,7 +243,7 @@ - template< class U, class... Args > - void construct(U * p, Args&& ... args) - { -- ::new(p) T(std::forward(args)...); -+ ::new(p) U(std::forward(args)...); - } - #endif - diff --git a/community/supercollider/supercollider-cxxflags.patch b/community/supercollider/supercollider-cxxflags.patch new file mode 100644 index 000000000..28f6f81df --- /dev/null +++ b/community/supercollider/supercollider-cxxflags.patch @@ -0,0 +1,11 @@ +--- SuperCollider-Source/CMakeLists.txt.orig 2016-10-23 10:21:32.322819928 +0000 ++++ SuperCollider-Source/CMakeLists.txt 2016-10-23 10:21:52.259731856 +0000 +@@ -240,7 +240,7 @@ + if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG) + if (SSE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse") +- set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -msse") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse") + if(NOT APPLE AND NOT CMAKE_COMPILER_IS_CLANG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse") diff --git a/community/supercollider/supercollider.install b/community/supercollider/supercollider.install deleted file mode 100644 index 32bd4537c..000000000 --- a/community/supercollider/supercollider.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} \ No newline at end of file