From: Christian Faulhammer Date: Wed, 6 Dec 2006 11:47:39 +0000 (+0000) Subject: version bump; only fixes in the build system. Added patches to avoid dependency... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2df2938ca90bcea16d6f0fa061e5eae6ebce45da;p=gentoo.git version bump; only fixes in the build system. Added patches to avoid dependency checks of the program itself. Maybe helps people to link with --as-needed Package-Manager: portage-2.1.1-r2 --- diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog index d5f3c7d56f2e..9ed49d336560 100644 --- a/x11-misc/gaia/ChangeLog +++ b/x11-misc/gaia/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-misc/gaia # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.11 2006/12/05 08:16:05 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.12 2006/12/06 11:47:39 opfer Exp $ + +*gaia-0.1.2 (06 Dec 2006) + + 06 Dec 2006; Christian Faulhammer + +files/gaia-0.1.2-font_inclusion.patch, + +files/gaia-0.1.2-remove_dep_checks_gaia.patch, + +files/gaia-0.1.2-remove_dep_checks_wwfetch.patch, +gaia-0.1.2.ebuild: + version bump; only fixes in the build system. Added patches to avoid + dependency checks of the program itself. Maybe helps people to link with + --as-needed 05 Dec 2006; Christian Faulhammer gaia-0.1.1.ebuild: Let install phase respect custom CFLAGS too diff --git a/x11-misc/gaia/Manifest b/x11-misc/gaia/Manifest index 60511ef05ecc..91cc7fe4451f 100644 --- a/x11-misc/gaia/Manifest +++ b/x11-misc/gaia/Manifest @@ -9,15 +9,32 @@ AUX gaia-0.1.1-font_inclusion.patch 421 RMD160 42c4616ae87b8ff1dece465037885fd09 MD5 ab1c8b793673a64307cda0cd49072bd1 files/gaia-0.1.1-font_inclusion.patch 421 RMD160 42c4616ae87b8ff1dece465037885fd0999f08f8 files/gaia-0.1.1-font_inclusion.patch 421 SHA256 623cf4d7c723f1c763282564db7daa13716bc168f742bf07df65eaf6afd34c3d files/gaia-0.1.1-font_inclusion.patch 421 +AUX gaia-0.1.2-font_inclusion.patch 421 RMD160 42c4616ae87b8ff1dece465037885fd0999f08f8 SHA1 5406efa34fb1a68002f473a1da747fb744d7ae3b SHA256 623cf4d7c723f1c763282564db7daa13716bc168f742bf07df65eaf6afd34c3d +MD5 ab1c8b793673a64307cda0cd49072bd1 files/gaia-0.1.2-font_inclusion.patch 421 +RMD160 42c4616ae87b8ff1dece465037885fd0999f08f8 files/gaia-0.1.2-font_inclusion.patch 421 +SHA256 623cf4d7c723f1c763282564db7daa13716bc168f742bf07df65eaf6afd34c3d files/gaia-0.1.2-font_inclusion.patch 421 +AUX gaia-0.1.2-remove_dep_checks_gaia.patch 1587 RMD160 94f7444b8922d3702d5c375f54ca858d9747840c SHA1 b96e8a1f7cfe0ab2f1a3966966b4cd6bcee4bf6e SHA256 2a2b0e59226e11de822edf2f69a74c9ae477873206237b010872d7fe4bb73e6d +MD5 69a0545fdc9708b78cf4d606113eb708 files/gaia-0.1.2-remove_dep_checks_gaia.patch 1587 +RMD160 94f7444b8922d3702d5c375f54ca858d9747840c files/gaia-0.1.2-remove_dep_checks_gaia.patch 1587 +SHA256 2a2b0e59226e11de822edf2f69a74c9ae477873206237b010872d7fe4bb73e6d files/gaia-0.1.2-remove_dep_checks_gaia.patch 1587 +AUX gaia-0.1.2-remove_dep_checks_wwfetch.patch 386 RMD160 89d43472835f671cf81270e1e516519f5e992742 SHA1 937388bb2c5b03a07af79b63bdaa21b2ac7084e3 SHA256 bfe581646050a3fceded899e0e6065f21340d1323a6fda50636010ea5405e954 +MD5 fa7acbf8bcf3b512e07da6ec5936de7b files/gaia-0.1.2-remove_dep_checks_wwfetch.patch 386 +RMD160 89d43472835f671cf81270e1e516519f5e992742 files/gaia-0.1.2-remove_dep_checks_wwfetch.patch 386 +SHA256 bfe581646050a3fceded899e0e6065f21340d1323a6fda50636010ea5405e954 files/gaia-0.1.2-remove_dep_checks_wwfetch.patch 386 DIST gaia-0.1.1.tar.bz2 60120 RMD160 cf09ba082ce217505b7217f6d9e9b97c89fb2dbc SHA1 8acb620a3e6939831361a4ccfc3e92c6a9448701 SHA256 081307da85836ca79c702ec7d68063992f9045bc86f29bb3f7db4845e945fd17 +DIST gaia-0.1.2.tar.bz2 60241 RMD160 df1a050a7f8187a7e7196cb160a453a0ebbbf41d SHA1 5a2c65064010c7d00151f6f94b0bf0e2ae796bfa SHA256 9174671fa3e88f6f10d6e5acfe1d18e8e4d6177fa0e288632b4b70f978864c95 EBUILD gaia-0.1.1.ebuild 1883 RMD160 851804389896a39a62666857fd11a08e3b60307a SHA1 7e1907da379338341d54d4a3867dc6e13b51fc3f SHA256 5f117b683052926b26d0cd2b42a83745d1d8fc1b6f3568a31da18ed7aa1643d7 MD5 0573d3163e523b7c9a062163900e7ec2 gaia-0.1.1.ebuild 1883 RMD160 851804389896a39a62666857fd11a08e3b60307a gaia-0.1.1.ebuild 1883 SHA256 5f117b683052926b26d0cd2b42a83745d1d8fc1b6f3568a31da18ed7aa1643d7 gaia-0.1.1.ebuild 1883 -MISC ChangeLog 779 RMD160 59e06a07bbb3c7a5fc80019d1bca1aca5e4f8877 SHA1 54b3c04ba0c1eab116903571c37755a8fefb7500 SHA256 f2e21a10d9b2fcd218d7d50670816c1ab63a4d84b8ed5fcfc00b9119b2692be1 -MD5 c0e6e0462fec6a8ea214d40f35d7bf2c ChangeLog 779 -RMD160 59e06a07bbb3c7a5fc80019d1bca1aca5e4f8877 ChangeLog 779 -SHA256 f2e21a10d9b2fcd218d7d50670816c1ab63a4d84b8ed5fcfc00b9119b2692be1 ChangeLog 779 +EBUILD gaia-0.1.2.ebuild 1932 RMD160 64a224d930cfc830389165cd184bccd2bcbaf357 SHA1 c4b18d63a3819047cdf79ce52f21e3f08918d86e SHA256 0b77354247cc5b4348a81537c86baec421f9eba511612149e20ee6aaf6edd285 +MD5 102fc66cc38584ad62f295e0d0768b86 gaia-0.1.2.ebuild 1932 +RMD160 64a224d930cfc830389165cd184bccd2bcbaf357 gaia-0.1.2.ebuild 1932 +SHA256 0b77354247cc5b4348a81537c86baec421f9eba511612149e20ee6aaf6edd285 gaia-0.1.2.ebuild 1932 +MISC ChangeLog 1187 RMD160 6e57b33ccaf2c2e17c0edef7216a52fe84a1d4f3 SHA1 6a3e980fad8a1bf954e2d240291904fd6174b5c5 SHA256 a8fdeb7cac6c4e12c8f90ac623c06768e3a7e86e358c65e3151a4f17268b556b +MD5 36c2f478a2f7e4370e5b87efa18a19ba ChangeLog 1187 +RMD160 6e57b33ccaf2c2e17c0edef7216a52fe84a1d4f3 ChangeLog 1187 +SHA256 a8fdeb7cac6c4e12c8f90ac623c06768e3a7e86e358c65e3151a4f17268b556b ChangeLog 1187 MISC metadata.xml 266 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 SHA1 2eb26e89e18770b3cc373ab290938a2aea6bce97 SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2 MD5 f2e99271e391d686f969c3d65ac24562 metadata.xml 266 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 metadata.xml 266 @@ -25,10 +42,13 @@ SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2 metadata MD5 be9044cdfc93f1e90d1d88aaef0af25c files/digest-gaia-0.1.1 232 RMD160 00ae57abd0b65f2d8adfe2ee7f93d5bf1782281f files/digest-gaia-0.1.1 232 SHA256 f95bcb75bfc5423841c9232cd7914bc63ed201b07abe3edc5012657653d89db7 files/digest-gaia-0.1.1 232 +MD5 5ebf9306d9c2595126e88dc17bc31d47 files/digest-gaia-0.1.2 232 +RMD160 d21596dcc4cd003828506c9c4b50c8438e2aaed1 files/digest-gaia-0.1.2 232 +SHA256 65c88c183e28db147692ef0d4fa213d11e94313c2bad91ce302ff0490a1dd63a files/digest-gaia-0.1.2 232 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFdSrLNQqtfCuFneMRAj7GAJ0ZZbIulyzO/6SqNsGRwje2VAu4EQCfRF1X -uVJ6F1ipfzsDIA3Jzs5Xido= -=IPIM +iD8DBQFFdq3tNQqtfCuFneMRAiVUAJ40/CbSdBdrAT2bt9h4cF8yXmlgowCgjED/ +P1L4sLfoms/DIJ+PProGqIY= +=pwo8 -----END PGP SIGNATURE----- diff --git a/x11-misc/gaia/files/digest-gaia-0.1.2 b/x11-misc/gaia/files/digest-gaia-0.1.2 new file mode 100644 index 000000000000..2951485025bb --- /dev/null +++ b/x11-misc/gaia/files/digest-gaia-0.1.2 @@ -0,0 +1,3 @@ +MD5 b9bd7fd9b035e843788c6a6f25baf07f gaia-0.1.2.tar.bz2 60241 +RMD160 df1a050a7f8187a7e7196cb160a453a0ebbbf41d gaia-0.1.2.tar.bz2 60241 +SHA256 9174671fa3e88f6f10d6e5acfe1d18e8e4d6177fa0e288632b4b70f978864c95 gaia-0.1.2.tar.bz2 60241 diff --git a/x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch b/x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch new file mode 100644 index 000000000000..2fb715aa2166 --- /dev/null +++ b/x11-misc/gaia/files/gaia-0.1.2-font_inclusion.patch @@ -0,0 +1,11 @@ +--- /tmp/Main.cc 2006-12-04 10:24:55.000000000 +0100 ++++ Main.cc 2006-12-04 10:25:12.000000000 +0100 +@@ -345,7 +345,7 @@ + last_frame = timer->GetFrame(); + + /* preloaded textures */ +- PreloadedTextureManager::Instance()->LoadPNG(TEXTURE_FONT, DATADIR "/font.png"); ++ PreloadedTextureManager::Instance()->LoadPNG(TEXTURE_FONT, "/usr/share/gaia/font.png"); + + /* sources */ + debug("Initializing tile storage\n"); diff --git a/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch new file mode 100644 index 000000000000..7e378483fbd4 --- /dev/null +++ b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_gaia.patch @@ -0,0 +1,46 @@ +--- /tmp/SConscript 2006-12-06 12:09:48.000000000 +0100 ++++ /tmp/gaia-0.1.2/programs/gaia/SConscript 2006-12-06 12:10:17.000000000 +0100 +@@ -27,43 +27,6 @@ + config = env.Configure(log_file = '/dev/null') + config_ok = True + +- if not config.CheckHeader('SDL.h'): +- print "You need to install SDL development libraries" +- config_ok = False +- +- if not config.CheckHeader('GL/gl.h'): +- print "You need to install GL development libraries" +- config_ok = False +- +- if not config.CheckHeader( [ 'stdio.h', 'jpeglib.h' ] ): +- print "You need to install jpeg development libraries" +- config_ok = False +- +- if not config.CheckHeader('png.h'): +- print "You need to install png development libraries" +- config_ok = False +- +- if int(env['gpsd']) and not config.CheckHeader('gps.h'): +- print "You need to install libgps from gpsd package (http://gpsd.berlios.de/), or turn off gpsd support with `gpsd=0' option (you'll still be able to use GPS)" +- config_ok = False +- +- +- if not config.CheckLib('curl'): +- print "You need to install libcurl development libraries" +- config_ok = False +- +- if not config.CheckLib('jpeg'): +- print "You need to install jpeg development libraries" +- config_ok = False +- +- if not config.CheckLib('png'): +- print "You need to install png development libraries" +- config_ok = False +- +- if int(env['gpsd']) and not config.CheckLib('gps'): +- print "You need to install libgps from gpsd package (http://gpsd.berlios.de/), or turn off gpsd support with `gpsd=0' option (you'll still be able to use GPS)" +- config_ok = False +- + if not config_ok: + Exit(1) + diff --git a/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch new file mode 100644 index 000000000000..667006a98705 --- /dev/null +++ b/x11-misc/gaia/files/gaia-0.1.2-remove_dep_checks_wwfetch.patch @@ -0,0 +1,13 @@ +--- /tmp/SConscript 2006-12-06 12:18:54.000000000 +0100 ++++ /tmp/gaia-0.1.2/lib/wwfetch/SConscript 2006-12-06 12:19:09.000000000 +0100 +@@ -14,10 +14,6 @@ + config = env.Configure(log_file = '/dev/null') + config_ok = True + +- if not config.CheckHeader('curl/curl.h'): +- print "You need to install the cURL development libraries" +- config_ok = False +- + if not config_ok: + Exit(1) + diff --git a/x11-misc/gaia/gaia-0.1.2.ebuild b/x11-misc/gaia/gaia-0.1.2.ebuild new file mode 100644 index 000000000000..4c815af47292 --- /dev/null +++ b/x11-misc/gaia/gaia-0.1.2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.2.ebuild,v 1.1 2006/12/06 11:47:39 opfer Exp $ + +inherit eutils + +DESCRIPTION="opensource 3D interface to the planet, based on NASA World Wind data" +HOMEPAGE="http://gaia.serezhkin.com/ + http://sourceforge.net/projects/gaia-clean" +SRC_URI="mirror://sourceforge/gaia-clean/${P}.tar.bz2" + + +SLOT="0" +LICENSE="GPL-2" + +IUSE="gps doc" +KEYWORDS="~x86" + +RDEPEND="media-libs/jpeg + media-libs/libpng + >=media-libs/libsdl-1.2 + net-misc/curl + virtual/opengl + gps? ( sci-geosciences/gpsd ) + doc? ( app-doc/doxygen )" + +DEPEND="${RDEPEND} + dev-util/scons" + +src_unpack() { + unpack ${A} + + # the binary would fail with a wrong hard coded path for font.png + cd ${S}/programs/gaia/ + epatch "${FILESDIR}/${P}-font_inclusion.patch" + + # when linked with --as-needed it will fail checking the deps, so we just + # remove them, as we have our own dependency checks + cd ${S}/programs/gaia/ + epatch "${FILESDIR}/${P}-remove_dep_checks_gaia.patch" + cd ${S}/lib/wwfetch/ + epatch "${FILESDIR}/${P}-remove_dep_checks_wwfetch.patch" +} + +src_compile() { + # Due to an error in the build script, the variable CCFLAGS is expected, + # setting it here is simpler than patching + export CCFLAGS=${CFLAGS} + # respect variables from the environment + local myconf="use_env=yes" + + if use gps; then + myconf="${myconf} gpsd=yes" + fi + + scons ${MAKEOPTS} ${myconf} || die + + use doc && doxygen +} + +src_install() { + dodir /usr/bin/ + dodir /usr/share/gaia/ + + dodoc TODO README ChangeLog + + if use doc; then + insinto /usr/share/doc/${P}/html/ + doins ${S}/doc/html/* + fi + + # local defines if there is installation requested, while prefix determines the + # target + export CCFLAGS=${CFLAGS} + scons local=no prefix="${D}/usr" install +} + +pkg_postinst() { + einfo + einfo "Please set color depth of X11 to 24 or 32 bpp" + einfo +} \ No newline at end of file