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

2013-12-27 Thread 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
===
--- PKGBUILD2013-12-27 11:10:36 UTC (rev 103137)
+++ PKGBUILD2013-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.pas2013-05-31 
00:07:33.0 +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.0 
+
-+++ b/QTfrontend/util/LibavInteraction.cpp 2013-07-22 16:24:42.564768844 
+
-@@ -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 @@ QListCodec codecs;
- QMapQString,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;

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

2013-06-03 Thread Sergej Pupykin 
Date: Monday, June 3, 2013 @ 18:14:48
  Author: spupykin
Revision: 92298

upgpkg: hedgewars 0.9.19-1

upd

Added:
  hedgewars/trunk/build-fix.patch
Modified:
  hedgewars/trunk/PKGBUILD

-+
 PKGBUILD|   19 +--
 build-fix.patch |   11 +++
 2 files changed, 24 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-03 14:58:14 UTC (rev 92297)
+++ PKGBUILD2013-06-03 16:14:48 UTC (rev 92298)
@@ -8,7 +8,7 @@
 arch=('i686' 'x86_64')
 url=http://hedgewars.org;
 license=('GPL' 'custom')
-depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 
'physfs' 'ffmpeg' 'glut')
+depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 
'ffmpeg' 'glut')
 makedepends=('fpc' 'cmake'
 # haskell specific
 'ghc'
@@ -21,19 +21,26 @@
 'haskell-random')
 source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
hedgewars.desktop
-   hedgewars.png)
+   hedgewars.png
+   build-fix.patch)
 md5sums=('51d84ad6ea00e9894e6119b118b4a523'
  '48c66a3204d4fa0a69e9aa46f7c31e0c'
- 'eeb14d50df39063549ac5eca9dbc65d1')
+ 'eeb14d50df39063549ac5eca9dbc65d1'
+ 'a9d7b0ba72cbeb7fc74fce459db9dd90')
 
+prepare() {
+  cd $pkgname-src-$pkgver
+  patch -Rp1 $srcdir/build-fix.patch
+}
+
 build() {
   cd $pkgname-src-$pkgver
-  sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
   cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-   -DDATA_INSTALL_DIR=/usr/share \
-   -DWITH_SERVER=1 .
+   -DDATA_INSTALL_DIR=/usr/share/hedgewars \
+   -DWITH_SERVER=1 \
+   -DSYSTEM_PHYSFS=OFF .
   make
 }
 

Added: build-fix.patch
===
--- build-fix.patch (rev 0)
+++ build-fix.patch 2013-06-03 16:14:48 UTC (rev 92298)
@@ -0,0 +1,11 @@
+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.pas2013-05-31 
00:07:33.0 +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}