Attachment 135865 Details for Bug 180906 – gpac.patch

[patch] gpac.patch

gpac.patch (text/x-patch), 20.02 KB, created by Vladimir Kondratyev on 2013-10-31 19:27:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Kondratyev

Created: 2013-10-31 19:27:06 UTC

Size: 20.02 KB

patch

obsolete

>Index: gpac-libgpac/Makefile
>===================================================================
>--- gpac-libgpac/Makefile	(revision 332270)
>+++ gpac-libgpac/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gpac
>-PORTVERSION=	0.4.5
>-PORTREVISION=	7
>+PORTVERSION=	0.5.0
> PORTEPOCH=	1
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
>@@ -12,16 +11,16 @@
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	Gpac MPEG-4 Systems library and headers
> 
>+LICENSE=	LGPL21
>+
> WRKSRC=		${WRKDIR}/gpac
> ALL_TARGET=	lib
>+INSTALL_TARGET=	install-lib
> USES=		gmake
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>+USE_DOS2UNIX=	src/utils/os_config_init.c
> 
>-BUILD_WRKSRC=	${WRKSRC}/src
>-INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
>-LIBVER=	1
>-
> OPTIONS_DEFINE=	IPV6 JPEG OPENGL SSL PNG XVIDEO
> OPTIONS_DEFAULT=	IPV6 JPEG SSL PNG
> 
>@@ -33,15 +32,13 @@
> 		--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}"
>-
> SSL_USE=	OPENSSL=yes
> SSL_CONFIGURE_ENABLE=	ssl
> OPENGL_USE=	GL=gl GL=glu
>-OPENGL_CONFIGURE_ENABLE=	opengl
>+OPENGL_CONFIGURE_ENABLE=3d
> XVIDEO_LIB_DEPENDS=	libXv.so:${PORTSDIR}/x11/libXv
> XVIDEO_CONFIGURE_OFF=	--disable-x11-xv --disable-x11-shm
> IPV6_CONFIGURE_ENABLE=	ipv6
>@@ -54,14 +51,10 @@
> PNG_CFLAGS=		-I${LOCALBASE}/include/libpng15
> 
> post-patch:
>-	${CHMOD} +x ${WRKSRC}/configure
>+	${REINPLACE_CMD} -e 's|s/\.\*\$\[0-9\]\$\\+\$$/\\1/|s/^[^0-9]*//| ;\
>+		/CFLAGS=/s/-O3//' ${WRKSRC}/configure
> 
>-do-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/include/gpac
>-	cd ${WRKSRC}/include/gpac && ${FIND} . | \
>-		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${PREFIX}/include/gpac
>-	${INSTALL_LIB} ${INSTALL_WRKSRC}/libgpac.so.${LIBVER} ${STAGEDIR}${PREFIX}/lib
>-	${LN} -sf libgpac.so.${LIBVER} ${STAGEDIR}${PREFIX}/lib/libgpac.so
>-	${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac_static.a ${STAGEDIR}${PREFIX}/lib
>+post-install:
>+	${INSTALL_DATA} ${WRKSRC}/gpac.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
> 
> .include <bsd.port.mk>
>Index: gpac-libgpac/distinfo
>===================================================================
>--- gpac-libgpac/distinfo	(revision 332270)
>+++ 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: gpac-libgpac/files/patch-configure
>===================================================================
>--- gpac-libgpac/files/patch-configure	(revision 332270)
>+++ 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: gpac-libgpac/files/patch-export-x264-symbols
>===================================================================
>--- gpac-libgpac/files/patch-export-x264-symbols	(revision 0)
>+++ gpac-libgpac/files/patch-export-x264-symbols	(working copy)
>@@ -0,0 +1,28 @@
>+--- 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;
>+--- 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;
>
>Property changes on: gpac-libgpac/files/patch-export-x264-symbols
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: gpac-libgpac/files/patch-src-media_tools-img.c
>===================================================================
>--- gpac-libgpac/files/patch-src-media_tools-img.c	(revision 332270)
>+++ 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: gpac-libgpac/files/patch-src-utils-os_config_init.c
>===================================================================
>--- gpac-libgpac/files/patch-src-utils-os_config_init.c	(revision 0)
>+++ gpac-libgpac/files/patch-src-utils-os_config_init.c	(working copy)
>@@ -0,0 +1,39 @@
>+--- src/utils/os_config_init.c.orig	2012-03-27 13:48:05.000000000 +0400
>++++ src/utils/os_config_init.c	2013-10-12 14:29:52.214068862 +0400
>+@@ -51,6 +51,9 @@
>+ #else
>+ #ifdef GPAC_CONFIG_LINUX
>+ #include <unistd.h>
>++#elif defined GPAC_CONFIG_FREEBSD
>++#include <sys/types.h>
>++#include <sys/sysctl.h>
>+ #endif
>+ #define CFG_FILE_NAME	".gpacrc"
>+ #define TEST_MODULE		"gm_dummy_in.so"
>+@@ -225,7 +228,11 @@
>+ {
>+ 	char app_path[GF_MAX_PATH];
>+ 	char *sep;
>++#ifdef GPAC_CONFIG_FREEBSD
>++	size_t size = GF_MAX_PATH;
>++#else
>+ 	u32 size = GF_MAX_PATH;
>++#endif
>+ 
>+ 	/*on OSX, Linux & co, user home is where we store the cfg file*/
>+ 	if (path_type==GF_PATH_CFG) {
>+@@ -252,6 +259,14 @@
>+ 			if (sep) sep[0] = 0;
>+ 			return 1;
>+ 		}
>++#elif defined(GPAC_CONFIG_FREEBSD)
>++		int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
>++		sysctl(mib, 4, file_path, &size, NULL, 0);
>++		if (size>0) {
>++			char *sep = strrchr(file_path, '/');
>++			if (sep) sep[0] = 0;
>++			return 1;
>++		}
>+ #endif
>+ 		return 0;
>+ 	}
>
>Property changes on: gpac-libgpac/files/patch-src-utils-os_config_init.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: gpac-libgpac/files/patch-src-utils-os_divers.c
>===================================================================
>--- gpac-libgpac/files/patch-src-utils-os_divers.c	(revision 0)
>+++ gpac-libgpac/files/patch-src-utils-os_divers.c	(working copy)
>@@ -0,0 +1,126 @@
>+--- src/utils/os_divers.c.orig	2012-04-04 18:47:33.000000000 +0400
>++++ src/utils/os_divers.c	2013-10-12 14:25:42.047109095 +0400
>+@@ -1533,6 +1533,123 @@
>+ 	return 1;
>+ }
>+ 
>++#elif defined GPAC_CONFIG_FREEBSD
>++
>++#include <sys/types.h>
>++#include <sys/sysctl.h>
>++#include <sys/time.h>
>++#include <sys/user.h>
>++
>++#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
>++int getsysctl(const char *name, void *ptr, size_t len) {
>++	size_t nlen = len;
>++	if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) {
>++		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] sysctl(%s...) failed: %s\n", name, strerror(errno)));
>++		return -1;
>++	}
>++	if (nlen != len) {
>++		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] sysctl(%s...) expected %lu, got %lu\n",
>++			name, (unsigned long)len, (unsigned long)nlen));
>++		return -1;
>++	}
>++	return 0;
>++}
>++
>++static int stathz = 128;
>++
>++Bool gf_sys_get_rti_os(u32 refresh_time_ms, GF_SystemRTInfo *rti, u32 flags)
>++{
>++	size_t length;
>++	u32 entry_time;
>++	struct kinfo_proc kinfo;
>++	unsigned long result;
>++	u32 u_k_time = 0, idle_time = 0;
>++	u64 process_u_k_time = 0;
>++	long cp_time[CPUSTATES];
>++	struct clockinfo clockinfo;
>++
>++	entry_time = gf_sys_clock();
>++	if (last_update_time && (entry_time - last_update_time < refresh_time_ms)) {
>++		memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
>++		return 0;
>++	}
>++
>++	int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, the_rti.pid };
>++	length = sizeof(kinfo);
>++
>++	if (sysctl(mib, 4, &kinfo, &length, NULL, 0) == 0) {
>++		process_u_k_time = (u64)(kinfo.ki_rusage.ru_utime.tv_usec + kinfo.ki_rusage.ru_stime.tv_usec) +
>++			(u64)(kinfo.ki_rusage.ru_utime.tv_sec + kinfo.ki_rusage.ru_stime.tv_sec) * (u64)1000000;
>++	}
>++
>++	if (GETSYSCTL("kern.cp_time", cp_time) == 0) {
>++		u_k_time = cp_time[CP_USER] + cp_time[CP_NICE] + cp_time[CP_SYS] + cp_time[CP_INTR];
>++		idle_time = cp_time[CP_IDLE];
>++	}
>++
>++	the_rti.physical_memory = the_rti.physical_memory_avail = 0;
>++	if (GETSYSCTL("hw.physmem", result) == 0) {
>++		the_rti.physical_memory = result;
>++	}
>++
>++	if (GETSYSCTL("hw.usermem", result) == 0) {
>++		the_rti.physical_memory_avail = result;
>++	}
>++
>++	the_rti.sampling_instant = last_update_time;
>++
>++	if (last_update_time) {
>++		the_rti.sampling_period_duration = (entry_time - last_update_time);
>++		the_rti.process_cpu_time_diff = (process_u_k_time - last_process_k_u_time) / 1000;
>++
>++		/*oops, we have no choice but to assume 100% cpu usage during this period*/
>++		if (!u_k_time) {
>++			the_rti.total_cpu_time_diff = the_rti.sampling_period_duration;
>++			u_k_time = last_cpu_u_k_time + the_rti.sampling_period_duration;
>++			the_rti.cpu_idle_time = 0;
>++			the_rti.total_cpu_usage = 100;
>++			if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
>++			the_rti.process_cpu_usage = (u32) ( 100 *  the_rti.process_cpu_time_diff / the_rti.sampling_period_duration);
>++		} else {
>++			u64 samp_sys_time, cpu_idle_time;
>++			/*move to ms (kern.cp_time gives times in 1/stathz unit*/
>++			the_rti.total_cpu_time_diff = (u_k_time - last_cpu_u_k_time) * 1000 / stathz;
>++
>++			/*we're not that accurate....*/
>++			if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration)
>++				the_rti.sampling_period_duration = the_rti.total_cpu_time_diff;
>++
>++			if (!idle_time) idle_time = (the_rti.sampling_period_duration - the_rti.total_cpu_time_diff) * stathz / 1000;
>++			samp_sys_time = u_k_time - last_cpu_u_k_time;
>++			cpu_idle_time = idle_time - last_cpu_idle_time;
>++			the_rti.total_cpu_usage = (u32) ( 100 * samp_sys_time / (cpu_idle_time + samp_sys_time ) );
>++			/*move to ms (kern.cp_time gives times in 1/stathz unit*/
>++			the_rti.cpu_idle_time = cpu_idle_time * 1000 / stathz;
>++			if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
>++			the_rti.process_cpu_usage = (u32) ( stathz * the_rti.process_cpu_time_diff / (cpu_idle_time + samp_sys_time) / 10 );
>++		}
>++	} else {
>++		mem_at_startup = the_rti.physical_memory_avail;
>++		if (GETSYSCTL("kern.clockrate", clockinfo) == 0) {
>++			if (clockinfo.stathz > 0) {
>++				stathz = clockinfo.stathz;
>++			}
>++		}
>++	}
>++	the_rti.process_memory = mem_at_startup - the_rti.physical_memory_avail;
>++
>++#ifdef GPAC_MEMORY_TRACKING
>++	the_rti.gpac_memory = gpac_allocated_memory;
>++#endif
>++
>++	last_process_k_u_time = process_u_k_time;
>++	last_cpu_idle_time = idle_time;
>++	last_cpu_u_k_time = u_k_time;
>++	last_update_time = entry_time;
>++	memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
>++	return 1;
>++}
>++
>+ //linux
>+ #else
>+ 
>
>Property changes on: gpac-libgpac/files/patch-src-utils-os_divers.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: gpac-libgpac/pkg-plist
>===================================================================
>--- gpac-libgpac/pkg-plist	(revision 332270)
>+++ 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,12 +84,16 @@
> 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
>+libdata/pkgconfig/gpac.pc
> @dirrm include/gpac/modules
> @dirrm include/gpac/internal
> @dirrm include/gpac
>Index: gpac-mp4box/Makefile
>===================================================================
>--- gpac-mp4box/Makefile	(revision 332270)
>+++ gpac-mp4box/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mp4box
>-DISTVERSION=	0.4.5
>-PORTREVISION=	1
>+DISTVERSION=	0.5.0
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/gpac/GPAC/GPAC%20${PORTVERSION}
> PKGNAMEPREFIX=	gpac-
>@@ -12,13 +11,23 @@
> MAINTAINER=	pvizeli@yahoo.de
> COMMENT=	A tool for merge mpg4 from Gpac
> 
>-LIB_DEPENDS=	gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
>+LICENSE=	LGPL21
> 
>+LIB_DEPENDS=	libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
>+
>+CFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib -lgpac
>+
> WRKSRC=		${WRKDIR}/gpac/applications/mp4box
>-PLIST_FILES=	bin/mp4box
>+PLIST_FILES=	bin/mp4box man/man1/mp4box.1.gz
> 
>-NO_STAGE=	yes
>-pre-patch:
>-	${RM} -f ${WRKSRC}/Makefile
>+do-build:
>+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} -o mp4box \
>+		filedump.c fileimport.c live.c main.c
> 
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/mp4box ${STAGEDIR}${PREFIX}/bin/mp4box
>+	${INSTALL_MAN} ${WRKSRC}/../../doc/man/mp4box.1 \
>+		${STAGEDIR}${PREFIX}/man/man1/mp4box.1
>+
> .include <bsd.port.mk>
>Index: gpac-mp4box/distinfo
>===================================================================
>--- gpac-mp4box/distinfo	(revision 332270)
>+++ 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: gpac-mp4box/files/patch-Makefile
>===================================================================
>--- gpac-mp4box/files/patch-Makefile	(revision 332270)
>+++ gpac-mp4box/files/patch-Makefile	(working copy)
>@@ -1,19 +0,0 @@
>---- /dev/null	2009-02-18 17:15:01.000000000 +0800
>-+++ Makefile	2009-02-18 17:15:16.760428054 +0800
>-@@ -0,0 +1,16 @@
>-+# FreeBSD Version
>-+CC?=		gcc
>-+CFLAGS?=	-Wall -O3 -pipe
>-+CFLAGS+=	-I/usr/local/include -L/usr/local/lib
>-+LDFLAGS=	-lpthread -lgpac
>-+NAME=	mp4box
>-+OBJ=	filedump.o fileimport.o main.o
>-+prog:	$(OBJ)
>-+				$(CC) $(CFLAGS) -o $(NAME) $(OBJ) $(LDFLAGS)
>-+all:	prog
>-+%.o:	%.c
>-+				$(CC) $(CFLAGS) -c $<
>-+install: prog
>-+				$(BSD_INSTALL_PROGRAM) -c $(NAME) $(PREFIX)/bin
>-+clean:
>-+				rm -f *.o $(NAME) 
>Index: x264/Makefile
>===================================================================
>--- x264/Makefile	(revision 332270)
>+++ x264/Makefile	(working copy)
>@@ -3,6 +3,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
>@@ -82,8 +83,7 @@
> .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
>+LIB_DEPENDS+=		libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
> .else
> CONFIGURE_ARGS+=	--disable-gpac
> .endif

Actions: View | Diff

Attachments on bug 180906: 135864 | 135865 | 135866