From 5697c3d1b4617106f0606705a5ff2f211c15b5a0 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Mon, 12 Feb 2007 21:10:44 +0000 Subject: [PATCH] Use external SDL_ttf and SDL_mixer, bug #166536 Package-Manager: portage-2.1.2-r9 --- games-rpg/adonthell/ChangeLog | 11 +- games-rpg/adonthell/Manifest | 34 +++--- ...3.4a.ebuild => adonthell-0.3.4a-r1.ebuild} | 23 ++-- .../adonthell-0.3.4a-external-libs.patch | 114 ++++++++++++++++++ ...hell-0.3.4a => digest-adonthell-0.3.4a-r1} | 0 5 files changed, 152 insertions(+), 30 deletions(-) rename games-rpg/adonthell/{adonthell-0.3.4a.ebuild => adonthell-0.3.4a-r1.ebuild} (69%) create mode 100644 games-rpg/adonthell/files/adonthell-0.3.4a-external-libs.patch rename games-rpg/adonthell/files/{digest-adonthell-0.3.4a => digest-adonthell-0.3.4a-r1} (100%) diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog index ab6c40511d71..1cb0e5c85a86 100644 --- a/games-rpg/adonthell/ChangeLog +++ b/games-rpg/adonthell/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-rpg/adonthell -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.13 2006/11/02 23:49:40 nyhm Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.14 2007/02/12 21:10:44 nyhm Exp $ + +*adonthell-0.3.4a-r1 (12 Feb 2007) + + 12 Feb 2007; Tristan Heaven + +files/adonthell-0.3.4a-external-libs.patch, -adonthell-0.3.4a.ebuild, + +adonthell-0.3.4a-r1.ebuild: + Use external SDL_ttf and SDL_mixer, bug #166536 02 Nov 2006; Tristan Heaven adonthell-0.3.4a.ebuild: Add nls dependencies diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest index 103119daed0e..0c3973db9062 100644 --- a/games-rpg/adonthell/Manifest +++ b/games-rpg/adonthell/Manifest @@ -5,6 +5,10 @@ AUX 0.3.4a-configure.in.patch 3310 RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5 MD5 6c334d9d004049f2da64c82402cb70d7 files/0.3.4a-configure.in.patch 3310 RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5ab files/0.3.4a-configure.in.patch 3310 SHA256 29883a145e5aaecbec3c526dffc9a75933eb1e6b0f0d536b6ecbb440cd26a17e files/0.3.4a-configure.in.patch 3310 +AUX adonthell-0.3.4a-external-libs.patch 3713 RMD160 6abeffb5adc289fec74814ea97e1e57c1b524cfe SHA1 7ece53eed1389804eb1a5c40cf6a748507145520 SHA256 e49b89b079e607d5077daf1e81ec64c81927b36e2cb804f20ff9623746b8c439 +MD5 54496682bcc6ecb5af069111de6f9d4c files/adonthell-0.3.4a-external-libs.patch 3713 +RMD160 6abeffb5adc289fec74814ea97e1e57c1b524cfe files/adonthell-0.3.4a-external-libs.patch 3713 +SHA256 e49b89b079e607d5077daf1e81ec64c81927b36e2cb804f20ff9623746b8c439 files/adonthell-0.3.4a-external-libs.patch 3713 AUX adonthell-0.3.4a-gcc-41.patch 368 RMD160 7809943ceb905846fbda7ac175dddd12eba82888 SHA1 9f2b8d4e3b3f2b3f56d468cacc65186e76a32b2b SHA256 8725778c536ef332586e22451fab31273e4efc1db1b28c3bc6fd2c1498dbb30b MD5 e0df3c89f64308db7e23f21e9d654b5c files/adonthell-0.3.4a-gcc-41.patch 368 RMD160 7809943ceb905846fbda7ac175dddd12eba82888 files/adonthell-0.3.4a-gcc-41.patch 368 @@ -14,25 +18,25 @@ MD5 7d04d8d24758161c901a81309f8857c3 files/adonthell-0.3.4a-inline.patch 432 RMD160 0df619b071ddd582cc34d819a10db234ba64fe58 files/adonthell-0.3.4a-inline.patch 432 SHA256 b2a1ffec7e75fb1919873c14173ce7f821fb3b7388125c93cfaff551503ae661 files/adonthell-0.3.4a-inline.patch 432 DIST adonthell-src-0.3.4a.tar.gz 680872 RMD160 0ad52d2940375fbddccd387346f84fa8f009a03c SHA1 01c07a138a7c41f5640d4306f2197f71a8554aee SHA256 05e0a282d15dfdac282f9a8fee077e43d09423eb30ae9a1654ada765e3052087 -EBUILD adonthell-0.3.4a.ebuild 1511 RMD160 9fffa2760de8bc6199caf17d5f8cfd8bd8c080f9 SHA1 15eda78c52c7ff65f291064d4175b66b44695a25 SHA256 2a9b7f4edbd0039d722c1ab2de210c4e6dbb4a8ac39d52a8dee08b3f6517a614 -MD5 719c8773bf493f6fa7d3838dac389f26 adonthell-0.3.4a.ebuild 1511 -RMD160 9fffa2760de8bc6199caf17d5f8cfd8bd8c080f9 adonthell-0.3.4a.ebuild 1511 -SHA256 2a9b7f4edbd0039d722c1ab2de210c4e6dbb4a8ac39d52a8dee08b3f6517a614 adonthell-0.3.4a.ebuild 1511 -MISC ChangeLog 2465 RMD160 34d9a99eba43f2cfb4c526ef1936eded76c7cc18 SHA1 d06460cbd17ad7780b5b37f8cd458d3a4c7da30f SHA256 cec632554330adfd6b17e36d6dc21765e63f6fbb1674be7398dd2df867e849c0 -MD5 a68d001d2313930804777b2914d4b68c ChangeLog 2465 -RMD160 34d9a99eba43f2cfb4c526ef1936eded76c7cc18 ChangeLog 2465 -SHA256 cec632554330adfd6b17e36d6dc21765e63f6fbb1674be7398dd2df867e849c0 ChangeLog 2465 +EBUILD adonthell-0.3.4a-r1.ebuild 1484 RMD160 1ad87d88accecaac083a5df8c2755d0e2da1ed26 SHA1 b0343296fec67bd91974cef2c611e49a4ea1b5e1 SHA256 8f9fd94bf0174b4f0211231e9aea8d1eab17681369fb71cd7cd907a259cd4c39 +MD5 b0964fc67a6e55a32d7f4e40e91cc87f adonthell-0.3.4a-r1.ebuild 1484 +RMD160 1ad87d88accecaac083a5df8c2755d0e2da1ed26 adonthell-0.3.4a-r1.ebuild 1484 +SHA256 8f9fd94bf0174b4f0211231e9aea8d1eab17681369fb71cd7cd907a259cd4c39 adonthell-0.3.4a-r1.ebuild 1484 +MISC ChangeLog 2704 RMD160 c0c14aceede498acbccb548cdd9a36484b1cc22e SHA1 2db3519113f244491995d85ef7709388cb0014d7 SHA256 83743ae35ad146271fa424a9e01105e067cb690c7b9ee6029dbfa57442e18080 +MD5 022623346d9e39c5b492e71a8846a0b0 ChangeLog 2704 +RMD160 c0c14aceede498acbccb548cdd9a36484b1cc22e ChangeLog 2704 +SHA256 83743ae35ad146271fa424a9e01105e067cb690c7b9ee6029dbfa57442e18080 ChangeLog 2704 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 6022b1fa92080a5bc8eaf2173f22c719 files/digest-adonthell-0.3.4a 262 -RMD160 eaf0dda5b8c28ed6f9739b689a195f2133fbc213 files/digest-adonthell-0.3.4a 262 -SHA256 55ad2c29c969c3c38f0de77abb1e99f3672ce73d5f14f1c8ea5e5847ed185f6d files/digest-adonthell-0.3.4a 262 +MD5 6022b1fa92080a5bc8eaf2173f22c719 files/digest-adonthell-0.3.4a-r1 262 +RMD160 eaf0dda5b8c28ed6f9739b689a195f2133fbc213 files/digest-adonthell-0.3.4a-r1 262 +SHA256 55ad2c29c969c3c38f0de77abb1e99f3672ce73d5f14f1c8ea5e5847ed185f6d files/digest-adonthell-0.3.4a-r1 262 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFSoQcdz7hIScOURERAhxAAJ0dde4Dh2TCNoZFV4RfXhC52QrC6wCff097 -pOZmxOpilhn4ilcdD6SXTlw= -=wypL +iD8DBQFF0Nfbdz7hIScOURERAug8AJ0d6d69/5A1cLh1xQhyY28NpZ23wgCg76xE +4GwwtAHic9BwymSUfw1zGEQ= +=USaQ -----END PGP SIGNATURE----- diff --git a/games-rpg/adonthell/adonthell-0.3.4a.ebuild b/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild similarity index 69% rename from games-rpg/adonthell/adonthell-0.3.4a.ebuild rename to games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild index f3251e0d06ce..688d24b194b4 100644 --- a/games-rpg/adonthell/adonthell-0.3.4a.ebuild +++ b/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild @@ -1,25 +1,21 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.8 2006/11/02 23:49:40 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a-r1.ebuild,v 1.1 2007/02/12 21:10:44 nyhm Exp $ -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" inherit autotools eutils games DESCRIPTION="roleplaying game engine" HOMEPAGE="http://adonthell.linuxgames.com/" -SRC_URI="http://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz" +SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc x86" IUSE="doc nls" -RDEPEND="dev-lang/python - >=media-libs/freetype-2 +RDEPEND="media-libs/sdl-ttf + media-libs/sdl-mixer media-libs/libsdl - media-libs/libvorbis - media-libs/libogg dev-lang/swig nls? ( virtual/libintl )" DEPEND="${RDEPEND} @@ -37,17 +33,18 @@ src_unpack() { epatch \ "${FILESDIR}"/${PV}-configure.in.patch \ "${FILESDIR}"/${P}-gcc-41.patch \ - "${FILESDIR}"/${P}-inline.patch + "${FILESDIR}"/${P}-inline.patch \ + "${FILESDIR}"/${P}-external-libs.patch + rm -f src/SDL_ttf.* # SDL_ttf + rm -f src/{music*,SDL_mixer.h,wavestream*,mixer.c} # SDL_mixer rm -f ac{local,include}.m4 AT_M4DIR="m4" eautoreconf } src_compile() { - # the fugly --with-vorbis is to work around #98689 egamesconf \ --disable-dependency-tracking \ --disable-py-debug \ - --with-vorbis="${T}" \ $(use_enable nls) \ $(use_enable doc) \ || die @@ -57,7 +54,7 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "make install failed" - keepdir "${GAMES_DATADIR}/${PN}/games" + keepdir "${GAMES_DATADIR}"/${PN}/games dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README prepgamesdirs } diff --git a/games-rpg/adonthell/files/adonthell-0.3.4a-external-libs.patch b/games-rpg/adonthell/files/adonthell-0.3.4a-external-libs.patch new file mode 100644 index 000000000000..d1ab6757d971 --- /dev/null +++ b/games-rpg/adonthell/files/adonthell-0.3.4a-external-libs.patch @@ -0,0 +1,114 @@ +--- configure.in ++++ configure.in +@@ -50,10 +50,6 @@ + AC_ARG_ENABLE(py-debug, + [ --disable-py-debug Disable debugging of Python scripts (enabled by default)], + pydebug=$enableval, pydebug=yes) +-AC_ARG_WITH(ogg, +-[ --with-ogg=DIR Set where the Ogg library is located]) +-AC_ARG_WITH(vorbis, +-[ --with-vorbis=DIR Set where the Vorbis library is located]) + AC_ARG_WITH(data-dir, + [ --with-data-dir=DIR Directory where datas will be installed], + gamedatadir="$withval", gamedatadir=none) +@@ -129,28 +125,16 @@ + ) + + dnl ******************* +-dnl Check for FreeType2 ++dnl Check for SDL_ttf + dnl ******************* + +-AC_CHECK_FT2(6.0.0, +- :, +- AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!]) +-) ++AC_CHECK_LIB(SDL_ttf, TTF_Init,,exit 1) + + dnl ******************* +-dnl Check for OggVorbis ++dnl Check for SDL_mixer + dnl ******************* + +-OGG_VORBIS=no +-XIPH_PATH_VORBIS( +- OGG_VORBIS="yes" +- ogg_music="enabled" +- OGG_LIBS="$VORBISFILE_LIBS $VORBIS_LIBS" +- OGG_DEFS="-DOGG_MUSIC" +- OGG_CFLAGS="$VORBIS_CFLAGS", +- AC_MSG_RESULT(Disabling OggVorbis support) +- ogg_music="disabled" +-) ++AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio,,exit 1) + + dnl ******************** + dnl Check for Python. +@@ -377,11 +361,7 @@ + AC_CHECK_HEADERS([pthread.h]) + fi + +-if test x$OGG_VORBIS = xyes; then +- AC_CHECK_HEADERS([vorbis/vorbisfile.h]) +-fi + +-AM_CONDITIONAL(HAVE_OGG_VORBIS, test x$OGG_VORBIS = xyes) + + dnl ******************************** + dnl Generate our compiler arguements +@@ -396,9 +376,6 @@ + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + AC_SUBST(SDL_DEFS) +-AC_SUBST(OGG_CFLAGS) +-AC_SUBST(OGG_LIBS) +-AC_SUBST(OGG_DEFS) + AC_SUBST(PY_CFLAGS) + AC_SUBST(PY_LIBS) + AC_SUBST(P_SWIG) +@@ -427,11 +404,9 @@ + echo "SDL ....................... : `$SDL_CONFIG --version`" + echo "Python .................... : $PY_VERSION" + echo "Python debugging .......... : $pydebug" +-echo "Freetype .................. : `freetype-config --version`" + if test x$haveswig = xyes; then + echo "SWIG ...................... : $SWIG_VERSION" + fi +-echo "Ogg music ................. : $ogg_music" + echo "Building API doc .......... : $builddoc" + if test x$memleaks = xyes; then + echo "Test for Memory Leaks ..... : enabled" +--- src/Makefile.am ++++ src/Makefile.am +@@ -6,7 +6,7 @@ + + EXTRA_DIST = .indent.pro prefs.l py_adonthell.i + +-AM_CPPFLAGS =$(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS) $(PY_CFLAGS) $(FT2_CFLAGS) ++AM_CPPFLAGS =$(SDL_DEFS) $(SDL_CFLAGS) $(PY_CFLAGS) + + noinst_LIBRARIES = libadonthell.a + +@@ -24,7 +24,7 @@ + win_base.h win_border.h win_container.h str_hash.h win_font.h win_image.h \ + win_label.h win_mapview.h label.h label_input.h win_scrollbar.h win_scroll.h \ + win_select.h win_theme.h win_keys.h win_event.h win_types.h win_write.h \ +-win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h SDL_ttf.h ++win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h + + libadonthell_a_SOURCES = adonthell.cc animation.cc audio.cc \ + character_base.cc character.cc data_screen.cc dialog.cc dialog_screen.cc \ +@@ -39,11 +39,9 @@ + win_background.cc win_base.cc win_border.cc win_container.cc win_font.cc \ + win_ttf.cc win_keys.cc win_manager.cc win_scrollbar.cc win_scroll.cc \ + win_select.cc \ +-win_theme.cc win_event.cc yarg.cc mixer.c music.c music_cmd.c music_cmd.h \ +-music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h SDL_mixer.h \ +-SDL_ttf.c $(headers) ++win_theme.cc win_event.cc yarg.cc $(headers) + +-libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS) $(FT2_LIBS) ++libadonthell_LDADD = $(SDL_LIBS) $(PY_LIBS) $(INTLLIBS) + + adonthell_LDADD = libadonthell.a $(libadonthell_LDADD) + diff --git a/games-rpg/adonthell/files/digest-adonthell-0.3.4a b/games-rpg/adonthell/files/digest-adonthell-0.3.4a-r1 similarity index 100% rename from games-rpg/adonthell/files/digest-adonthell-0.3.4a rename to games-rpg/adonthell/files/digest-adonthell-0.3.4a-r1 -- 2.26.2