diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
| commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
| tree | c1d4adcda7f0b767537620aea02633158e17218a /community/performous | |
| parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
| parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/performous')
| -rw-r--r-- | community/performous/PKGBUILD | 14 | ||||
| -rw-r--r-- | community/performous/fix-boost-1.50-xtime.patch | 35 |
2 files changed, 44 insertions, 5 deletions
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 9cf72cee5..ae0b6b929 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73483 2012-07-08 09:31:23Z ibiru $ +# $Id: PKGBUILD 74003 2012-07-18 01:07:58Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=14 +pkgrel=15 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" @@ -12,16 +12,18 @@ license=('GPL') depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') #depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ # 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48') +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 boost-filesystem-v3.patch ffmpeg-0.11.patch - png15.patch) + png15.patch + fix-boost-1.50-xtime.patch) md5sums=('451a759de77984b5a699e91107fe52e2' '42a8c825d80b0de16bd5752d2a80e585' '07e52e926595d053155bbfb7168e308f' - '89157d5e21b0efd09fcbeee299d23c7e') + '89157d5e21b0efd09fcbeee299d23c7e' + '6b43ab7f1c3e2cacd3540242634eabb3') build() { cd ${srcdir}/Performous-${pkgver}-Source @@ -35,6 +37,8 @@ build() { # fix glib2.0 building # #error "Only <glib.h> can be included directly." sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc + # boost 1.50 fix + patch -Np1 -i ../fix-boost-1.50-xtime.patch mkdir -p build cd build diff --git a/community/performous/fix-boost-1.50-xtime.patch b/community/performous/fix-boost-1.50-xtime.patch new file mode 100644 index 000000000..d13b18c26 --- /dev/null +++ b/community/performous/fix-boost-1.50-xtime.patch @@ -0,0 +1,35 @@ +From a4be6f47bcdd64e7c77db0a04415973d4c322ae8 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Alvaro=20Fernando=20Garc=C3=ADa?= <alvarofernandogarcia@gmail.com> +Date: Sat, 7 Jul 2012 18:53:56 -0300 +Subject: [PATCH] Fixed boost xtime.hpp usage (for 1.50 version) + +--- + game/xtime.hh | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/game/xtime.hh b/game/xtime.hh +index 41303cb..8f5463d 100644 +--- a/game/xtime.hh ++++ b/game/xtime.hh +@@ -1,5 +1,6 @@ + #pragma once + ++#include <boost/version.hpp> + #include <boost/thread/xtime.hpp> + #include <cmath> + +@@ -20,7 +21,11 @@ namespace { + } + boost::xtime now() { + boost::xtime time; ++#if (BOOST_VERSION / 100 % 1000 >= 50) ++ boost::xtime_get(&time, boost::TIME_UTC_); ++#else + boost::xtime_get(&time, boost::TIME_UTC); ++#endif + return time; + } + double seconds(boost::xtime const& time) { +-- +1.7.4.1 + |