diff options
Diffstat (limited to 'community/hedgewars')
| -rw-r--r-- | community/hedgewars/PKGBUILD | 29 | ||||
| -rw-r--r-- | community/hedgewars/build-fix.patch | 11 | ||||
| -rw-r--r-- | community/hedgewars/ffmpeg2.0.patch | 21 |
3 files changed, 10 insertions, 51 deletions
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index c918a8a8e..0c1b5318d 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,10 +1,12 @@ -# $Id: PKGBUILD 97071 2013-09-12 10:11:10Z spupykin $ +# $Id: PKGBUILD 103142 2013-12-27 12:15:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.19 -pkgrel=4 -pkgdesc="Free Worms-like turn based strategy game" +pkgver=0.9.20 +pkgrel=1 +pkgdesc="turn based strategy, artillery, action and comedy game, featuring the + antics of pink hedgehogs with attitude as they battle from the depths of hell + to the depths of space." arch=('i686' 'x86_64') url="http://hedgewars.org" license=('GPL' 'custom') @@ -20,19 +22,9 @@ makedepends=('fpc' 'cmake' 'haskell-vector' 'haskell-random') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.png - build-fix.patch - ffmpeg2.0.patch) -md5sums=('51d84ad6ea00e9894e6119b118b4a523' - 'eeb14d50df39063549ac5eca9dbc65d1' - 'a9d7b0ba72cbeb7fc74fce459db9dd90' - 'da84d64a252579236d3ff0cc6e008e72') - -prepare() { - cd $pkgname-src-$pkgver - patch -Rp1 <$srcdir/build-fix.patch - patch -Np1 -i ../ffmpeg2.0.patch -} + hedgewars.png) +md5sums=('7ee1b23e51053d34feb84464184f60fa' + 'eeb14d50df39063549ac5eca9dbc65d1') build() { cd $pkgname-src-$pkgver @@ -40,8 +32,7 @@ build() { -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share/hedgewars \ - -DWITH_SERVER=1 \ - -DSYSTEM_PHYSFS=OFF . + -DNOSERVER=0 . make } diff --git a/community/hedgewars/build-fix.patch b/community/hedgewars/build-fix.patch deleted file mode 100644 index 90a4365f2..000000000 --- a/community/hedgewars/build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas ---- /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-06-03 20:01:14.212121255 +0400 -+++ hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-05-31 00:07:33.000000000 +0400 -@@ -9,7 +9,6 @@ - {$IFNDEF WIN32} - {$linklib physfs} - {$linklib physlayer} -- {$linklib gcc_s} - - {statically linking physfs brings IOKit dependency on OSX} - {divdi3 is found in stdc++ on linux x86 and in gcc_s.1 on osx ppc32} diff --git a/community/hedgewars/ffmpeg2.0.patch b/community/hedgewars/ffmpeg2.0.patch deleted file mode 100644 index 67f123ae3..000000000 --- a/community/hedgewars/ffmpeg2.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -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; |