From 16d80e51dbff5492bcf996f866257164fc72d0eb Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Mon, 10 Jan 2011 16:22:08 +0000 Subject: Fix spidermonkey linkage, bug #350151 per ssuominen (Portage version: 2.1.9.30/cvs/Linux x86_64) --- media-video/gpac/ChangeLog | 11 +- .../files/gpac-0.4.5-spidermonkey-update.patch | 25 ++++ media-video/gpac/gpac-0.4.5-r2.ebuild | 142 -------------------- media-video/gpac/gpac-0.4.5-r3.ebuild | 144 -------------------- media-video/gpac/gpac-0.4.5-r4.ebuild | 146 +++++++++++++++++++++ 5 files changed, 180 insertions(+), 288 deletions(-) create mode 100644 media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch delete mode 100644 media-video/gpac/gpac-0.4.5-r2.ebuild delete mode 100644 media-video/gpac/gpac-0.4.5-r3.ebuild create mode 100644 media-video/gpac/gpac-0.4.5-r4.ebuild (limited to 'media-video') diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog index e6e26fc8052d..b904db34fe95 100644 --- a/media-video/gpac/ChangeLog +++ b/media-video/gpac/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/gpac -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.82 2010/11/01 17:17:34 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.83 2011/01/10 16:22:08 anarchy Exp $ + +*gpac-0.4.5-r4 (10 Jan 2011) + + 10 Jan 2011; Jory A. Pratt -gpac-0.4.5-r2.ebuild, + -gpac-0.4.5-r3.ebuild, +gpac-0.4.5-r4.ebuild, + +files/gpac-0.4.5-spidermonkey-update.patch: + Fix spidermonkey linkage, bug #350151 per ssuominen *gpac-0.4.5-r3 (01 Nov 2010) diff --git a/media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch b/media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch new file mode 100644 index 000000000000..6674c93b19b9 --- /dev/null +++ b/media-video/gpac/files/gpac-0.4.5-spidermonkey-update.patch @@ -0,0 +1,25 @@ +--- a/configure 2011-01-01 14:37:30.188000001 -0600 ++++ b/configure 2011-01-01 14:40:30.409000001 -0600 +@@ -491,6 +491,13 @@ + has_js="system" + js_lib="-lmozjs" + else ++#gentoo spidermonkey (mozjs) ++js_flags="-DXP_UNIX -I/usr/include/js" ++js_inc="/usr/include/js" ++if $cc -o $TMPO $TMPC $js_flags -lmozjs 2> /dev/null ; then ++has_js="system" ++js_lib="-lmozjs" ++else + #try local + js_inc="$local_inc/js" + js_flags="-DXP_UNIX -I$local_inc/js" +@@ -499,6 +506,7 @@ + fi + fi + fi ++fi + fi + + + diff --git a/media-video/gpac/gpac-0.4.5-r2.ebuild b/media-video/gpac/gpac-0.4.5-r2.ebuild deleted file mode 100644 index ebb8ef86bb4c..000000000000 --- a/media-video/gpac/gpac-0.4.5-r2.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r2.ebuild,v 1.3 2010/09/16 17:19:47 scarabeus Exp $ - -inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs - -DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C." -HOMEPAGE="http://gpac.sourceforge.net/" -NBV="610" -WBV="600" -PATCHLEVEL="4" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="a52 aac alsa debug ffmpeg ipv6 jack jpeg jpeg2k javascript mad ogg opengl oss png pulseaudio sdl ssl theora truetype vorbis wxwidgets xml xvid" - -S=${WORKDIR}/${PN} - -RDEPEND=" - a52? ( media-libs/a52dec ) - aac? ( >=media-libs/faad2-2.0 ) - alsa? ( media-libs/alsa-lib ) - ffmpeg? ( media-video/ffmpeg ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( media-libs/jpeg ) - javascript? ( >=dev-lang/spidermonkey-1.5 ) - mad? ( >=media-libs/libmad-0.15.1b ) - opengl? ( virtual/opengl media-libs/freeglut ) - ogg? ( >=media-libs/libogg-1.1 ) - png? ( >=media-libs/libpng-1.2.5 ) - vorbis? ( >=media-libs/libvorbis-1.1 ) - theora? ( media-libs/libtheora ) - truetype? ( >=media-libs/freetype-2.1.4 ) - wxwidgets? ( =x11-libs/wxGTK-2.8* ) - xml? ( >=dev-libs/libxml2-2.6.0 ) - xvid? ( >=media-libs/xvid-1.0.1 ) - sdl? ( media-libs/libsdl ) - jpeg2k? ( media-libs/openjpeg ) - ssl? ( dev-libs/openssl ) - pulseaudio? ( media-sound/pulseaudio ) - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXext" - -DEPEND="${RDEPEND}" - -my_use() { - local flag="$1" pflag="${2:-$1}" - if use ${flag}; then - echo "--use-${pflag}=system" - else - echo "--use-${pflag}=no" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - sed -ie '/ldconfig / d' "${S}/Makefile" - - cd "${S}" - - chmod +x configure - # make sure configure looks for wx-2.6 - if use wxwidgets; then - WX_GTK_VER=2.8 - need-wxwidgets unicode - sed -i -e "s:wx-config:${WX_CONFIG}:g" configure - else - sed -i -e 's:^has_wx="yes:has_wx="no:' configure - fi - - use sdl || sed -i 's:^has_sdl=yes:has_sdl=no:' configure - use alsa || sed -i 's:^has_alsa="yes":has_alsa=no:' configure - - # make sure mozilla won't be used - sed -i -e 's/osmozilla//g' applications/Makefile - - # use this to cut down on the warnings noise - append-flags -fno-strict-aliasing - - # multilib libdir fix - sed -i -e 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile - sed -i -e 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure -} - -src_compile() { - if use ogg; then - myconf="${myconf} --use-ogg=system" - if use vorbis; then - myconf="${myconf} --use-vorbis=system" - fi - if use theora; then - myconf="${myconf} --use-theora=system" - fi - else - myconf="${myconf} --use-ogg=no" - fi - - tc-export CC CXX - - econf \ - --enable-svg \ - --enable-pic \ - --disable-amr \ - $(use_enable debug) \ - $(use_enable opengl) \ - $(use_enable oss oss-audio) \ - $(use_enable ssl) \ - $(use_enable ipv6) \ - $(use_enable jack)=yes \ - $(use_enable pulseaudio)=yes \ - $(my_use ffmpeg) \ - $(my_use aac faad) \ - $(my_use jpeg) \ - $(my_use mad) \ - $(my_use javascript js) \ - $(my_use png) \ - $(my_use truetype ft) \ - $(my_use xvid) \ - $(my_use jpeg2k openjpeg) \ - $(my_use a52) \ - --cc="$(tc-getCC)" \ - ${myconf} || die "configure died" - - emake -j1 OPTFLAGS="${CFLAGS}" || die "emake failed." -} - -src_install() { - emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install || die - emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib || die - dodoc AUTHORS BUGS Changelog README TODO - dodoc doc/*.txt - dohtml doc/*.html -} diff --git a/media-video/gpac/gpac-0.4.5-r3.ebuild b/media-video/gpac/gpac-0.4.5-r3.ebuild deleted file mode 100644 index fe2474a69ef7..000000000000 --- a/media-video/gpac/gpac-0.4.5-r3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r3.ebuild,v 1.1 2010/11/01 17:17:34 ssuominen Exp $ - -inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs - -DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C." -HOMEPAGE="http://gpac.sourceforge.net/" -NBV="610" -WBV="600" -PATCHLEVEL="4" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="a52 aac alsa debug ffmpeg ipv6 jack jpeg jpeg2k javascript mad opengl oss png pulseaudio sdl ssl theora truetype vorbis wxwidgets xml xvid" - -S=${WORKDIR}/${PN} - -RDEPEND=" - a52? ( media-libs/a52dec ) - aac? ( >=media-libs/faad2-2.0 ) - alsa? ( media-libs/alsa-lib ) - ffmpeg? ( media-video/ffmpeg ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( media-libs/jpeg ) - javascript? ( >=dev-lang/spidermonkey-1.5 ) - mad? ( >=media-libs/libmad-0.15.1b ) - opengl? ( virtual/opengl media-libs/freeglut ) - >=media-libs/libogg-1.1 - png? ( >=media-libs/libpng-1.2.5 ) - vorbis? ( >=media-libs/libvorbis-1.1 ) - theora? ( media-libs/libtheora ) - truetype? ( >=media-libs/freetype-2.1.4 ) - wxwidgets? ( =x11-libs/wxGTK-2.8* ) - xml? ( >=dev-libs/libxml2-2.6.0 ) - xvid? ( >=media-libs/xvid-1.0.1 ) - sdl? ( media-libs/libsdl ) - jpeg2k? ( media-libs/openjpeg ) - ssl? ( dev-libs/openssl ) - pulseaudio? ( media-sound/pulseaudio ) - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXv - x11-libs/libXext" - -DEPEND="${RDEPEND}" - -my_use() { - local flag="$1" pflag="${2:-$1}" - if use ${flag}; then - echo "--use-${pflag}=system" - else - echo "--use-${pflag}=no" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - sed -ie '/ldconfig / d' "${S}/Makefile" - - cd "${S}" - - # remove last of internal ogg - sed -i \ - -e 's:::' \ - src/media_tools/{av_parsers,gpac_ogg,media_import,media_export}.c || die - rm -f include/gpac/internal/ogg.h || die - - chmod +x configure - # make sure configure looks for wx-2.6 - if use wxwidgets; then - WX_GTK_VER=2.8 - need-wxwidgets unicode - sed -i -e "s:wx-config:${WX_CONFIG}:g" configure - else - sed -i -e 's:^has_wx="yes:has_wx="no:' configure - fi - - use sdl || sed -i 's:^has_sdl=yes:has_sdl=no:' configure - use alsa || sed -i 's:^has_alsa="yes":has_alsa=no:' configure - - # make sure mozilla won't be used - sed -i -e 's/osmozilla//g' applications/Makefile - - # use this to cut down on the warnings noise - append-flags -fno-strict-aliasing - - # multilib libdir fix - sed -i -e 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile - sed -i -e 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure -} - -src_compile() { - myconf="${myconf} --use-ogg=system" - if use vorbis; then - myconf="${myconf} --use-vorbis=system" - fi - if use theora; then - myconf="${myconf} --use-theora=system" - fi - - tc-export CC CXX - - econf \ - --enable-svg \ - --enable-pic \ - --disable-amr \ - $(use_enable debug) \ - $(use_enable opengl) \ - $(use_enable oss oss-audio) \ - $(use_enable ssl) \ - $(use_enable ipv6) \ - $(use_enable jack)=yes \ - $(use_enable pulseaudio)=yes \ - $(my_use ffmpeg) \ - $(my_use aac faad) \ - $(my_use jpeg) \ - $(my_use mad) \ - $(my_use javascript js) \ - $(my_use png) \ - $(my_use truetype ft) \ - $(my_use xvid) \ - $(my_use jpeg2k openjpeg) \ - $(my_use a52) \ - --cc="$(tc-getCC)" \ - ${myconf} || die "configure died" - - emake -j1 OPTFLAGS="${CFLAGS}" || die "emake failed." -} - -src_install() { - emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install || die - emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib || die - dodoc AUTHORS BUGS Changelog README TODO - dodoc doc/*.txt - dohtml doc/*.html -} diff --git a/media-video/gpac/gpac-0.4.5-r4.ebuild b/media-video/gpac/gpac-0.4.5-r4.ebuild new file mode 100644 index 000000000000..4f778ef4b257 --- /dev/null +++ b/media-video/gpac/gpac-0.4.5-r4.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r4.ebuild,v 1.1 2011/01/10 16:22:08 anarchy Exp $ + +inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs + +DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C." +HOMEPAGE="http://gpac.sourceforge.net/" +NBV="610" +WBV="600" +PATCHLEVEL="4" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="a52 aac alsa debug ffmpeg ipv6 jack jpeg jpeg2k javascript mad opengl oss png pulseaudio sdl ssl theora truetype vorbis wxwidgets xml xvid" + +S=${WORKDIR}/${PN} + +RDEPEND=" + a52? ( media-libs/a52dec ) + aac? ( >=media-libs/faad2-2.0 ) + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( media-video/ffmpeg ) + jack? ( media-sound/jack-audio-connection-kit ) + jpeg? ( media-libs/jpeg ) + javascript? ( >=dev-lang/spidermonkey-1.5 ) + mad? ( >=media-libs/libmad-0.15.1b ) + opengl? ( virtual/opengl media-libs/freeglut ) + >=media-libs/libogg-1.1 + png? ( >=media-libs/libpng-1.2.5 ) + vorbis? ( >=media-libs/libvorbis-1.1 ) + theora? ( media-libs/libtheora ) + truetype? ( >=media-libs/freetype-2.1.4 ) + wxwidgets? ( =x11-libs/wxGTK-2.8* ) + xml? ( >=dev-libs/libxml2-2.6.0 ) + xvid? ( >=media-libs/xvid-1.0.1 ) + sdl? ( media-libs/libsdl ) + jpeg2k? ( media-libs/openjpeg ) + ssl? ( dev-libs/openssl ) + pulseaudio? ( media-sound/pulseaudio ) + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXv + x11-libs/libXext" + +DEPEND="${RDEPEND}" + +my_use() { + local flag="$1" pflag="${2:-$1}" + if use ${flag}; then + echo "--use-${pflag}=system" + else + echo "--use-${pflag}=no" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + + epatch "${FILESDIR}/${P}-spidermonkey-update.patch" + + sed -ie '/ldconfig / d' "${S}/Makefile" + + cd "${S}" + + # remove last of internal ogg + sed -i \ + -e 's:::' \ + src/media_tools/{av_parsers,gpac_ogg,media_import,media_export}.c || die + rm -f include/gpac/internal/ogg.h || die + + chmod +x configure + # make sure configure looks for wx-2.6 + if use wxwidgets; then + WX_GTK_VER=2.8 + need-wxwidgets unicode + sed -i -e "s:wx-config:${WX_CONFIG}:g" configure + else + sed -i -e 's:^has_wx="yes:has_wx="no:' configure + fi + + use sdl || sed -i 's:^has_sdl=yes:has_sdl=no:' configure + use alsa || sed -i 's:^has_alsa="yes":has_alsa=no:' configure + + # make sure mozilla won't be used + sed -i -e 's/osmozilla//g' applications/Makefile + + # use this to cut down on the warnings noise + append-flags -fno-strict-aliasing + + # multilib libdir fix + sed -i -e 's:$(prefix)/lib:$(prefix)/'$(get_libdir)':' Makefile src/Makefile + sed -i -e 's:/lib/gpac:/'$(get_libdir)'/gpac:' configure +} + +src_compile() { + myconf="${myconf} --use-ogg=system" + if use vorbis; then + myconf="${myconf} --use-vorbis=system" + fi + if use theora; then + myconf="${myconf} --use-theora=system" + fi + + tc-export CC CXX + + econf \ + --enable-svg \ + --enable-pic \ + --disable-amr \ + $(use_enable debug) \ + $(use_enable opengl) \ + $(use_enable oss oss-audio) \ + $(use_enable ssl) \ + $(use_enable ipv6) \ + $(use_enable jack)=yes \ + $(use_enable pulseaudio)=yes \ + $(my_use ffmpeg) \ + $(my_use aac faad) \ + $(my_use jpeg) \ + $(my_use mad) \ + $(my_use javascript js) \ + $(my_use png) \ + $(my_use truetype ft) \ + $(my_use xvid) \ + $(my_use jpeg2k openjpeg) \ + $(my_use a52) \ + --cc="$(tc-getCC)" \ + ${myconf} || die "configure died" + + emake -j1 OPTFLAGS="${CFLAGS}" || die "emake failed." +} + +src_install() { + emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install || die + emake STRIP="true" OPTFLAGS="${CFLAGS}" DESTDIR="${D}" install-lib || die + dodoc AUTHORS BUGS Changelog README TODO + dodoc doc/*.txt + dohtml doc/*.html +} -- cgit v1.2.3-65-gdbad