resurrect 2.1 which is still in use

Package-Manager: portage-2.1.2-r9

diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog
index 37c67a406cbefa8c640865b8149ccf1c7826e9d4..8e209adb3e8854585e3c33bb2d036619fc63e3b8 100644 (file)
--- a/games-engines/stratagus/ChangeLog
+++ b/games-engines/stratagus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/stratagus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.14 2007/03/05 05:51:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.15 2007/03/05 07:00:51 mr_bones_ Exp $
+
+  05 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/flac-1.1.3.patch, +stratagus-2.1.ebuild:
+  resurrect 2.1 which is still in use
 
 *stratagus-2.2.3 (05 Mar 2007)
 

diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index 700942b905d93199d8a1c84587cb21af01bdab50..610e98bde195b840f299edd8324c75540f81d9e8 100644 (file)
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1,16 +1,28 @@
+AUX flac-1.1.3.patch 2332 RMD160 8018503ece12c6a7885a7de564009004b05c32ea SHA1 16da857ab6d2093697ae20ff510c9981574ef801 SHA256 2b10d6657949c9b848129f97eaeee374ba6e5dac6644ec2daad6ca5e441570ab
+MD5 7385442b8b647c32e3fe19dd9f68b734 files/flac-1.1.3.patch 2332
+RMD160 8018503ece12c6a7885a7de564009004b05c32ea files/flac-1.1.3.patch 2332
+SHA256 2b10d6657949c9b848129f97eaeee374ba6e5dac6644ec2daad6ca5e441570ab files/flac-1.1.3.patch 2332
+DIST stratagus-2.1-src.tar.gz 995686 RMD160 f5f97854cad9f17104de34613012fd3aa2efbb9b SHA1 33181d57e018825a450f1e8c0ec31b0887cbd39c SHA256 1a5fb943ebc9422a18d165ba57deeae406d3d5e2cba171dfe15608732a22326b
 DIST stratagus-2.2.3-src.tar.gz 933530 RMD160 a3e7ef3f0fa5c0afaca853227458758d603419a7 SHA1 d9df8998b4e99c7fcac0f0c0383f7312dc435b88 SHA256 f0f7b24738ae99d8c3c76ade6468f9f2b13e8386b06a042639f97c7ec558680c
+EBUILD stratagus-2.1.ebuild 1494 RMD160 a84ee4f99ba8e7718b02a5a7203274c81c877b7f SHA1 0bb2bd68fd19b312713d199e2227641a093c25d8 SHA256 29aa5e5051cd68220833dfe2739ac8d7edfa02df1402f8eec3e3f0fedd8e59ab
+MD5 c4443bdb919deb5535e6ae3aae6f3042 stratagus-2.1.ebuild 1494
+RMD160 a84ee4f99ba8e7718b02a5a7203274c81c877b7f stratagus-2.1.ebuild 1494
+SHA256 29aa5e5051cd68220833dfe2739ac8d7edfa02df1402f8eec3e3f0fedd8e59ab stratagus-2.1.ebuild 1494
 EBUILD stratagus-2.2.3.ebuild 1392 RMD160 13fa4c41d2473782c54542b47f170c86cfdf1221 SHA1 834e743896f804a11e2be928b76f326cbb723c83 SHA256 f671b10c6ca1171e06e8e8bae1e159d99747b4cc47dd3f5e9f682260903b3e55
 MD5 5a1b645823f0054f9ec63746939aed64 stratagus-2.2.3.ebuild 1392
 RMD160 13fa4c41d2473782c54542b47f170c86cfdf1221 stratagus-2.2.3.ebuild 1392
 SHA256 f671b10c6ca1171e06e8e8bae1e159d99747b4cc47dd3f5e9f682260903b3e55 stratagus-2.2.3.ebuild 1392
-MISC ChangeLog 2164 RMD160 e8653d7180500c1afeb6f783a26a5cf4e2107301 SHA1 d5724afa0b014285ca38bf4b8d6031ee486827cb SHA256 46ed2e8a886002f7daa3fecc9cee4bf021b92aede1a6f828277e57d97c58184f
-MD5 b9ae7ba535ba96b04a6b6cb3376b8fd9 ChangeLog 2164
-RMD160 e8653d7180500c1afeb6f783a26a5cf4e2107301 ChangeLog 2164
-SHA256 46ed2e8a886002f7daa3fecc9cee4bf021b92aede1a6f828277e57d97c58184f ChangeLog 2164
+MISC ChangeLog 2308 RMD160 4b15a48d4fbc59cff2620cd6cb03c75749f69d57 SHA1 c060d25a019a774138f5dcbb3856621e07156e22 SHA256 81a2bf42946c0fabf6694d2fb1596943c1d524be07c9cc46b2ef4a90973322fb
+MD5 9147847a7bf28130af46250c02b302f7 ChangeLog 2308
+RMD160 4b15a48d4fbc59cff2620cd6cb03c75749f69d57 ChangeLog 2308
+SHA256 81a2bf42946c0fabf6694d2fb1596943c1d524be07c9cc46b2ef4a90973322fb ChangeLog 2308
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 141d5838b904cda2e3a88ebda4ab3bcd files/digest-stratagus-2.1 253
+RMD160 07fd4259c4ee74b7414c07c1a578e083622dd421 files/digest-stratagus-2.1 253
+SHA256 ceadacde233f36a29b09ea539172dad0496d303884c9c41f7b39a8b5c00d8642 files/digest-stratagus-2.1 253
 MD5 06ec15a10c49ca7f7b6fefdfdb280a8c files/digest-stratagus-2.2.3 259
 RMD160 5018b5a2931d3e60e66d063939b1954e8992ee47 files/digest-stratagus-2.2.3 259
 SHA256 4435a50877ca4182b6aab46328eee22f6ff9722226d449d3fa13b5c60c0160be files/digest-stratagus-2.2.3 259

diff --git a/games-engines/stratagus/files/digest-stratagus-2.1 b/games-engines/stratagus/files/digest-stratagus-2.1
new file mode 100644 (file)
index 0000000..f9187ae
--- /dev/null
+++ b/games-engines/stratagus/files/digest-stratagus-2.1
@@ -0,0 +1,3 @@
+MD5 ff6b2070b66e8847eeed6bedc24ad8bb stratagus-2.1-src.tar.gz 995686
+RMD160 f5f97854cad9f17104de34613012fd3aa2efbb9b stratagus-2.1-src.tar.gz 995686
+SHA256 1a5fb943ebc9422a18d165ba57deeae406d3d5e2cba171dfe15608732a22326b stratagus-2.1-src.tar.gz 995686

diff --git a/games-engines/stratagus/files/flac-1.1.3.patch b/games-engines/stratagus/files/flac-1.1.3.patch
new file mode 100644 (file)
index 0000000..acb89fc
--- /dev/null
+++ b/games-engines/stratagus/files/flac-1.1.3.patch
@@ -0,0 +1,68 @@
+diff -ru stratagus-040702/configure.in stratagus-040702-b2/configure.in
+--- stratagus-040702/configure.in      2004-06-12 04:55:49.000000000 -0700
++++ stratagus-040702-b2/configure.in   2006-10-25 17:07:48.000000000 -0700
+@@ -213,8 +213,9 @@
+     FLAC_CFLAGS=
+     FLAC_LIBS=
+ else
+-    FLAC_CFLAGS="-DUSE_FLAC"
+-    FLAC_LIBS="-lFLAC"
++      # starting with FLAC-1.1.3 libFLAC requires libogg
++    FLAC_CFLAGS="-DUSE_FLAC $OGG_CFLAGS"
++    FLAC_LIBS="-lFLAC $OGG_LIBS"
+ fi
+ AC_SUBST(FLAC_CFLAGS)
+ AC_SUBST(FLAC_LIBS)
+diff -ru stratagus-040702/src/sound/flac.c stratagus-040702-b2/src/sound/flac.c
+--- stratagus-040702/src/sound/flac.c  2004-06-25 16:22:33.000000000 -0700
++++ stratagus-040702-b2/src/sound/flac.c       2006-10-25 17:19:41.000000000 -0700
+@@ -47,6 +47,13 @@
+ #include "iolib.h"
+ #include "sound_server.h"
+ 
++/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ /*----------------------------------------------------------------------------
+ --  Declaration
+ ----------------------------------------------------------------------------*/
+@@ -88,7 +95,12 @@
+ */
+ static FLAC__StreamDecoderReadStatus FLAC_read_callback(
+       const FLAC__StreamDecoder* stream, FLAC__byte buffer[],
+-      unsigned int* bytes, void* user)
++#ifdef LEGACY_FLAC
++      unsigned int* bytes,
++#else
++      size_t* bytes,
++#endif
++      void* user)
+ {
+       Sample* sample;
+       FlacData* data;
+@@ -339,12 +351,21 @@
+       sample->Pos = 0;
+       sample->User = data;
+ 
++#ifdef LEGACY_FLAC
+       FLAC__stream_decoder_set_read_callback(stream, FLAC_read_callback);
+       FLAC__stream_decoder_set_write_callback(stream, FLAC_write_callback);
+       FLAC__stream_decoder_set_metadata_callback(stream, FLAC_metadata_callback);
+       FLAC__stream_decoder_set_error_callback(stream, FLAC_error_callback);
+       FLAC__stream_decoder_set_client_data(stream, sample);
+       FLAC__stream_decoder_init(stream);
++#else
++      if(FLAC__stream_decoder_init_stream(stream, FLAC_read_callback, NULL, NULL, NULL, NULL, FLAC_write_callback, FLAC_metadata_callback, FLAC_error_callback, sample) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++              FLAC__stream_decoder_delete(stream);
++              free(data);
++              free(sample);
++              return NULL;
++      }
++#endif
+ 
+       if (flags & PlayAudioStream) {
+               sample->Buffer = malloc(SOUND_BUFFER_SIZE);

diff --git a/games-engines/stratagus/stratagus-2.1.ebuild b/games-engines/stratagus/stratagus-2.1.ebuild
new file mode 100644 (file)
index 0000000..4cb65e8
--- /dev/null
+++ b/games-engines/stratagus/stratagus-2.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.1.ebuild,v 1.18 2007/03/05 07:00:51 mr_bones_ Exp $
+
+inherit eutils games
+
+MY_PV=040702
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="http://www.stratagus.org/"
+SRC_URI="mirror://sourceforge/stratagus/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc flac mp3 mikmod ogg opengl vorbis"
+
+RDEPEND="app-arch/bzip2
+       >=dev-lang/lua-5
+       media-libs/libpng
+       media-libs/libsdl
+       sys-libs/zlib
+       flac? ( media-libs/flac )
+       mp3? ( media-libs/libmad )
+       mikmod? ( media-libs/libmikmod )
+       ogg? ( vorbis? ( media-libs/libogg media-libs/libvorbis ) )"
+
+DEPEND="${RDEPEND}
+       x11-libs/libXt
+       doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/stratagus-${MY_PV}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/flac-1.1.3.patch
+}
+
+src_compile() {
+       local myconf
+
+       if use ogg && use vorbis ; then
+               myconf="--enable-ogg" \
+       else
+               myconf="--disable-ogg"
+       fi
+       econf \
+               $(use_enable debug) \
+               $(use_with mikmod) \
+               $(use_with flac) \
+               $(use_with mp3 mad) \
+               $(use_with opengl) \
+               ${myconf} \
+               || die "econf failed"
+       emake -j1 || die "emake failed"
+
+       if use doc ; then
+               emake doc || die "making source documentation failed"
+       fi
+}
+
+src_install() {
+       dogamesbin stratagus || die "dogamesbin failed"
+       dodoc README
+       dohtml -r doc/*
+       use doc && dohtml -r srcdoc/html/*
+       prepgamesdirs
+}