diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
| commit | 513c776d74c56a49781a09a5a772f4ea6d6bb401 (patch) | |
| tree | 161509e3271db459f14f8c69de7c52d4902ba107 /community/performous | |
| parent | 8183144fe6e064d80985ac810f6178a3cf289d0d (diff) | |
| parent | e191a289464c21aafe7478065ea7ed3ddda0766f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arm-elf-binutils/PKGBUILD
community/bird/PKGBUILD
community/cantata/PKGBUILD
community/dbmail/PKGBUILD
community/ekg2/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/gigedit/PKGBUILD
community/gimp-refocus/PKGBUILD
community/gmime24/PKGBUILD
community/gmpc/PKGBUILD
community/gnash/PKGBUILD
community/id3lib-rcc/PKGBUILD
community/linuxsampler/PKGBUILD
community/lwm/PKGBUILD
community/midori/PKGBUILD
community/mplayer2/PKGBUILD
community/mtpaint/PKGBUILD
community/nestopia/PKGBUILD
community/preload/PKGBUILD
community/projectm/PKGBUILD
community/rusxmms/PKGBUILD
community/taglib-rcc/PKGBUILD
community/the_silver_searcher/PKGBUILD
community/xnee/PKGBUILD
core/libgcrypt/PKGBUILD
core/libusbx/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
extra/a2ps/PKGBUILD
extra/a52dec/PKGBUILD
extra/abook/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cln/PKGBUILD
extra/exempi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/fluxter/PKGBUILD
extra/fontforge/PKGBUILD
extra/glib/PKGBUILD
extra/gnet/PKGBUILD
extra/gnome-vfs/PKGBUILD
extra/gnutls/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk/PKGBUILD
extra/idnkit/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imake/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/libdatrie/PKGBUILD
extra/libmbim/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/libqmi/PKGBUILD
extra/libtxc_dxtn/PKGBUILD
extra/libxfont/PKGBUILD
extra/mesa/PKGBUILD
extra/modemmanager/PKGBUILD
extra/nedit/PKGBUILD
extra/nmap/PKGBUILD
extra/openexr/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/qemu/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/subversion/PKGBUILD
extra/transmission/PKGBUILD
extra/truecrypt/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/wxmaxima/PKGBUILD
extra/x264/PKGBUILD
extra/xorg-iceauth/PKGBUILD
extra/xorg-mkfontscale/PKGBUILD
extra/xorg-xfd/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/clementine-libre/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'community/performous')
| -rw-r--r-- | community/performous/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/performous/ffmpeg-2.0.patch | 11 |
2 files changed, 19 insertions, 5 deletions
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 201bb53e2..d20f9db2a 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94039 2013-07-13 12:35:25Z svenstaro $ +# $Id: PKGBUILD 94902 2013-08-01 06:55:27Z bpiotrowski $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=8 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" @@ -14,19 +14,22 @@ 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 - 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() { diff --git a/community/performous/ffmpeg-2.0.patch b/community/performous/ffmpeg-2.0.patch new file mode 100644 index 000000000..26819dd9b --- /dev/null +++ b/community/performous/ffmpeg-2.0.patch @@ -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.cc 2012-11-12 23:14:08.000000000 +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; + |