Fix memset to correct size wrt #259389 by Daniel Gryniewicz to avoid segfault with MP4Box when Nero AAC/MP4 format is used.

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

3 files changed, 153 insertions, 12 deletions

diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index 658328ce1419..7dbd2517d3de 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gpac
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.67 2009/02/09 19:00:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.68 2009/12/19 11:16:07 ssuominen Exp $
+
+*gpac-0.4.5-r1 (19 Dec 2009)
+
+  19 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> +gpac-0.4.5-r1.ebuild:
+  Fix memset to correct size wrt #259389 by Daniel Gryniewicz to avoid
+  segfault with MP4Box when Nero AAC/MP4 format is used.
 
   09 Feb 2009; Alexis Ballier <aballier@gentoo.org> gpac-0.4.5.ebuild:
   avoid prestripping libgpac.so
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index a63ac0899412..ea4049081cb0 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST 26104-610.zip 292640 RMD160 84b2642709ca072c30658a71a6d8bec50fceb2fe SHA1 7ee6dcb29e2a28f905befd87857ce07a7062fa5b SHA256 8dc9453f9b93202247b4800a1d946ae6eaa3b9d0c48237ae8848144feb88399e
 DIST 26204-600.zip 255764 RMD160 d85a1879e60deeaa9b371646a1d43dd07ae07777 SHA1 fe0746e0456abe9285a54f0c3fd8e20598ee0408 SHA256 01513a7ae5d26ff16a37fba5deec2994a1992829180b4a15d9c646c51eb8fcdb
 DIST gpac-0.4.4-patches-6.tar.bz2 5926 RMD160 675599b6b8a401863e72c675c5627c7d0bb5502d SHA1 fdea8fe820bb81c68c2bba23895ffbef77990e87 SHA256 a6f06c796312f4db3e466b7acc567f481e02a5cf03ba13ea2538d4f8f580d4d5
 DIST gpac-0.4.4.tar.gz 4375687 RMD160 3812d236d326e70ddc601786317837c1c77517f4 SHA1 99b185966632376295f4406821223f5d60d1a32c SHA256 30417b233eaada0a467e47f852383897ad6f96327fed3defbb3dc3660b934704
 DIST gpac-0.4.5-patches-1.tar.bz2 3447 RMD160 ff72fc92ca40a6b72c59ef41a258a0d079c267ce SHA1 9358a3440cdb98af2b47f6c8c3d7187c228fbb0d SHA256 eb3927b507f6dbf827ea6d6c145665fee6bb88abd84986498416f8ff3bd7e6c8
+DIST gpac-0.4.5-patches-2.tar.bz2 3680 RMD160 dea4191716220e88172e57682a08c546e5c49471 SHA1 01736f9f34b9a5b01e7bf9e3718b7e425c2a9f5d SHA256 2103c61126cb99e1e76899b369ab223730860adbbc65f18aec0a68395e238862
 DIST gpac-0.4.5.tar.gz 4269054 RMD160 21249249a412efa5d1237907cb6b8cfe6282e86f SHA1 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
 EBUILD gpac-0.4.4-r1.ebuild 3922 RMD160 52276f88d54a82cb4904dbf954c375fcbf7b3bbc SHA1 ee6254d0d4f7bcd3f6c6d13e10ec567fc09ddf04 SHA256 99f7c1d13ebd837c2440040c9d8798aae5605c6851eef011afc94918f5c23f9e
+EBUILD gpac-0.4.5-r1.ebuild 3816 RMD160 8da64369a36c93598dd3a0e02ca5857ba0b63a0d SHA1 fef433d4b90bb39026b7158b283e15417fc14cbd SHA256 dd990f01cf8e334942f14b80d37d9364f3ca9db5df35f90a8a35be58db54b9dd
 EBUILD gpac-0.4.5.ebuild 3797 RMD160 6a376e6233a316300d9aa704cba462faa65e6472 SHA1 53009ed051a18078ccac9d5737774f8d808bef2a SHA256 aac70e43ac66a2374eba21150707c31f8d5f7181081c50cf0f6dc6fab879ebb6
-MISC ChangeLog 9831 RMD160 e93577462ab0281c131ffaf2ab25181e65412fd0 SHA1 60aaeac94c4d7be184702dda1d3d1e7ecf16b0c9 SHA256 35d11227fed4a2b6de43576efa8a1807e8922ba4e70b18c0a10aaa240b3ac228
+MISC ChangeLog 10068 RMD160 a942889d7b178dfd1547fd3a73954bc3e2ba8d64 SHA1 75dfa0efaf6e54b4ae3e2578de8f4c088fbdd17c SHA256 fa6bc655b208e51c8a2f3cf4be6b8df0b57522c2e0567059208ed1c5675a8434
 MISC metadata.xml 465 RMD160 32e7ff16a199c89e72a05f60849601dc1fa1452a SHA1 7740a56b8f7061ce7391cf65f5a515f76c62efe0 SHA256 501d9674a483b0ade39ea40123b20f2d332f3b69447a89389560f749fcb6a04c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmQfU4ACgkQvFcC4BYPU0rbHQCeJOXdC+tz32DYQBcIgA6xfNMK
-KF0AoKvC/lgpX2S1WUwlm5BDS5cGGs1Q
-=Uljl
------END PGP SIGNATURE-----
diff --git a/media-video/gpac/gpac-0.4.5-r1.ebuild b/media-video/gpac/gpac-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..11ea5daebeac
--- /dev/null
+++ b/media-video/gpac/gpac-0.4.5-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/12/19 11:16:07 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="2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 aac alsa amr debug ffmpeg ipv6 jack jpeg jpeg2k javascript mad ogg opengl oss png pulseaudio sdl ssl theora truetype vorbis wxwindows xml xvid"
+
+S=${WORKDIR}/${PN}
+
+RDEPEND="
+	a52? ( media-libs/a52dec )
+	aac? ( >=media-libs/faad2-2.0 )
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/amrnb media-libs/amrwb )
+	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 )
+	wxwindows? ( =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 wxwindows; 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 \
+		$(use_enable 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
+}