performous: rebuild against sdl2's change.

This commit is contained in:
Jeff Huang 2015-10-11 13:38:52 +00:00
parent a23fcf418e
commit 82dcf074f1
2 changed files with 36 additions and 5 deletions

View File

@ -1,8 +1,6 @@
# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves gmail.com>
pkgname=performous pkgname=performous
pkgver=1.0 pkgver=1.0
pkgrel=1 pkgrel=2
pkgdesc='A free game like Singstar™, Rockband™ or Stepmania™' pkgdesc='A free game like Singstar™, Rockband™ or Stepmania™'
arch=('x86_64') arch=('x86_64')
url="http://$pkgname.org/" url="http://$pkgname.org/"
@ -11,9 +9,16 @@ screenshot="http://performous.org/screenshots/Performous-0.4.0-Windows.jpg"
depends=('boost-libs' 'cairo' 'ffmpeg' 'glew' 'jack' 'libjpeg' 'libpng' 'librsvg' 'libxml++' 'opencv' 'portaudio' 'portmidi' 'sdl2') depends=('boost-libs' 'cairo' 'ffmpeg' 'glew' 'jack' 'libjpeg' 'libpng' 'librsvg' 'libxml++' 'opencv' 'portaudio' 'portmidi' 'sdl2')
makedepends=('boost' 'cmake' 'help2man' 'tar') makedepends=('boost' 'cmake' 'help2man' 'tar')
optdepends=('performous-songs: some songs for Performous') optdepends=('performous-songs: some songs for Performous')
source=("https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz") source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz
md5sums=('cbeec2f0c0114cc499746c1e33f56055') cast-basic_istream-to-bool.patch)
md5sums=('cbeec2f0c0114cc499746c1e33f56055'
'c883cce82d0359c6b40ce38bd4ccf4bf')
prepare() {
cd performous-${pkgver}
patch -Np1 -i ../cast-basic_istream-to-bool.patch
}
build() { build() {
cd $pkgname-$pkgver cd $pkgname-$pkgver

View File

@ -0,0 +1,26 @@
From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
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;