diff options
| -rw-r--r-- | media-video/gpac/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.4.5-glx-define-prototype.patch | 12 | ||||
| -rw-r--r-- | media-video/gpac/files/gpac-0.4.5-libpng14.patch | 13 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.4.5-r1.ebuild | 9 |
4 files changed, 10 insertions, 31 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/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" |