View | Details | Raw Unified | Return to bug 180906 | Differences between
and this patch

Collapse All | Expand All

(-)gpac-libgpac/Makefile (-20 / +13 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gpac
4
PORTNAME=	gpac
5
PORTVERSION=	0.4.5
5
PORTVERSION=	0.5.0
6
PORTREVISION=	7
7
PORTEPOCH=	1
6
PORTEPOCH=	1
8
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
9
MASTER_SITES=	SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
Lines 12-31 Link Here
12
MAINTAINER=	multimedia@FreeBSD.org
11
MAINTAINER=	multimedia@FreeBSD.org
13
COMMENT=	Gpac MPEG-4 Systems library and headers
12
COMMENT=	Gpac MPEG-4 Systems library and headers
14
13
14
LICENSE=	LGPL21
15
15
WRKSRC=		${WRKDIR}/gpac
16
WRKSRC=		${WRKDIR}/gpac
16
ALL_TARGET=	lib
17
ALL_TARGET=	lib
18
INSTALL_TARGET=	install-lib
17
USES=		gmake
19
USES=		gmake
18
HAS_CONFIGURE=	yes
20
HAS_CONFIGURE=	yes
19
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
22
USE_DOS2UNIX=	src/utils/os_config_init.c
20
23
21
BUILD_WRKSRC=	${WRKSRC}/src
22
INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
23
LIBVER=	1
24
25
OPTIONS_DEFINE=	IPV6 JPEG OPENGL SSL PNG XVIDEO
24
OPTIONS_DEFINE=	IPV6 JPEG OPENGL SSL PNG XVIDEO
26
OPTIONS_DEFAULT=	IPV6 JPEG SSL PNG
25
OPTIONS_DEFAULT=	IPV6 JPEG SSL PNG
27
26
28
CFLAGS+=	-I${LOCALBASE}/include
27
CFLAGS+=	-I${WRKSRC}/include -I${LOCALBASE}/include
29
LDFLAGS+=	-L${LOCALBASE}/lib
28
LDFLAGS+=	-L${LOCALBASE}/lib
30
29
31
CONFIGURE_ARGS=	--cc="${CC}" --X11-path="${LOCALBASE}" \
30
CONFIGURE_ARGS=	--cc="${CC}" --X11-path="${LOCALBASE}" \
Lines 33-47 Link Here
33
		--enable-pic \
32
		--enable-pic \
34
		--disable-wx \
33
		--disable-wx \
35
		--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \
34
		--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \
36
		--use-ft=no --use-mad=no --use-ogg=no \
35
		--use-ft=no --use-mad=no --use-ogg=no --use-xvid=no \
37
		--use-openjpeg=no --use-theora=no --usr-vorbis=no
36
		--use-openjpeg=no --use-theora=no --use-vorbis=no
38
37
39
CONFIGURE_ENV+=	LIBVER="${LIBVER}" PTHREAD_LIBS="${PTHREAD_LIBS}"
40
41
SSL_USE=	OPENSSL=yes
38
SSL_USE=	OPENSSL=yes
42
SSL_CONFIGURE_ENABLE=	ssl
39
SSL_CONFIGURE_ENABLE=	ssl
43
OPENGL_USE=	GL=gl GL=glu
40
OPENGL_USE=	GL=gl GL=glu
44
OPENGL_CONFIGURE_ENABLE=	opengl
41
OPENGL_CONFIGURE_ENABLE=3d
45
XVIDEO_LIB_DEPENDS=	libXv.so:${PORTSDIR}/x11/libXv
42
XVIDEO_LIB_DEPENDS=	libXv.so:${PORTSDIR}/x11/libXv
46
XVIDEO_CONFIGURE_OFF=	--disable-x11-xv --disable-x11-shm
43
XVIDEO_CONFIGURE_OFF=	--disable-x11-xv --disable-x11-shm
47
IPV6_CONFIGURE_ENABLE=	ipv6
44
IPV6_CONFIGURE_ENABLE=	ipv6
Lines 54-67 Link Here
54
PNG_CFLAGS=		-I${LOCALBASE}/include/libpng15
51
PNG_CFLAGS=		-I${LOCALBASE}/include/libpng15
55
52
56
post-patch:
53
post-patch:
57
	${CHMOD} +x ${WRKSRC}/configure
54
	${REINPLACE_CMD} -e 's|s/\.\*\\(\[0-9\]\\)\\+\$$/\\1/|s/^[^0-9]*//| ;\
55
		/CFLAGS=/s/-O3//' ${WRKSRC}/configure
58
56
59
do-install:
57
post-install:
60
	${MKDIR} ${STAGEDIR}${PREFIX}/include/gpac
58
	${INSTALL_DATA} ${WRKSRC}/gpac.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
61
	cd ${WRKSRC}/include/gpac && ${FIND} . | \
62
		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${PREFIX}/include/gpac
63
	${INSTALL_LIB} ${INSTALL_WRKSRC}/libgpac.so.${LIBVER} ${STAGEDIR}${PREFIX}/lib
64
	${LN} -sf libgpac.so.${LIBVER} ${STAGEDIR}${PREFIX}/lib/libgpac.so
65
	${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac_static.a ${STAGEDIR}${PREFIX}/lib
66
59
67
.include <bsd.port.mk>
60
.include <bsd.port.mk>
(-)gpac-libgpac/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gpac-0.4.5.tar.gz) = f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
1
SHA256 (gpac-0.5.0.tar.gz) = 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24
2
SIZE (gpac-0.4.5.tar.gz) = 4269054
2
SIZE (gpac-0.5.0.tar.gz) = 7861057
(-)gpac-libgpac/files/patch-configure (-75 lines)
Lines 1-75 Link Here
1
--- configure.orig	2008-12-02 19:04:42.000000000 +0100
2
+++ configure	2012-05-19 17:09:20.000000000 +0200
3
@@ -33,6 +33,7 @@
4
 make="make"
5
 strip="strip"
6
 cpu=`uname -m`
7
+targetos=`uname -s`
8
 debuginfo="no"
9
 sdl_path=""
10
 sdl_local="no"
11
@@ -102,7 +103,7 @@
12
 bigendian="no"
13
 SHFLAGS=-shared
14
 need_inet_aton="no"
15
-LDFLAGS="$LDFLAGS -Wl --warn-common"
16
+LDFLAGS="$LDFLAGS -Wl,--warn-common"
17
 CFLAGS=""
18
 CPPFLAGS=""
19
 GPAC_SH_FLAGS=-lpthread
20
@@ -222,7 +223,9 @@
21
     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
22
       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
23
         cpu="x86_64"
24
-	libdir="lib64"
25
+        if [ x"$targetos" != x"FreeBSD" ]; then
26
+          libdir="lib64"
27
+        fi
28
         #that's a bit crude...
29
         PIC_CFLAGS="-fPIC -DPIC"
30
         want_pic="yes"
31
@@ -280,7 +283,6 @@
32
     source_path="`cd \"$source_path\"; pwd`"
33
 fi
34
 # OS specific
35
-targetos=`uname -s`
36
 case $targetos in
37
 BeOS)
38
 js_flags=-DXP_BEOS
39
@@ -317,8 +319,8 @@
40
 FreeBSD)
41
 make="gmake"
42
 LDFLAGS="$LDFLAGS -export-dynamic"
43
-CFLAGS="$CFLAGS -pthread"
44
-GPAC_SH_FLAGS=-pthread
45
+DYN_LIB_SUFFIX="so.$LIBVER"
46
+GPAC_SH_FLAGS="$PTHREAD_LIBS"
47
 freebsd="yes"
48
 js_flags="-DXP_UNIX -I/usr/include/js"
49
 ;;
50
@@ -1111,6 +1113,8 @@
51
     LINK3D="-lopengl32 -lglu32"
52
   elif test "$darwin" = "yes" ; then
53
     LINK3D="-lgl -lglu"
54
+  elif test "$freebsd" = "yes" ; then
55
+    LINK3D="-lGL -lGLU"
56
   else
57
    LINK3D="-lGL -lglut"
58
   fi
59
@@ -1673,7 +1677,7 @@
60
 echo "USE_X11_XV=$has_x11_xv" >> config.mak
61
 fi
62
 
63
-if test "$is_64" = "yes"; then
64
+if test "$is_64" = "yes" -a "$freebsd" = "no" ; then
65
 echo "X11_LIB_PATH=$X11_PATH/lib64" >> config.mak
66
 else
67
 echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak
68
@@ -1805,6 +1809,6 @@
69
 fi
70
 
71
 echo '%.opic : %.c' >> config.mak
72
-echo '	$(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak
73
+echo "	\$(CC) \$(CFLAGS) \$(PIC_CFLAGS) $INCL3D -c \$< -o \$@" >> config.mak
74
 
75
 echo "Done - type 'make help' for make info, 'make' to build"
(-)gpac-libgpac/files/patch-export-x264-symbols (+28 lines)
Line 0 Link Here
1
--- src/isomedia/avc_ext.c.orig	2012-03-27 13:48:05.000000000 +0400
2
+++ src/isomedia/avc_ext.c	2013-03-12 01:00:39.595690860 +0400
3
@@ -170,6 +170,7 @@
4
 
5
 
6
 #ifndef GPAC_DISABLE_ISOM_WRITE
7
+GF_EXPORT
8
 GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
9
 {
10
 	GF_TrackBox *trak;
11
--- src/isomedia/isom_write.c.orig	2012-03-29 16:36:23.000000000 +0400
12
+++ src/isomedia/isom_write.c	2013-03-12 01:00:39.605699394 +0400
13
@@ -1140,6 +1140,7 @@
14
 	return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL);
15
 }
16
 
17
+GF_EXPORT
18
 GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height)
19
 {
20
 	GF_Err e;
21
@@ -1187,6 +1188,7 @@
22
 	}
23
 }
24
 
25
+GF_EXPORT
26
 GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
27
 {
28
 	GF_Err e;
(-)gpac-libgpac/files/patch-src-media_tools-img.c (-37 lines)
Lines 1-37 Link Here
1
--- src/media_tools/img.c.orig	2008-12-01 18:39:36.000000000 +0100
2
+++ src/media_tools/img.c	2012-04-24 23:00:42.000000000 +0200
3
@@ -33,6 +33,7 @@
4
 
5
 /*include png.h before setjmp.h, otherwise we get compilation errors*/
6
 #include <png.h>
7
+#include <pngpriv.h>
8
 
9
 #endif /*GPAC_HAS_PNG*/
10
 
11
@@ -399,7 +400,7 @@
12
 }
13
 static void user_error_fn(png_structp png_ptr,png_const_charp error_msg)
14
 {
15
-	longjmp(png_ptr->jmpbuf, 1);
16
+	longjmp(png_jmpbuf(png_ptr), 1);
17
 }
18
 
19
 GF_EXPORT
20
@@ -424,7 +425,7 @@
21
 		png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
22
 		return GF_IO_ERR;
23
 	}
24
-	if (setjmp(png_ptr->jmpbuf)) {
25
+	if (setjmp(png_jmpbuf(png_ptr))) {
26
 		png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
27
 		png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
28
 		return GF_IO_ERR;
29
@@ -551,7 +552,7 @@
30
 	/* Allocate/initialize the image information data.  REQUIRED */
31
 	info_ptr = png_create_info_struct(png_ptr);
32
 	if (info_ptr == NULL) {
33
-		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
34
+		png_destroy_write_struct(&png_ptr,  (png_infopp)NULL);
35
 		return GF_IO_ERR;
36
 	}
37
 	
(-)gpac-libgpac/files/patch-src-utils-os_config_init.c (+39 lines)
Line 0 Link Here
1
--- src/utils/os_config_init.c.orig	2012-03-27 13:48:05.000000000 +0400
2
+++ src/utils/os_config_init.c	2013-10-12 14:29:52.214068862 +0400
3
@@ -51,6 +51,9 @@
4
 #else
5
 #ifdef GPAC_CONFIG_LINUX
6
 #include <unistd.h>
7
+#elif defined GPAC_CONFIG_FREEBSD
8
+#include <sys/types.h>
9
+#include <sys/sysctl.h>
10
 #endif
11
 #define CFG_FILE_NAME	".gpacrc"
12
 #define TEST_MODULE		"gm_dummy_in.so"
13
@@ -225,7 +228,11 @@
14
 {
15
 	char app_path[GF_MAX_PATH];
16
 	char *sep;
17
+#ifdef GPAC_CONFIG_FREEBSD
18
+	size_t size = GF_MAX_PATH;
19
+#else
20
 	u32 size = GF_MAX_PATH;
21
+#endif
22
 
23
 	/*on OSX, Linux & co, user home is where we store the cfg file*/
24
 	if (path_type==GF_PATH_CFG) {
25
@@ -252,6 +259,14 @@
26
 			if (sep) sep[0] = 0;
27
 			return 1;
28
 		}
29
+#elif defined(GPAC_CONFIG_FREEBSD)
30
+		int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
31
+		sysctl(mib, 4, file_path, &size, NULL, 0);
32
+		if (size>0) {
33
+			char *sep = strrchr(file_path, '/');
34
+			if (sep) sep[0] = 0;
35
+			return 1;
36
+		}
37
 #endif
38
 		return 0;
39
 	}
(-)gpac-libgpac/files/patch-src-utils-os_divers.c (+126 lines)
Line 0 Link Here
1
--- src/utils/os_divers.c.orig	2012-04-04 18:47:33.000000000 +0400
2
+++ src/utils/os_divers.c	2013-10-12 14:25:42.047109095 +0400
3
@@ -1533,6 +1533,123 @@
4
 	return 1;
5
 }
6
 
7
+#elif defined GPAC_CONFIG_FREEBSD
8
+
9
+#include <sys/types.h>
10
+#include <sys/sysctl.h>
11
+#include <sys/time.h>
12
+#include <sys/user.h>
13
+
14
+#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
15
+int getsysctl(const char *name, void *ptr, size_t len) {
16
+	size_t nlen = len;
17
+	if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) {
18
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] sysctl(%s...) failed: %s\n", name, strerror(errno)));
19
+		return -1;
20
+	}
21
+	if (nlen != len) {
22
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[RTI] sysctl(%s...) expected %lu, got %lu\n",
23
+			name, (unsigned long)len, (unsigned long)nlen));
24
+		return -1;
25
+	}
26
+	return 0;
27
+}
28
+
29
+static int stathz = 128;
30
+
31
+Bool gf_sys_get_rti_os(u32 refresh_time_ms, GF_SystemRTInfo *rti, u32 flags)
32
+{
33
+	size_t length;
34
+	u32 entry_time;
35
+	struct kinfo_proc kinfo;
36
+	unsigned long result;
37
+	u32 u_k_time = 0, idle_time = 0;
38
+	u64 process_u_k_time = 0;
39
+	long cp_time[CPUSTATES];
40
+	struct clockinfo clockinfo;
41
+
42
+	entry_time = gf_sys_clock();
43
+	if (last_update_time && (entry_time - last_update_time < refresh_time_ms)) {
44
+		memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
45
+		return 0;
46
+	}
47
+
48
+	int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, the_rti.pid };
49
+	length = sizeof(kinfo);
50
+
51
+	if (sysctl(mib, 4, &kinfo, &length, NULL, 0) == 0) {
52
+		process_u_k_time = (u64)(kinfo.ki_rusage.ru_utime.tv_usec + kinfo.ki_rusage.ru_stime.tv_usec) +
53
+			(u64)(kinfo.ki_rusage.ru_utime.tv_sec + kinfo.ki_rusage.ru_stime.tv_sec) * (u64)1000000;
54
+	}
55
+
56
+	if (GETSYSCTL("kern.cp_time", cp_time) == 0) {
57
+		u_k_time = cp_time[CP_USER] + cp_time[CP_NICE] + cp_time[CP_SYS] + cp_time[CP_INTR];
58
+		idle_time = cp_time[CP_IDLE];
59
+	}
60
+
61
+	the_rti.physical_memory = the_rti.physical_memory_avail = 0;
62
+	if (GETSYSCTL("hw.physmem", result) == 0) {
63
+		the_rti.physical_memory = result;
64
+	}
65
+
66
+	if (GETSYSCTL("hw.usermem", result) == 0) {
67
+		the_rti.physical_memory_avail = result;
68
+	}
69
+
70
+	the_rti.sampling_instant = last_update_time;
71
+
72
+	if (last_update_time) {
73
+		the_rti.sampling_period_duration = (entry_time - last_update_time);
74
+		the_rti.process_cpu_time_diff = (process_u_k_time - last_process_k_u_time) / 1000;
75
+
76
+		/*oops, we have no choice but to assume 100% cpu usage during this period*/
77
+		if (!u_k_time) {
78
+			the_rti.total_cpu_time_diff = the_rti.sampling_period_duration;
79
+			u_k_time = last_cpu_u_k_time + the_rti.sampling_period_duration;
80
+			the_rti.cpu_idle_time = 0;
81
+			the_rti.total_cpu_usage = 100;
82
+			if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
83
+			the_rti.process_cpu_usage = (u32) ( 100 *  the_rti.process_cpu_time_diff / the_rti.sampling_period_duration);
84
+		} else {
85
+			u64 samp_sys_time, cpu_idle_time;
86
+			/*move to ms (kern.cp_time gives times in 1/stathz unit*/
87
+			the_rti.total_cpu_time_diff = (u_k_time - last_cpu_u_k_time) * 1000 / stathz;
88
+
89
+			/*we're not that accurate....*/
90
+			if (the_rti.total_cpu_time_diff > the_rti.sampling_period_duration)
91
+				the_rti.sampling_period_duration = the_rti.total_cpu_time_diff;
92
+
93
+			if (!idle_time) idle_time = (the_rti.sampling_period_duration - the_rti.total_cpu_time_diff) * stathz / 1000;
94
+			samp_sys_time = u_k_time - last_cpu_u_k_time;
95
+			cpu_idle_time = idle_time - last_cpu_idle_time;
96
+			the_rti.total_cpu_usage = (u32) ( 100 * samp_sys_time / (cpu_idle_time + samp_sys_time ) );
97
+			/*move to ms (kern.cp_time gives times in 1/stathz unit*/
98
+			the_rti.cpu_idle_time = cpu_idle_time * 1000 / stathz;
99
+			if (!the_rti.process_cpu_time_diff) the_rti.process_cpu_time_diff = the_rti.total_cpu_time_diff;
100
+			the_rti.process_cpu_usage = (u32) ( stathz * the_rti.process_cpu_time_diff / (cpu_idle_time + samp_sys_time) / 10 );
101
+		}
102
+	} else {
103
+		mem_at_startup = the_rti.physical_memory_avail;
104
+		if (GETSYSCTL("kern.clockrate", clockinfo) == 0) {
105
+			if (clockinfo.stathz > 0) {
106
+				stathz = clockinfo.stathz;
107
+			}
108
+		}
109
+	}
110
+	the_rti.process_memory = mem_at_startup - the_rti.physical_memory_avail;
111
+
112
+#ifdef GPAC_MEMORY_TRACKING
113
+	the_rti.gpac_memory = gpac_allocated_memory;
114
+#endif
115
+
116
+	last_process_k_u_time = process_u_k_time;
117
+	last_cpu_idle_time = idle_time;
118
+	last_cpu_u_k_time = u_k_time;
119
+	last_update_time = entry_time;
120
+	memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
121
+	return 1;
122
+}
123
+
124
 //linux
125
 #else
126
 
(-)gpac-libgpac/pkg-plist (-3 / +22 lines)
Lines 1-16 Link Here
1
include/gpac/ait.h
1
include/gpac/avparse.h
2
include/gpac/avparse.h
2
include/gpac/base_coding.h
3
include/gpac/base_coding.h
3
include/gpac/bifs.h
4
include/gpac/bifs.h
4
include/gpac/bifsengine.h
5
include/gpac/bitstream.h
5
include/gpac/bitstream.h
6
include/gpac/cache.h
6
include/gpac/color.h
7
include/gpac/color.h
7
include/gpac/compositor.h
8
include/gpac/compositor.h
8
include/gpac/config_file.h
9
include/gpac/config_file.h
10
include/gpac/configuration.h
9
include/gpac/constants.h
11
include/gpac/constants.h
10
include/gpac/crypt.h
12
include/gpac/crypt.h
11
include/gpac/download.h
13
include/gpac/download.h
14
include/gpac/dsmcc.h
15
include/gpac/dvb_mpe.h
12
include/gpac/esi.h
16
include/gpac/esi.h
13
include/gpac/events.h
17
include/gpac/events.h
18
include/gpac/events_constants.h
19
include/gpac/filestreamer.h
14
include/gpac/ietf.h
20
include/gpac/ietf.h
15
include/gpac/internal/avilib.h
21
include/gpac/internal/avilib.h
16
include/gpac/internal/bifs_dev.h
22
include/gpac/internal/bifs_dev.h
Lines 17-32 Link Here
17
include/gpac/internal/bifs_tables.h
23
include/gpac/internal/bifs_tables.h
18
include/gpac/internal/camera.h
24
include/gpac/internal/camera.h
19
include/gpac/internal/compositor_dev.h
25
include/gpac/internal/compositor_dev.h
20
include/gpac/internal/config_static.h
21
include/gpac/internal/crypt_dev.h
26
include/gpac/internal/crypt_dev.h
27
include/gpac/internal/dvb_mpe_dev.h
22
include/gpac/internal/ietf_dev.h
28
include/gpac/internal/ietf_dev.h
23
include/gpac/internal/isomedia_dev.h
29
include/gpac/internal/isomedia_dev.h
24
include/gpac/internal/laser_dev.h
30
include/gpac/internal/laser_dev.h
31
include/gpac/internal/m3u8.h
25
include/gpac/internal/media_dev.h
32
include/gpac/internal/media_dev.h
26
include/gpac/internal/mesh.h
33
include/gpac/internal/mesh.h
34
include/gpac/internal/mpd.h
27
include/gpac/internal/odf_dev.h
35
include/gpac/internal/odf_dev.h
36
include/gpac/internal/odf_parse_common.h
28
include/gpac/internal/ogg.h
37
include/gpac/internal/ogg.h
38
include/gpac/internal/reedsolomon.h
29
include/gpac/internal/scenegraph_dev.h
39
include/gpac/internal/scenegraph_dev.h
40
include/gpac/internal/smjs_api.h
30
include/gpac/internal/swf_dev.h
41
include/gpac/internal/swf_dev.h
31
include/gpac/internal/terminal_dev.h
42
include/gpac/internal/terminal_dev.h
32
include/gpac/internal/vobsub.h
43
include/gpac/internal/vobsub.h
Lines 42-47 Link Here
42
include/gpac/modules/audio_out.h
53
include/gpac/modules/audio_out.h
43
include/gpac/modules/codec.h
54
include/gpac/modules/codec.h
44
include/gpac/modules/font.h
55
include/gpac/modules/font.h
56
include/gpac/modules/hardcoded_proto.h
45
include/gpac/modules/ipmp.h
57
include/gpac/modules/ipmp.h
46
include/gpac/modules/js_usr.h
58
include/gpac/modules/js_usr.h
47
include/gpac/modules/raster2d.h
59
include/gpac/modules/raster2d.h
Lines 57-62 Link Here
57
include/gpac/nodes_xbl.h
69
include/gpac/nodes_xbl.h
58
include/gpac/options.h
70
include/gpac/options.h
59
include/gpac/path2d.h
71
include/gpac/path2d.h
72
include/gpac/ringbuffer.h
73
include/gpac/rtp_streamer.h
74
include/gpac/scene_engine.h
60
include/gpac/scene_manager.h
75
include/gpac/scene_manager.h
61
include/gpac/scenegraph.h
76
include/gpac/scenegraph.h
62
include/gpac/scenegraph_svg.h
77
include/gpac/scenegraph_svg.h
Lines 69-80 Link Here
69
include/gpac/thread.h
84
include/gpac/thread.h
70
include/gpac/token.h
85
include/gpac/token.h
71
include/gpac/tools.h
86
include/gpac/tools.h
87
include/gpac/unicode.h
72
include/gpac/user.h
88
include/gpac/user.h
73
include/gpac/utf.h
89
include/gpac/utf.h
90
include/gpac/version.h
74
include/gpac/xml.h
91
include/gpac/xml.h
75
lib/libgpac.so
92
lib/libgpac.so
76
lib/libgpac.so.1
93
lib/libgpac.so.2
94
lib/libgpac.so.2.0.0
77
lib/libgpac_static.a
95
lib/libgpac_static.a
96
libdata/pkgconfig/gpac.pc
78
@dirrm include/gpac/modules
97
@dirrm include/gpac/modules
79
@dirrm include/gpac/internal
98
@dirrm include/gpac/internal
80
@dirrm include/gpac
99
@dirrm include/gpac
(-)gpac-mp4box/Makefile (-7 / +16 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mp4box
4
PORTNAME=	mp4box
5
DISTVERSION=	0.4.5
5
DISTVERSION=	0.5.0
6
PORTREVISION=	1
7
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
8
MASTER_SITES=	SF/gpac/GPAC/GPAC%20${PORTVERSION}
7
MASTER_SITES=	SF/gpac/GPAC/GPAC%20${PORTVERSION}
9
PKGNAMEPREFIX=	gpac-
8
PKGNAMEPREFIX=	gpac-
Lines 12-24 Link Here
12
MAINTAINER=	pvizeli@yahoo.de
11
MAINTAINER=	pvizeli@yahoo.de
13
COMMENT=	A tool for merge mpg4 from Gpac
12
COMMENT=	A tool for merge mpg4 from Gpac
14
13
15
LIB_DEPENDS=	gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
14
LICENSE=	LGPL21
16
15
16
LIB_DEPENDS=	libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
17
18
CFLAGS+=	-I${LOCALBASE}/include
19
LDFLAGS+=	-L${LOCALBASE}/lib -lgpac
20
17
WRKSRC=		${WRKDIR}/gpac/applications/mp4box
21
WRKSRC=		${WRKDIR}/gpac/applications/mp4box
18
PLIST_FILES=	bin/mp4box
22
PLIST_FILES=	bin/mp4box man/man1/mp4box.1.gz
19
23
20
NO_STAGE=	yes
24
do-build:
21
pre-patch:
25
	cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} -o mp4box \
22
	${RM} -f ${WRKSRC}/Makefile
26
		filedump.c fileimport.c live.c main.c
23
27
28
do-install:
29
	${INSTALL_PROGRAM} ${WRKSRC}/mp4box ${STAGEDIR}${PREFIX}/bin/mp4box
30
	${INSTALL_MAN} ${WRKSRC}/../../doc/man/mp4box.1 \
31
		${STAGEDIR}${PREFIX}/man/man1/mp4box.1
32
24
.include <bsd.port.mk>
33
.include <bsd.port.mk>
(-)gpac-mp4box/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gpac-0.4.5.tar.gz) = f4039763ebec6630dc38e5e030c6573b47ced28fd009770c2e0e18b087753671
1
SHA256 (gpac-0.5.0.tar.gz) = 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24
2
SIZE (gpac-0.4.5.tar.gz) = 4269054
2
SIZE (gpac-0.5.0.tar.gz) = 7861057
(-)gpac-mp4box/files/patch-Makefile (-19 lines)
Lines 1-19 Link Here
1
--- /dev/null	2009-02-18 17:15:01.000000000 +0800
2
+++ Makefile	2009-02-18 17:15:16.760428054 +0800
3
@@ -0,0 +1,16 @@
4
+# FreeBSD Version
5
+CC?=		gcc
6
+CFLAGS?=	-Wall -O3 -pipe
7
+CFLAGS+=	-I/usr/local/include -L/usr/local/lib
8
+LDFLAGS=	-lpthread -lgpac
9
+NAME=	mp4box
10
+OBJ=	filedump.o fileimport.o main.o
11
+prog:	$(OBJ)
12
+				$(CC) $(CFLAGS) -o $(NAME) $(OBJ) $(LDFLAGS)
13
+all:	prog
14
+%.o:	%.c
15
+				$(CC) $(CFLAGS) -c $<
16
+install: prog
17
+				$(BSD_INSTALL_PROGRAM) -c $(NAME) $(PREFIX)/bin
18
+clean:
19
+				rm -f *.o $(NAME) 
(-)x264/Makefile (-2 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	x264
4
PORTNAME=	x264
5
PORTVERSION=	0.${X264_BUILD}.${X264_REV}
5
PORTVERSION=	0.${X264_BUILD}.${X264_REV}
6
PORTREVISION=	1
6
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
7
MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
8
MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
8
		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
9
		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
Lines 82-89 Link Here
82
.endif
83
.endif
83
84
84
.if ${PORT_OPTIONS:MGPAC}
85
.if ${PORT_OPTIONS:MGPAC}
85
BUILD_DEPENDS+=		gpac-libgpac>=0.4.5,1:${PORTSDIR}/multimedia/gpac-libgpac
86
LIB_DEPENDS+=		libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac
86
LIB_DEPENDS+=		gpac.1:${PORTSDIR}/multimedia/gpac-libgpac
87
.else
87
.else
88
CONFIGURE_ARGS+=	--disable-gpac
88
CONFIGURE_ARGS+=	--disable-gpac
89
.endif
89
.endif

Return to bug 180906