Date: Thursday, September 12, 2013 @ 12:11:10 Author: spupykin Revision: 97071
archrelease: copy trunk to community-i686, community-x86_64 Added: hedgewars/repos/community-i686/PKGBUILD (from rev 97070, hedgewars/trunk/PKGBUILD) hedgewars/repos/community-i686/build-fix.patch (from rev 97070, hedgewars/trunk/build-fix.patch) hedgewars/repos/community-i686/ffmpeg2.0.patch (from rev 97070, hedgewars/trunk/ffmpeg2.0.patch) hedgewars/repos/community-i686/hedgewars.png (from rev 97070, hedgewars/trunk/hedgewars.png) hedgewars/repos/community-x86_64/PKGBUILD (from rev 97070, hedgewars/trunk/PKGBUILD) hedgewars/repos/community-x86_64/build-fix.patch (from rev 97070, hedgewars/trunk/build-fix.patch) hedgewars/repos/community-x86_64/ffmpeg2.0.patch (from rev 97070, hedgewars/trunk/ffmpeg2.0.patch) hedgewars/repos/community-x86_64/hedgewars.png (from rev 97070, hedgewars/trunk/hedgewars.png) Deleted: hedgewars/repos/community-i686/PKGBUILD hedgewars/repos/community-i686/build-fix.patch hedgewars/repos/community-i686/ffmpeg2.0.patch hedgewars/repos/community-i686/hedgewars.desktop hedgewars/repos/community-i686/hedgewars.png hedgewars/repos/community-x86_64/PKGBUILD hedgewars/repos/community-x86_64/build-fix.patch hedgewars/repos/community-x86_64/ffmpeg2.0.patch hedgewars/repos/community-x86_64/hedgewars.desktop hedgewars/repos/community-x86_64/hedgewars.png ------------------------------------+ /PKGBUILD | 112 +++++++++++++++++++++++++++++++++++ /build-fix.patch | 22 ++++++ /ffmpeg2.0.patch | 42 +++++++++++++ community-i686/PKGBUILD | 58 ------------------ community-i686/build-fix.patch | 11 --- community-i686/ffmpeg2.0.patch | 21 ------ community-i686/hedgewars.desktop | 8 -- community-x86_64/PKGBUILD | 58 ------------------ community-x86_64/build-fix.patch | 11 --- community-x86_64/ffmpeg2.0.patch | 21 ------ community-x86_64/hedgewars.desktop | 8 -- 11 files changed, 176 insertions(+), 196 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-09-12 10:10:43 UTC (rev 97070) +++ community-i686/PKGBUILD 2013-09-12 10:11:10 UTC (rev 97071) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=hedgewars -pkgver=0.9.19 -pkgrel=2 -pkgdesc="Free Worms-like turn based strategy game" -arch=('i686' 'x86_64') -url="http://hedgewars.org" -license=('GPL' 'custom') -depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut') -makedepends=('fpc' 'cmake' - # haskell specific - 'ghc' - 'haskell-network' - 'haskell-bytestring-show' - 'haskell-utf8-string' - 'haskell-dataenc' - 'haskell-hslogger' - 'haskell-vector' - 'haskell-random') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.desktop - hedgewars.png - build-fix.patch - ffmpeg2.0.patch) -md5sums=('51d84ad6ea00e9894e6119b118b4a523' - '48c66a3204d4fa0a69e9aa46f7c31e0c' - 'eeb14d50df39063549ac5eca9dbc65d1' - 'a9d7b0ba72cbeb7fc74fce459db9dd90' - 'da84d64a252579236d3ff0cc6e008e72') - -prepare() { - cd $pkgname-src-$pkgver - patch -Rp1 <$srcdir/build-fix.patch - patch -Np1 -i ../ffmpeg2.0.patch -} - -build() { - cd $pkgname-src-$pkgver - cmake \ - -DCMAKE_BUILD_TYPE="Release" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATA_INSTALL_DIR=/usr/share/hedgewars \ - -DWITH_SERVER=1 \ - -DSYSTEM_PHYSFS=OFF . - make -} - -package() { - cd $pkgname-src-$pkgver - - make DESTDIR=$pkgdir install - - install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt - install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png - install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop -} Copied: hedgewars/repos/community-i686/PKGBUILD (from rev 97070, hedgewars/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-12 10:11:10 UTC (rev 97071) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=hedgewars +pkgver=0.9.19 +pkgrel=4 +pkgdesc="Free Worms-like turn based strategy game" +arch=('i686' 'x86_64') +url="http://hedgewars.org" +license=('GPL' 'custom') +depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut') +makedepends=('fpc' 'cmake' + # haskell specific + 'ghc' + 'haskell-network' + 'haskell-bytestring-show' + 'haskell-utf8-string' + 'haskell-dataenc' + 'haskell-hslogger' + '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 +} + +build() { + cd $pkgname-src-$pkgver + cmake \ + -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATA_INSTALL_DIR=/usr/share/hedgewars \ + -DWITH_SERVER=1 \ + -DSYSTEM_PHYSFS=OFF . + make +} + +package() { + cd $pkgname-src-$pkgver + + make DESTDIR=$pkgdir install + + install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt + install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png + install -D -m644 share/hedgewars/Data/misc/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop +} Deleted: community-i686/build-fix.patch =================================================================== --- community-i686/build-fix.patch 2013-09-12 10:10:43 UTC (rev 97070) +++ community-i686/build-fix.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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} Copied: hedgewars/repos/community-i686/build-fix.patch (from rev 97070, hedgewars/trunk/build-fix.patch) =================================================================== --- community-i686/build-fix.patch (rev 0) +++ community-i686/build-fix.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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.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: community-i686/ffmpeg2.0.patch =================================================================== --- community-i686/ffmpeg2.0.patch 2013-09-12 10:10:43 UTC (rev 97070) +++ community-i686/ffmpeg2.0.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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; Copied: hedgewars/repos/community-i686/ffmpeg2.0.patch (from rev 97070, hedgewars/trunk/ffmpeg2.0.patch) =================================================================== --- community-i686/ffmpeg2.0.patch (rev 0) +++ community-i686/ffmpeg2.0.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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; Deleted: community-i686/hedgewars.desktop =================================================================== --- community-i686/hedgewars.desktop 2013-09-12 10:10:43 UTC (rev 97070) +++ community-i686/hedgewars.desktop 2013-09-12 10:11:10 UTC (rev 97071) @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Hedgewars -GenericName=Platform Game -Comment=Worms style game -Exec=hedgewars -Icon=hedgewars -Categories=Game;ArcadeGame; \ No newline at end of file Deleted: community-i686/hedgewars.png =================================================================== (Binary files differ) Copied: hedgewars/repos/community-i686/hedgewars.png (from rev 97070, hedgewars/trunk/hedgewars.png) =================================================================== (Binary files differ) Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-09-12 10:10:43 UTC (rev 97070) +++ community-x86_64/PKGBUILD 2013-09-12 10:11:10 UTC (rev 97071) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=hedgewars -pkgver=0.9.19 -pkgrel=2 -pkgdesc="Free Worms-like turn based strategy game" -arch=('i686' 'x86_64') -url="http://hedgewars.org" -license=('GPL' 'custom') -depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut') -makedepends=('fpc' 'cmake' - # haskell specific - 'ghc' - 'haskell-network' - 'haskell-bytestring-show' - 'haskell-utf8-string' - 'haskell-dataenc' - 'haskell-hslogger' - 'haskell-vector' - 'haskell-random') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.desktop - hedgewars.png - build-fix.patch - ffmpeg2.0.patch) -md5sums=('51d84ad6ea00e9894e6119b118b4a523' - '48c66a3204d4fa0a69e9aa46f7c31e0c' - 'eeb14d50df39063549ac5eca9dbc65d1' - 'a9d7b0ba72cbeb7fc74fce459db9dd90' - 'da84d64a252579236d3ff0cc6e008e72') - -prepare() { - cd $pkgname-src-$pkgver - patch -Rp1 <$srcdir/build-fix.patch - patch -Np1 -i ../ffmpeg2.0.patch -} - -build() { - cd $pkgname-src-$pkgver - cmake \ - -DCMAKE_BUILD_TYPE="Release" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATA_INSTALL_DIR=/usr/share/hedgewars \ - -DWITH_SERVER=1 \ - -DSYSTEM_PHYSFS=OFF . - make -} - -package() { - cd $pkgname-src-$pkgver - - make DESTDIR=$pkgdir install - - install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt - install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png - install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop -} Copied: hedgewars/repos/community-x86_64/PKGBUILD (from rev 97070, hedgewars/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-09-12 10:11:10 UTC (rev 97071) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=hedgewars +pkgver=0.9.19 +pkgrel=4 +pkgdesc="Free Worms-like turn based strategy game" +arch=('i686' 'x86_64') +url="http://hedgewars.org" +license=('GPL' 'custom') +depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut') +makedepends=('fpc' 'cmake' + # haskell specific + 'ghc' + 'haskell-network' + 'haskell-bytestring-show' + 'haskell-utf8-string' + 'haskell-dataenc' + 'haskell-hslogger' + '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 +} + +build() { + cd $pkgname-src-$pkgver + cmake \ + -DCMAKE_BUILD_TYPE="Release" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATA_INSTALL_DIR=/usr/share/hedgewars \ + -DWITH_SERVER=1 \ + -DSYSTEM_PHYSFS=OFF . + make +} + +package() { + cd $pkgname-src-$pkgver + + make DESTDIR=$pkgdir install + + install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt + install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png + install -D -m644 share/hedgewars/Data/misc/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop +} Deleted: community-x86_64/build-fix.patch =================================================================== --- community-x86_64/build-fix.patch 2013-09-12 10:10:43 UTC (rev 97070) +++ community-x86_64/build-fix.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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} Copied: hedgewars/repos/community-x86_64/build-fix.patch (from rev 97070, hedgewars/trunk/build-fix.patch) =================================================================== --- community-x86_64/build-fix.patch (rev 0) +++ community-x86_64/build-fix.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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.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: community-x86_64/ffmpeg2.0.patch =================================================================== --- community-x86_64/ffmpeg2.0.patch 2013-09-12 10:10:43 UTC (rev 97070) +++ community-x86_64/ffmpeg2.0.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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; Copied: hedgewars/repos/community-x86_64/ffmpeg2.0.patch (from rev 97070, hedgewars/trunk/ffmpeg2.0.patch) =================================================================== --- community-x86_64/ffmpeg2.0.patch (rev 0) +++ community-x86_64/ffmpeg2.0.patch 2013-09-12 10:11:10 UTC (rev 97071) @@ -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; Deleted: community-x86_64/hedgewars.desktop =================================================================== --- community-x86_64/hedgewars.desktop 2013-09-12 10:10:43 UTC (rev 97070) +++ community-x86_64/hedgewars.desktop 2013-09-12 10:11:10 UTC (rev 97071) @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Hedgewars -GenericName=Platform Game -Comment=Worms style game -Exec=hedgewars -Icon=hedgewars -Categories=Game;ArcadeGame; \ No newline at end of file Deleted: community-x86_64/hedgewars.png =================================================================== (Binary files differ) Copied: hedgewars/repos/community-x86_64/hedgewars.png (from rev 97070, hedgewars/trunk/hedgewars.png) =================================================================== (Binary files differ)