teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

supercollider: rebuild against boost-1.68.0 

[ci skip]
This commit is contained in:
John Zimmermann 2018-10-02 19:47:07 +02:00
parent f08c4eac6f
commit 6021d67115
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
srcpkgs/supercollider/patches/bbcd068659ced596402dedc78f49fabfab6470bd.patch Normal file
View File

@ -0,0 +1,23 @@
From bbcd068659ced596402dedc78f49fabfab6470bd Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Sat, 29 Sep 2018 17:14:18 +0200
Subject: [PATCH] server/supernova/utilities/time_tag.hpp: Adding static_cast
to long for time_duration offset in microseconds to satisfy boost >= 1.67.0.
---
server/supernova/utilities/time_tag.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git server/supernova/utilities/time_tag.hpp server/supernova/utilities/time_tag.hpp
index 33b1effd80..3d0f21dba9 100644
--- server/supernova/utilities/time_tag.hpp
+++ server/supernova/utilities/time_tag.hpp
@@ -229,7 +229,7 @@ class time_tag
#ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG
time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds());
#else
- time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000);
+ time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(static_cast<long>(get_nanoseconds()/1000));
#endif
return ptime(base, offset);
}

18
srcpkgs/supercollider/template
View File

@ -1,20 +1,24 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.9.3
revision=3
revision=4
wrksrc=SuperCollider-Source
build_style=cmake
configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
hostmakedepends="emacs pkg-config"
makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libXt-devel libatomic-devel libsndfile-devel qt5-declarative-devel qt5-devel qt5-location-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-webkit-devel yaml-cpp-devel"
makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libatomic-devel
libsndfile-devel libXt-devel qt5-declarative-devel qt5-location-devel
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-webkit-devel
yaml-cpp-devel"
short_desc="An environment and programming language for real time audio synthesis"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
license="GPL-3.0-or-later"
homepage="https://github.com/supercollider/supercollider"
distfiles="${homepage}/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"
checksum=b939964a93709d747711552d116fb935508d39ba3fb64e55a45b0210a8eb11b5
if [ -n "$CROSS_BUILD" ]; then
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"
fi
@ -22,7 +26,13 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libglob-devel";;
esac
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*);;
*) configure_args+=" -DSSE=OFF -DSSE2=OFF";;
esac
pre_configure() {
rm -rf external_libraries/boost # https://github.com/supercollider/supercollider/issues/4096
sed -i 's/yaml/yaml-cpp/g' CMakeLists.txt editors/sc-ide/CMakeLists.txt
case "$XBPS_TARGET_MACHINE" in
*-musl)