[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Saturday, December 12, 2020 @ 16:01:15 Author: foutrelis Revision: 773377 upgpkg: performous 1.1-28: boost 1.75.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-12-12 16:01:07 UTC (rev 773376) +++ PKGBUILD2020-12-12 16:01:15 UTC (rev 773377) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=27 +pkgrel=28 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, December 7, 2020 @ 00:05:46 Author: felixonmars Revision: 771339 upgpkg: performous 1.1-27: boost 1.74.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-12-07 00:05:03 UTC (rev 771338) +++ PKGBUILD2020-12-07 00:05:46 UTC (rev 771339) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=26 +pkgrel=27 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD performous-boost-1.73.patch)
Date: Monday, December 7, 2020 @ 00:04:07 Author: foutrelis Revision: 771336 Fix build with boost 1.73 (patch by loqs) Added: performous/trunk/performous-boost-1.73.patch Modified: performous/trunk/PKGBUILD -+ PKGBUILD|7 +-- performous-boost-1.73.patch | 26 ++ 2 files changed, 31 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-12-06 23:59:48 UTC (rev 771335) +++ PKGBUILD2020-12-07 00:04:07 UTC (rev 771336) @@ -16,13 +16,15 @@ performous-libswresample.patch performous-opencv4.patch performous-boost-1.69.patch -performous-boost-1.70.patch) +performous-boost-1.70.patch +performous-boost-1.73.patch) sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1' 'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1' 'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17' '854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56' '6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd' - '7a4a11f0150930ea0527067519487629e714bc732eb111c1d4ca9b13cd8d0775182b22f8a96093223f7aab8524f63bdf901886169e6559adcd5e6b6a9b14edb4') + '7a4a11f0150930ea0527067519487629e714bc732eb111c1d4ca9b13cd8d0775182b22f8a96093223f7aab8524f63bdf901886169e6559adcd5e6b6a9b14edb4' + 'd291621b191c0e55a47232e63a75d4059e2a983c78f9ad7d3a9709293fe22486f307d641ccecf2f0a56ff784b8a3cb6be35a531cb8adf5d35ff2ee3d333d5c40') prepare() { cd performous-${pkgver} @@ -31,6 +33,7 @@ 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 patch -p1 -i ../performous-boost-1.70.patch # Fix build with boost 1.70 + patch -p1 -i ../performous-boost-1.73.patch # Fix build with boost 1.73 } build() { Added: performous-boost-1.73.patch === --- performous-boost-1.73.patch (rev 0) +++ performous-boost-1.73.patch 2020-12-07 00:04:07 UTC (rev 771336) @@ -0,0 +1,26 @@ +diff --git a/game/engine.cc b/game/engine.cc +index 9f0f7ef..560ce71 100644 +--- a/game/engine.cc b/game/engine.cc +@@ -8,6 +8,8 @@ + #include + #include + ++using namespace boost::placeholders; ++ + const double Engine::TIMESTEP = 0.01; + + Engine::Engine(Audio& audio, VocalTrackPtrs vocals, Database& database): +diff --git a/game/surface.cc b/game/surface.cc +index 75356fe..34951f9 100644 +--- a/game/surface.cc b/game/surface.cc +@@ -16,6 +16,8 @@ + + using std::uint32_t; + ++using namespace boost::placeholders; ++ + Shader& getShader(std::string const& name) { + return Game::getSingletonPtr()->window().shader(name); // FIXME + } \ No newline at end of file
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, October 12, 2020 @ 17:37:25 Author: arojas Revision: 723706 opencv 4.5 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-10-12 17:35:32 UTC (rev 723705) +++ PKGBUILD2020-10-12 17:37:25 UTC (rev 723706) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=25 +pkgrel=26 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Saturday, July 25, 2020 @ 07:27:47 Author: arojas Revision: 665254 opencv 4.4 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-07-25 07:25:34 UTC (rev 665253) +++ PKGBUILD2020-07-25 07:27:47 UTC (rev 665254) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=24 +pkgrel=25 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Saturday, April 4, 2020 @ 12:04:57 Author: arojas Revision: 611572 opencv 4.3 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-04-04 12:02:59 UTC (rev 611571) +++ PKGBUILD2020-04-04 12:04:57 UTC (rev 611572) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=23 +pkgrel=24 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Tuesday, January 28, 2020 @ 03:13:43 Author: foutrelis Revision: 557078 boost 1.72.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-01-28 03:13:25 UTC (rev 557077) +++ PKGBUILD2020-01-28 03:13:43 UTC (rev 557078) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=22 +pkgrel=23 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Saturday, December 21, 2019 @ 13:58:02 Author: arojas Revision: 538603 opencv 4.2 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-21 13:11:49 UTC (rev 538602) +++ PKGBUILD2019-12-21 13:58:02 UTC (rev 538603) @@ -3,13 +3,13 @@ pkgname=performous pkgver=1.1 -pkgrel=21 +pkgrel=22 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/"; license=('GPL') depends=('boost-libs' 'libepoxy' 'libxml++2.6' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg' 'opencv' 'sdl2') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa') +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa' 'xorgproto') 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
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Friday, September 13, 2019 @ 12:39:59 Author: foutrelis Revision: 510315 boost 1.71.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-09-13 12:39:43 UTC (rev 510314) +++ PKGBUILD2019-09-13 12:39:59 UTC (rev 510315) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=20 +pkgrel=21 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="https://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD performous-boost-1.70.patch)
Date: Friday, September 13, 2019 @ 12:26:50 Author: arojas Revision: 510313 Fix build with pango 1.44 and boost 1.70 Added: performous/trunk/performous-boost-1.70.patch Modified: performous/trunk/PKGBUILD -+ PKGBUILD| 13 - performous-boost-1.70.patch | 10 ++ 2 files changed, 18 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-09-13 12:16:03 UTC (rev 510312) +++ PKGBUILD2019-09-13 12:26:50 UTC (rev 510313) @@ -15,12 +15,14 @@ boost-1.67.patch performous-libswresample.patch performous-opencv4.patch -performous-boost-1.69.patch) +performous-boost-1.69.patch +performous-boost-1.70.patch) sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1' 'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1' 'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17' '854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56' - '6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd') + '6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd' + '7a4a11f0150930ea0527067519487629e714bc732eb111c1d4ca9b13cd8d0775182b22f8a96093223f7aab8524f63bdf901886169e6559adcd5e6b6a9b14edb4') prepare() { cd performous-${pkgver} @@ -28,6 +30,7 @@ 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 + patch -p1 -i ../performous-boost-1.70.patch # Fix build with boost 1.70 } build() { @@ -36,9 +39,9 @@ mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr .. - + cmake .. \ +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I/usr/include/harfbuzz" # Workaround build failure with pango 1.44 make } Added: performous-boost-1.70.patch === --- performous-boost-1.70.patch (rev 0) +++ performous-boost-1.70.patch 2019-09-13 12:26:50 UTC (rev 510313) @@ -0,0 +1,10 @@ +--- a/game/svg.cc b/game/svg.cc +@@ -4,6 +4,7 @@ + #include "configuration.hh" + #include "../common/image.hh" + ++#include + #include + #include +
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Saturday, June 8, 2019 @ 10:50:07 Author: arojas Revision: 478260 https Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-06-08 10:49:45 UTC (rev 478259) +++ PKGBUILD2019-06-08 10:50:07 UTC (rev 478260) @@ -6,7 +6,7 @@ pkgrel=20 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') -url="http://performous.org/"; +url="https://performous.org/"; license=('GPL') depends=('boost-libs' 'libepoxy' 'libxml++2.6' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg' 'opencv' 'sdl2') makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, April 8, 2019 @ 10:10:50 Author: arojas Revision: 450347 opencv 4.1 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-04-08 10:07:24 UTC (rev 450346) +++ PKGBUILD2019-04-08 10:10:50 UTC (rev 450347) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=19 +pkgrel=20 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Tuesday, January 15, 2019 @ 10:45:29 Author: foutrelis Revision: 423290 boost 1.69.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-01-15 10:44:38 UTC (rev 423289) +++ PKGBUILD2019-01-15 10:45:29 UTC (rev 423290) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=18 +pkgrel=19 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD performous-boost-1.69.patch)
Date: Tuesday, January 15, 2019 @ 10:43:05 Author: arojas Revision: 423288 Fix build with boost 1.69 Added: performous/trunk/performous-boost-1.69.patch Modified: performous/trunk/PKGBUILD -+ PKGBUILD|7 +-- performous-boost-1.69.patch | 22 ++ 2 files changed, 27 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-15 10:42:42 UTC (rev 423287) +++ PKGBUILD2019-01-15 10:43:05 UTC (rev 423288) @@ -14,11 +14,13 @@ 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-opencv4.patch +performous-boost-1.69.patch) sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1' 'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1' 'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17' - '854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56') + '854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56' + '6e2d619ba55294ad901f84e3d3a30fe08f092521b4e19041ce4eb19dddc3d8021dfd5697947489a8312246c71ff7b544af4562fa4dfc744f9c27c7bc59b8e9bd') prepare() { cd performous-${pkgver} @@ -25,6 +27,7 @@ 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() { Added: performous-boost-1.69.patch === --- performous-boost-1.69.patch (rev 0) +++ performous-boost-1.69.patch 2019-01-15 10:43:05 UTC (rev 423288) @@ -0,0 +1,22 @@ +diff -ru performous-1.1.orig/game/backgrounds.hh performous-1.1/game/backgrounds.hh +--- performous-1.1.orig/game/backgrounds.hh2019-01-15 10:39:54.147584168 + performous-1.1/game/backgrounds.hh 2019-01-15 10:40:41.284376151 + +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + + /// songs class for songs screen +diff -ru performous-1.1.orig/game/songs.hh performous-1.1/game/songs.hh +--- performous-1.1.orig/game/songs.hh 2019-01-15 10:39:54.147584168 + performous-1.1/game/songs.hh 2019-01-15 10:41:03.901102679 + +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include + #include + #include
[arch-commits] Commit in performous/trunk (PKGBUILD performous-opencv4.patch)
Date: Tuesday, November 20, 2018 @ 21:00:37 Author: arojas Revision: 409223 opencv 4.0 rebuild Added: performous/trunk/performous-opencv4.patch Modified: performous/trunk/PKGBUILD --+ PKGBUILD |9 ++--- performous-opencv4.patch | 41 + 2 files changed, 47 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-11-20 20:57:04 UTC (rev 409222) +++ PKGBUILD2018-11-20 21:00:37 UTC (rev 409223) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=17 +pkgrel=18 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/"; @@ -13,15 +13,18 @@ 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-libswresample.patch +performous-opencv4.patch) sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1' 'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1' - 'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17') + 'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17' + '854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56') 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 } build() { Added: performous-opencv4.patch === --- performous-opencv4.patch(rev 0) +++ performous-opencv4.patch2018-11-20 21:00:37 UTC (rev 409223) @@ -0,0 +1,41 @@ +--- performous-1.1/game/webcam.cc.orig 2018-11-20 20:50:27.857909212 + performous-1.1/game/webcam.cc 2018-11-20 20:51:55.798134386 + +@@ -7,6 +7,7 @@ + + #ifdef USE_OPENCV + #include ++#include + + #else + // Dummy classes +@@ -31,21 +32,21 @@ + throw std::runtime_error("Could not initialize webcam capturing!"); + } + // Try to get at least VGA resolution +- if (m_capture->get(CV_CAP_PROP_FRAME_WIDTH) < 640 +-|| m_capture->get(CV_CAP_PROP_FRAME_HEIGHT) < 480) { +- m_capture->set(CV_CAP_PROP_FRAME_WIDTH, 640); +- m_capture->set(CV_CAP_PROP_FRAME_HEIGHT, 480); ++ if (m_capture->get(cv::CAP_PROP_FRAME_WIDTH) < 640 ++|| m_capture->get(cv::CAP_PROP_FRAME_HEIGHT) < 480) { ++ m_capture->set(cv::CAP_PROP_FRAME_WIDTH, 640); ++ m_capture->set(cv::CAP_PROP_FRAME_HEIGHT, 480); + } + // Print actual values + std::cout << "Webcam frame properties: " +-<< m_capture->get(CV_CAP_PROP_FRAME_WIDTH) << "x" +-<< m_capture->get(CV_CAP_PROP_FRAME_HEIGHT) << std::endl; ++<< m_capture->get(cv::CAP_PROP_FRAME_WIDTH) << "x" ++<< m_capture->get(cv::CAP_PROP_FRAME_HEIGHT) << std::endl; + + // Initialize the video writer + #ifdef SAVE_WEBCAM_VIDEO +- float fps = m_capture->get(CV_CAP_PROP_FPS); +- int framew = m_capture->get(CV_CAP_PROP_FRAME_WIDTH); +- int frameh = m_capture->get(CV_CAP_PROP_FRAME_HEIGHT); ++ float fps = m_capture->get(cv::CAP_PROP_FPS); ++ int framew = m_capture->get(cv::CAP_PROP_FRAME_WIDTH); ++ int frameh = m_capture->get(cv::CAP_PROP_FRAME_HEIGHT); + int codec = CV_FOURCC('P','I','M','1'); // MPEG-1 + std::string out_file = (getHomeDir() / "performous-webcam_out.mpg").string(); + m_writer.reset(new cv::VideoWriter(out_file.c_str(), codec, fps > 0 ? fps : 30.0f, cvSize(framew,frameh)));
[arch-commits] Commit in performous/trunk (PKGBUILD performous-libswresample.patch)
Date: Tuesday, September 18, 2018 @ 17:41:25 Author: alucryd Revision: 383127 libavresample drop: performous 1.1-17 Added: performous/trunk/performous-libswresample.patch Modified: performous/trunk/PKGBUILD + PKGBUILD |9 performous-libswresample.patch | 380 +++ 2 files changed, 386 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-18 17:41:01 UTC (rev 383126) +++ PKGBUILD2018-09-18 17:41:25 UTC (rev 383127) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=16 +pkgrel=17 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/"; @@ -12,13 +12,16 @@ 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) +boost-1.67.patch +performous-libswresample.patch) sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1' - 'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1') + 'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1' + 'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde82652888d6a4c2e888a8bae311f17') prepare() { cd performous-${pkgver} patch -Np1 -i ../boost-1.67.patch + patch -Np1 -i ../performous-libswresample.patch } build() { Added: performous-libswresample.patch === --- performous-libswresample.patch (rev 0) +++ performous-libswresample.patch 2018-09-18 17:41:25 UTC (rev 383127) @@ -0,0 +1,380 @@ +diff --git a/.gitignore b/.gitignore +index 8f3cd966..908da8e1 100644 +--- a/.gitignore b/.gitignore +@@ -7,4 +7,5 @@ CMakeLists.txt.user* + dylibbundler.log + performous-app-build.sh + osx-utils/out +-osx-utils/Performous.dmg +\ No newline at end of file ++osx-utils/Performous.dmg ++.vscode/ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73993f92..2a7ec01a 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -86,7 +86,7 @@ endif() + include(CPack) + SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Niek Nooijens") + SET(CPACK_PACKAGE_CONTACT "nieknooij...@gmail.com") +-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, libavcodec54, libavformat54, libavresample1, libsdl2-2.0-0, libportaudiocpp0, libboost-all-dev, libswscale2, libxml++2.6-2, libopencv-dev, librsvg2-2, libpango-1.0-0, libcairo2, libjpeg8, libpng12-0, libportmidi0 ") ++SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, libavcodec54, libavformat54, libswresample2, libsdl2-2.0-0, libportaudiocpp0, libboost-all-dev, libswscale2, libxml++2.6-2, libopencv-dev, librsvg2-2, libpango-1.0-0, libcairo2, libjpeg8, libpng12-0, libportmidi0 ") + SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "A free music rhythm game similar to SingStar, Guitar Hero and DDR") + SET(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION}) + SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") +diff --git a/cmake/Modules/FindSWResample.cmake b/cmake/Modules/FindSWResample.cmake +new file mode 100644 +index ..ce4dffd1 +--- /dev/null b/cmake/Modules/FindSWResample.cmake +@@ -0,0 +1,44 @@ ++# - Try to find FFMPEG libswresample ++# Once done, this will define ++# ++# SWResample_FOUND - the library is available ++# SWResample_INCLUDE_DIRS - the include directories ++# SWResample_LIBRARIES - the libraries ++# SWResample_INCLUDE - the file to include (may be used in config.h) ++# ++# See documentation on how to write CMake scripts at ++# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries ++ ++include(LibFindMacros) ++ ++libfind_package(SWResample AVUtil) ++ ++libfind_pkg_check_modules(SWResample_PKGCONF libswresample) ++ ++find_path(SWResample_INCLUDE_DIR ++ NAMES libswresample/swresample.h ffmpeg/swresample.h swresample.h ++ HINTS ${SWResample_PKGCONF_INCLUDE_DIRS} ++ PATH_SUFFIXES ffmpeg ++) ++ ++if(SWResample_INCLUDE_DIR) ++ foreach(suffix libswresample/ ffmpeg/ "") ++if(NOT SWResample_INCLUDE) ++ if(EXISTS "${SWResample_INCLUDE_DIR}/${suffix}swresample.h") ++set(SWResample_INCLUDE "${suffix}swresample.h") ++ endif(EXISTS "${SWResample_INCLUDE_DIR}/${suffix}swresample.h") ++endif(NOT SWResample_INCLUDE) ++ endforeach(suffix) ++ ++ if(NOT SWResample_INCLUDE) ++message(FATAL_ERROR "Found swresample.h include dir, but not the header file. Maybe you need to clear CMake cache?") ++ endif(NOT SWResample_INCLUDE) ++endif(SWResample_INCLUDE_DIR) ++
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Tuesday, September 18, 2018 @ 13:55:28 Author: foutrelis Revision: 383060 boost 1.68.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-09-18 13:54:05 UTC (rev 383059) +++ PKGBUILD2018-09-18 13:55:28 UTC (rev 383060) @@ -3,7 +3,7 @@ pkgname=performous pkgver=1.1 -pkgrel=15 +pkgrel=16 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Sunday, June 3, 2018 @ 01:08:56 Author: foutrelis Revision: 338502 boost 1.67.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-06-03 01:07:20 UTC (rev 338501) +++ PKGBUILD2018-06-03 01:08:56 UTC (rev 338502) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=14 +pkgrel=15 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD boost-1.67.patch)
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 === --- PKGBUILD2018-06-03 00:09:51 UTC (rev 338498) +++ PKGBUILD2018-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.patch2018-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.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 * samples / srate / 2.0)); } + public: + bool suppressCenterChannel; + double fadeLevel;
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Friday, April 27, 2018 @ 18:34:12 Author: arojas Revision: 318302 ffmpeg 4.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-27 18:31:30 UTC (rev 318301) +++ PKGBUILD2018-04-27 18:34:12 UTC (rev 318302) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=13 +pkgrel=14 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Thursday, December 28, 2017 @ 14:37:35 Author: felixonmars Revision: 276454 upgpkg: performous 1.1-13 rebuild with boost 1.66.0 Modified: performous/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-12-28 14:37:07 UTC (rev 276453) +++ PKGBUILD2017-12-28 14:37:35 UTC (rev 276454) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=12 +pkgrel=13 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/"; @@ -13,7 +13,7 @@ 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=('cf31d0973cd88b3cd626d312d6d3f5b2') +sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1') build() { cd performous-${pkgver}
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Sunday, December 24, 2017 @ 23:29:06 Author: arojas Revision: 275873 opencv 3.4 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-12-24 23:27:10 UTC (rev 275872) +++ PKGBUILD2017-12-24 23:29:06 UTC (rev 275873) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=11 +pkgrel=12 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Friday, September 15, 2017 @ 17:15:45 Author: arojas Revision: 257703 boost 1.65 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-09-15 17:09:40 UTC (rev 257702) +++ PKGBUILD2017-09-15 17:15:45 UTC (rev 257703) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=10 +pkgrel=11 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, August 21, 2017 @ 18:51:54 Author: arojas Revision: 252875 opencv 3.3 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-08-21 17:14:02 UTC (rev 252874) +++ PKGBUILD2017-08-21 18:51:54 UTC (rev 252875) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=9 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Friday, May 19, 2017 @ 18:26:24 Author: lcarlier Revision: 228600 upgpkg: performous 1.1-9 boost 1.64.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-05-19 18:22:32 UTC (rev 228599) +++ PKGBUILD2017-05-19 18:26:24 UTC (rev 228600) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=8 +pkgrel=9 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Wednesday, February 8, 2017 @ 13:08:17 Author: jgc Revision: 211237 upgpkg: performous 1.1-8 Rebuild with libxml++2.6 Modified: performous/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-02-08 13:02:03 UTC (rev 211236) +++ PKGBUILD2017-02-08 13:08:17 UTC (rev 211237) @@ -4,12 +4,12 @@ pkgname=performous pkgver=1.1 -pkgrel=7 +pkgrel=8 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/"; license=('GPL') -depends=('boost-libs' 'libepoxy' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg' 'opencv' 'sdl2') +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)
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, January 30, 2017 @ 16:42:47 Author: arojas Revision: 209523 opencv 3.2 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-01-30 16:36:54 UTC (rev 209522) +++ PKGBUILD2017-01-30 16:42:47 UTC (rev 209523) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=6 +pkgrel=7 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, January 2, 2017 @ 17:27:01 Author: arojas Revision: 204322 Boost 1.63 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-01-02 17:25:28 UTC (rev 204321) +++ PKGBUILD2017-01-02 17:27:01 UTC (rev 204322) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=5 +pkgrel=6 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Sunday, October 9, 2016 @ 15:51:53 Author: jelle Revision: 191715 upgpkg: performous 1.1-5 boost 1.62 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-10-09 15:13:06 UTC (rev 191714) +++ PKGBUILD2016-10-09 15:51:53 UTC (rev 191715) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=4 +pkgrel=5 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Tuesday, August 23, 2016 @ 16:29:50 Author: lcarlier Revision: 187410 upgpkg: performous 1.1-4 boost 1.61 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-08-23 16:23:43 UTC (rev 187409) +++ PKGBUILD2016-08-23 16:29:50 UTC (rev 187410) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=3 +pkgrel=4 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Thursday, May 12, 2016 @ 13:39:38 Author: foutrelis Revision: 174957 boost 1.60.0-5 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-05-12 11:38:09 UTC (rev 174956) +++ PKGBUILD2016-05-12 11:39:38 UTC (rev 174957) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Wednesday, March 9, 2016 @ 14:49:15 Author: lcarlier Revision: 165750 upgpkg: performous 1.1-2 OpenCV 3 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-03-09 13:46:44 UTC (rev 165749) +++ PKGBUILD2016-03-09 13:49:15 UTC (rev 165750) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD performous-ffmpeg3.patch)
Date: Wednesday, February 17, 2016 @ 21:43:22 Author: arojas Revision: 162123 ffmpeg 3.0 rebuild Added: performous/trunk/performous-ffmpeg3.patch Modified: performous/trunk/PKGBUILD --+ PKGBUILD |9 ++--- performous-ffmpeg3.patch | 20 2 files changed, 26 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-02-17 20:33:23 UTC (rev 162122) +++ PKGBUILD2016-02-17 20:43:22 UTC (rev 162123) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=9 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/"; @@ -13,14 +13,17 @@ 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) +cast-basic_istream-to-bool.patch performous-ffmpeg3.patch) md5sums=('cbeec2f0c0114cc499746c1e33f56055' - 'c883cce82d0359c6b40ce38bd4ccf4bf') + 'c883cce82d0359c6b40ce38bd4ccf4bf' + 'dbffea91ebe1a9041a52f9de62907934') prepare() { cd performous-${pkgver} patch -Np1 -i ../cast-basic_istream-to-bool.patch +# Fix build with ffmpeg 3.0 + patch -p1 -i ../performous-ffmpeg3.patch } build() { Added: performous-ffmpeg3.patch === --- performous-ffmpeg3.patch(rev 0) +++ performous-ffmpeg3.patch2016-02-17 20:43:22 UTC (rev 162123) @@ -0,0 +1,20 @@ +--- performous-1.0/game/ffmpeg.cc.orig 2016-02-17 20:37:00.157658695 + performous-1.0/game/ffmpeg.cc 2016-02-17 20:38:20.287291460 + +@@ -116,7 +116,7 @@ + height = cc->height; + m_swsContext = sws_getContext( + cc->width, cc->height, cc->pix_fmt, +-width, height, PIX_FMT_RGB24, ++width, height, AV_PIX_FMT_RGB24, + SWS_POINT, nullptr, nullptr, nullptr); + break; + default: // Should never be reached but avoids compile warnings +@@ -187,7 +187,7 @@ + if (packetSize < 0) throw std::logic_error("negative packet size?!"); + if (m_quit || m_seekTarget == m_seekTarget) return; + if (packet.stream_index != m_streamId) return; +- boost::shared_ptr frame(avcodec_alloc_frame(), &av_free); ++ boost::shared_ptr frame(av_frame_alloc(), &av_free); + int frameFinished = 0; + int decodeSize = (m_mediaType == AVMEDIA_TYPE_VIDEO ? + avcodec_decode_video2(m_codecContext, frame.get(), &frameFinished, &packet) :
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, December 21, 2015 @ 18:13:51 Author: fyan Revision: 153937 boost 1.60.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-21 17:13:15 UTC (rev 153936) +++ PKGBUILD2015-12-21 17:13:51 UTC (rev 153937) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=8 +pkgrel=9 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, December 7, 2015 @ 08:51:33 Author: foutrelis Revision: 149732 C++11 ABI rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-07 07:50:54 UTC (rev 149731) +++ PKGBUILD2015-12-07 07:51:33 UTC (rev 149732) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=7 +pkgrel=8 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Thursday, October 15, 2015 @ 14:14:43 Author: foutrelis Revision: 144134 boost 1.59.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-10-15 12:12:13 UTC (rev 144133) +++ PKGBUILD2015-10-15 12:14:43 UTC (rev 144134) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=6 +pkgrel=7 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Thursday, October 15, 2015 @ 13:27:20 Author: bpiotrowski Revision: 144099 boost 1.59.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-10-15 11:20:24 UTC (rev 144098) +++ PKGBUILD2015-10-15 11:27:20 UTC (rev 144099) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=5 +pkgrel=6 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, September 28, 2015 @ 23:19:57 Author: foutrelis Revision: 142159 poppler 0.36.0 / glew 1.13.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-09-28 21:02:44 UTC (rev 142158) +++ PKGBUILD2015-09-28 21:19:57 UTC (rev 142159) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=4 +pkgrel=5 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD cast-basic_istream-to-bool.patch)
Date: Sunday, May 31, 2015 @ 00:07:44 Author: lcarlier Revision: 134389 upgpkg: performous 1.0-4 fix building with gcc 5.1.0 Added: performous/trunk/cast-basic_istream-to-bool.patch Modified: performous/trunk/PKGBUILD --+ PKGBUILD | 14 +++--- cast-basic_istream-to-bool.patch | 26 ++ 2 files changed, 37 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-05-30 20:00:32 UTC (rev 134388) +++ PKGBUILD2015-05-30 22:07:44 UTC (rev 134389) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=3 +pkgrel=4 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/"; @@ -12,9 +12,17 @@ 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') +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} Added: cast-basic_istream-to-bool.patch === --- cast-basic_istream-to-bool.patch(rev 0) +++ cast-basic_istream-to-bool.patch2015-05-30 22:07:44 UTC (rev 134389) @@ -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;
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Thursday, April 23, 2015 @ 05:28:08 Author: fyan Revision: 132027 upgpkg: performous 1.0-3 rebuild for boost 1.58.0 Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-04-23 03:21:15 UTC (rev 132026) +++ PKGBUILD2015-04-23 03:28:08 UTC (rev 132027) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Friday, January 30, 2015 @ 11:45:28 Author: lcarlier Revision: 126781 upgpkg: performous 1.0-2 glew 1.12 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-01-30 10:37:02 UTC (rev 126780) +++ PKGBUILD2015-01-30 10:45:28 UTC (rev 126781) @@ -4,7 +4,7 @@ pkgname=performous pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Wednesday, November 5, 2014 @ 03:26:26 Author: fyan Revision: 121917 upgpkg: performous 0.7.0-16 boost 1.57.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-11-05 01:38:55 UTC (rev 121916) +++ PKGBUILD2014-11-05 02:26:26 UTC (rev 121917) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=15 +pkgrel=16 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Wednesday, September 17, 2014 @ 08:07:17 Author: lcarlier Revision: 119077 upgpkg: performous 0.7.0-15 ffmpeg 2.4 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-09-17 05:59:17 UTC (rev 119076) +++ PKGBUILD2014-09-17 06:07:17 UTC (rev 119077) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=14 +pkgrel=15 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Tuesday, August 19, 2014 @ 01:14:50 Author: alucryd Revision: 117580 glew rebuild: performous 0.7.0-14 Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-08-18 23:11:18 UTC (rev 117579) +++ PKGBUILD2014-08-18 23:14:50 UTC (rev 117580) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=13 +pkgrel=14 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Tuesday, August 19, 2014 @ 01:11:06 Author: alucryd Revision: 117578 glew rebuild: performous 0.7.0-13 Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-08-18 23:09:16 UTC (rev 117577) +++ PKGBUILD2014-08-18 23:11:06 UTC (rev 117578) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=12 +pkgrel=13 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Tuesday, August 12, 2014 @ 12:18:04 Author: bpiotrowski Revision: 117273 upgpkg: performous 0.7.0-12 rebuild against boost 1.56.0 Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-08-12 10:10:48 UTC (rev 117272) +++ PKGBUILD2014-08-12 10:18:04 UTC (rev 117273) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=11 +pkgrel=12 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Saturday, November 30, 2013 @ 08:00:07 Author: lcarlier Revision: 101680 upgpkg: performous 0.7.0-11 boost 1.55.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-11-30 06:28:26 UTC (rev 101679) +++ PKGBUILD2013-11-30 07:00:07 UTC (rev 101680) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=10 +pkgrel=11 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/"; @@ -30,6 +30,8 @@ patch -Np1 -i ../fix-noisy-sound-output.patch # fix building with ffmpeg-2.0 patch -Np1 -i ../ffmpeg-2.0.patch + # since freetype2-2.5.1 include files aren't anymore in the freetype subdir + sed -i "s#freetype/freetype.h#freetype.h#g" cmake/Modules/FindFreetype.cmake } build() {
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Wednesday, July 31, 2013 @ 11:52:19 Author: lcarlier Revision: 94851 upgpkg: performous 0.7.0-10 libglew-1.10 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-07-31 09:33:45 UTC (rev 94850) +++ PKGBUILD2013-07-31 09:52:19 UTC (rev 94851) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=9 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD ffmpeg-2.0.patch)
Date: Wednesday, July 17, 2013 @ 10:36:06 Author: lcarlier Revision: 94224 prepare ffmpeg-2.0 rebuild Added: performous/trunk/ffmpeg-2.0.patch Modified: performous/trunk/PKGBUILD --+ PKGBUILD | 11 +++ ffmpeg-2.0.patch | 11 +++ 2 files changed, 18 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-07-17 06:40:51 UTC (rev 94223) +++ PKGBUILD2013-07-17 08:36:06 UTC (rev 94224) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=8 +pkgrel=9 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/"; @@ -14,19 +14,22 @@ 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 - fix-noisy-sound-output.patch) + fix-noisy-sound-output.patch + ffmpeg-2.0.patch) md5sums=('60f3f72b51a630a4aa996484aedb9526' '7da8aef3f4dd28e19f95957ae9ac2bb1' - '820dc6d1a91c23f0ef56e2cd1759afb6') + '820dc6d1a91c23f0ef56e2cd1759afb6' + '9f781162b6ebc77b68caa05e2941c527') prepare() { cd performous-${pkgver} # patch from gentoo patch -Np0 -i ../performous-0.7.0-cmake.patch - # fix FS#33948 (merged upstream) patch -Np1 -i ../fix-noisy-sound-output.patch + # fix building with ffmpeg-2.0 + patch -Np1 -i ../ffmpeg-2.0.patch } build() { Added: ffmpeg-2.0.patch === --- ffmpeg-2.0.patch(rev 0) +++ ffmpeg-2.0.patch2013-07-17 08:36:06 UTC (rev 94224) @@ -0,0 +1,11 @@ +diff -ru performous-0.7.0/game/ffmpeg.cc performous-0.7.0a/game/ffmpeg.cc +--- performous-0.7.0/game/ffmpeg.cc2012-11-12 23:14:08.0 +0100 performous-0.7.0a/game/ffmpeg.cc 2013-07-17 10:28:11.284467081 +0200 +@@ -17,6 +17,7 @@ + #endif + + #define AUDIO_CHANNELS 2 ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 + + /*static*/ boost::mutex FFmpeg::s_avcodec_mutex; +
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, July 8, 2013 @ 10:15:19 Author: lcarlier Revision: 93649 upgpkg: performous 0.7.0-8 boost 1.54.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-07-08 08:01:25 UTC (rev 93648) +++ PKGBUILD2013-07-08 08:15:19 UTC (rev 93649) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=7 +pkgrel=8 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD fix-noisy-sound-output.patch)
Date: Thursday, May 23, 2013 @ 21:50:00 Author: lcarlier Revision: 91561 upgpkg: performous 0.7.0-7 Fix FS#33948 and FS#33949 Added: performous/trunk/fix-noisy-sound-output.patch Modified: performous/trunk/PKGBUILD --+ PKGBUILD | 18 + fix-noisy-sound-output.patch | 440 + 2 files changed, 454 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-05-23 19:16:48 UTC (rev 91560) +++ PKGBUILD2013-05-23 19:50:00 UTC (rev 91561) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=6 +pkgrel=7 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/"; @@ -13,15 +13,25 @@ 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) +performous-0.7.0-cmake.patch + fix-noisy-sound-output.patch) md5sums=('60f3f72b51a630a4aa996484aedb9526' - '7da8aef3f4dd28e19f95957ae9ac2bb1') + '7da8aef3f4dd28e19f95957ae9ac2bb1' + '820dc6d1a91c23f0ef56e2cd1759afb6') -build() { +prepare() { cd performous-${pkgver} + # patch from gentoo patch -Np0 -i ../performous-0.7.0-cmake.patch + # fix FS#33948 (merged upstream) + patch -Np1 -i ../fix-noisy-sound-output.patch +} + +build() { + cd performous-${pkgver} + mkdir -p build cd build Added: fix-noisy-sound-output.patch === --- fix-noisy-sound-output.patch(rev 0) +++ fix-noisy-sound-output.patch2013-05-23 19:50:00 UTC (rev 91561) @@ -0,0 +1,440 @@ +diff -ur performous-0.7.0/game/audio.cc performous-0.7.0b/game/audio.cc +--- performous-0.7.0/game/audio.cc 2012-11-12 23:14:08.0 +0100 performous-0.7.0b/game/audio.cc2013-05-23 19:38:26.568498744 +0200 +@@ -140,7 +140,8 @@ + FFmpeg mpeg; + float fadeLevel; + float pitchFactor; +- Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} ++ //Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} ++ Track(std::string const& filename, unsigned int sr): mpeg(filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} + }; + typedef boost::ptr_map Tracks; + Tracks tracks; ///< Audio decoders +@@ -241,7 +242,8 @@ + FFmpeg mpeg; + bool eof; + public: +- Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { } ++ //Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { } ++ Sample(std::string const& filename, unsigned sr) : m_pos(), mpeg(filename, sr), eof(true) { } + void operator()(float* begin, float* end) { + if(eof) { + // No more data to play in this sample +diff -ur performous-0.7.0/game/ffmpeg.cc performous-0.7.0b/game/ffmpeg.cc +--- performous-0.7.0/game/ffmpeg.cc2012-11-12 23:14:08.0 +0100 performous-0.7.0b/game/ffmpeg.cc 2013-05-23 21:41:09.057986491 +0200 +@@ -3,6 +3,7 @@ + #include "config.hh" + #include "util.hh" + #include "xtime.hh" ++#include + #include + #include + +@@ -20,15 +21,20 @@ + + /*static*/ boost::mutex FFmpeg::s_avcodec_mutex; + +-FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate): +- width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(), +- m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(), +- m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(), ++//FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate): ++// width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(), ++// m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(), ++// m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(), ++FFmpeg::FFmpeg(std::string const& _filename, unsigned int rate): ++ width(), height(), m_filename(_filename), m_rate(rate), m_quit(), ++ m_seekTarget(getNaN()), m_position(), m_duration(), m_streamId(-1), ++ m_mediaType(rate ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO), ++ m_formatContext(), m_codecContext(), m_resampleContext(), m_swsContext(), + m_thread(new boost::thread(boost::ref(*this))) + { +- if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO; +- else if (decodeAudio) m_mediaT
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Monday, April 29, 2013 @ 11:52:37 Author: lcarlier Revision: 89405 upgpkg: performous 0.7.0-6 libpng-1.6 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-04-29 09:34:10 UTC (rev 89404) +++ PKGBUILD2013-04-29 09:52:37 UTC (rev 89405) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=5 +pkgrel=6 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Thursday, March 28, 2013 @ 13:39:18 Author: foutrelis Revision: 87169 upgpkg: performous 0.7.0-5 Boost 1.53 rebuild. Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-03-28 12:31:44 UTC (rev 87168) +++ PKGBUILD2013-03-28 12:39:18 UTC (rev 87169) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=4 +pkgrel=5 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";
[arch-commits] Commit in performous/trunk (PKGBUILD performous-0.7.0-cmake.patch)
Date: Sunday, February 10, 2013 @ 15:48:13 Author: ioni Revision: 84091 ffmpeg rebuild Added: performous/trunk/performous-0.7.0-cmake.patch Modified: performous/trunk/PKGBUILD --+ PKGBUILD | 16 ++-- performous-0.7.0-cmake.patch | 155 + 2 files changed, 165 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-02-10 13:06:04 UTC (rev 84090) +++ PKGBUILD2013-02-10 14:48:13 UTC (rev 84091) @@ -4,20 +4,24 @@ pkgname=performous pkgver=0.7.0 -pkgrel=3 +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>=1.50' 'mesa') +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) -md5sums=('60f3f72b51a630a4aa996484aedb9526') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2 +performous-0.7.0-cmake.patch) +md5sums=('60f3f72b51a630a4aa996484aedb9526' + '7da8aef3f4dd28e19f95957ae9ac2bb1') build() { - cd ${srcdir}/performous-${pkgver} + cd performous-${pkgver} + patch -Np0 -i ../performous-0.7.0-cmake.patch + mkdir -p build cd build @@ -28,7 +32,7 @@ } package() { - cd ${srcdir}/performous-${pkgver}/build + cd performous-${pkgver}/build make DESTDIR="$pkgdir" install } Added: performous-0.7.0-cmake.patch === --- performous-0.7.0-cmake.patch(rev 0) +++ performous-0.7.0-cmake.patch2013-02-10 14:48:13 UTC (rev 84091) @@ -0,0 +1,155 @@ +From: Julian Ospald +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) + + +-else(EXISTS "${OpenCV_DIR}") ++else(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) + set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable") +-endif(EXISTS "${OpenCV_DIR}") ++endif(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) + ## + + ## +--- CMakeLists.txt CMakeLists.txt +@@ -33,7 +33,7 @@ + + #need to put here do setting LOCALE_DIR variable + find_package(Gettext) +-if(Gettext_FOUND) ++if(GETTEXT_FOUND) + if(NOT LOCALE_DIR) + if(WIN32) + SET(LOCALE_DIR "bin/locale") +@@ -55,7 +55,7 @@ + message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled") + endif() + endif(NOT LOCALE_DIR) +-endif(Gettext_FOUND)
[arch-commits] Commit in performous/trunk (PKGBUILD)
Date: Wednesday, January 23, 2013 @ 09:47:06 Author: lcarlier Revision: 82698 upgpkg: performous 0.7.0-3 boost 1.52.0 rebuild Modified: performous/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-01-23 08:34:37 UTC (rev 82697) +++ PKGBUILD2013-01-23 08:47:06 UTC (rev 82698) @@ -4,7 +4,7 @@ pkgname=performous pkgver=0.7.0 -pkgrel=2 +pkgrel=3 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/";