Attachment 135864 Details for Bug 180906 – file.diff

[patch] file.diff

file.diff (text/plain), 12.45 KB, created by Vladimir Kondratiev on 2013-07-28 13:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Kondratiev

Created: 2013-07-28 13:10:00 UTC

Size: 12.45 KB

patch

obsolete

>Index: multimedia/gpac-libgpac/Makefile
>===================================================================
>--- multimedia/gpac-libgpac/Makefile	(revision 323815)
>+++ multimedia/gpac-libgpac/Makefile	(working copy)
>@@ -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}
>@@ -23,9 +22,7 @@
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-BUILD_WRKSRC=	${WRKSRC}/src
>-INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
>-LIBVER=	1
>+BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
> 
> OPTIONS_DEFINE=	IPV6 JPEG OPENGL SSL PNG XVIDEO
> OPTIONS_DEFAULT=	IPV6 JPEG SSL PNG
>@@ -38,11 +35,9 @@
> 		--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
>+		--use-ft=no --use-mad=no --use-ogg=no --use-xvid=no \
>+		--use-openjpeg=no --use-theora=no --use-vorbis=no
> 
>-CONFIGURE_ENV+=	LIBVER="${LIBVER}" PTHREAD_LIBS="${PTHREAD_LIBS}"
>-
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MSSL}
>@@ -54,7 +49,7 @@
> .if ${PORT_OPTIONS:MOPENGL}
> USE_GL=		gl glu
> .else
>-CONFIGURE_ARGS+=	--disable-opengl
>+CONFIGURE_ARGS+=	--disable-3d
> .endif
> 
> .if ${PORT_OPTIONS:MXVIDEO}
>@@ -86,13 +81,9 @@
> 
> post-patch:
> 	${CHMOD} +x ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's| sed | gsed |g' ${WRKSRC}/configure
> 
> do-install:
>-	${MKDIR} ${PREFIX}/include/gpac
>-	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
>-	${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac_static.a ${PREFIX}/lib
>+	gmake -C ${WRKSRC} install-lib
> 
> .include <bsd.port.post.mk>
>Index: multimedia/gpac-libgpac/distinfo
>===================================================================
>--- multimedia/gpac-libgpac/distinfo	(revision 323815)
>+++ multimedia/gpac-libgpac/distinfo	(working copy)
>@@ -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
>Index: multimedia/gpac-libgpac/files/patch-configure
>===================================================================
>--- multimedia/gpac-libgpac/files/patch-configure	(revision 323815)
>+++ multimedia/gpac-libgpac/files/patch-configure	(working copy)
>@@ -1,75 +0,0 @@
>---- 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
>- 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
>- 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"
>Index: multimedia/gpac-libgpac/files/patch-src-isomedia-avc_ext.c
>===================================================================
>--- multimedia/gpac-libgpac/files/patch-src-isomedia-avc_ext.c	(revision 0)
>+++ multimedia/gpac-libgpac/files/patch-src-isomedia-avc_ext.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/isomedia/avc_ext.c.orig	2012-03-27 13:48:05.000000000 +0400
>++++ src/isomedia/avc_ext.c	2013-03-12 01:00:39.595690860 +0400
>+@@ -170,6 +170,7 @@
>+ 
>+ 
>+ #ifndef GPAC_DISABLE_ISOM_WRITE
>++GF_EXPORT
>+ GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
>+ {
>+ 	GF_TrackBox *trak;
>Index: multimedia/gpac-libgpac/files/patch-src-isomedia-isom_write.c
>===================================================================
>--- multimedia/gpac-libgpac/files/patch-src-isomedia-isom_write.c	(revision 0)
>+++ multimedia/gpac-libgpac/files/patch-src-isomedia-isom_write.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- src/isomedia/isom_write.c.orig	2012-03-29 16:36:23.000000000 +0400
>++++ src/isomedia/isom_write.c	2013-03-12 01:00:39.605699394 +0400
>+@@ -1140,6 +1140,7 @@
>+ 	return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL);
>+ }
>+ 
>++GF_EXPORT
>+ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height)
>+ {
>+ 	GF_Err e;
>+@@ -1187,6 +1188,7 @@
>+ 	}
>+ }
>+ 
>++GF_EXPORT
>+ GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
>+ {
>+ 	GF_Err e;
>Index: multimedia/gpac-libgpac/files/patch-src-media_tools-img.c
>===================================================================
>--- multimedia/gpac-libgpac/files/patch-src-media_tools-img.c	(revision 323815)
>+++ multimedia/gpac-libgpac/files/patch-src-media_tools-img.c	(working copy)
>@@ -1,37 +0,0 @@
>---- 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) {
>--		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
>-+		png_destroy_write_struct(&png_ptr,  (png_infopp)NULL);
>- 		return GF_IO_ERR;
>- 	}
>- 	
>Index: multimedia/gpac-libgpac/pkg-plist
>===================================================================
>--- multimedia/gpac-libgpac/pkg-plist	(revision 323815)
>+++ multimedia/gpac-libgpac/pkg-plist	(working copy)
>@@ -1,16 +1,22 @@
>+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
>@@ -17,16 +23,21 @@
> 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
>Index: multimedia/gpac-mp4box/Makefile
>===================================================================
>--- multimedia/gpac-mp4box/Makefile	(revision 323815)
>+++ multimedia/gpac-mp4box/Makefile	(working copy)
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	mp4box
>-DISTVERSION=	0.4.5
>-PORTREVISION=	1
>+DISTVERSION=	0.5.0
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/gpac/GPAC/GPAC%20${PORTVERSION}
> PKGNAMEPREFIX=	gpac-
>@@ -16,7 +15,7 @@
> MAINTAINER=	pvizeli@yahoo.de
> COMMENT=	A tool for merge mpg4 from Gpac
> 
>-LIB_DEPENDS=	gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
>+LIB_DEPENDS=	gpac.2:${PORTSDIR}/multimedia/gpac-libgpac
> 
> WRKSRC=		${WRKDIR}/gpac/applications/mp4box
> PLIST_FILES=	bin/mp4box
>Index: multimedia/gpac-mp4box/distinfo
>===================================================================
>--- multimedia/gpac-mp4box/distinfo	(revision 323815)
>+++ multimedia/gpac-mp4box/distinfo	(working copy)
>@@ -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
>Index: multimedia/gpac-mp4box/files/patch-Makefile
>===================================================================
>--- multimedia/gpac-mp4box/files/patch-Makefile	(revision 323815)
>+++ multimedia/gpac-mp4box/files/patch-Makefile	(working copy)
>@@ -5,9 +5,9 @@
> +CC?=		gcc
> +CFLAGS?=	-Wall -O3 -pipe
> +CFLAGS+=	-I/usr/local/include -L/usr/local/lib
>-+LDFLAGS=	-lpthread -lgpac
>++LDFLAGS=	-pthread -lgpac
> +NAME=	mp4box
>-+OBJ=	filedump.o fileimport.o main.o
>++OBJ=	filedump.o fileimport.o live.o main.o
> +prog:	$(OBJ)
> +				$(CC) $(CFLAGS) -o $(NAME) $(OBJ) $(LDFLAGS)
> +all:	prog
>Index: multimedia/x264/Makefile
>===================================================================
>--- multimedia/x264/Makefile	(revision 323815)
>+++ multimedia/x264/Makefile	(working copy)
>@@ -6,6 +6,7 @@
> 
> PORTNAME=	x264
> PORTVERSION=	0.${X264_BUILD}.${X264_REV}
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
> 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
>@@ -97,8 +98,8 @@
> .endif
> 
> .if ${PORT_OPTIONS:MGPAC}
>-BUILD_DEPENDS+=		gpac-libgpac>=0.4.5,1:${PORTSDIR}/multimedia/gpac-libgpac
>-LIB_DEPENDS+=		gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
>+BUILD_DEPENDS+=		gpac-libgpac>=0.5.0,1:${PORTSDIR}/multimedia/gpac-libgpac
>+LIB_DEPENDS+=		gpac.2:${PORTSDIR}/multimedia/gpac-libgpac
> .else
> CONFIGURE_ARGS+=	--disable-gpac
> .endif

Actions: View | Diff

Attachments on bug 180906: 135864 | 135865 | 135866