resurrect 2.1 which is still in use

(Portage version: 2.1.2-r9)

4 files changed, 144 insertions, 1 deletions

diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog
index 37c67a406cbe..8e209adb3e88 100644
--- 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/files/digest-stratagus-2.1 b/games-engines/stratagus/files/digest-stratagus-2.1
new file mode 100644
index 000000000000..f9187ae6faeb
--- /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
index 000000000000..acb89fca1332
--- /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
index 000000000000..4cb65e8d27e7
--- /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
+}