diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2008-09-23 18:30:00 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-09-23 18:30:00 +0000 |
| commit | 99a56c78940ed049133b4528332d44f28a3db7a5 (patch) | |
| tree | 4bdde34205100270cb6aa903c0ad913b3670face /dev-games/ogre | |
| parent | tiny fix in init-script (diff) | |
| download | historical-99a56c78940ed049133b4528332d44f28a3db7a5.tar.gz historical-99a56c78940ed049133b4528332d44f28a3db7a5.tar.bz2 historical-99a56c78940ed049133b4528332d44f28a3db7a5.zip | |
fix linking with USE=cg with patch update from Artem Semendyaev; more messing
about with the examples.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-games/ogre')
| -rw-r--r-- | dev-games/ogre/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-games/ogre/Manifest | 6 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.4.9-as-needed.patch | 2 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.4.9.ebuild | 14 |
4 files changed, 19 insertions, 10 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog index 87204048d7ad..e051b68d0e07 100644 --- a/dev-games/ogre/ChangeLog +++ b/dev-games/ogre/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-games/ogre # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.53 2008/06/26 00:44:37 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.54 2008/09/23 18:30:00 mr_bones_ Exp $ + + 23 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org> + files/ogre-1.4.9-as-needed.patch, ogre-1.4.9.ebuild: + fix linking with USE=cg with patch update from Artem Semendyaev; more messing + about with the examples. 26 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org> ogre-1.4.9.ebuild: stable amd64, bug 229175 diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index e959367a8d8c..2c3f4e8413d8 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,6 +1,6 @@ -AUX ogre-1.4.9-as-needed.patch 428 RMD160 30dcb1754fc9eaf83352a2890d69217c27b8e71b SHA1 89e9b5954e4f5321bdd100af09b5f5425f52d5f9 SHA256 c8e5d95ae9da0619bcca241c900489e14cf658b858ff7be6d8842067696f0e6a +AUX ogre-1.4.9-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a AUX ogre-1.4.9-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96 DIST ogre-v1-4-9.tar.bz2 29555312 RMD160 c95536520d222b410e30f7bbee15c55360ee9c8d SHA1 3b8fb296a16cac77cdba6370bd9c752bfcccf18a SHA256 38b17826b6b34e70bf1bab17d4791ab1d485409c938cf71e1e5f866f3391c35b -EBUILD ogre-1.4.9.ebuild 2291 RMD160 5ed978e80bd236a6eb32ba4a7762900872e3956c SHA1 6bc5d1bb72b9f98af5dac1461c84848c41ab8f02 SHA256 708f5fc87b2fb0e155503419e401b518f4232199c98063dc8b28da58bbaced18 -MISC ChangeLog 7633 RMD160 cdcdacf4f290fed8b56935f0b70a1ec4ba063321 SHA1 eb826f5d412e4996f66818dc7b7bee2f82748e5d SHA256 1bdaacb8d955b152d197b9adcad7b5467fe5c08199a548b69b579059f93c565b +EBUILD ogre-1.4.9.ebuild 2475 RMD160 aeb04f2cd910b0d8892d2720233c26e865e68526 SHA1 37d74c6419b419bdcf89480cac267751d7a8eb91 SHA256 655e5ece149fe54aac80c465cf191a325ce5ee14d7d6ef59c10897422f4dde23 +MISC ChangeLog 7849 RMD160 8443be4600b13bf9462066cdcee73ec4aa202803 SHA1 5268dda4c6c32cbe2afe98ab11b8528fdaa9d253 SHA256 4de1cb9d568863d1c5d65b6c9ed602ed0d6446d9bd21039dcb97fbafdf278fbd MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304 diff --git a/dev-games/ogre/files/ogre-1.4.9-as-needed.patch b/dev-games/ogre/files/ogre-1.4.9-as-needed.patch index ce218097f770..11ccb571776a 100644 --- a/dev-games/ogre/files/ogre-1.4.9-as-needed.patch +++ b/dev-games/ogre/files/ogre-1.4.9-as-needed.patch @@ -5,7 +5,7 @@ * discouraged as this breaks many of the examples. * ****************************************************************]) - ) -+ ,-Xlinker --no-as-needed) ++ ,-Xlinker --no-as-needed -lstdc++) fi AM_CONDITIONAL(BUILD_CGPLUGIN, test x$build_cg = xyes) diff --git a/dev-games/ogre/ogre-1.4.9.ebuild b/dev-games/ogre/ogre-1.4.9.ebuild index fd4576fba3c6..250cfbf2bb1a 100644 --- a/dev-games/ogre/ogre-1.4.9.ebuild +++ b/dev-games/ogre/ogre-1.4.9.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.9.ebuild,v 1.3 2008/06/26 00:44:37 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.9.ebuild,v 1.4 2008/09/23 18:30:00 mr_bones_ Exp $ -inherit eutils autotools flag-o-matic +inherit multilib eutils autotools flag-o-matic DESCRIPTION="Object-oriented Graphics Rendering Engine" HOMEPAGE="http://www.ogre3d.org/" @@ -48,9 +48,13 @@ src_unpack() { if use examples ; then cp -r Samples install-examples || die find install-examples \ - '(' -name 'Makefile*' -o -name obj -o \ - -name bin -o -name '*.cbp' -o -name '*.vcproj*' ')' \ + '(' -name .keepme -o -name '*.cbp' -o -name '*.vcproj*' ')' \ -print0 | xargs -0 rm -rf + find install-examples -type d -print0 | xargs -0 rmdir 2> /dev/null + sed -i \ + -e "s:/usr/local/lib/OGRE:/usr/$(get_libdir)/OGRE:" \ + $(grep -rl /usr/local/lib/OGRE install-examples) \ + || die "sed failed" fi sed -i -e '/CPPUNIT/d' configure.in || die "sed failed" epatch "${FILESDIR}"/${P}-*.patch @@ -59,7 +63,7 @@ src_unpack() { src_compile() { strip-flags - econf \ + econf \ --disable-dependency-tracking \ --disable-freeimage \ --disable-ogre-demos \ |