Date: Sunday, June 3, 2018 @ 00:33:24
Author: foutrelis
Revision: 338499
Fix build with boost 1.67
Added:
performous/trunk/boost-1.67.patch
Modified:
performous/trunk/PKGBUILD
------------------+
PKGBUILD | 11 +++++++++--
boost-1.67.patch | 22 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-03 00:09:51 UTC (rev 338498)
+++ PKGBUILD 2018-06-03 00:33:24 UTC (rev 338499)
@@ -12,9 +12,16 @@
depends=('boost-libs' 'libepoxy' 'libxml++2.6' 'portaudio' 'portmidi'
'librsvg' 'ffmpeg' 'opencv' 'sdl2')
makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
optdepends=('performous-freesongs: free songs for performous')
-source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz)
-sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1')
+source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz
+ boost-1.67.patch)
+sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1'
+
'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1')
+prepare() {
+ cd performous-${pkgver}
+ patch -Np1 -i ../boost-1.67.patch
+}
+
build() {
cd performous-${pkgver}
Added: boost-1.67.patch
===================================================================
--- boost-1.67.patch (rev 0)
+++ boost-1.67.patch 2018-06-03 00:33:24 UTC (rev 338499)
@@ -0,0 +1,22 @@
+Only in performous-1.1: build
+diff -upr performous-1.1.orig/game/audio.cc performous-1.1/game/audio.cc
+--- performous-1.1.orig/game/audio.cc 2016-01-23 12:40:01.000000000 +0200
++++ performous-1.1/game/audio.cc 2018-06-03 03:29:35.251425495 +0300
+@@ -77,7 +77,7 @@ class AudioClock {
+ static ptime getTime() { return microsec_clock::universal_time(); }
+ // Conversion helpers
+ static double getSeconds(time_duration t) { return 1e-6 *
t.total_microseconds(); }
+- static time_duration getDuration(double seconds) { return
microseconds(1e6 * seconds); }
++ static time_duration getDuration(double seconds) { return
microseconds(static_cast<long long>(1e6 * seconds)); }
+
+ mutable boost::mutex m_mutex;
+ ptime m_baseTime; ///< A reference time (corresponds to m_basePos)
+@@ -149,7 +149,7 @@ class Music {
+ int64_t m_pos; ///< Current sample position
+ bool m_preview;
+ AudioClock m_clock;
+- time_duration durationOf(int64_t samples) const { return
microseconds(1e6 * samples / srate / 2.0); }
++ time_duration durationOf(int64_t samples) const { return
microseconds(static_cast<long long>(1e6 * samples / srate / 2.0)); }
+ public:
+ bool suppressCenterChannel;
+ double fadeLevel;
