# 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.13 2007/02/28 16:12:55 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.14 2007/03/05 05:51:40 mr_bones_ Exp $
+
+*stratagus-2.2.3 (05 Mar 2007)
+
+ 05 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
+ -files/flac-1.1.3.patch, -files/stratagus-2.2.2-lua.patch,
+ -stratagus-2.1.ebuild, -stratagus-2.2.2.ebuild, +stratagus-2.2.3.ebuild:
+ version bump; clean old versions
28 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+files/stratagus-2.2.2-lua.patch, stratagus-2.2.2.ebuild:
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-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
-AUX stratagus-2.2.2-lua.patch 3372 RMD160 5232897a40937bb452dd2cebc11802252245cf8b SHA1 6b9e5eb930ba8ab2ebb068b5e727efef217ef5b5 SHA256 5638450e52480fb0f590a74709ad712a6972a5eb88b79183ec1ebc17ec341d75
-MD5 aa51b9c3e63cf5aca831dae6358491bd files/stratagus-2.2.2-lua.patch 3372
-RMD160 5232897a40937bb452dd2cebc11802252245cf8b files/stratagus-2.2.2-lua.patch 3372
-SHA256 5638450e52480fb0f590a74709ad712a6972a5eb88b79183ec1ebc17ec341d75 files/stratagus-2.2.2-lua.patch 3372
-DIST stratagus-2.1-src.tar.gz 995686 RMD160 f5f97854cad9f17104de34613012fd3aa2efbb9b SHA1 33181d57e018825a450f1e8c0ec31b0887cbd39c SHA256 1a5fb943ebc9422a18d165ba57deeae406d3d5e2cba171dfe15608732a22326b
-DIST stratagus-2.2.2-src.tar.gz 931693 RMD160 75bf6c4e2d7e3082172658087266f7730ff07420 SHA1 e5ae1475278fc007c196c2d10f61295bf50aafac SHA256 b01417a32358a4f234d2d093fff932e3dd526c1bdba1bf0b95fb6aed52e1c9be
-EBUILD stratagus-2.1.ebuild 1488 RMD160 3c7594e437e222bfb3f90524ac036f7427752cc4 SHA1 ace4ab4e79e9bac3d76f4ef8863d9c9c82baf0ba SHA256 3d8c0000934141247ae5b8ac48b92d4ca20560cbdb8aaa0ca01132f8a8383ac9
-MD5 3cd7fdf5ebb09b5ef4d4565586ca99c7 stratagus-2.1.ebuild 1488
-RMD160 3c7594e437e222bfb3f90524ac036f7427752cc4 stratagus-2.1.ebuild 1488
-SHA256 3d8c0000934141247ae5b8ac48b92d4ca20560cbdb8aaa0ca01132f8a8383ac9 stratagus-2.1.ebuild 1488
-EBUILD stratagus-2.2.2.ebuild 1431 RMD160 5fdabc5488f2d8203488817488ca33f74fe28d87 SHA1 f1d1ee946db0999e700dba654f1e92dd7a12bdc7 SHA256 4d051b3bc7e1b28a871ac6833b89605d3892eb193dc8e32a474dda42cd9621f8
-MD5 e1115d75f793ed20f6d660d45bd8ca00 stratagus-2.2.2.ebuild 1431
-RMD160 5fdabc5488f2d8203488817488ca33f74fe28d87 stratagus-2.2.2.ebuild 1431
-SHA256 4d051b3bc7e1b28a871ac6833b89605d3892eb193dc8e32a474dda42cd9621f8 stratagus-2.2.2.ebuild 1431
-MISC ChangeLog 1900 RMD160 69f7132a918f5982668e5019b369c012d23112cf SHA1 d8c6caf2e9e99030d49b07fcf38f024bfd204279 SHA256 e334d6c017c49ac3bdb643002aa8e84c6f2e426fb68404a4369f735c7a627ddf
-MD5 649e5d3372ee86cc946e0efdca2776b4 ChangeLog 1900
-RMD160 69f7132a918f5982668e5019b369c012d23112cf ChangeLog 1900
-SHA256 e334d6c017c49ac3bdb643002aa8e84c6f2e426fb68404a4369f735c7a627ddf ChangeLog 1900
+DIST stratagus-2.2.3-src.tar.gz 933530 RMD160 a3e7ef3f0fa5c0afaca853227458758d603419a7 SHA1 d9df8998b4e99c7fcac0f0c0383f7312dc435b88 SHA256 f0f7b24738ae99d8c3c76ade6468f9f2b13e8386b06a042639f97c7ec558680c
+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 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 2b96508e7b92e3f40dc61e742cfd1592 files/digest-stratagus-2.2.2 259
-RMD160 d939ad9b9fe9fa2ba2b0de8563fa3b1cf73e0416 files/digest-stratagus-2.2.2 259
-SHA256 df94bb9aa699c26c45c2f3f1ba236d0b345977064f396009475b4386f0871e1f files/digest-stratagus-2.2.2 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF5aoOdz7hIScOURERAgPsAKDpu+yo9VbeSafrHhFTL0t5mpzQ8gCg6xlm
-XPOfR6es94NKxhJtBMc0j8I=
-=Wycw
------END PGP SIGNATURE-----
+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
+++ /dev/null
-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
+++ /dev/null
-MD5 0e116a9d4080dbca6dad78b7d34fec8f stratagus-2.2.2-src.tar.gz 931693
-RMD160 75bf6c4e2d7e3082172658087266f7730ff07420 stratagus-2.2.2-src.tar.gz 931693
-SHA256 b01417a32358a4f234d2d093fff932e3dd526c1bdba1bf0b95fb6aed52e1c9be stratagus-2.2.2-src.tar.gz 931693
--- /dev/null
+MD5 8c3381470cb04800f6af5f1685ce2958 stratagus-2.2.3-src.tar.gz 933530
+RMD160 a3e7ef3f0fa5c0afaca853227458758d603419a7 stratagus-2.2.3-src.tar.gz 933530
+SHA256 f0f7b24738ae99d8c3c76ade6468f9f2b13e8386b06a042639f97c7ec558680c stratagus-2.2.3-src.tar.gz 933530
+++ /dev/null
-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);
+++ /dev/null
---- src/tolua/tolua.cpp
-+++ src/tolua/tolua.cpp
-@@ -16179,7 +16179,12 @@
- 10,115,101,116,109,101,116, 97,116, 97, 98,108,101, 40, 85,
- 110,105,116, 84,121,112,101,115, 44, 32,109,116, 41,32
- };
-+#if LUA_VERSION_NUM >= 501
-+ luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 1");
-+#endif
- lua_settop(tolua_S, top);
- } /* end of embedded lua code */
-
-@@ -16242,7 +16247,12 @@
- 111,110, 76,105,115,116,101,110,101,114, 58,110,101,119, 40,
- 102, 41, 10,101,110,100,32
- };
-+#if LUA_VERSION_NUM >= 501
-+ luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 2");
-+#endif
- lua_settop(tolua_S, top);
- } /* end of embedded lua code */
-
-@@ -16490,7 +16500,12 @@
- 105,115,116,101,110,101,114, 40,119, 46, 95, 97, 99,116,105,
- 111,110, 99, 98, 41, 10,101,110,100,32
- };
-+#if LUA_VERSION_NUM >= 501
-+ luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 3");
-+#endif
- lua_settop(tolua_S, top);
- } /* end of embedded lua code */
-
-@@ -16886,7 +16901,12 @@
- 110,100, 10,114,101,116,117,114,110, 32,109,101,110,117, 10,
- 101,110,100,32
- };
-+#if LUA_VERSION_NUM >= 501
-+ luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 4");
-+#endif
- lua_settop(tolua_S, top);
- } /* end of embedded lua code */
-
-@@ -17086,7 +17106,12 @@
- 101,110,101,114, 58,110,101,119, 40, 99, 97,108,108, 98, 97,
- 99,107, 41, 41, 10,101,110,100,32
- };
-+#if LUA_VERSION_NUM >= 501
-+ luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 5");
-+ lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
- lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 5");
-+#endif
- lua_settop(tolua_S, top);
- } /* end of embedded lua code */
-
---- src/tolua/tolua_map.cpp
-+++ src/tolua/tolua_map.cpp
-@@ -152,7 +152,11 @@
- {
- lua_pop(L,1); /* clear metatable off stack */
- /* force garbage collection to avoid C to reuse a to-be-collected address */
-+ #if LUA_VERSION_NUM >= 501
-+ lua_gc(L, LUA_GCCOLLECT, 0);
-+ #else
- lua_setgcthreshold(L,0);
-+ #endif
- success = tolua_register_gc(L,1);
- }
- }
-@@ -169,7 +173,11 @@
- {
- void* u = *((void**)lua_touserdata(L,1));
- /* force garbage collection to avoid releasing a to-be-collected address */
-+ #if LUA_VERSION_NUM >= 501
-+ lua_gc(L, LUA_GCCOLLECT, 0);
-+ #else
- lua_setgcthreshold(L,0);
-+ #endif
- lua_pushstring(L,"tolua_gc");
- lua_rawget(L,LUA_REGISTRYINDEX);
- lua_pushlightuserdata(L,u);
---- src/tolua/tolua_to.cpp
-+++ src/tolua/tolua_to.cpp
-@@ -95,7 +95,11 @@
- void* v;
- lua_pushnumber(L,index);
- lua_gettable(L,lo);
-- v = lua_isnil(L,-1) ? def : lua_unboxpointer(L,-1);
-+#if LUA_VERSION_NUM >= 501
-+ v = lua_isnil(L,-1) ? def : lua_touserdata(L,-1);
-+#else
-+ v = lua_isnil(L,-1) ? def : lua_touserdata(L,-1);
-+#endif
- lua_pop(L,1);
- return v;
- }
+++ /dev/null
-# Copyright 1999-2006 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.16 2006/12/21 06:24:24 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
-}
# 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.2.2.ebuild,v 1.2 2007/02/28 16:12:55 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.3.ebuild,v 1.1 2007/03/05 05:51:40 mr_bones_ Exp $
-inherit eutils games
+inherit games
DESCRIPTION="A realtime strategy game engine"
HOMEPAGE="http://www.stratagus.org/"
-e 's/-O.*\(-fsigned-char\).*/\1"/' \
configure \
|| die "sed failed"
- epatch "${FILESDIR}"/${P}-lua.patch
}
src_compile() {
projects / gentoo.git / commitdiff