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

[Sergej Pupykin]

    Date: Friday, December 27, 2013 @ 13:01:24
  Author: spupykin
Revision: 103138

Modified:
  hedgewars/trunk/PKGBUILD
Deleted:
  hedgewars/trunk/build-fix.patch
  hedgewars/trunk/ffmpeg2.0.patch

-----------------+
 PKGBUILD        |   18 +++++-------------
 build-fix.patch |   11 -----------
 ffmpeg2.0.patch |   21 ---------------------
 3 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-27 11:10:36 UTC (rev 103137)
+++ PKGBUILD	2013-12-27 12:01:24 UTC (rev 103138)
@@ -4,7 +4,9 @@
 pkgname=hedgewars
 pkgver=0.9.20
 pkgrel=1
-pkgdesc="Free Worms-like turn based strategy game"
+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,20 +22,10 @@
 	     'haskell-vector'
 	     'haskell-random')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.png
-	build-fix.patch
-	ffmpeg2.0.patch)
+	hedgewars.png)
 md5sums=('7ee1b23e51053d34feb84464184f60fa'
-         'eeb14d50df39063549ac5eca9dbc65d1'
-         'a9d7b0ba72cbeb7fc74fce459db9dd90'
-         'da84d64a252579236d3ff0cc6e008e72')
+         'eeb14d50df39063549ac5eca9dbc65d1')
 
-prepare() {
-  cd $pkgname-src-$pkgver
-#  patch -Rp1 <$srcdir/build-fix.patch
-#  patch -Np1 -i ../ffmpeg2.0.patch
-}
-
 build() {
   cd $pkgname-src-$pkgver
   cmake \

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2013-12-27 11:10:36 UTC (rev 103137)
+++ build-fix.patch	2013-12-27 12:01:24 UTC (rev 103138)
@@ -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}

Deleted: ffmpeg2.0.patch
===================================================================
--- ffmpeg2.0.patch	2013-12-27 11:10:36 UTC (rev 103137)
+++ ffmpeg2.0.patch	2013-12-27 12:01:24 UTC (rev 103138)
@@ -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;