diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /multimedia/gpac-libgpac | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
Notes
Diffstat (limited to 'multimedia/gpac-libgpac')
| -rw-r--r-- | multimedia/gpac-libgpac/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/gpac-libgpac/files/patch-src-media_tools-img.c | 32 |
2 files changed, 32 insertions, 5 deletions
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile index 6a9a21f3995c..52e3c9921645 100644 --- a/multimedia/gpac-libgpac/Makefile +++ b/multimedia/gpac-libgpac/Makefile @@ -7,7 +7,7 @@ PORTNAME= gpac PORTVERSION= 0.4.5 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION} @@ -77,8 +77,9 @@ CONFIGURE_ARGS+= --use-jpeg=no .endif .if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --use-png=local +CFLAGS+= -I${LOCALBASE}/include/libpng15 .else CONFIGURE_ARGS+= --use-png=no .endif diff --git a/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c b/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c index 43a34f264345..1d8a614bb5e4 100644 --- a/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c +++ b/multimedia/gpac-libgpac/files/patch-src-media_tools-img.c @@ -1,6 +1,32 @@ ---- src/media_tools/img.c.orig 2010-03-31 10:03:24.806360005 +0000 -+++ src/media_tools/img.c 2010-03-31 10:05:39.430477556 +0000 -@@ -551,7 +551,7 @@ +--- src/media_tools/img.c.orig 2008-12-01 18:39:36.000000000 +0100 ++++ src/media_tools/img.c 2012-04-24 23:00:42.000000000 +0200 +@@ -33,6 +33,7 @@ + + /*include png.h before setjmp.h, otherwise we get compilation errors*/ + #include <png.h> ++#include <pngpriv.h> + + #endif /*GPAC_HAS_PNG*/ + +@@ -399,7 +400,7 @@ + } + static void user_error_fn(png_structp png_ptr,png_const_charp error_msg) + { +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + GF_EXPORT +@@ -424,7 +425,7 @@ + png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + return GF_IO_ERR; + } +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr); + png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + return GF_IO_ERR; +@@ -551,7 +552,7 @@ /* Allocate/initialize the image information data. REQUIRED */ info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { |