aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Domke <felix.domke@multimedia-labs.de>2009-10-07 00:50:39 +0200
committerFelix Domke <felix.domke@multimedia-labs.de>2009-10-07 00:50:39 +0200
commit809c64828aa25759db78d971384407433b8f9cdd (patch)
tree2d98f03e62d78d2bb5f7aff377d03ae85bcde3c9
parent7c1ca0a88635e9c45b4a9b7b6641a9770bbe319f (diff)
parentb425254b163abfae6e1ef14d8050cd42f7ed753a (diff)
downloadopenembedded-809c64828aa25759db78d971384407433b8f9cdd.tar.gz
Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost/opendreambox-1.5 into org.openembedded.dreambox
-rw-r--r--packages/gstreamer/files/gst-configure_skip_shave.patch11
-rw-r--r--packages/gstreamer/files/gst-plugins_disable_introspection.patch12
-rw-r--r--packages/gstreamer/gst-plugin-dvbmediasink.bb2
-rw-r--r--packages/gstreamer/gst-plugins-bad_0.10.14.bb2
-rw-r--r--packages/gstreamer/gst-plugins-base/playsink-textsink.diff28
-rw-r--r--packages/gstreamer/gst-plugins-base/playsink_fix_double_refcount.patch64
-rw-r--r--packages/gstreamer/gst-plugins-base_0.10.25.bb (renamed from packages/gstreamer/gst-plugins-base_0.10.24.bb)6
-rw-r--r--packages/gstreamer/gst-plugins-good_0.10.16.bb2
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.12.bb1
-rw-r--r--packages/gstreamer/gst-plugins.inc3
-rw-r--r--packages/gstreamer/gstreamer/gst-configure_disable_introspection.patch12
-rw-r--r--packages/gstreamer/gstreamer/gst-configure_skip_shave.patch11
-rw-r--r--packages/gstreamer/gstreamer_0.10.25.bb (renamed from packages/gstreamer/gstreamer_0.10.24.bb)5
13 files changed, 46 insertions, 113 deletions
diff --git a/packages/gstreamer/files/gst-configure_skip_shave.patch b/packages/gstreamer/files/gst-configure_skip_shave.patch
deleted file mode 100644
index 76dc14799c..0000000000
--- a/packages/gstreamer/files/gst-configure_skip_shave.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac 2009-04-16 01:49:47.000000000 +0200
-+++ configure.ac 2009-04-16 08:09:31.000000000 +0200
-@@ -625,8 +625,6 @@
- GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
- AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS")
-
--SHAVE_INIT([common],[enable])
--
- AC_CONFIG_FILES(
- Makefile
- common/shave
diff --git a/packages/gstreamer/files/gst-plugins_disable_introspection.patch b/packages/gstreamer/files/gst-plugins_disable_introspection.patch
new file mode 100644
index 0000000000..bf742349aa
--- /dev/null
+++ b/packages/gstreamer/files/gst-plugins_disable_introspection.patch
@@ -0,0 +1,12 @@
+--- configure.ac 2009-10-05 14:04:05.000000000 +0200
++++ configure.ac 2009-10-06 13:03:56.000000000 +0200
+@@ -134,8 +134,7 @@
+ AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
+ AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
+
+-dnl check for gobject-introspection
+-GOBJECT_INTROSPECTION_CHECK([0.6.3])
++AM_CONDITIONAL(HAVE_INTROSPECTION, test "a" = "b")
+
+ dnl check for documentation tools
+ GTK_DOC_CHECK([1.3])
diff --git a/packages/gstreamer/gst-plugin-dvbmediasink.bb b/packages/gstreamer/gst-plugin-dvbmediasink.bb
index 4fc4215b67..e5622f8328 100644
--- a/packages/gstreamer/gst-plugin-dvbmediasink.bb
+++ b/packages/gstreamer/gst-plugin-dvbmediasink.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
MAINTAINER = "Felix Domke <tmbinc@openembedded.org>"
DEPENDS = "gstreamer gst-plugins-base"
PV = "0.10+${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit autotools pkgconfig
diff --git a/packages/gstreamer/gst-plugins-bad_0.10.14.bb b/packages/gstreamer/gst-plugins-bad_0.10.14.bb
index 6f3e8e13d4..3a2e08cc36 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.14.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.14.bb
@@ -5,4 +5,4 @@ RCONFLICTS_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"
RREPLACES_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"
SRC_URI += "file://gst-plugins_configure_skip_shave.patch;patch=1;pnum=0 \
file://mpegpsdemux_speedup.diff;patch=1;pnum=0"
-PR = "r0"
+PR = "r1"
diff --git a/packages/gstreamer/gst-plugins-base/playsink-textsink.diff b/packages/gstreamer/gst-plugins-base/playsink-textsink.diff
deleted file mode 100644
index 46dd64a169..0000000000
--- a/packages/gstreamer/gst-plugins-base/playsink-textsink.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
-index 0a65a4f..6c54f48 100644
---- a/gst/playback/gstplaysink.c
-+++ b/gst/playback/gstplaysink.c
-@@ -2385,6 +2385,15 @@ gst_play_sink_send_event_to_sink (GstPlaySink * playsink, GstEvent * event)
- {
- gboolean res = TRUE;
-
-+ if (playsink->textchain && playsink->text_sink) {
-+ gst_event_ref (event);
-+ if ((res = gst_element_send_event (playsink->textchain->chain.bin, event))) {
-+ GST_DEBUG_OBJECT (playsink, "Sent event succesfully to text sink");
-+ } else {
-+ GST_DEBUG_OBJECT (playsink, "Event failed when sent to text sink");
-+ }
-+ }
-+
- if (playsink->videochain) {
- gst_event_ref (event);
- if ((res = gst_element_send_event (playsink->videochain->chain.bin, event))) {
-@@ -2401,6 +2410,7 @@ gst_play_sink_send_event_to_sink (GstPlaySink * playsink, GstEvent * event)
- }
- GST_DEBUG_OBJECT (playsink, "Event failed when sent to audio sink");
- }
-+
- done:
- gst_event_unref (event);
- return res;
diff --git a/packages/gstreamer/gst-plugins-base/playsink_fix_double_refcount.patch b/packages/gstreamer/gst-plugins-base/playsink_fix_double_refcount.patch
deleted file mode 100644
index ac26b50589..0000000000
--- a/packages/gstreamer/gst-plugins-base/playsink_fix_double_refcount.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c3ebeec5a54c6c00bf30f7196968a9369c3d8205 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wim.taymans@collabora.co.uk>
-Date: Mon, 24 Aug 2009 13:06:28 +0000
-Subject: playbin2: fix refcounting of _get_sink()
-
-g_value_set_object() increases the refcount of the sink, which is not needed
-because the object should already be refcounted. Make sure this is always the
-case and use g_value_take_object().
-
-Fixes: #592884
----
-diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
-index 6fc8d2d..24071b5 100644
---- a/gst/playback/gstplaybin2.c
-+++ b/gst/playback/gstplaybin2.c
-@@ -1618,8 +1618,12 @@ gst_play_bin_get_current_sink (GstPlayBin * playbin, GstElement ** elem,
- GST_PTR_FORMAT ", the originally set %s sink is %" GST_PTR_FORMAT,
- dbg, sink, dbg, *elem);
-
-- if (sink == NULL)
-- sink = *elem;
-+ if (sink == NULL) {
-+ GST_PLAY_BIN_LOCK (playbin);
-+ if ((sink = *elem))
-+ gst_object_ref (sink);
-+ GST_PLAY_BIN_UNLOCK (playbin);
-+ }
-
- return sink;
- }
-@@ -1720,26 +1724,26 @@ gst_play_bin_get_property (GObject * object, guint prop_id, GValue * value,
- GST_PLAY_BIN_UNLOCK (playbin);
- break;
- case PROP_VIDEO_SINK:
-- g_value_set_object (value,
-+ g_value_take_object (value,
- gst_play_bin_get_current_sink (playbin, &playbin->video_sink,
- "video", GST_PLAY_SINK_TYPE_VIDEO));
- break;
- case PROP_AUDIO_SINK:
-- g_value_set_object (value,
-+ g_value_take_object (value,
- gst_play_bin_get_current_sink (playbin, &playbin->audio_sink,
- "audio", GST_PLAY_SINK_TYPE_AUDIO));
- break;
- case PROP_VIS_PLUGIN:
-- g_value_set_object (value,
-+ g_value_take_object (value,
- gst_play_sink_get_vis_plugin (playbin->playsink));
- break;
- case PROP_TEXT_SINK:
-- g_value_set_object (value,
-+ g_value_take_object (value,
- gst_play_bin_get_current_sink (playbin, &playbin->text_sink,
- "text", GST_PLAY_SINK_TYPE_TEXT));
- break;
- case PROP_SUBPIC_SINK:
-- g_value_set_object (value,
-+ g_value_take_object (value,
- gst_play_bin_get_current_sink (playbin, &playbin->subpic_sink,
- "subpicture", GST_PLAY_SINK_TYPE_SUBPIC));
- break;
---
-cgit v0.8.2
diff --git a/packages/gstreamer/gst-plugins-base_0.10.24.bb b/packages/gstreamer/gst-plugins-base_0.10.25.bb
index b1f085edf2..edaefb40b7 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.24.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.25.bb
@@ -2,8 +2,6 @@ include gst-plugins.inc
PROVIDES_${PN} += "gst-plugins"
RCONFLICTS_gst-plugins-base = "libgstapp-0.10-0"
RREPLACES_gst-plugins-base = "libgstapp-0.10-0"
-EXTRA_OECONF += "--with-audioresample-format=int"
-PR = "r3"
+EXTRA_OECONF += "--with-audioresample-format=int --disable-pango"
SRC_URI += "file://gst-plugins_configure_skip_shave.patch;patch=1;pnum=0 \
- file://playsink-textsink.diff;patch=1;pnum=1 \
- file://playsink_fix_double_refcount.patch;patch=1;pnum=1" \ No newline at end of file
+ file://gst-plugins_disable_introspection.patch;patch=1;pnum=0"
diff --git a/packages/gstreamer/gst-plugins-good_0.10.16.bb b/packages/gstreamer/gst-plugins-good_0.10.16.bb
index 19de0e9f15..d016940784 100644
--- a/packages/gstreamer/gst-plugins-good_0.10.16.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.16.bb
@@ -2,4 +2,4 @@ require gst-plugins.inc
DEPENDS += "gst-plugins-base"
SRC_URI += "file://sed-with-autoconf-2.59.patch;patch=1;pnum=1 \
file://gst-plugins-good_configure_skip_shave.patch;patch=1;pnum=0"
-PR = "r0" \ No newline at end of file
+PR = "r1" \ No newline at end of file
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.12.bb b/packages/gstreamer/gst-plugins-ugly_0.10.12.bb
index e4684a73fd..7eaea9e444 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.12.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.12.bb
@@ -1,3 +1,4 @@
require gst-plugins.inc
SRC_URI += "file://gst-plugins_configure_skip_shave.patch;patch=1;pnum=0"
DEPENDS += "gst-plugins-base"
+PR="r5" \ No newline at end of file
diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index b65df0547c..7318e65d5a 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -3,7 +3,7 @@ SECTION = "multimedia"
PRIORITY = "optional"
MAINTAINER = "Felix Domke <tmbinc@openembedded.org>"
DEPENDS = "gstreamer libcdio libmikmod libmad libogg tremor libvorbis libid3tag liboil alsa-lib neon flac"
-PR = "r4"
+PR = "r0"
inherit autotools pkgconfig
@@ -25,6 +25,7 @@ python populate_packages_prepend () {
}
do_configure_prepend() {
+ rm ${S}/common/m4/introspection.m4 || /bin/true
for i in libtool ltoptions ltsugar ltversion lt~obsolete; do
rm ${S}/m4/$i.m4 || /bin/true;
done
diff --git a/packages/gstreamer/gstreamer/gst-configure_disable_introspection.patch b/packages/gstreamer/gstreamer/gst-configure_disable_introspection.patch
new file mode 100644
index 0000000000..e3864c4430
--- /dev/null
+++ b/packages/gstreamer/gstreamer/gst-configure_disable_introspection.patch
@@ -0,0 +1,12 @@
+--- configure.ac 2009-10-05 13:04:31.000000000 +0200
++++ configure.ac 2009-10-06 12:39:29.000000000 +0200
+@@ -268,8 +268,7 @@
+ AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
+ AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
+
+-dnl check for gobject-introspection
+-GOBJECT_INTROSPECTION_CHECK([0.6.3])
++AM_CONDITIONAL(HAVE_INTROSPECTION, test "a" = "b")
+
+ dnl check for documentation tools
+ AG_GST_DOCBOOK_CHECK
diff --git a/packages/gstreamer/gstreamer/gst-configure_skip_shave.patch b/packages/gstreamer/gstreamer/gst-configure_skip_shave.patch
new file mode 100644
index 0000000000..e9d7abcf80
--- /dev/null
+++ b/packages/gstreamer/gstreamer/gst-configure_skip_shave.patch
@@ -0,0 +1,11 @@
+--- configure.ac 2009-10-05 23:29:45.000000000 +0200
++++ configure.ac 2009-10-05 23:30:46.000000000 +0200
+@@ -658,8 +658,6 @@
+ GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+ AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS")
+
+-SHAVE_INIT([common],[enable])
+-
+ dnl things for our internal libcheck
+ if test "x$BUILD_CHECK" = "xyes"; then
+ AG_GST_CHECK_CHECKS()
diff --git a/packages/gstreamer/gstreamer_0.10.24.bb b/packages/gstreamer/gstreamer_0.10.25.bb
index 0b4e7aadc3..911a51106f 100644
--- a/packages/gstreamer/gstreamer_0.10.24.bb
+++ b/packages/gstreamer/gstreamer_0.10.25.bb
@@ -12,9 +12,10 @@ PR = "r0"
inherit autotools pkgconfig
SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
-file://gst-configure_skip_shave.patch;patch=1;pnum=0"
+ file://gst-configure_skip_shave.patch;patch=1;pnum=0 \
+ file://gst-configure_disable_introspection.patch;patch=1;pnum=0"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no"
+EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-tests --disable-check --disable-examples"
do_configure_prepend() {
for i in libtool ltoptions ltsugar ltversion lt~obsolete shave; do