Index: multimedia/gpac-libgpac/Makefile =================================================================== diff -u -N -r4356405423b53e7f936c3754a88858f7c69d2e65 -reb7987fb607acad5a0aaa0ee98490c7e993f19af --- multimedia/gpac-libgpac/Makefile (.../Makefile) (revision 4356405423b53e7f936c3754a88858f7c69d2e65) +++ multimedia/gpac-libgpac/Makefile (.../Makefile) (revision eb7987fb607acad5a0aaa0ee98490c7e993f19af) @@ -1,9 +1,9 @@ -# $MidnightBSD: mports/multimedia/gpac-libgpac/Makefile,v 1.7 2010/12/05 21:01:07 laffer1 Exp $ +# $MidnightBSD: mports/multimedia/gpac-libgpac/Makefile,v 1.8 2012/09/09 04:09:51 laffer1 Exp $ # $FreeBSD: ports/multimedia/gpac-libgpac/Makefile,v 1.13 2006/08/14 23:36:33 ahze Exp $ PORTNAME= gpac PORTVERSION= 0.4.5 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION} @@ -15,7 +15,6 @@ WRKSRC= ${WRKDIR}/gpac ALL_TARGET= lib -USE_GCPIO= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes @@ -25,53 +24,59 @@ INSTALL_WRKSRC= ${WRKSRC}/bin/gcc LIBVER= 1 -OPTIONS= IPV6 "IPv6 support" on \ - JPEG "JPEG support" on \ - OPENGL "OpenGL support" on \ - OPENSSL "OpenSSL support" on \ - PNG "PNG support" on +OPTIONS_DEFINE= IPV6 JPEG OPENGL SSL PNG XVIDEO +OPTIONS_DEFAULT= IPV6 JPEG SSL PNG CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --cc="${CC}" --X11-path="${LOCALBASE}" \ --extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \ --enable-pic \ + --disable-wx \ --use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \ --use-ft=no --use-mad=no --use-ogg=no \ --use-openjpeg=no --use-theora=no --usr-vorbis=no CONFIGURE_ENV+= LIBVER="${LIBVER}" PTHREAD_LIBS="${PTHREAD_LIBS}" -.include +.include -.if defined(WITHOUT_IPV6) -CONFIGURE_ARGS+= --disable-ipv6 +.if ${PORT_OPTIONS:MSSL} +USE_OPENSSL= yes +.else +CONFIGURE_ARGS+= --disable-ssl .endif -.if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -CONFIGURE_ARGS+= --use-jpeg=local +.if ${PORT_OPTIONS:MOPENGL} +USE_GL= gl glu .else -CONFIGURE_ARGS+= --use-jpeg=no +CONFIGURE_ARGS+= --disable-opengl .endif -.if defined(WITHOUT_OPENGL) -CONFIGURE_ARGS+= --disable-opengl +.if ${PORT_OPTIONS:MXVIDEO} +LIB_DEPENDS+= Xv.1:${PORTSDIR}/x11/libXv .else -USE_GL= gl glu glut +CONFIGURE_ARGS+= --disable-x11-xv --disable-x11-shm .endif -.if !defined(WITHOUT_OPENSSL) -USE_OPENSSL= yes +.include + +.if empty(PORT_OPTIONS:MIPV6) +CONFIGURE_ARGS+= --disable-ipv6 +.endif + +.if ${PORT_OPTIONS:MJPEG} +LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg +CONFIGURE_ARGS+= --use-jpeg=local .else -CONFIGURE_ARGS+= --disable-ssl +CONFIGURE_ARGS+= --use-jpeg=no .endif -.if !defined(WITHOUT_PNG) +.if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --use-png=local -CFLAGS+= -I${LOCALBASE}/include/libpng15 +CFLAGS+= -I${LOCALBASE}/include/libpng15 .else CONFIGURE_ARGS+= --use-png=no .endif Index: multimedia/gpac-libgpac/distinfo =================================================================== diff -u -N -r4356405423b53e7f936c3754a88858f7c69d2e65 -reb7987fb607acad5a0aaa0ee98490c7e993f19af --- multimedia/gpac-libgpac/distinfo (.../distinfo) (revision 4356405423b53e7f936c3754a88858f7c69d2e65) +++ multimedia/gpac-libgpac/distinfo (.../distinfo) (revision eb7987fb607acad5a0aaa0ee98490c7e993f19af) @@ -1,3 +1,2 @@ SHA256 (gpac-0.4.5.tar.gz) = f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671 -RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f SIZE (gpac-0.4.5.tar.gz) = 4269054 Index: multimedia/gpac-libgpac/files/patch-configure =================================================================== diff -u -N -r2d63a0044deedcf33a04be5b90589d50ea23bc63 -reb7987fb607acad5a0aaa0ee98490c7e993f19af --- multimedia/gpac-libgpac/files/patch-configure (.../patch-configure) (revision 2d63a0044deedcf33a04be5b90589d50ea23bc63) +++ multimedia/gpac-libgpac/files/patch-configure (.../patch-configure) (revision eb7987fb607acad5a0aaa0ee98490c7e993f19af) @@ -1,5 +1,5 @@ ---- configure.orig 2008-12-02 13:04:42.000000000 -0500 -+++ configure 2009-02-19 15:16:18.000000000 -0500 +--- configure.orig 2008-12-02 19:04:42.000000000 +0100 ++++ configure 2012-05-19 17:09:20.000000000 +0200 @@ -33,6 +33,7 @@ make="make" strip="strip" @@ -8,6 +8,15 @@ debuginfo="no" sdl_path="" sdl_local="no" +@@ -102,7 +103,7 @@ + bigendian="no" + SHFLAGS=-shared + need_inet_aton="no" +-LDFLAGS="$LDFLAGS -Wl --warn-common" ++LDFLAGS="$LDFLAGS -Wl,--warn-common" + CFLAGS="" + CPPFLAGS="" + GPAC_SH_FLAGS=-lpthread @@ -222,7 +223,9 @@ if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then Index: multimedia/gpac-libgpac/files/patch-src-media_tools-img.c =================================================================== diff -u -N -re3f3bc21d3be7ee8bea4882a576e5837a8634dfb -reb7987fb607acad5a0aaa0ee98490c7e993f19af --- multimedia/gpac-libgpac/files/patch-src-media_tools-img.c (.../patch-src-media_tools-img.c) (revision e3f3bc21d3be7ee8bea4882a576e5837a8634dfb) +++ multimedia/gpac-libgpac/files/patch-src-media_tools-img.c (.../patch-src-media_tools-img.c) (revision eb7987fb607acad5a0aaa0ee98490c7e993f19af) @@ -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 ++#include + + #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) { Index: multimedia/gpac-libgpac/files/patch-src_Makefile =================================================================== diff -u -N --- multimedia/gpac-libgpac/files/patch-src_Makefile (revision 1bd8611b81884ea8a914d20ea627a8ae22e52a44) +++ multimedia/gpac-libgpac/files/patch-src_Makefile (revision 0) @@ -1,19 +0,0 @@ ---- src/Makefile.orig Tue Jul 11 11:53:44 2006 -+++ src/Makefile Wed Aug 9 09:57:59 2006 -@@ -35,6 +35,7 @@ - ifeq ($(DISABLE_SVG), no) - LIBGPAC_SCENE+=scenegraph/svg_attributes.o scenegraph/svg_nodes.o scenegraph/svg_tools.o scenegraph/svg_types.o scenegraph/svg_smjs.o scenegraph/smil_anim.o scenegraph/smil_timing.o scenegraph/svg_properties.o - endif -+EXTRALIBS+=-Wl,-soname,$(LIB) - - - ## libgpac objects gathering: src/mcrypt -@@ -137,7 +138,7 @@ - - - ##libgpac library output --LIB=libgpac.$(DYN_LIB_SUFFIX) -+LIB=libgpac.$(DYN_LIB_SUFFIX).1 - ifeq ($(CONFIG_WIN32),yes) - #LDFLAGS+=-export-symbols libgpac.def - else