[arch-commits] Commit in performous/repos (6 files)

2019-04-08 Thread Antonio Rojas via arch-commits 
Date: Monday, April 8, 2019 @ 10:11:14
  Author: arojas
Revision: 450348

archrelease: copy trunk to community-staging-x86_64

Added:
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 450347, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/boost-1.67.patch
(from rev 450347, performous/trunk/boost-1.67.patch)
  performous/repos/community-staging-x86_64/performous-boost-1.69.patch
(from rev 450347, performous/trunk/performous-boost-1.69.patch)
  performous/repos/community-staging-x86_64/performous-libswresample.patch
(from rev 450347, performous/trunk/performous-libswresample.patch)
  performous/repos/community-staging-x86_64/performous-opencv4.patch
(from rev 450347, performous/trunk/performous-opencv4.patch)

+
 PKGBUILD   |   49 +
 boost-1.67.patch   |   22 ++
 performous-boost-1.69.patch|   22 ++
 performous-libswresample.patch |  380 +++
 performous-opencv4.patch   |   41 
 5 files changed, 514 insertions(+)

Copied: performous/repos/community-staging-x86_64/PKGBUILD (from rev 450347, 
performous/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2019-04-08 10:11:14 UTC (rev 450348)
@@ -0,0 +1,49 @@
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.1
+pkgrel=20
+pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
+arch=('x86_64')
+url="http://performous.org/;
+license=('GPL')
+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
+boost-1.67.patch
+performous-libswresample.patch
+performous-opencv4.patch
+performous-boost-1.69.patch)
+sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1'
+
'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1'
+
'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17'
+
'854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56'
+
'6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd')
+
+prepare() {
+  cd performous-${pkgver}
+  patch -Np1 -i ../boost-1.67.patch
+  patch -Np1 -i ../performous-libswresample.patch
+  patch -p1 -i ../performous-opencv4.patch # Fix build with openCV 4
+  patch -p1 -i ../performous-boost-1.69.patch # Fix build with boost 1.69
+}
+
+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/boost-1.67.patch (from rev 
450347, performous/trunk/boost-1.67.patch)
===
--- community-staging-x86_64/boost-1.67.patch   (rev 0)
+++ community-staging-x86_64/boost-1.67.patch   2019-04-08 10:11:14 UTC (rev 
450348)
@@ -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.0 +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(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(1e6 *

[arch-commits] Commit in performous/repos (6 files)

2019-01-15 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, January 15, 2019 @ 10:45:36
  Author: foutrelis
Revision: 423291

archrelease: copy trunk to community-staging-x86_64

Added:
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 423290, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/boost-1.67.patch
(from rev 423290, performous/trunk/boost-1.67.patch)
  performous/repos/community-staging-x86_64/performous-boost-1.69.patch
(from rev 423290, performous/trunk/performous-boost-1.69.patch)
  performous/repos/community-staging-x86_64/performous-libswresample.patch
(from rev 423290, performous/trunk/performous-libswresample.patch)
  performous/repos/community-staging-x86_64/performous-opencv4.patch
(from rev 423290, performous/trunk/performous-opencv4.patch)

+
 PKGBUILD   |   49 +
 boost-1.67.patch   |   22 ++
 performous-boost-1.69.patch|   22 ++
 performous-libswresample.patch |  380 +++
 performous-opencv4.patch   |   41 
 5 files changed, 514 insertions(+)

Copied: performous/repos/community-staging-x86_64/PKGBUILD (from rev 423290, 
performous/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2019-01-15 10:45:36 UTC (rev 423291)
@@ -0,0 +1,49 @@
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.1
+pkgrel=19
+pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
+arch=('x86_64')
+url="http://performous.org/;
+license=('GPL')
+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
+boost-1.67.patch
+performous-libswresample.patch
+performous-opencv4.patch
+performous-boost-1.69.patch)
+sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1'
+
'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1'
+
'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17'
+
'854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56'
+
'6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd')
+
+prepare() {
+  cd performous-${pkgver}
+  patch -Np1 -i ../boost-1.67.patch
+  patch -Np1 -i ../performous-libswresample.patch
+  patch -p1 -i ../performous-opencv4.patch # Fix build with openCV 4
+  patch -p1 -i ../performous-boost-1.69.patch # Fix build with boost 1.69
+}
+
+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/boost-1.67.patch (from rev 
423290, performous/trunk/boost-1.67.patch)
===
--- community-staging-x86_64/boost-1.67.patch   (rev 0)
+++ community-staging-x86_64/boost-1.67.patch   2019-01-15 10:45:36 UTC (rev 
423291)
@@ -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.0 +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(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(1e6 *

[arch-commits] Commit in performous/repos (6 files)

2015-12-21 Thread Felix Yan 
Date: Monday, December 21, 2015 @ 18:14:21
  Author: fyan
Revision: 153938

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 153937, performous/trunk/PKGBUILD)
  performous/repos/community-staging-i686/cast-basic_istream-to-bool.patch
(from rev 153937, performous/trunk/cast-basic_istream-to-bool.patch)
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 153937, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/cast-basic_istream-to-bool.patch
(from rev 153937, 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 153937, 
performous/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-21 17:14:21 UTC (rev 153938)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.0
+pkgrel=9
+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 153937, 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-12-21 
17:14:21 UTC (rev 153938)
@@ -0,0 +1,26 @@
+From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
+From: Tobias Gruetzmacher 
+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 153937, 
performous/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-12-21 17:14:21 UTC (rev 153938)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.0
+pkgrel=9
+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')

[arch-commits] Commit in performous/repos (6 files)

2015-12-06 Thread Evangelos Foutras 
Date: Monday, December 7, 2015 @ 08:51:41
  Author: foutrelis
Revision: 149733

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 149732, performous/trunk/PKGBUILD)
  performous/repos/community-staging-i686/cast-basic_istream-to-bool.patch
(from rev 149732, performous/trunk/cast-basic_istream-to-bool.patch)
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 149732, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/cast-basic_istream-to-bool.patch
(from rev 149732, 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 149732, 
performous/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-07 07:51:41 UTC (rev 149733)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.0
+pkgrel=8
+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 149732, 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-12-07 
07:51:41 UTC (rev 149733)
@@ -0,0 +1,26 @@
+From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
+From: Tobias Gruetzmacher 
+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 149732, 
performous/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-12-07 07:51:41 UTC (rev 149733)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.0
+pkgrel=8
+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')

[arch-commits] Commit in performous/repos (6 files)

2015-10-15 Thread Evangelos Foutras 
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 
+# Contributor: Christoph Zeiler 
+
+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 
+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 
+# Contributor: Christoph Zeiler 
+
+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')

[arch-commits] Commit in performous/repos (6 files)

2015-09-28 Thread Evangelos Foutras 
Date: Monday, September 28, 2015 @ 23:20:04
  Author: foutrelis
Revision: 142160

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 142159, performous/trunk/PKGBUILD)
  performous/repos/community-staging-i686/cast-basic_istream-to-bool.patch
(from rev 142159, performous/trunk/cast-basic_istream-to-bool.patch)
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 142159, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/cast-basic_istream-to-bool.patch
(from rev 142159, 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 142159, 
performous/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-09-28 21:20:04 UTC (rev 142160)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.0
+pkgrel=5
+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 142159, 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-09-28 
21:20:04 UTC (rev 142160)
@@ -0,0 +1,26 @@
+From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
+From: Tobias Gruetzmacher 
+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 142159, 
performous/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2015-09-28 21:20:04 UTC (rev 142160)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier 
+# Contributor: Christoph Zeiler 
+
+pkgname=performous
+pkgver=1.0
+pkgrel=5
+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')

[arch-commits] Commit in performous/repos (6 files)

2015-05-30 Thread Laurent Carlier 
Date: Sunday, May 31, 2015 @ 00:07:54
  Author: lcarlier
Revision: 134390

archrelease: copy trunk to community-i686, community-x86_64

Added:
  performous/repos/community-i686/PKGBUILD
(from rev 134389, performous/trunk/PKGBUILD)
  performous/repos/community-i686/cast-basic_istream-to-bool.patch
(from rev 134389, performous/trunk/cast-basic_istream-to-bool.patch)
  performous/repos/community-x86_64/PKGBUILD
(from rev 134389, performous/trunk/PKGBUILD)
  performous/repos/community-x86_64/cast-basic_istream-to-bool.patch
(from rev 134389, performous/trunk/cast-basic_istream-to-bool.patch)
Deleted:
  performous/repos/community-i686/PKGBUILD
  performous/repos/community-x86_64/PKGBUILD

---+
 /PKGBUILD |   84 
 community-i686/PKGBUILD   |   34 
 community-i686/cast-basic_istream-to-bool.patch   |   26 ++
 community-x86_64/PKGBUILD |   34 
 community-x86_64/cast-basic_istream-to-bool.patch |   26 ++
 5 files changed, 136 insertions(+), 68 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2015-05-30 22:07:44 UTC (rev 134389)
+++ community-i686/PKGBUILD 2015-05-30 22:07:54 UTC (rev 134390)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer : Laurent Carlier lordhea...@gmail.com
-# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
-
-pkgname=performous
-pkgver=1.0
-pkgrel=3
-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)
-md5sums=('cbeec2f0c0114cc499746c1e33f56055')
-
-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-i686/PKGBUILD (from rev 134389, 
performous/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-05-30 22:07:54 UTC (rev 134390)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer : Laurent Carlier lordhea...@gmail.com
+# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
+
+pkgname=performous
+pkgver=1.0
+pkgrel=4
+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-i686/cast-basic_istream-to-bool.patch (from 
rev 134389, performous/trunk/cast-basic_istream-to-bool.patch)
===
--- community-i686/cast-basic_istream-to-bool.patch 
(rev 0)
+++ community-i686/cast-basic_istream-to-bool.patch 2015-05-30 22:07:54 UTC 
(rev 134390)
@@ -0,0 +1,26 @@
+From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
+From: Tobias Gruetzmacher tobias-...@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;
+-

[arch-commits] Commit in performous/repos (6 files)

2013-04-29 Thread Laurent Carlier 
Date: Monday, April 29, 2013 @ 11:52:55
  Author: lcarlier
Revision: 89406

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 89405, performous/trunk/PKGBUILD)
  performous/repos/community-staging-i686/performous-0.7.0-cmake.patch
(from rev 89405, performous/trunk/performous-0.7.0-cmake.patch)
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 89405, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/performous-0.7.0-cmake.patch
(from rev 89405, performous/trunk/performous-0.7.0-cmake.patch)

---+
 community-staging-i686/PKGBUILD   |   38 +++
 community-staging-i686/performous-0.7.0-cmake.patch   |  155 
 community-staging-x86_64/PKGBUILD |   38 +++
 community-staging-x86_64/performous-0.7.0-cmake.patch |  155 
 4 files changed, 386 insertions(+)

Copied: performous/repos/community-staging-i686/PKGBUILD (from rev 89405, 
performous/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-04-29 09:52:55 UTC (rev 89406)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer : Laurent Carlier lordhea...@gmail.com
+# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
+
+pkgname=performous
+pkgver=0.7.0
+pkgrel=6
+pkgdesc='A free game like Singstar, Rockband or Stepmania'
+arch=('i686' 'x86_64')
+url=http://performous.org/;
+license=('GPL')
+depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 
'librsvg' 'ffmpeg') # opencv
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
+optdepends=('performous-freesongs: free songs for performous')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2
+performous-0.7.0-cmake.patch)
+md5sums=('60f3f72b51a630a4aa996484aedb9526'
+ '7da8aef3f4dd28e19f95957ae9ac2bb1')
+
+build() {
+  cd performous-${pkgver}
+
+  patch -Np0 -i ../performous-0.7.0-cmake.patch
+
+  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/performous-0.7.0-cmake.patch 
(from rev 89405, performous/trunk/performous-0.7.0-cmake.patch)
===
--- community-staging-i686/performous-0.7.0-cmake.patch 
(rev 0)
+++ community-staging-i686/performous-0.7.0-cmake.patch 2013-04-29 09:52:55 UTC 
(rev 89406)
@@ -0,0 +1,155 @@
+From: Julian Ospald hasuf...@gentoo.org
+Date: Thu Jan 24 13:13:50 UTC 2013
+Subject: build system
+
+   - fix opencv module to prefer pkg-config results
+   - fix some module and macro names and try to use
+   system modules as much as possible (ALSA Boost Gettext Jpeg Png Tiff Z)
+
+--- cmake/Modules/FindOpenCV.cmake
 cmake/Modules/FindOpenCV.cmake
+@@ -57,13 +57,21 @@
+ include(FindPkgConfig)
+ if(PKG_CONFIG_FOUND)
+   pkg_check_modules(OPENCV_PKGCONF opencv)
+-  set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
+-  if(EXISTS ${OpenCV_DIR})
+-  set(OpenCV_configScript_DIR ${OpenCV_DIR}/share/opencv)
+-  if(EXISTS ${OpenCV_configScript_DIR})
+-set(OpenCV_configScript 
${OpenCV_configScript_DIR}/OpenCVConfig.cmake)
+-  endif(EXISTS ${OpenCV_configScript_DIR})
+-  endif(EXISTS ${OpenCV_DIR})
++  # prefer pkg-config values
++  if(OPENCV_PKGCONF_FOUND)
++set(OpenCV_LIBS ${OPENCV_PKGCONF_LDFLAGS})
++  set(OpenCV_FOUND true)
++  set(OpenCV_INCLUDE_DIR ${OPENCV_PKGCONF_INCLUDE_DIRS})
++  set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION})
++  else(OPENCV_PKGCONF_FOUND)
++set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
++if(EXISTS ${OpenCV_DIR})
++set(OpenCV_configScript_DIR ${OpenCV_DIR}/share/opencv)
++if(EXISTS ${OpenCV_configScript_DIR})
++  set(OpenCV_configScript 
${OpenCV_configScript_DIR}/OpenCVConfig.cmake)
++endif(EXISTS ${OpenCV_configScript_DIR})
++endif(EXISTS ${OpenCV_DIR})
++  endif(OPENCV_PKGCONF_FOUND)
+ endif(PKG_CONFIG_FOUND)
+   endif(NOT WIN32)
+ endif(NOT EXISTS ${OpenCV_DIR})
+@@ -72,7 +80,7 @@
+ ##
+ ## Find OpenCV libraries
+ ##
+-if(EXISTS ${OpenCV_DIR})
++if(EXISTS ${OpenCV_DIR} AND NOT OpenCV_FOUND)
+ 
+   #When its possible to use the Config script use it.
+   if(EXISTS ${OpenCV_configScript})
+@@ -257,9 +265,9 @@
+   endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0)
+ 
+

[arch-commits] Commit in performous/repos (6 files)

2013-03-28 Thread Evangelos Foutras 
Date: Thursday, March 28, 2013 @ 13:39:29
  Author: foutrelis
Revision: 87170

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 87169, performous/trunk/PKGBUILD)
  performous/repos/community-staging-i686/performous-0.7.0-cmake.patch
(from rev 87169, performous/trunk/performous-0.7.0-cmake.patch)
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 87169, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/performous-0.7.0-cmake.patch
(from rev 87169, performous/trunk/performous-0.7.0-cmake.patch)

---+
 community-staging-i686/PKGBUILD   |   38 +++
 community-staging-i686/performous-0.7.0-cmake.patch   |  155 
 community-staging-x86_64/PKGBUILD |   38 +++
 community-staging-x86_64/performous-0.7.0-cmake.patch |  155 
 4 files changed, 386 insertions(+)

Copied: performous/repos/community-staging-i686/PKGBUILD (from rev 87169, 
performous/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-03-28 12:39:29 UTC (rev 87170)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer : Laurent Carlier lordhea...@gmail.com
+# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
+
+pkgname=performous
+pkgver=0.7.0
+pkgrel=5
+pkgdesc='A free game like Singstar, Rockband or Stepmania'
+arch=('i686' 'x86_64')
+url=http://performous.org/;
+license=('GPL')
+depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 
'librsvg' 'ffmpeg') # opencv
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
+optdepends=('performous-freesongs: free songs for performous')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2
+performous-0.7.0-cmake.patch)
+md5sums=('60f3f72b51a630a4aa996484aedb9526'
+ '7da8aef3f4dd28e19f95957ae9ac2bb1')
+
+build() {
+  cd performous-${pkgver}
+
+  patch -Np0 -i ../performous-0.7.0-cmake.patch
+
+  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/performous-0.7.0-cmake.patch 
(from rev 87169, performous/trunk/performous-0.7.0-cmake.patch)
===
--- community-staging-i686/performous-0.7.0-cmake.patch 
(rev 0)
+++ community-staging-i686/performous-0.7.0-cmake.patch 2013-03-28 12:39:29 UTC 
(rev 87170)
@@ -0,0 +1,155 @@
+From: Julian Ospald hasuf...@gentoo.org
+Date: Thu Jan 24 13:13:50 UTC 2013
+Subject: build system
+
+   - fix opencv module to prefer pkg-config results
+   - fix some module and macro names and try to use
+   system modules as much as possible (ALSA Boost Gettext Jpeg Png Tiff Z)
+
+--- cmake/Modules/FindOpenCV.cmake
 cmake/Modules/FindOpenCV.cmake
+@@ -57,13 +57,21 @@
+ include(FindPkgConfig)
+ if(PKG_CONFIG_FOUND)
+   pkg_check_modules(OPENCV_PKGCONF opencv)
+-  set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
+-  if(EXISTS ${OpenCV_DIR})
+-  set(OpenCV_configScript_DIR ${OpenCV_DIR}/share/opencv)
+-  if(EXISTS ${OpenCV_configScript_DIR})
+-set(OpenCV_configScript 
${OpenCV_configScript_DIR}/OpenCVConfig.cmake)
+-  endif(EXISTS ${OpenCV_configScript_DIR})
+-  endif(EXISTS ${OpenCV_DIR})
++  # prefer pkg-config values
++  if(OPENCV_PKGCONF_FOUND)
++set(OpenCV_LIBS ${OPENCV_PKGCONF_LDFLAGS})
++  set(OpenCV_FOUND true)
++  set(OpenCV_INCLUDE_DIR ${OPENCV_PKGCONF_INCLUDE_DIRS})
++  set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION})
++  else(OPENCV_PKGCONF_FOUND)
++set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
++if(EXISTS ${OpenCV_DIR})
++set(OpenCV_configScript_DIR ${OpenCV_DIR}/share/opencv)
++if(EXISTS ${OpenCV_configScript_DIR})
++  set(OpenCV_configScript 
${OpenCV_configScript_DIR}/OpenCVConfig.cmake)
++endif(EXISTS ${OpenCV_configScript_DIR})
++endif(EXISTS ${OpenCV_DIR})
++  endif(OPENCV_PKGCONF_FOUND)
+ endif(PKG_CONFIG_FOUND)
+   endif(NOT WIN32)
+ endif(NOT EXISTS ${OpenCV_DIR})
+@@ -72,7 +80,7 @@
+ ##
+ ## Find OpenCV libraries
+ ##
+-if(EXISTS ${OpenCV_DIR})
++if(EXISTS ${OpenCV_DIR} AND NOT OpenCV_FOUND)
+ 
+   #When its possible to use the Config script use it.
+   if(EXISTS ${OpenCV_configScript})
+@@ -257,9 +265,9 @@
+   endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0)
+ 
+

[arch-commits] Commit in performous/repos (6 files)

2013-02-10 Thread Ionuț Mircea Bîru 
Date: Sunday, February 10, 2013 @ 15:49:18
  Author: ioni
Revision: 84092

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 84091, performous/trunk/PKGBUILD)
  performous/repos/community-staging-i686/performous-0.7.0-cmake.patch
(from rev 84091, performous/trunk/performous-0.7.0-cmake.patch)
  performous/repos/community-staging-x86_64/
  performous/repos/community-staging-x86_64/PKGBUILD
(from rev 84091, performous/trunk/PKGBUILD)
  performous/repos/community-staging-x86_64/performous-0.7.0-cmake.patch
(from rev 84091, performous/trunk/performous-0.7.0-cmake.patch)

---+
 community-staging-i686/PKGBUILD   |   38 +++
 community-staging-i686/performous-0.7.0-cmake.patch   |  155 
 community-staging-x86_64/PKGBUILD |   38 +++
 community-staging-x86_64/performous-0.7.0-cmake.patch |  155 
 4 files changed, 386 insertions(+)

Copied: performous/repos/community-staging-i686/PKGBUILD (from rev 84091, 
performous/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-10 14:49:18 UTC (rev 84092)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer : Laurent Carlier lordhea...@gmail.com
+# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
+
+pkgname=performous
+pkgver=0.7.0
+pkgrel=4
+pkgdesc='A free game like Singstar, Rockband or Stepmania'
+arch=('i686' 'x86_64')
+url=http://performous.org/;
+license=('GPL')
+depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 
'librsvg' 'ffmpeg') # opencv
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
+optdepends=('performous-freesongs: free songs for performous')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2
+performous-0.7.0-cmake.patch)
+md5sums=('60f3f72b51a630a4aa996484aedb9526'
+ '7da8aef3f4dd28e19f95957ae9ac2bb1')
+
+build() {
+  cd performous-${pkgver}
+
+  patch -Np0 -i ../performous-0.7.0-cmake.patch
+
+  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/performous-0.7.0-cmake.patch 
(from rev 84091, performous/trunk/performous-0.7.0-cmake.patch)
===
--- community-staging-i686/performous-0.7.0-cmake.patch 
(rev 0)
+++ community-staging-i686/performous-0.7.0-cmake.patch 2013-02-10 14:49:18 UTC 
(rev 84092)
@@ -0,0 +1,155 @@
+From: Julian Ospald hasuf...@gentoo.org
+Date: Thu Jan 24 13:13:50 UTC 2013
+Subject: build system
+
+   - fix opencv module to prefer pkg-config results
+   - fix some module and macro names and try to use
+   system modules as much as possible (ALSA Boost Gettext Jpeg Png Tiff Z)
+
+--- cmake/Modules/FindOpenCV.cmake
 cmake/Modules/FindOpenCV.cmake
+@@ -57,13 +57,21 @@
+ include(FindPkgConfig)
+ if(PKG_CONFIG_FOUND)
+   pkg_check_modules(OPENCV_PKGCONF opencv)
+-  set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
+-  if(EXISTS ${OpenCV_DIR})
+-  set(OpenCV_configScript_DIR ${OpenCV_DIR}/share/opencv)
+-  if(EXISTS ${OpenCV_configScript_DIR})
+-set(OpenCV_configScript 
${OpenCV_configScript_DIR}/OpenCVConfig.cmake)
+-  endif(EXISTS ${OpenCV_configScript_DIR})
+-  endif(EXISTS ${OpenCV_DIR})
++  # prefer pkg-config values
++  if(OPENCV_PKGCONF_FOUND)
++set(OpenCV_LIBS ${OPENCV_PKGCONF_LDFLAGS})
++  set(OpenCV_FOUND true)
++  set(OpenCV_INCLUDE_DIR ${OPENCV_PKGCONF_INCLUDE_DIRS})
++  set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION})
++  else(OPENCV_PKGCONF_FOUND)
++set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX})
++if(EXISTS ${OpenCV_DIR})
++set(OpenCV_configScript_DIR ${OpenCV_DIR}/share/opencv)
++if(EXISTS ${OpenCV_configScript_DIR})
++  set(OpenCV_configScript 
${OpenCV_configScript_DIR}/OpenCVConfig.cmake)
++endif(EXISTS ${OpenCV_configScript_DIR})
++endif(EXISTS ${OpenCV_DIR})
++  endif(OPENCV_PKGCONF_FOUND)
+ endif(PKG_CONFIG_FOUND)
+   endif(NOT WIN32)
+ endif(NOT EXISTS ${OpenCV_DIR})
+@@ -72,7 +80,7 @@
+ ##
+ ## Find OpenCV libraries
+ ##
+-if(EXISTS ${OpenCV_DIR})
++if(EXISTS ${OpenCV_DIR} AND NOT OpenCV_FOUND)
+ 
+   #When its possible to use the Config script use it.
+   if(EXISTS ${OpenCV_configScript})
+@@ -257,9 +265,9 @@
+   endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0)
+ 
+

[arch-commits] Commit in performous/repos (6 files)

2013-01-28 Thread Stéphane Gaudreault 
Date: Monday, January 28, 2013 @ 17:49:52
  Author: stephane
Revision: 83265

db-move: moved performous from [community-testing] to [community] (i686, x86_64)

Added:
  performous/repos/community-i686/PKGBUILD
(from rev 83238, performous/repos/community-testing-i686/PKGBUILD)
  performous/repos/community-x86_64/PKGBUILD
(from rev 83238, performous/repos/community-testing-x86_64/PKGBUILD)
Deleted:
  performous/repos/community-i686/PKGBUILD
  performous/repos/community-testing-i686/
  performous/repos/community-testing-x86_64/
  performous/repos/community-x86_64/PKGBUILD

---+
 community-i686/PKGBUILD   |   68 ++--
 community-x86_64/PKGBUILD |   68 ++--
 2 files changed, 68 insertions(+), 68 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-01-28 16:49:51 UTC (rev 83264)
+++ community-i686/PKGBUILD 2013-01-28 16:49:52 UTC (rev 83265)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer : Laurent Carlier lordhea...@gmail.com
-# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
-
-pkgname=performous
-pkgver=0.7.0
-pkgrel=2
-pkgdesc='A free game like Singstar, Rockband or Stepmania'
-arch=('i686' 'x86_64')
-url=http://performous.org/;
-license=('GPL')
-depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 
'librsvg' 'ffmpeg') # opencv
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost=1.50' 'mesa')
-optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2)
-md5sums=('60f3f72b51a630a4aa996484aedb9526')
-
-build() {
-  cd ${srcdir}/performous-${pkgver}
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd ${srcdir}/performous-${pkgver}/build
-
-  make DESTDIR=$pkgdir install
-}

Copied: performous/repos/community-i686/PKGBUILD (from rev 83238, 
performous/repos/community-testing-i686/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-01-28 16:49:52 UTC (rev 83265)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer : Laurent Carlier lordhea...@gmail.com
+# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
+
+pkgname=performous
+pkgver=0.7.0
+pkgrel=3
+pkgdesc='A free game like Singstar, Rockband or Stepmania'
+arch=('i686' 'x86_64')
+url=http://performous.org/;
+license=('GPL')
+depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 
'librsvg' 'ffmpeg') # opencv
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost=1.50' 'mesa')
+optdepends=('performous-freesongs: free songs for performous')
+source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2)
+md5sums=('60f3f72b51a630a4aa996484aedb9526')
+
+build() {
+  cd ${srcdir}/performous-${pkgver}
+
+  mkdir -p build
+  cd build
+
+  cmake -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_INSTALL_PREFIX=/usr ..
+
+  make
+}
+
+package() {
+  cd ${srcdir}/performous-${pkgver}/build
+
+  make DESTDIR=$pkgdir install
+}

Deleted: community-x86_64/PKGBUILD
===
--- community-x86_64/PKGBUILD   2013-01-28 16:49:51 UTC (rev 83264)
+++ community-x86_64/PKGBUILD   2013-01-28 16:49:52 UTC (rev 83265)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer : Laurent Carlier lordhea...@gmail.com
-# Contributor: Christoph Zeiler archNOSPAM_at_moonblade.dot.org
-
-pkgname=performous
-pkgver=0.7.0
-pkgrel=2
-pkgdesc='A free game like Singstar, Rockband or Stepmania'
-arch=('i686' 'x86_64')
-url=http://performous.org/;
-license=('GPL')
-depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 
'librsvg' 'ffmpeg') # opencv
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost=1.50' 'mesa')
-optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2)
-md5sums=('60f3f72b51a630a4aa996484aedb9526')
-
-build() {
-  cd ${srcdir}/performous-${pkgver}
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-   -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd ${srcdir}/performous-${pkgver}/build
-
-  make DESTDIR=$pkgdir install
-}

Copied: performous/repos/community-x86_64/PKGBUILD (from rev 83238, 
performous/repos/community-testing-x86_64/PKGBUILD)
===
--- community-x86_64/PKGBUILD   (rev 0)
+++ community-x86_64/PKGBUILD   2013-01-28 16:49:52 UTC (rev 83265)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer : Laurent Carlier lordhea...@gmail.com
+# Contributor: Christoph Zeiler