[arch-commits] Commit in hedgewars/trunk (PKGBUILD ffmpeg2.0.patch)

[Bartłomiej Piotrowski]

    Date: Monday, July 22, 2013 @ 18:38:17
  Author: bpiotrowski
Revision: 94399

upgpkg: hedgewars 0.9.19-2

- rebuild against ffmpeg 2.0

Added:
  hedgewars/trunk/ffmpeg2.0.patch
Modified:
  hedgewars/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    9 ++++++---
 ffmpeg2.0.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-22 16:18:59 UTC (rev 94398)
+++ PKGBUILD	2013-07-22 16:38:17 UTC (rev 94399)
@@ -3,7 +3,7 @@
 
 pkgname=hedgewars
 pkgver=0.9.19
-pkgrel=1
+pkgrel=2
 pkgdesc="Free Worms-like turn based strategy game"
 arch=('i686' 'x86_64')
 url="http://hedgewars.org"
@@ -22,15 +22,18 @@
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
 	hedgewars.desktop
 	hedgewars.png
-	build-fix.patch)
+	build-fix.patch
+	ffmpeg2.0.patch)
 md5sums=('51d84ad6ea00e9894e6119b118b4a523'
          '48c66a3204d4fa0a69e9aa46f7c31e0c'
          'eeb14d50df39063549ac5eca9dbc65d1'
-         'a9d7b0ba72cbeb7fc74fce459db9dd90')
+         'a9d7b0ba72cbeb7fc74fce459db9dd90'
+         'da84d64a252579236d3ff0cc6e008e72')
 
 prepare() {
   cd $pkgname-src-$pkgver
   patch -Rp1 <$srcdir/build-fix.patch
+  patch -Np1 -i ../ffmpeg2.0.patch
 }
 
 build() {

Added: ffmpeg2.0.patch
===================================================================
--- ffmpeg2.0.patch	                        (rev 0)
+++ ffmpeg2.0.patch	2013-07-22 16:38:17 UTC (rev 94399)
@@ -0,0 +1,21 @@
+diff -rupN a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp
+--- a/QTfrontend/util/LibavInteraction.cpp	2013-05-30 20:07:33.000000000 +0000
++++ b/QTfrontend/util/LibavInteraction.cpp	2013-07-22 16:24:42.564768844 +0000
+@@ -32,7 +32,7 @@ extern "C"
+ 
+ struct Codec
+ {
+-    CodecID id;
++    AVCodecID id;
+     bool isAudio;
+     QString shortName; // used for identification
+     QString longName; // used for displaying to user
+@@ -52,7 +52,7 @@ QList<Codec> codecs;
+ QMap<QString,Format> formats;
+ 
+ // test if given format supports given codec
+-bool FormatQueryCodec(AVOutputFormat *ofmt, enum CodecID codec_id)
++bool FormatQueryCodec(AVOutputFormat *ofmt, enum AVCodecID codec_id)
+ {
+ #if LIBAVFORMAT_VERSION_MAJOR >= 54
+     return avformat_query_codec(ofmt, codec_id, FF_COMPLIANCE_NORMAL) == 1;