Use system libogg wrt #258331 by Zeev Tarantov. Use LDFLAGS when linking gm_alsa...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 1339e4c185fe6c0697700217e8f50dfbe87a81f1..8bd28fb7d3af71586c557e688b23a7036f54d8bd 100644 (file)
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,12 @@
 # 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.79 2010/04/29 11:22:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.80 2010/04/29 18:16:10 ssuominen Exp $
+
+*gpac-0.4.5-r2 (29 Apr 2010)
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +gpac-0.4.5-r2.ebuild:
+  Use system libogg wrt #258331 by Zeev Tarantov. Use LDFLAGS when linking
+  gm_alsa.so wrt #310257 by Zeev Tarantov and Doktor Notor.
 
   29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> gpac-0.4.5-r1.ebuild,
   -files/gpac-0.4.5-glx-define-prototype.patch,

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index f162a7ff820f358ad7d5f60019dad28bccbe1055..2e490f3677c7c355d93f1993d3010e3e7b6a4f71 100644 (file)
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,5 +1,7 @@
 DIST gpac-0.4.5-patches-3.tar.bz2 4121 RMD160 122bb47f6edaad357bf099722c4467b9f9f384bf SHA1 9dba51afa71fd580080a28731e02a5ff81442a91 SHA256 6bf173724334e9764796f28ce13fa74d154fa2fd7a8ddbd73d8992746a11e222
+DIST gpac-0.4.5-patches-4.tar.bz2 4668 RMD160 3062c3473827e84ee538bee16842af44c6223637 SHA1 2721bc95a9139e89d64a0059af76550d6db9656b SHA256 75a44be945a06634f036eff3d8c660ab51d05df2b8baaed83f2890e94f9f372c
 DIST gpac-0.4.5.tar.gz 4269054 RMD160 21249249a412efa5d1237907cb6b8cfe6282e86f SHA1 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
 EBUILD gpac-0.4.5-r1.ebuild 3812 RMD160 6f21c01f477ce80d15156a8df2389f8fa748695d SHA1 18e431dbf9627141f0c6d8a724b497bd4bd0315e SHA256 40f534f72c0d03f22a93b55f3dd463911ec681759971ec8ccdf22c90793c1a8b
-MISC ChangeLog 11563 RMD160 a53c5f84442fc3077890f64bfd4b7100fbfd4458 SHA1 09f9e5da4183b088fc17d340865e257510655ea0 SHA256 4f971ddf95c7602584c9f62765213df6e1156e7c4ddaad0a5a754002f37779e5
+EBUILD gpac-0.4.5-r2.ebuild 3817 RMD160 98e62715a897edeff8310dffb024146161aa42ae SHA1 39b182f41054e3a07b114da59af9621ed464dda8 SHA256 312d28c355f7a050c2c9dc350432fa152b36875a417659fbdd35c1d2fc36838f
+MISC ChangeLog 11806 RMD160 5e40523e42ac2074759dbf9dc777014f8565424f SHA1 88b9708d0c0098dda77b378ea45e87d1b538d3c8 SHA256 da3a2e2aecdd92194c2db6f121a61962825faf8af67da97ba448548a0743e179
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a

diff --git a/media-video/gpac/gpac-0.4.5-r2.ebuild b/media-video/gpac/gpac-0.4.5-r2.ebuild
new file mode 100644 (file)
index 0000000..69b8822
--- /dev/null
+++ b/media-video/gpac/gpac-0.4.5-r2.ebuild
@@ -0,0 +1,143 @@
+# 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.1 2010/04/29 18:16:10 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
+       http://dev.gentoo.org/~ssuominen/${P}-patches-${PATCHLEVEL}.tar.bz2"
+# 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 virtual/glut )
+       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
+}