From owner-freebsd-multimedia@FreeBSD.ORG Sun Sep 23 07:05:14 2012 Return-Path: Delivered-To: multimedia@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2E69D106566C; Sun, 23 Sep 2012 07:05:14 +0000 (UTC) (envelope-from horance@djh5e.doesntexist.org) Received: from djh5e.doesntexist.org (host-69.74-185-111.static.totalbb.net.tw [111.185.74.69]) by mx1.freebsd.org (Postfix) with ESMTP id B8EBB8FC17; Sun, 23 Sep 2012 07:05:13 +0000 (UTC) Received: from djh5e.doesntexist.org (smmsp@localhost [127.0.0.1]) by djh5e.doesntexist.org (8.14.5/8.14.5) with ESMTP id q8N6tJmH036233; Sun, 23 Sep 2012 14:55:19 +0800 (CST) (envelope-from horance@djh5e.doesntexist.org) Received: (from root@localhost) by djh5e.doesntexist.org (8.14.5/8.14.5/Submit) id q8N6tJBR036232; Sun, 23 Sep 2012 14:55:19 +0800 (CST) (envelope-from horance) Date: Sun, 23 Sep 2012 14:55:19 +0800 (CST) Message-Id: <201209230655.q8N6tJBR036232@djh5e.doesntexist.org> To: FreeBSD-gnats-submit@freebsd.org From: Horance Chou X-send-pr-version: 3.113 X-GNATS-Notify: Cc: multimedia@freebsd.org Subject: [PATCH] multimedia/gpac-libgpac: update to 0.5.0,1 X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2012 07:05:14 -0000 >Submitter-Id: current-users >Originator: Horance Chou >Organization: FreeBSD User @ Taiwan >Confidential: no >Synopsis: [PATCH] multimedia/gpac-libgpac: update to 0.5.0,1 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 9.1-PRERELEASE i386 >Environment: System: FreeBSD gaia.freera.net 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #9: Thu Jul 26 16:35:35 CST 2012 >Description: - Update to 0.5.0,1 Added file(s): - files/patch-src-Makefile Port maintainer (multimedia@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix) >How-To-Repeat: >Fix: --- gpac-libgpac-0.5.0,1.patch begins here --- diff -ruN --exclude=CVS ../gpac-libgpac.orig/Makefile ./Makefile --- ../gpac-libgpac.orig/Makefile 2012-06-01 13:22:30.000000000 +0800 +++ ./Makefile 2012-09-23 13:12:34.000000000 +0800 @@ -6,8 +6,7 @@ # PORTNAME= gpac -PORTVERSION= 0.4.5 -PORTREVISION= 6 +PORTVERSION= 0.5.0 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION} @@ -25,12 +24,13 @@ BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/bin/gcc -LIBVER= 1 +LIBVER_MAJOR= 2 +LIBVER= ${LIBVER_MAJOR}.0.0 OPTIONS_DEFINE= IPV6 JPEG OPENGL SSL PNG XVIDEO OPTIONS_DEFAULT= IPV6 JPEG SSL PNG -CFLAGS+= -I${LOCALBASE}/include +CFLAGS= LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --cc="${CC}" --X11-path="${LOCALBASE}" \ @@ -92,6 +92,7 @@ cd ${WRKSRC}/include/gpac && ${FIND} . | \ ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/gpac ${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac.so.${LIBVER} ${PREFIX}/lib + ${LN} -sf libgpac.so.${LIBVER} ${PREFIX}/lib/libgpac.so.${LIBVER_MAJOR} ${LN} -sf libgpac.so.${LIBVER} ${PREFIX}/lib/libgpac.so ${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac_static.a ${PREFIX}/lib diff -ruN --exclude=CVS ../gpac-libgpac.orig/distinfo ./distinfo --- ../gpac-libgpac.orig/distinfo 2011-07-03 21:38:24.000000000 +0800 +++ ./distinfo 2012-09-23 13:10:42.000000000 +0800 @@ -1,2 +1,2 @@ -SHA256 (gpac-0.4.5.tar.gz) = f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671 -SIZE (gpac-0.4.5.tar.gz) = 4269054 +SHA256 (gpac-0.5.0.tar.gz) = 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 +SIZE (gpac-0.5.0.tar.gz) = 7861057 diff -ruN --exclude=CVS ../gpac-libgpac.orig/files/patch-configure ./files/patch-configure --- ../gpac-libgpac.orig/files/patch-configure 2012-05-19 23:16:51.000000000 +0800 +++ ./files/patch-configure 2012-09-13 23:33:51.000000000 +0800 @@ -1,75 +1,43 @@ ---- 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" - cpu=`uname -m` -+targetos=`uname -s` - 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 - cpu="x86_64" -- libdir="lib64" -+ if [ x"$targetos" != x"FreeBSD" ]; then -+ libdir="lib64" -+ fi - #that's a bit crude... - PIC_CFLAGS="-fPIC -DPIC" - want_pic="yes" -@@ -280,7 +283,6 @@ - source_path="`cd \"$source_path\"; pwd`" - fi - # OS specific --targetos=`uname -s` - case $targetos in - BeOS) - js_flags=-DXP_BEOS -@@ -317,8 +319,8 @@ - FreeBSD) - make="gmake" - LDFLAGS="$LDFLAGS -export-dynamic" --CFLAGS="$CFLAGS -pthread" --GPAC_SH_FLAGS=-pthread -+DYN_LIB_SUFFIX="so.$LIBVER" -+GPAC_SH_FLAGS="$PTHREAD_LIBS" - freebsd="yes" - js_flags="-DXP_UNIX -I/usr/include/js" - ;; -@@ -1111,6 +1113,8 @@ - LINK3D="-lopengl32 -lglu32" - elif test "$darwin" = "yes" ; then - LINK3D="-lgl -lglu" -+ elif test "$freebsd" = "yes" ; then -+ LINK3D="-lGL -lGLU" - else - LINK3D="-lGL -lglut" - fi -@@ -1673,7 +1677,7 @@ - echo "USE_X11_XV=$has_x11_xv" >> config.mak +--- configure.orig 2012-09-13 23:29:03.000000000 +0800 ++++ configure 2012-09-13 23:33:38.000000000 +0800 +@@ -496,8 +496,7 @@ + FreeBSD) + make="gmake" + LDFLAGS="$LDFLAGS -export-dynamic" +- CFLAGS="$CFLAGS -pthread" +- GPAC_SH_FLAGS=-pthread ++ GPAC_SH_FLAGS="$PTHREAD_LIBS" + freebsd="yes" + js_flags="-DXP_UNIX -I/usr/include/js" + ;; +@@ -1900,6 +1899,8 @@ + elif test "$darwin" = "yes" ; then + LINK3D="-framework OpenGL -framework GLUT" + DarwinGL="yes" ++ elif test "$freebsd" = "yes" ; then ++ LINK3D="-lGL -lGLU" + else + LINK3D="-lGL -lGLU -lX11" + fi +@@ -2123,9 +2124,9 @@ + echo "#define GPAC_CONFIGURATION \"$GPAC_CONFIGURATION\"" >> $TMPH + + version="`grep '#define GPAC_VERSION ' \"$source_path/include/gpac/tools.h\" | cut -d '"' -f 2`" +-version_major=`grep '#define GPAC_VERSION_MAJOR ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)\+$/\1/'` +-version_minor=`grep '#define GPAC_VERSION_MINOR ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)\+$/\1/'` +-version_micro=`grep '#define GPAC_VERSION_MICRO ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)\+$/\1/'` ++version_major=`grep '#define GPAC_VERSION_MAJOR ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)$/\1/'` ++version_minor=`grep '#define GPAC_VERSION_MINOR ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)$/\1/'` ++version_micro=`grep '#define GPAC_VERSION_MICRO ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)$/\1/'` + soname_version="${version_major}.${version_minor}.${version_micro}" + + if [ -d ".svn" ]; then +@@ -2766,7 +2767,7 @@ + echo "USE_X11_XV=$has_x11_xv" >> config.mak fi -if test "$is_64" = "yes"; then +if test "$is_64" = "yes" -a "$freebsd" = "no" ; then - echo "X11_LIB_PATH=$X11_PATH/lib64" >> config.mak + echo "X11_LIB_PATH=$X11_PATH/lib64" >> config.mak else - echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak -@@ -1805,6 +1809,6 @@ - fi - - echo '%.opic : %.c' >> config.mak --echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak -+echo " \$(CC) \$(CFLAGS) \$(PIC_CFLAGS) $INCL3D -c \$< -o \$@" >> config.mak - - echo "Done - type 'make help' for make info, 'make' to build" + echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak diff -ruN --exclude=CVS ../gpac-libgpac.orig/files/patch-src-Makefile ./files/patch-src-Makefile --- ../gpac-libgpac.orig/files/patch-src-Makefile 1970-01-01 08:00:00.000000000 +0800 +++ ./files/patch-src-Makefile 2012-09-13 23:14:44.000000000 +0800 @@ -0,0 +1,11 @@ +--- src/Makefile.orig 2012-09-13 23:13:43.000000000 +0800 ++++ src/Makefile 2012-09-13 23:14:10.000000000 +0800 +@@ -2,7 +2,7 @@ + + vpath %.c $(SRC_PATH)/src + +-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" ++CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -I$(PREFIX)/include + + ifeq ($(DEBUGBUILD), yes) + CFLAGS+=-g diff -ruN --exclude=CVS ../gpac-libgpac.orig/files/patch-src-media_tools-img.c ./files/patch-src-media_tools-img.c --- ../gpac-libgpac.orig/files/patch-src-media_tools-img.c 2012-06-01 13:22:30.000000000 +0800 +++ ./files/patch-src-media_tools-img.c 2012-09-12 15:39:34.000000000 +0800 @@ -8,30 +8,3 @@ #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) { -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - return GF_IO_ERR; - } - diff -ruN --exclude=CVS ../gpac-libgpac.orig/pkg-plist ./pkg-plist --- ../gpac-libgpac.orig/pkg-plist 2009-02-14 09:55:45.000000000 +0800 +++ ./pkg-plist 2012-09-14 00:17:05.000000000 +0800 @@ -1,32 +1,43 @@ +include/gpac/ait.h include/gpac/avparse.h include/gpac/base_coding.h include/gpac/bifs.h -include/gpac/bifsengine.h include/gpac/bitstream.h +include/gpac/cache.h include/gpac/color.h include/gpac/compositor.h include/gpac/config_file.h +include/gpac/configuration.h include/gpac/constants.h include/gpac/crypt.h include/gpac/download.h +include/gpac/dsmcc.h +include/gpac/dvb_mpe.h include/gpac/esi.h include/gpac/events.h +include/gpac/events_constants.h +include/gpac/filestreamer.h include/gpac/ietf.h include/gpac/internal/avilib.h include/gpac/internal/bifs_dev.h include/gpac/internal/bifs_tables.h include/gpac/internal/camera.h include/gpac/internal/compositor_dev.h -include/gpac/internal/config_static.h include/gpac/internal/crypt_dev.h +include/gpac/internal/dvb_mpe_dev.h include/gpac/internal/ietf_dev.h include/gpac/internal/isomedia_dev.h include/gpac/internal/laser_dev.h +include/gpac/internal/m3u8.h include/gpac/internal/media_dev.h include/gpac/internal/mesh.h +include/gpac/internal/mpd.h include/gpac/internal/odf_dev.h +include/gpac/internal/odf_parse_common.h include/gpac/internal/ogg.h +include/gpac/internal/reedsolomon.h include/gpac/internal/scenegraph_dev.h +include/gpac/internal/smjs_api.h include/gpac/internal/swf_dev.h include/gpac/internal/terminal_dev.h include/gpac/internal/vobsub.h @@ -42,6 +53,7 @@ include/gpac/modules/audio_out.h include/gpac/modules/codec.h include/gpac/modules/font.h +include/gpac/modules/hardcoded_proto.h include/gpac/modules/ipmp.h include/gpac/modules/js_usr.h include/gpac/modules/raster2d.h @@ -57,6 +69,9 @@ include/gpac/nodes_xbl.h include/gpac/options.h include/gpac/path2d.h +include/gpac/ringbuffer.h +include/gpac/rtp_streamer.h +include/gpac/scene_engine.h include/gpac/scene_manager.h include/gpac/scenegraph.h include/gpac/scenegraph_svg.h @@ -69,11 +84,14 @@ include/gpac/thread.h include/gpac/token.h include/gpac/tools.h +include/gpac/unicode.h include/gpac/user.h include/gpac/utf.h +include/gpac/version.h include/gpac/xml.h lib/libgpac.so -lib/libgpac.so.1 +lib/libgpac.so.2 +lib/libgpac.so.2.0.0 lib/libgpac_static.a @dirrm include/gpac/modules @dirrm include/gpac/internal --- gpac-libgpac-0.5.0,1.patch ends here ---