Attachment #149247 for bug #194922




#    $MCom: ports/multimedia/gstreamer1/Makefile,v 1.5 2013/01/15 21:43:45 kwm Exp $

PORTNAME=	gstreamer1
PORTVERSION=	1.4.4
CATEGORIES=	multimedia
MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
DISTNAME=	${PORTNAME:S/1//}-${PORTVERSION}

COMMENT=	Media applications framework

LICENSE=	LGPL20
LICENSE_FILE=	${WRKSRC}/COPYING

PORTSCOUT=	limitw:1,even


CONFIGURE_ENV=	ac_cv_func_register_printf_function="no"
INSTALL_TARGET=	install-strip
PLIST_SUB=	VERSION=${GST10_VERSION} \
		SOVERSION=0.404.0
USE_LDCONFIG=	yes
GST10_VERSION=	1.0


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (gstreamer-1.2.4.tar.xz) = 1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929	1	SHA256 (gstreamer-1.4.4.tar.xz) = f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237
2	SIZE (gstreamer-1.2.4.tar.xz) = 3225208	2	SIZE (gstreamer-1.4.4.tar.xz) = 3323860




From 63c17280408410d799e1c2f2ed49c5ab04cc80ae Mon Sep 17 00:00:00 2001
From: Sebastian DrÃ¶ge <sebastian@centricular.com>
Date: Sun, 20 Apr 2014 09:59:02 +0000
Subject: basesrc: Make sure to always hold the LIVE_LOCK when going to the flushing label

https://bugzilla.gnome.org/show_bug.cgi?id=728596
---
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 9f2e52c..fc5a3af 100644
--- libs/gst/base/gstbasesrc.c
+++ libs/gst/base/gstbasesrc.c
@@ -2684,10 +2684,12 @@ gst_base_src_loop (GstPad * pad)
   if (gst_pad_check_reconfigure (pad)) {
     if (!gst_base_src_negotiate (src)) {
       gst_pad_mark_reconfigure (pad);
-      if (GST_PAD_IS_FLUSHING (pad))
+      if (GST_PAD_IS_FLUSHING (pad)) {
+        GST_LIVE_LOCK (src);
         goto flushing;
-      else
+      } else {
         goto negotiate_failed;
+      }
     }
   }
 
--
cgit v0.9.0.2-2-gbebe




include/gstreamer-%%VERSION%%/gst/base/base.h
include/gstreamer-%%VERSION%%/gst/base/gstadapter.h
include/gstreamer-%%VERSION%%/gst/base/gstbaseparse.h
include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h
include/gstreamer-%%VERSION%%/gst/base/gstqueuearray.h
include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h
include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h
include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h

include/gstreamer-%%VERSION%%/gst/base/gstbytereader.h
include/gstreamer-%%VERSION%%/gst/base/gstbytewriter.h
include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h
include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h
include/gstreamer-%%VERSION%%/gst/base/gstflowcombiner.h
include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h
include/gstreamer-%%VERSION%%/gst/base/gstqueuearray.h
include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/check.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h

include/gstreamer-%%VERSION%%/gst/controller/controller.h
include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h
include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h
include/gstreamer-%%VERSION%%/gst/controller/gsttimedvaluecontrolsource.h
include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h
include/gstreamer-%%VERSION%%/gst/controller/gstlfocontrolsource.h
include/gstreamer-%%VERSION%%/gst/controller/gsttimedvaluecontrolsource.h
include/gstreamer-%%VERSION%%/gst/controller/gsttriggercontrolsource.h
include/gstreamer-%%VERSION%%/gst/glib-compat.h
include/gstreamer-%%VERSION%%/gst/gst.h

include/gstreamer-%%VERSION%%/gst/gstcontrolsource.h
include/gstreamer-%%VERSION%%/gst/gstdatetime.h
include/gstreamer-%%VERSION%%/gst/gstdebugutils.h
include/gstreamer-%%VERSION%%/gst/gstdevice.h
include/gstreamer-%%VERSION%%/gst/gstdevicemonitor.h
include/gstreamer-%%VERSION%%/gst/gstdeviceprovider.h
include/gstreamer-%%VERSION%%/gst/gstdeviceproviderfactory.h
include/gstreamer-%%VERSION%%/gst/gstelement.h
include/gstreamer-%%VERSION%%/gst/gstelementfactory.h
include/gstreamer-%%VERSION%%/gst/gstelementmetadata.h

include/gstreamer-%%VERSION%%/gst/gstvalue.h
include/gstreamer-%%VERSION%%/gst/gstversion.h
include/gstreamer-%%VERSION%%/gst/math-compat.h
include/gstreamer-%%VERSION%%/gst/net/net.h
include/gstreamer-%%VERSION%%/gst/net/gstnet.h
include/gstreamer-%%VERSION%%/gst/net/gstnetaddressmeta.h
include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h
include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h
include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h
include/gstreamer-%%VERSION%%/gst/net/net.h
lib/girepository-%%VERSION%%/Gst-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstBase-%%VERSION%%.typelib
%%CHECK%%lib/girepository-%%VERSION%%/GstCheck-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstController-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstNet-%%VERSION%%.typelib
lib/gstreamer-%%VERSION%%/libgstcoreelements.la
lib/gstreamer-%%VERSION%%/libgstcoreelements.so
lib/libgstbase-%%VERSION%%.la

share/locale/el/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/eo/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/eu/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/gl/LC_MESSAGES/gstreamer-%%VERSION%%.mo

share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrm libexec/gstreamer-%%VERSION%%
@dirrm lib/gstreamer-%%VERSION%%
@dirrm include/gstreamer-%%VERSION%%/gst/net
@dirrm include/gstreamer-%%VERSION%%/gst/controller
%%CHECK%%@dirrm include/gstreamer-%%VERSION%%/gst/check
@dirrm include/gstreamer-%%VERSION%%/gst/base
@dirrm include/gstreamer-%%VERSION%%/gst
@dirrm include/gstreamer-%%VERSION%%

Return to bug 194922

Lines 3-9 Link Here

(-)Makefile (-2 / +3 lines)
3	# $MCom: ports/multimedia/gstreamer1/Makefile,v 1.5 2013/01/15 21:43:45 kwm Exp $	3	# $MCom: ports/multimedia/gstreamer1/Makefile,v 1.5 2013/01/15 21:43:45 kwm Exp $
4		4
5	PORTNAME= gstreamer1	5	PORTNAME= gstreamer1
6	PORTVERSION= 1.2.4	6	PORTVERSION= 1.4.4
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8	MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/	8	MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/
9	DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION}	9	DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION}
Lines 12-17 Link Here
12	COMMENT= Media applications framework	12	COMMENT= Media applications framework
13		13
14	LICENSE= LGPL20	14	LICENSE= LGPL20
		15	LICENSE_FILE= ${WRKSRC}/COPYING
15		16
16	PORTSCOUT= limitw:1,even	17	PORTSCOUT= limitw:1,even
17		18
Lines 27-33 Link Here
27	CONFIGURE_ENV= ac_cv_func_register_printf_function="no"	28	CONFIGURE_ENV= ac_cv_func_register_printf_function="no"
28	INSTALL_TARGET= install-strip	29	INSTALL_TARGET= install-strip
29	PLIST_SUB= VERSION=${GST10_VERSION} \	30	PLIST_SUB= VERSION=${GST10_VERSION} \
30	SOVERSION=0.204.0	31	SOVERSION=0.404.0
31	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
32	GST10_VERSION= 1.0	33	GST10_VERSION= 1.0
33		34

Lines 1-28 Link Here

(-)files/patch-libs_gst_base_gstbasesrc.c (-28 lines)
1	From 63c17280408410d799e1c2f2ed49c5ab04cc80ae Mon Sep 17 00:00:00 2001
2	From: Sebastian DrÃ¶ge <sebastian@centricular.com>
3	Date: Sun, 20 Apr 2014 09:59:02 +0000
4	Subject: basesrc: Make sure to always hold the LIVE_LOCK when going to the flushing label
5
6	https://bugzilla.gnome.org/show_bug.cgi?id=728596
7	---
8	diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
9	index 9f2e52c..fc5a3af 100644
10	--- libs/gst/base/gstbasesrc.c
11	+++ libs/gst/base/gstbasesrc.c
12	@@ -2684,10 +2684,12 @@ gst_base_src_loop (GstPad * pad)
13	if (gst_pad_check_reconfigure (pad)) {
14	if (!gst_base_src_negotiate (src)) {
15	gst_pad_mark_reconfigure (pad);
16	- if (GST_PAD_IS_FLUSHING (pad))
17	+ if (GST_PAD_IS_FLUSHING (pad)) {
18	+ GST_LIVE_LOCK (src);
19	goto flushing;
20	- else
21	+ } else {
22	goto negotiate_failed;
23	+ }
24	}
25	}
26
27	--
28	cgit v0.9.0.2-2-gbebe

Lines 4-11 Link Here

(-)pkg-plist (-20 / +15 lines)
4	include/gstreamer-%%VERSION%%/gst/base/base.h	4	include/gstreamer-%%VERSION%%/gst/base/base.h
5	include/gstreamer-%%VERSION%%/gst/base/gstadapter.h	5	include/gstreamer-%%VERSION%%/gst/base/gstadapter.h
6	include/gstreamer-%%VERSION%%/gst/base/gstbaseparse.h	6	include/gstreamer-%%VERSION%%/gst/base/gstbaseparse.h
7	include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h
8	include/gstreamer-%%VERSION%%/gst/base/gstqueuearray.h
9	include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h	7	include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h
10	include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h	8	include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h
11	include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h	9	include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h
Lines 13-19 Link Here
13	include/gstreamer-%%VERSION%%/gst/base/gstbytereader.h	11	include/gstreamer-%%VERSION%%/gst/base/gstbytereader.h
14	include/gstreamer-%%VERSION%%/gst/base/gstbytewriter.h	12	include/gstreamer-%%VERSION%%/gst/base/gstbytewriter.h
15	include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h	13	include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h
		14	include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h
		15	include/gstreamer-%%VERSION%%/gst/base/gstflowcombiner.h
16	include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h	16	include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h
		17	include/gstreamer-%%VERSION%%/gst/base/gstqueuearray.h
17	include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h	18	include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h
18	%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/check.h	19	%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/check.h
19	%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h	20	%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h
Lines 24-32 Link Here
24	include/gstreamer-%%VERSION%%/gst/controller/controller.h	25	include/gstreamer-%%VERSION%%/gst/controller/controller.h
25	include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h	26	include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h
26	include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h	27	include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h
27	include/gstreamer-%%VERSION%%/gst/controller/gsttimedvaluecontrolsource.h
28	include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h	28	include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h
29	include/gstreamer-%%VERSION%%/gst/controller/gstlfocontrolsource.h	29	include/gstreamer-%%VERSION%%/gst/controller/gstlfocontrolsource.h
		30	include/gstreamer-%%VERSION%%/gst/controller/gsttimedvaluecontrolsource.h
30	include/gstreamer-%%VERSION%%/gst/controller/gsttriggercontrolsource.h	31	include/gstreamer-%%VERSION%%/gst/controller/gsttriggercontrolsource.h
31	include/gstreamer-%%VERSION%%/gst/glib-compat.h	32	include/gstreamer-%%VERSION%%/gst/glib-compat.h
32	include/gstreamer-%%VERSION%%/gst/gst.h	33	include/gstreamer-%%VERSION%%/gst/gst.h
Lines 48-53 Link Here
48	include/gstreamer-%%VERSION%%/gst/gstcontrolsource.h	49	include/gstreamer-%%VERSION%%/gst/gstcontrolsource.h
49	include/gstreamer-%%VERSION%%/gst/gstdatetime.h	50	include/gstreamer-%%VERSION%%/gst/gstdatetime.h
50	include/gstreamer-%%VERSION%%/gst/gstdebugutils.h	51	include/gstreamer-%%VERSION%%/gst/gstdebugutils.h
		52	include/gstreamer-%%VERSION%%/gst/gstdevice.h
		53	include/gstreamer-%%VERSION%%/gst/gstdevicemonitor.h
		54	include/gstreamer-%%VERSION%%/gst/gstdeviceprovider.h
		55	include/gstreamer-%%VERSION%%/gst/gstdeviceproviderfactory.h
51	include/gstreamer-%%VERSION%%/gst/gstelement.h	56	include/gstreamer-%%VERSION%%/gst/gstelement.h
52	include/gstreamer-%%VERSION%%/gst/gstelementfactory.h	57	include/gstreamer-%%VERSION%%/gst/gstelementfactory.h
53	include/gstreamer-%%VERSION%%/gst/gstelementmetadata.h	58	include/gstreamer-%%VERSION%%/gst/gstelementmetadata.h
Lines 92-108 Link Here
92	include/gstreamer-%%VERSION%%/gst/gstvalue.h	97	include/gstreamer-%%VERSION%%/gst/gstvalue.h
93	include/gstreamer-%%VERSION%%/gst/gstversion.h	98	include/gstreamer-%%VERSION%%/gst/gstversion.h
94	include/gstreamer-%%VERSION%%/gst/math-compat.h	99	include/gstreamer-%%VERSION%%/gst/math-compat.h
95	include/gstreamer-%%VERSION%%/gst/net/net.h
96	include/gstreamer-%%VERSION%%/gst/net/gstnet.h	100	include/gstreamer-%%VERSION%%/gst/net/gstnet.h
97	include/gstreamer-%%VERSION%%/gst/net/gstnetaddressmeta.h	101	include/gstreamer-%%VERSION%%/gst/net/gstnetaddressmeta.h
98	include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h	102	include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h
99	include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h	103	include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h
100	include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h	104	include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h
101	lib/girepository-1.0/Gst-%%VERSION%%.typelib	105	include/gstreamer-%%VERSION%%/gst/net/net.h
102	lib/girepository-1.0/GstBase-%%VERSION%%.typelib	106	lib/girepository-%%VERSION%%/Gst-%%VERSION%%.typelib
103	%%CHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib	107	lib/girepository-%%VERSION%%/GstBase-%%VERSION%%.typelib
104	lib/girepository-1.0/GstController-%%VERSION%%.typelib	108	%%CHECK%%lib/girepository-%%VERSION%%/GstCheck-%%VERSION%%.typelib
105	lib/girepository-1.0/GstNet-%%VERSION%%.typelib	109	lib/girepository-%%VERSION%%/GstController-%%VERSION%%.typelib
		110	lib/girepository-%%VERSION%%/GstNet-%%VERSION%%.typelib
106	lib/gstreamer-%%VERSION%%/libgstcoreelements.la	111	lib/gstreamer-%%VERSION%%/libgstcoreelements.la
107	lib/gstreamer-%%VERSION%%/libgstcoreelements.so	112	lib/gstreamer-%%VERSION%%/libgstcoreelements.so
108	lib/libgstbase-%%VERSION%%.la	113	lib/libgstbase-%%VERSION%%.la
Lines 151-158 Link Here
151	share/locale/el/LC_MESSAGES/gstreamer-%%VERSION%%.mo	156	share/locale/el/LC_MESSAGES/gstreamer-%%VERSION%%.mo
152	share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo	157	share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
153	share/locale/eo/LC_MESSAGES/gstreamer-%%VERSION%%.mo	158	share/locale/eo/LC_MESSAGES/gstreamer-%%VERSION%%.mo
		159	share/locale/es/LC_MESSAGES/gstreamer-%%VERSION%%.mo
154	share/locale/eu/LC_MESSAGES/gstreamer-%%VERSION%%.mo	160	share/locale/eu/LC_MESSAGES/gstreamer-%%VERSION%%.mo
155	share/locale/es/LC_MESSAGES/gstreamer-%%VERSION%%.mo
156	share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo	161	share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
157	share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo	162	share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
158	share/locale/gl/LC_MESSAGES/gstreamer-%%VERSION%%.mo	163	share/locale/gl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
Lines 179-191 Link Here
179	share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo	184	share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
180	share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo	185	share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo
181	share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo	186	share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo
182	@dirrmtry share/locale/rw/LC_MESSAGES
183	@dirrmtry share/locale/rw
184	@dirrm libexec/gstreamer-%%VERSION%%
185	@dirrm lib/gstreamer-%%VERSION%%
186	@dirrm include/gstreamer-%%VERSION%%/gst/net
187	@dirrm include/gstreamer-%%VERSION%%/gst/controller
188	%%CHECK%%@dirrm include/gstreamer-%%VERSION%%/gst/check
189	@dirrm include/gstreamer-%%VERSION%%/gst/base
190	@dirrm include/gstreamer-%%VERSION%%/gst
191	@dirrm include/gstreamer-%%VERSION%%