diff options
| author | root <root@rshg054.dnsready.net> | 2013-08-02 01:31:32 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-08-02 01:31:32 -0700 |
| commit | f7cd2a0a073da2373cd3f3c8e31515dd0b83b645 (patch) | |
| tree | e28c5c379825afaf02a927a8f1d1b1fcb94c2362 /community/hedgewars | |
| parent | 70ec180b1cca6eda5576597c2bfff9171f7815bf (diff) | |
Fri Aug 2 01:30:56 PDT 2013
Diffstat (limited to 'community/hedgewars')
| -rw-r--r-- | community/hedgewars/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/hedgewars/ffmpeg2.0.patch | 21 |
2 files changed, 28 insertions, 4 deletions
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index caa8bd5b5..35558eafc 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92299 2013-06-03 16:15:33Z spupykin $ +# $Id: PKGBUILD 94887 2013-08-01 06:55:02Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> 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 @@ makedepends=('fpc' 'cmake' 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() { diff --git a/community/hedgewars/ffmpeg2.0.patch b/community/hedgewars/ffmpeg2.0.patch new file mode 100644 index 000000000..67f123ae3 --- /dev/null +++ b/community/hedgewars/ffmpeg2.0.patch @@ -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; |