diff options
| -rw-r--r-- | media-gfx/freewrl/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/freewrl/Manifest | 15 | ||||
| -rw-r--r-- | media-gfx/freewrl/freewrl-1.22.10-r1.ebuild | 108 | ||||
| -rw-r--r-- | media-gfx/freewrl/freewrl-1.22.10.ebuild | 6 |
4 files changed, 132 insertions, 6 deletions
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog index 27402e763ae7..78da8bc3b835 100644 --- a/media-gfx/freewrl/ChangeLog +++ b/media-gfx/freewrl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/freewrl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.31 2011/04/01 14:23:54 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.32 2011/04/02 14:29:43 ssuominen Exp $ + +*freewrl-1.22.10-r1 (02 Apr 2011) + + 02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> freewrl-1.22.10.ebuild, + +freewrl-1.22.10-r1.ebuild: + Rename USE="static" to USE="static-libs" wrt #361659. Force spidermonkey as + javascript engine until xulrunner-2 support is available wrt #361663. 01 Apr 2011; Patrick Lauer <patrick@gentoo.org> freewrl-1.22.9.ebuild, freewrl-1.22.10.ebuild: diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest index 59dc1a6080d0..9572ddd6b028 100644 --- a/media-gfx/freewrl/Manifest +++ b/media-gfx/freewrl/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST freewrl-1.22.10.tar.bz2 1548349 RMD160 9ff1894c59e48e0c9412fa068ff52f75d45f6a6c SHA1 94ecc960a1936692aeee2ec232bb31561fac5958 SHA256 b52999a1754968c8f889de0f98566dceb2ddd70eec1d68d2d4f07a90292a466e DIST freewrl-1.22.9.tar.bz2 1457743 RMD160 f8c3a2c12422bed747bd71704ef05cdaa646de13 SHA1 7f3becb4f64b3c9caa32a7d9a35e61b3cc7eab41 SHA256 0ad0e264351018015e2a6fe7cd4c2f7c3e3f486ddc85be9b680e013981f05804 -EBUILD freewrl-1.22.10.ebuild 3507 RMD160 7d4223cf44b6b2ff4c82093eb64278d05ecf9b7c SHA1 0530aac7540b4b1cd7bcc5abf2984c1a6f4f2989 SHA256 d361520cd697ac3b34217b775f09d9d4bdaefae7828e60485bd888a7b1768393 +EBUILD freewrl-1.22.10-r1.ebuild 3569 RMD160 8792a8ad7588ecbac90a8f451736c3a64dab5cd8 SHA1 55a12f8bb87359e8544e9ccb64f286c6535c85ec SHA256 5304848d0d229efac3a061445780cea8d11e10c64df6b2cd64590821320b1b86 +EBUILD freewrl-1.22.10.ebuild 3526 RMD160 ba890e879752cc4a269606fe4b3e2a109b93ba1c SHA1 7e49e50a4c37b7ffc0bc4c42b9ae55d57b5159e8 SHA256 bb7f090af2e0c87fbc72e379d4eb240091c3366b0c6fd69d93ecd7104985db12 EBUILD freewrl-1.22.9.ebuild 3069 RMD160 3adb6255da5a523583e977823739d7368be903e8 SHA1 47aae0e84128d15e849a75235d1880f518776985 SHA256 a6e0f83b3c3d4a3ad9bb1acf32fa21947b1177555ff38cf0d99b01543850ecac -MISC ChangeLog 4544 RMD160 2ef73fff242ce76dfc055d0a9602d48bd8902681 SHA1 8a8591ca3b57fc45e7c07289ae91d379bb2c869e SHA256 1cd8dc99165fe0d240f9db89fee41a4f80bc2ba94f7a8802c5159094a2459cea +MISC ChangeLog 4840 RMD160 0120a19031082b001db8bb7d4dc9e2735c7357c3 SHA1 50ccc0d666c0c74a0fd2af62ee9036054c58844e SHA256 1c3dc4d599045678ab42d09fc860ad7b6e35fef6665a3a61100710a5df2ff65c MISC metadata.xml 552 RMD160 ef3eca4d7c6f76c0442a987ff5916d68fbfe6d4d SHA1 51c1146433e244c29ecb210d72c35b8054cdee2b SHA256 f85e5ec3121bcb3552984a6c49183dd41e2fe9eb85770fc6c0b636123c42526d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk2XMxwACgkQXkR9YqOcLPF0sAEAoJL/wGJ6kigSCHvyn3SO6hhU +zFB3xXa2e2PlkFmRl90BAKCVFKElRVbpRKcmm2ssXAmA4n8OQgZE/mDFYxdztAY/ +=reiM +-----END PGP SIGNATURE----- diff --git a/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild b/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild new file mode 100644 index 000000000000..0d2bd42246c0 --- /dev/null +++ b/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild,v 1.1 2011/04/02 14:29:43 ssuominen Exp $ + +EAPI="2" + +inherit nsplugins eutils flag-o-matic java-pkg-opt-2 + +DESCRIPTION="VRML2 and X3D compliant browser" +SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2" +HOMEPAGE="http://freewrl.sourceforge.net/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl debug libeai +glew +java +motif +sox static-libs" + +COMMONDEPEND="x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libX11 + motif? ( x11-libs/openmotif ) + media-libs/mesa + glew? ( media-libs/glew ) + virtual/opengl + media-libs/libpng + virtual/jpeg + media-libs/imlib2 + >=media-libs/freetype-2 + media-libs/fontconfig + curl? ( net-misc/curl ) + dev-lang/spidermonkey" +DEPEND="${COMMONDEPEND} + >=dev-util/pkgconfig-0.22 + java? ( >=virtual/jdk-1.4 )" +RDEPEND="${COMMONDEPEND} + media-fonts/dejavu + || ( media-gfx/imagemagick + media-gfx/graphicsmagick[imagemagick] ) + app-arch/unzip + java? ( >=virtual/jre-1.4 ) + sox? ( media-sound/sox )" + +src_prepare() { + # A hack to get around expat being grabbed from xulrunner + mkdir "${S}/src/lib/include"; + cp /usr/include/expat.h "${S}/src/lib/include/"; + cp /usr/include/expat_external.h "${S}/src/lib/include/"; +} + +src_configure() { + local myconf="--enable-fontconfig --disable-plugin + --with-imageconvert=/usr/bin/convert + --with-unzip=/usr/bin/unzip" + if use motif; then + myconf="${myconf} --with-x --with-target=motif" + else + myconf="${myconf} --with-x --with-target=x11" + fi + if use sox; then + myconf="${myconf} --with-soundconv=/usr/bin/sox" + fi + # disable the checks for other js libs, in case they are installed + myconf="${myconf} --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js --disable-seamonkey-js" + # spidermonkey has no pkg-config, so override ./configure + JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX" + JAVASCRIPT_ENGINE_LIBS="-ljs" + if has_version dev-lang/spidermonkey[threadsafe] ; then + JAVASCRIPT_ENGINE_CFLAGS="${JAVASCRIPT_ENGINE_CFLAGS} -DJS_THREADSAFE $(pkg-config --cflags nspr)" + JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}" + fi + export JAVASCRIPT_ENGINE_CFLAGS + export JAVASCRIPT_ENGINE_LIBS + econf ${myconf} \ + $(use_enable curl libcurl) \ + $(use_with glew) \ + $(use_enable debug) $(use_enable debug thread_colorized) \ + $(use_enable libeai) \ + $(use_enable java) \ + $(use_enable static-libs static) \ + $(use_enable sox sound) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + if use java; then + java-pkg_dojar src/java/vrml.jar + insinto /usr/share/${PN}/lib + doins src/java/java.policy + elog "Because vrml.jar requires access to sockets, you will need to incorporate the" + elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default" + elog "java policy." + fi + + # remove unneeded .la files (as per Flameeyes' rant) + cd "${D}" + rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la +} + +pkg_postinst() { + elog "All versions of FreeWRL are incompatible with xulrunner-2.0 and above." + elog "This ebuild gets around it by removing support for browser plugins and forcing" + elog "the javascript engine to spidermonkey. If you are willing to downgrade to" + elog "xulrunner-1.9 (as well as downgrade/rebuild all packages depending on it), then" + elog "you can get this functionality back by adding =media-gfx/freewrl-1.22.10-r1 to your" + elog "package.mask" +}
\ No newline at end of file diff --git a/media-gfx/freewrl/freewrl-1.22.10.ebuild b/media-gfx/freewrl/freewrl-1.22.10.ebuild index 0ced8269ec91..342c564da681 100644 --- a/media-gfx/freewrl/freewrl-1.22.10.ebuild +++ b/media-gfx/freewrl/freewrl-1.22.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.10.ebuild,v 1.3 2011/04/01 14:23:54 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.10.ebuild,v 1.4 2011/04/02 14:29:43 ssuominen Exp $ EAPI="2" @@ -13,7 +13,7 @@ HOMEPAGE="http://freewrl.sourceforge.net/" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="curl debug libeai +glew +java +motif nsplugin +sox spidermonkey static" +IUSE="curl debug libeai +glew +java +motif nsplugin +sox spidermonkey static-libs" COMMONDEPEND="x11-libs/libXau x11-libs/libXdmcp @@ -91,7 +91,7 @@ src_configure() { $(use_enable libeai) \ $(use_enable java) \ $(use_enable nsplugin plugin) \ - $(use_enable static) \ + $(use_enable static-libs static) \ $(use_enable sox sound) } |