5 files changed, 13 insertions, 36 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index fd4154ee7dfa..1339e4c185fe 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,11 @@
 # 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.78 2010/04/23 12:39:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.79 2010/04/29 11:22:29 ssuominen Exp $
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> gpac-0.4.5-r1.ebuild,
+  -files/gpac-0.4.5-glx-define-prototype.patch,
+  -files/gpac-0.4.5-libpng14.patch:
+  Move glx-define-prototype.patch and libpng14.patch to patchset tarball.
 
   23 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> gpac-0.4.5-r1.ebuild,
   metadata.xml:
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 16804b10ad0b..f162a7ff820f 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,7 +1,5 @@
-AUX gpac-0.4.5-glx-define-prototype.patch 561 RMD160 c51ce9aa4a2d6a8da69c2bdc0b6ac0fbaaa0b958 SHA1 e777afe95ba7e4c5f9f5854b9cf473a159884082 SHA256 319dbf60ee953c5eb173c0e1ce4d8bee314f561fb08b53538375c974ed8154d3
-AUX gpac-0.4.5-libpng14.patch 463 RMD160 08446a21efbe22ee81e7a774e82e3cdd26383880 SHA1 1479e4bd714235a333bfb3e1cebb9f93ff030d01 SHA256 c2920ab31000a5dcdde01ba0e7809bfda63e811af6ae0fa2e7e28c56a73656d6
-DIST gpac-0.4.5-patches-2.tar.bz2 3680 RMD160 dea4191716220e88172e57682a08c546e5c49471 SHA1 01736f9f34b9a5b01e7bf9e3718b7e425c2a9f5d SHA256 2103c61126cb99e1e76899b369ab223730860adbbc65f18aec0a68395e238862
+DIST gpac-0.4.5-patches-3.tar.bz2 4121 RMD160 122bb47f6edaad357bf099722c4467b9f9f384bf SHA1 9dba51afa71fd580080a28731e02a5ff81442a91 SHA256 6bf173724334e9764796f28ce13fa74d154fa2fd7a8ddbd73d8992746a11e222
 DIST gpac-0.4.5.tar.gz 4269054 RMD160 21249249a412efa5d1237907cb6b8cfe6282e86f SHA1 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 SHA256 f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
-EBUILD gpac-0.4.5-r1.ebuild 3834 RMD160 688a540c750706112158f83d1d3e769c8ca94cc4 SHA1 fea93ddc8ef321a21dd500ccfe91077496aa5c75 SHA256 ff8b858a14570e21c5dc0d4c8711c9408c7fc22596461e45d418bbc7838dc42a
-MISC ChangeLog 11328 RMD160 3379c75839b6c640225ed65e198d4e49b57fb29a SHA1 5a36b6d02f8780aaee21e502e8e0e9b878503156 SHA256 db88e8ec2b2934743db77585e800cc03ff6636d0b2f315bfe94c602bb3598004
+EBUILD gpac-0.4.5-r1.ebuild 3812 RMD160 6f21c01f477ce80d15156a8df2389f8fa748695d SHA1 18e431dbf9627141f0c6d8a724b497bd4bd0315e SHA256 40f534f72c0d03f22a93b55f3dd463911ec681759971ec8ccdf22c90793c1a8b
+MISC ChangeLog 11563 RMD160 a53c5f84442fc3077890f64bfd4b7100fbfd4458 SHA1 09f9e5da4183b088fc17d340865e257510655ea0 SHA256 4f971ddf95c7602584c9f62765213df6e1156e7c4ddaad0a5a754002f37779e5
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
diff --git a/media-video/gpac/files/gpac-0.4.5-glx-define-prototype.patch b/media-video/gpac/files/gpac-0.4.5-glx-define-prototype.patch
deleted file mode 100644
index f62781d49b1b..000000000000
--- a/media-video/gpac/files/gpac-0.4.5-glx-define-prototype.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: work/gpac/src/compositor/visual_manager_3d_gl.c
-===================================================================
---- work.orig/gpac/src/compositor/visual_manager_3d_gl.c
-+++ work/gpac/src/compositor/visual_manager_3d_gl.c
-@@ -70,6 +70,7 @@ void gf_sc_load_opengl_extensions(GF_Com
- #elif defined (WIN32)
- #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) wglGetProcAddress(__name) 
- #else
-+extern void (*glXGetProcAddress(const GLubyte *procname))( void );
- #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glXGetProcAddress(__name) 
- #endif
- 
diff --git a/media-video/gpac/files/gpac-0.4.5-libpng14.patch b/media-video/gpac/files/gpac-0.4.5-libpng14.patch
deleted file mode 100644
index 4a6748160d68..000000000000
--- a/media-video/gpac/files/gpac-0.4.5-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://repos.archlinux.org/wsvn/community/gpac/trunk/libpng14-infopp-null.patch
-
---- src/media_tools/img.c
-+++ src/media_tools/img.c
-@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
- 	/* Allocate/initialize the image information data.  REQUIRED */
- 	info_ptr = png_create_info_struct(png_ptr);
- 	if (info_ptr == NULL) {
--		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+		png_destroy_write_struct(&png_ptr,  NULL);
- 		return GF_IO_ERR;
- 	}
- 	
diff --git a/media-video/gpac/gpac-0.4.5-r1.ebuild b/media-video/gpac/gpac-0.4.5-r1.ebuild
index 2baaffb8adaf..c75e127e9909 100644
--- a/media-video/gpac/gpac-0.4.5-r1.ebuild
+++ b/media-video/gpac/gpac-0.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.12 2010/04/23 12:39:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r1.ebuild,v 1.13 2010/04/29 11:22:29 ssuominen Exp $
 
 inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
 
@@ -8,9 +8,10 @@ DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed
 HOMEPAGE="http://gpac.sourceforge.net/"
 NBV="610"
 WBV="600"
-PATCHLEVEL="2"
+PATCHLEVEL="3"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2"
+	http://dev.gentoo.org/~ssuominen/${P}-patches-${PATCHLEVEL}.tar.bz2"
+# mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -62,8 +63,6 @@ src_unpack() {
 	cd "${S}"
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}"/${P}-glx-define-prototype.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
 
 	sed -ie '/ldconfig / d' "${S}/Makefile"