Date: Thursday, October 15, 2015 @ 14:14:50
Author: foutrelis
Revision: 144135
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
performous/repos/community-staging-i686/
performous/repos/community-staging-i686/PKGBUILD
(from rev 144134, performous/trunk/PKGBUILD)
performous/repos/community-staging-i686/cast-basic_istream-to-bool.patch
(from rev 144134, performous/trunk/cast-basic_istream-to-bool.patch)
performous/repos/community-staging-x86_64/
performous/repos/community-staging-x86_64/PKGBUILD
(from rev 144134, performous/trunk/PKGBUILD)
performous/repos/community-staging-x86_64/cast-basic_istream-to-bool.patch
(from rev 144134, performous/trunk/cast-basic_istream-to-bool.patch)
-----------------------------------------------------------+
community-staging-i686/PKGBUILD | 42 ++++++++++++
community-staging-i686/cast-basic_istream-to-bool.patch | 26 +++++++
community-staging-x86_64/PKGBUILD | 42 ++++++++++++
community-staging-x86_64/cast-basic_istream-to-bool.patch | 26 +++++++
4 files changed, 136 insertions(+)
Copied: performous/repos/community-staging-i686/PKGBUILD (from rev 144134,
performous/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-10-15 12:14:50 UTC (rev 144135)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier <[email protected]>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=performous
+pkgver=1.0
+pkgrel=7
+pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
+arch=('i686' 'x86_64')
+url="http://performous.org/";
+license=('GPL')
+depends=('boost-libs' 'glew' 'libxml++' '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
+ cast-basic_istream-to-bool.patch)
+md5sums=('cbeec2f0c0114cc499746c1e33f56055'
+ 'c883cce82d0359c6b40ce38bd4ccf4bf')
+
+prepare() {
+ cd performous-${pkgver}
+
+ patch -Np1 -i ../cast-basic_istream-to-bool.patch
+}
+
+build() {
+ cd performous-${pkgver}
+
+ mkdir -p build
+ cd build
+
+ cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr ..
+
+ make
+}
+
+package() {
+ cd performous-${pkgver}/build
+
+ make DESTDIR="$pkgdir" install
+}
Copied:
performous/repos/community-staging-i686/cast-basic_istream-to-bool.patch (from
rev 144134, performous/trunk/cast-basic_istream-to-bool.patch)
===================================================================
--- community-staging-i686/cast-basic_istream-to-bool.patch
(rev 0)
+++ community-staging-i686/cast-basic_istream-to-bool.patch 2015-10-15
12:14:50 UTC (rev 144135)
@@ -0,0 +1,26 @@
+From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
+From: Tobias Gruetzmacher <[email protected]>
+Date: Sun, 22 Mar 2015 18:43:11 +0100
+Subject: [PATCH] Cast basic_istream to bool.
+
+This shouldn't be necessary as far as I understand it (istream has an
+operator bool()), but clang 3.4 with libc++ insists that it can't cast
+basic_istream to bool. This may be a bug in libc++ or my bad
+understanding of C++ cast rules, but changing it doesn't hurt.
+---
+ game/songparser.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/game/songparser.hh b/game/songparser.hh
+index 5196c8e..21d7e16 100644
+--- a/game/songparser.hh
++++ b/game/songparser.hh
+@@ -33,7 +33,7 @@ class SongParser {
+ Song& m_song;
+ std::stringstream m_ss;
+ unsigned int m_linenum;
+- bool getline(std::string& line) { ++m_linenum; return
std::getline(m_ss, line);}
++ bool getline(std::string& line) { ++m_linenum; return (bool)
std::getline(m_ss, line);}
+ bool m_relative;
+ double m_gap;
+ double m_bpm;
Copied: performous/repos/community-staging-x86_64/PKGBUILD (from rev 144134,
performous/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-10-15 12:14:50 UTC (rev 144135)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier <[email protected]>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=performous
+pkgver=1.0
+pkgrel=7
+pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
+arch=('i686' 'x86_64')
+url="http://performous.org/";
+license=('GPL')
+depends=('boost-libs' 'glew' 'libxml++' '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
+ cast-basic_istream-to-bool.patch)
+md5sums=('cbeec2f0c0114cc499746c1e33f56055'
+ 'c883cce82d0359c6b40ce38bd4ccf4bf')
+
+prepare() {
+ cd performous-${pkgver}
+
+ patch -Np1 -i ../cast-basic_istream-to-bool.patch
+}
+
+build() {
+ cd performous-${pkgver}
+
+ mkdir -p build
+ cd build
+
+ cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr ..
+
+ make
+}
+
+package() {
+ cd performous-${pkgver}/build
+
+ make DESTDIR="$pkgdir" install
+}
Copied:
performous/repos/community-staging-x86_64/cast-basic_istream-to-bool.patch
(from rev 144134, performous/trunk/cast-basic_istream-to-bool.patch)
===================================================================
--- community-staging-x86_64/cast-basic_istream-to-bool.patch
(rev 0)
+++ community-staging-x86_64/cast-basic_istream-to-bool.patch 2015-10-15
12:14:50 UTC (rev 144135)
@@ -0,0 +1,26 @@
+From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
+From: Tobias Gruetzmacher <[email protected]>
+Date: Sun, 22 Mar 2015 18:43:11 +0100
+Subject: [PATCH] Cast basic_istream to bool.
+
+This shouldn't be necessary as far as I understand it (istream has an
+operator bool()), but clang 3.4 with libc++ insists that it can't cast
+basic_istream to bool. This may be a bug in libc++ or my bad
+understanding of C++ cast rules, but changing it doesn't hurt.
+---
+ game/songparser.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/game/songparser.hh b/game/songparser.hh
+index 5196c8e..21d7e16 100644
+--- a/game/songparser.hh
++++ b/game/songparser.hh
+@@ -33,7 +33,7 @@ class SongParser {
+ Song& m_song;
+ std::stringstream m_ss;
+ unsigned int m_linenum;
+- bool getline(std::string& line) { ++m_linenum; return
std::getline(m_ss, line);}
++ bool getline(std::string& line) { ++m_linenum; return (bool)
std::getline(m_ss, line);}
+ bool m_relative;
+ double m_gap;
+ double m_bpm;
