[arch-commits] Commit in performous/trunk (PKGBUILD ffmpeg-2.0.patch)

[Laurent Carlier]

    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
===================================================================
--- PKGBUILD	2013-07-17 06:40:51 UTC (rev 94223)
+++ PKGBUILD	2013-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.patch	2013-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.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;
+