summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-05-12 12:08:17 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-05-12 12:18:52 +0200
commit6f10609660bfc8475b9de55287602b6a5b7603cc (patch)
tree81466f3756fc0d26585ba45f302b748bc4880f8c
parent81ac3fdf227dc34871b4aabb1c67eae9d28658a3 (diff)
downloadptxdist-6f10609660bfc8475b9de55287602b6a5b7603cc.tar.gz
ptxdist-6f10609660bfc8475b9de55287602b6a5b7603cc.tar.xz
gst-plugins-good: version bump 0.10.23 -> 0.10.29
Based on a patch from Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch26
-rw-r--r--patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch43
-rw-r--r--patches/gst-plugins-good-0.10.23/series2
-rw-r--r--patches/gst-plugins-good-0.10.29/0001-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch26
-rw-r--r--patches/gst-plugins-good-0.10.29/series1
-rw-r--r--rules/gst-plugins-good.in11
-rw-r--r--rules/gst-plugins-good.make25
7 files changed, 44 insertions, 90 deletions
diff --git a/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch b/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
deleted file mode 100644
index 687f19e2c..000000000
--- a/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 15d09f55a687f5e5f26c5a5c7d9cabc36ee19512 Mon Sep 17 00:00:00 2001
-From: Michael Grzeschik <m.grzeschik@pengutronix.de>
-Date: Wed, 23 Jun 2010 12:15:13 +0200
-Subject: [PATCH 1/2] [gstavidemux] reset the have_index flag at transition PAUSED_TO_READY
-
-If we restart the Stream in the case of doing a transition from
-PAUSED_TO_READY and back with READY_TO_PAUSED aso. the duration of the video
-will get calculated even if we have a avi header with that information.
-
-Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
----
- gst/avi/gstavidemux.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-Index: gst-plugins-good-0.10.23/gst/avi/gstavidemux.c
-===================================================================
---- gst-plugins-good-0.10.23.orig/gst/avi/gstavidemux.c 2010-06-23 17:36:48.000000000 +0200
-+++ gst-plugins-good-0.10.23/gst/avi/gstavidemux.c 2010-06-23 17:36:50.000000000 +0200
-@@ -5345,6 +5345,7 @@
-
- switch (transition) {
- case GST_STATE_CHANGE_PAUSED_TO_READY:
-+ avi->have_index = FALSE;
- gst_avi_demux_reset (avi);
- break;
- default:
diff --git a/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch b/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
deleted file mode 100644
index b4b08f7bf..000000000
--- a/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 49e64005c4ed0a09ccf9ccb2b0e7521e64d21efd Mon Sep 17 00:00:00 2001
-From: Michael Grzeschik <m.grzeschik@pengutronix.de>
-Date: Wed, 23 Jun 2010 11:47:43 +0200
-Subject: [PATCH 2/2] [gstv4l2sink] destroy open buffers when changing to NULL
-
-In the case we change the State from READY_TO_NULL the open buffers
-still hold a open dup filedescriptor to the device, therefor the device
-release function will not be called and the device probably answer with
--EBUSY when we reopen it at transition NULL_TO_READY.
-
-Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
----
- sys/v4l2/gstv4l2sink.c | 10 +++-------
- 1 files changed, 3 insertions(+), 7 deletions(-)
-
-Index: gst-plugins-good-0.10.23/sys/v4l2/gstv4l2sink.c
-===================================================================
---- gst-plugins-good-0.10.23.orig/sys/v4l2/gstv4l2sink.c 2010-06-23 17:36:47.000000000 +0200
-+++ gst-plugins-good-0.10.23/sys/v4l2/gstv4l2sink.c 2010-06-23 17:36:55.000000000 +0200
-@@ -461,6 +461,8 @@
- }
- break;
- case GST_STATE_CHANGE_READY_TO_NULL:
-+ gst_v4l2_buffer_pool_destroy(v4l2sink->pool);
-+ v4l2sink->pool=NULL;
- /* close the device */
- if (!gst_v4l2_object_stop (v4l2sink->v4l2object))
- return GST_STATE_CHANGE_FAILURE;
-@@ -557,13 +559,7 @@
- }
-
- if (v4l2sink->pool) {
-- /* TODO: if we've already allocated buffers, we probably need to
-- * do something here to free and reallocate....
-- *
-- * gst_v4l2_object_stop_streaming()
-- * gst_v4l2_buffer_pool_destroy()
-- *
-- */
-+ gst_v4l2_object_stop_streaming(v4l2sink->v4l2object);
- GST_DEBUG_OBJECT (v4l2sink, "warning, changing caps not supported yet");
- return FALSE;
- }
diff --git a/patches/gst-plugins-good-0.10.23/series b/patches/gst-plugins-good-0.10.23/series
deleted file mode 100644
index 8fcf4a27b..000000000
--- a/patches/gst-plugins-good-0.10.23/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
-0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
diff --git a/patches/gst-plugins-good-0.10.29/0001-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch b/patches/gst-plugins-good-0.10.29/0001-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
new file mode 100644
index 000000000..39ebb6be8
--- /dev/null
+++ b/patches/gst-plugins-good-0.10.29/0001-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
@@ -0,0 +1,26 @@
+From 5423cc8de5c5ea0772043e03d3501a5560444b00 Mon Sep 17 00:00:00 2001
+From: Michael Grzeschik <m.grzeschik@pengutronix.de>
+Date: Mon, 18 Apr 2011 11:35:21 +0200
+Subject: [PATCH] follow up on bug:622500 in gst-plugins-good bugzilla
+
+The situation is still unclear, so just for now we will
+keep that patch to check on this again later.
+---
+ sys/v4l2/gstv4l2sink.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/sys/v4l2/gstv4l2sink.c b/sys/v4l2/gstv4l2sink.c
+index aa6785c..0df7faa 100644
+--- a/sys/v4l2/gstv4l2sink.c
++++ b/sys/v4l2/gstv4l2sink.c
+@@ -725,6 +725,7 @@ gst_v4l2sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
+ * gst_v4l2_buffer_pool_destroy()
+ *
+ */
++ gst_v4l2_object_stop_streaming(v4l2sink->v4l2object);
+ GST_DEBUG_OBJECT (v4l2sink, "warning, changing caps not supported yet");
+ return FALSE;
+ }
+--
+1.7.4.1
+
diff --git a/patches/gst-plugins-good-0.10.29/series b/patches/gst-plugins-good-0.10.29/series
new file mode 100644
index 000000000..19065a40a
--- /dev/null
+++ b/patches/gst-plugins-good-0.10.29/series
@@ -0,0 +1 @@
+0001-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in
index c5281f49a..26300914a 100644
--- a/rules/gst-plugins-good.in
+++ b/rules/gst-plugins-good.in
@@ -61,6 +61,10 @@ if GST_PLUGINS_GOOD
bool
prompt "audiofx"
+ config GST_PLUGINS_GOOD_AUDIOPARSERS
+ bool
+ prompt "audioparsers"
+
config GST_PLUGINS_GOOD_AUPARSE
bool
prompt "auparse"
@@ -151,7 +155,7 @@ if GST_PLUGINS_GOOD
config GST_PLUGINS_GOOD_QTDEMUX
bool
- prompt "qtdemux"
+ prompt "isomp4"
config GST_PLUGINS_GOOD_REPLAYGAIN
bool
@@ -300,6 +304,11 @@ if GST_PLUGINS_GOOD
bool
prompt "jpeg"
+ config GST_PLUGINS_GOOD_JACK
+ bool
+ prompt "jack"
+ depends on BROKEN
+
config GST_PLUGINS_GOOD_LIBCACA
bool
prompt "libcaca"
diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make
index 4141a6faa..2e9b2917e 100644
--- a/rules/gst-plugins-good.make
+++ b/rules/gst-plugins-good.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD) += gst-plugins-good
#
# Paths and names
#
-GST_PLUGINS_GOOD_VERSION := 0.10.23
-GST_PLUGINS_GOOD_MD5 := 9cddbb0e7e90677f0cc05c23feffef5c
+GST_PLUGINS_GOOD_VERSION := 0.10.29
+GST_PLUGINS_GOOD_MD5 := 5a652416141d9530258b474dc1d384b9
GST_PLUGINS_GOOD := gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION)
GST_PLUGINS_GOOD_SUFFIX := tar.bz2
GST_PLUGINS_GOOD_URL := http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD).$(GST_PLUGINS_GOOD_SUFFIX)
@@ -41,6 +41,7 @@ GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_ALPHA) += alpha
GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_ALPHA) += alpha alphacolor
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_APETAG) += apetag
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUDIOFX) += audiofx
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUDIOPARSERS)+= audioparsers
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUPARSE) += auparse
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AUTODETECT) += autodetect
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_AVI) += avi
@@ -66,7 +67,7 @@ GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MATROSKA) += matroska
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MONOSCOPE) += monoscope
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MULTIFILE) += multifile
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_MULTIPART) += multipart
-GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_QTDEMUX) += qtdemux
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_QTDEMUX) += isomp4
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_REPLAYGAIN) += replaygain
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_RTP) += rtp
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_RTPMANAGER) += rtpmanager
@@ -106,6 +107,7 @@ GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_GDK_PIXBUF) += gdk_pixbuf
GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_GDK_PIXBUF) += gdkpixbuf
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_HAL) += hal
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_JPEG) += jpeg
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_JACK) += jack
GST_PLUGINS_GOOD_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD_LIBCACA) += libcaca
GST_PLUGINS_GOOD_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD_LIBCACA) += cacasink
GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_LIBDV) += libdv
@@ -128,27 +130,14 @@ GST_PLUGINS_GOOD_ENABLEP-y += $(GST_PLUGINS_GOOD_ENABLE-y)
#
# autoconf
#
-# --without-libiconv-prefix -> we use libc iconv
-#
GST_PLUGINS_GOOD_CONF_TOOL := autoconf
-GST_PLUGINS_GOOD_CONF_OPT := \
+GST_PLUGINS_GOOD_CONF_OPT = \
$(CROSS_AUTOCONF_USR) \
- --enable-option-checking \
- --enable-silent-rules \
- --disable-nls \
- --disable-rpath \
- --disable-debug \
- --disable-profiling \
- --disable-valgrind \
- --disable-gcov \
- --disable-examples \
+ $(GSTREAMER_GENERIC_CONF_OPT) \
--enable-external \
--enable-experimental \
--disable-schemas-install \
- --disable-gtk-doc \
--disable-gconftool \
- --without-libiconv-prefix \
- --without-libintl-prefix \
--disable-esdtest \
--disable-aalibtest \
--disable-shout2test