Attachment #44882 for bug #69351




#

PORTNAME=	gstreamer
PORTVERSION=	0.8.1
PORTREVISION=	1
CATEGORIES=	multimedia
MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX=	-ffmpeg

GST_VERSION=${PORTVERSION:C/..$//}

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500000
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-gst-libs_ext_ffmpeg_libavformat_nut.c
.endif

post-patch:
	@${REINPLACE_CMD} -E -e \

Lines 1-2 Link Here

(-)gstreamer-ffmpeg/distinfo (-2 / +2 lines)
1	MD5 (gst-ffmpeg-0.8.0.tar.bz2) = 26dd962c37e886cbc3be167680a44ee4	1	MD5 (gst-ffmpeg-0.8.1.tar.bz2) = f020b9f394fec2712964cd11ac46b43d
2	SIZE (gst-ffmpeg-0.8.0.tar.bz2) = 1558194	2	SIZE (gst-ffmpeg-0.8.1.tar.bz2) = 1590668




--- gst-libs/ext/ffmpeg/libavformat/nut.c.orig	Wed Apr 14 20:38:02 2004
+++ gst-libs/ext/ffmpeg/libavformat/nut.c	Sun Jul 11 18:14:19 2004
@@ -59,6 +59,9 @@
 #define FLAG_FULL_PTS        4
 #define FLAG_KEY_FRAME      32
 
+// UINT64_MAX isn't defined on FreeBSD 4.x borrow it from 5.x
+#define UINT64_MAX      0xffffffffffffffffULL
+
 typedef struct {
     uint8_t flags;
     uint8_t stream_id_plus1;




--- ext/ffmpeg/gstffmpegcodecmap.c.orig	Fri Feb  6 15:29:09 2004
+++ ext/ffmpeg/gstffmpegcodecmap.c	Fri Feb  6 15:40:14 2004
@@ -44,13 +44,13 @@
 	"width",     G_TYPE_INT,   context->width,	      	\
 	"height",    G_TYPE_INT,   context->height,	  	\
 	"framerate", G_TYPE_DOUBLE, 1. * context->frame_rate /  \
-				   context->frame_rate_base,    \
+				   context->frame_rate_base ,    \
 	##props, NULL)	  					\
     :	  							\
     gst_caps_new_simple (mimetype,			      	\
 	"width",     GST_TYPE_INT_RANGE, 16, 4096,      	\
 	"height",    GST_TYPE_INT_RANGE, 16, 4096,	      	\
-	"framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE,	\
+	"framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE ,	\
 	##props, NULL)
 
 /* same for audio - now with channels/sample rate
@@ -60,10 +60,10 @@
     (context != NULL) ?					      	\
     gst_caps_new_simple (mimetype,	      			\
 	"rate", G_TYPE_INT, context->sample_rate,		\
-	"channels", G_TYPE_INT, context->channels,		\
+	"channels", G_TYPE_INT, context->channels ,		\
 	##props, NULL)						\
     :								\
-    gst_caps_new_simple (mimetype,	      			\
+    gst_caps_new_simple (mimetype ,	      			\
 	##props, NULL)
 
 /* Convert a FFMPEG codec ID and optional AVCodecContext




--- gst-libs/ext/ffmpeg/libavformat/mov.c.orig	Fri Apr 30 20:41:45 2004
+++ gst-libs/ext/ffmpeg/libavformat/mov.c	Sun Jul 11 18:21:15 2004
@@ -998,6 +998,7 @@
             else if( st->codec.codec_tag == MKTAG( 'm', 'p', '4', 'a' ))
             {
                 /* Handle mp4 audio tag */
+                MOV_atom_t a = { format, url_ftell(pb), size - (20 + 20 + 8) };
                 get_be32(pb); /* version */
                 get_be32(pb);
                 st->codec.channels = get_be16(pb); /* channels */
@@ -1006,7 +1007,6 @@
                 st->codec.sample_rate = get_be16(pb); /* sample rate, not always correct */
                 get_be16(pb);
                 c->mp4=1;
-                MOV_atom_t a = { format, url_ftell(pb), size - (20 + 20 + 8) };
                 mov_read_default(c, pb, a);
                 /* Get correct sample rate from extradata */
                 if(st->codec.extradata_size) {

Return to bug 69351

Lines 6-13 Link Here

(-)gstreamer-ffmpeg/Makefile (-2 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= gstreamer	8	PORTNAME= gstreamer
9	PORTVERSION= 0.8.0	9	PORTVERSION= 0.8.1
10	PORTREVISION= 1
11	CATEGORIES= multimedia	10	CATEGORIES= multimedia
12	MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/	11	MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
13	PKGNAMESUFFIX= -ffmpeg	12	PKGNAMESUFFIX= -ffmpeg
Lines 36-41 Link Here
36	GST_VERSION=${PORTVERSION:C/..$//}	35	GST_VERSION=${PORTVERSION:C/..$//}
37		36
38	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
		38
		39	.if ${OSVERSION} < 500000
		40	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gst-libs_ext_ffmpeg_libavformat_nut.c
		41	.endif
39		42
40	post-patch:	43	post-patch:
41	@${REINPLACE_CMD} -E -e \	44	@${REINPLACE_CMD} -E -e \

Line 0 Link Here

(-)gstreamer-ffmpeg/files/extra-patch-gst-libs_ext_ffmpeg_libavformat_nut.c (+12 lines)
	1	--- gst-libs/ext/ffmpeg/libavformat/nut.c.orig Wed Apr 14 20:38:02 2004
	2	+++ gst-libs/ext/ffmpeg/libavformat/nut.c Sun Jul 11 18:14:19 2004
	3	@@ -59,6 +59,9 @@
	4	#define FLAG_FULL_PTS 4
	5	#define FLAG_KEY_FRAME 32
	6
	7	+// UINT64_MAX isn't defined on FreeBSD 4.x borrow it from 5.x
	8	+#define UINT64_MAX 0xffffffffffffffffULL
	9	+
	10	typedef struct {
	11	uint8_t flags;
	12	uint8_t stream_id_plus1;

Lines 1-31 Link Here

(-)gstreamer-ffmpeg/files/patch-ext_ffmpeg_gstffmpegcodecmap.c (-31 lines)
1	--- ext/ffmpeg/gstffmpegcodecmap.c.orig Fri Feb 6 15:29:09 2004
2	+++ ext/ffmpeg/gstffmpegcodecmap.c Fri Feb 6 15:40:14 2004
3	@@ -44,13 +44,13 @@
4	"width", G_TYPE_INT, context->width, \
5	"height", G_TYPE_INT, context->height, \
6	"framerate", G_TYPE_DOUBLE, 1. * context->frame_rate / \
7	- context->frame_rate_base, \
8	+ context->frame_rate_base , \
9	##props, NULL) \
10	: \
11	gst_caps_new_simple (mimetype, \
12	"width", GST_TYPE_INT_RANGE, 16, 4096, \
13	"height", GST_TYPE_INT_RANGE, 16, 4096, \
14	- "framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE, \
15	+ "framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE , \
16	##props, NULL)
17
18	/* same for audio - now with channels/sample rate
19	@@ -60,10 +60,10 @@
20	(context != NULL) ? \
21	gst_caps_new_simple (mimetype, \
22	"rate", G_TYPE_INT, context->sample_rate, \
23	- "channels", G_TYPE_INT, context->channels, \
24	+ "channels", G_TYPE_INT, context->channels , \
25	##props, NULL) \
26	: \
27	- gst_caps_new_simple (mimetype, \
28	+ gst_caps_new_simple (mimetype , \
29	##props, NULL)
30
31	/* Convert a FFMPEG codec ID and optional AVCodecContext

Line 0 Link Here

(-)gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_libavformat_mov.c (+18 lines)
	1	--- gst-libs/ext/ffmpeg/libavformat/mov.c.orig Fri Apr 30 20:41:45 2004
	2	+++ gst-libs/ext/ffmpeg/libavformat/mov.c Sun Jul 11 18:21:15 2004
	3	@@ -998,6 +998,7 @@
	4	else if( st->codec.codec_tag == MKTAG( 'm', 'p', '4', 'a' ))
	5	{
	6	/* Handle mp4 audio tag */
	7	+ MOV_atom_t a = { format, url_ftell(pb), size - (20 + 20 + 8) };
	8	get_be32(pb); /* version */
	9	get_be32(pb);
	10	st->codec.channels = get_be16(pb); /* channels */
	11	@@ -1006,7 +1007,6 @@
	12	st->codec.sample_rate = get_be16(pb); /* sample rate, not always correct */
	13	get_be16(pb);
	14	c->mp4=1;
	15	- MOV_atom_t a = { format, url_ftell(pb), size - (20 + 20 + 8) };
	16	mov_read_default(c, pb, a);
	17	/* Get correct sample rate from extradata */
	18	if(st->codec.extradata_size) {