summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Brett Witherspoon <spoonb@exherbo.org> 2011-01-15 15:36:21 -0600
committerAvatar Brett Witherspoon <spoonb@exherbo.org> 2011-01-15 15:36:21 -0600
commit97ebdec187a5aa71925fe2e37b1fb959f17fb55d (patch)
tree3b77dacf8aa351365eb5fa03b9d4918444c53203
parent4f1b529137958a363c57c3b6632e38628203ea8c (diff)
downloadgstreamer-97ebdec187a5aa71925fe2e37b1fb959f17fb55d.tar.gz
gstreamer-97ebdec187a5aa71925fe2e37b1fb959f17fb55d.tar.xz
gst-plugins-bad: disable examples use gtk-doc
-rw-r--r--packages/media-plugins/gst-plugins-bad/files/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch40
-rw-r--r--packages/media-plugins/gst-plugins-bad/files/gst-plugins-bad-0.10.20-api-fix-for-gst-camera.patch44
-rw-r--r--packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.20.exheres-010
3 files changed, 4 insertions, 90 deletions
diff --git a/packages/media-plugins/gst-plugins-bad/files/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch b/packages/media-plugins/gst-plugins-bad/files/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch
deleted file mode 100644
index b84f82c..0000000
--- a/packages/media-plugins/gst-plugins-bad/files/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7 Mon Sep 17 00:00:00 2001
-From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
-Date: Tue, 12 Oct 2010 10:11:37 +0000
-Subject: examples: Fix compilation with GTK+ 3.0
-
----
-diff --git a/tests/examples/camerabin/gst-camera.c b/tests/examples/camerabin/gst-camera.c
-index b56402a..c837ba5 100644
---- a/tests/examples/camerabin/gst-camera.c
-+++ b/tests/examples/camerabin/gst-camera.c
-@@ -1035,6 +1035,9 @@ on_color_control_value_changed (GtkRange * range, gpointer user_data)
- gst_color_balance_set_value (balance, channel, val);
- }
-
-+#ifndef GDK_KEY_F11
-+#define GDK_KEY_F11 GDK_F11
-+#endif
-
- gboolean
- on_key_released (GtkWidget * widget, GdkEventKey * event, gpointer user_data)
-@@ -1042,7 +1045,7 @@ on_key_released (GtkWidget * widget, GdkEventKey * event, gpointer user_data)
- g_return_val_if_fail (event != NULL, FALSE);
-
- switch (event->keyval) {
-- case GDK_F11:
-+ case GDK_KEY_F11:
- #ifdef HAVE_GST_PHOTO_IFACE_H
- gst_photography_set_autofocus (GST_PHOTOGRAPHY (gst_videosrc), FALSE);
- #endif
-@@ -1060,7 +1063,7 @@ on_key_pressed (GtkWidget * widget, GdkEventKey * event, gpointer user_data)
- g_return_val_if_fail (event != NULL, FALSE);
-
- switch (event->keyval) {
-- case GDK_F11:
-+ case GDK_KEY_F11:
- #ifdef HAVE_GST_PHOTO_IFACE_H
- gst_photography_set_autofocus (GST_PHOTOGRAPHY (gst_videosrc), TRUE);
- #endif
---
-cgit v0.8.3-6-g21f6
diff --git a/packages/media-plugins/gst-plugins-bad/files/gst-plugins-bad-0.10.20-api-fix-for-gst-camera.patch b/packages/media-plugins/gst-plugins-bad/files/gst-plugins-bad-0.10.20-api-fix-for-gst-camera.patch
deleted file mode 100644
index 8d2b4c5..0000000
--- a/packages/media-plugins/gst-plugins-bad/files/gst-plugins-bad-0.10.20-api-fix-for-gst-camera.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Saleem Abdulrasool <compnerd@compnerd.org>
-Reason: fix for API removal in latest GTK+:3.0
-Upstream: no
---
---- gst-plugins-bad-0.10.20/tests/examples/camerabin/gst-camera.c.orig 2010-12-19 09:16:05.867000067 -0800
-+++ gst-plugins-bad-0.10.20/tests/examples/camerabin/gst-camera.c 2010-12-19 09:24:15.624000130 -0800
-@@ -276,7 +276,11 @@
-
- /* FIXME: make sure to get XID in main thread */
- gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (message->src),
-+#if GTK_CHECK_VERSION (2, 91, 6)
-+ GDK_WINDOW_XID (gtk_widget_get_window (ui_drawing)));
-+#else
- GDK_WINDOW_XWINDOW (gtk_widget_get_window (ui_drawing)));
-+#endif
-
- gst_message_unref (message);
- return GST_BUS_DROP;
-@@ -1156,6 +1160,10 @@
-
- for (j = 0; j < num_framerates; j++) {
- GstCaps *video_caps;
-+#if GTK_CHECK_VERSION (2, 91, 6)
-+ GtkListStore *store;
-+ GtkTreeIter iter;
-+#endif
-
- if (framerate_list) {
- const GValue *item = gst_value_list_get_value (framerate_list, j);
-@@ -1166,7 +1174,14 @@
- g_string_append_printf (item_str, " (%" GST_FOURCC_FORMAT ")",
- GST_FOURCC_ARGS (fourcc));
- g_string_append_printf (item_str, ", %dx%d at %d/%d", w, h, n, d);
-+
-+#if GTK_CHECK_VERSION (2, 91, 6)
-+ store = GTK_LIST_STORE (gtk_combo_box_get_model (ui_cbbox_resolution));
-+ gtk_list_store_append (store, &iter);
-+ gtk_list_store_set (store, &iter, 0, item_str->str, -1);
-+#else
- gtk_combo_box_append_text (ui_cbbox_resolution, item_str->str);
-+#endif
-
- video_caps =
- gst_caps_new_simple (structure_name, "format", GST_TYPE_FOURCC,
diff --git a/packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.20.exheres-0 b/packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.20.exheres-0
index bdf0ce6..502a2b8 100644
--- a/packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.20.exheres-0
+++ b/packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.20.exheres-0
@@ -12,7 +12,7 @@ LICENCES="LGPL-2"
SLOT="0"
PLATFORMS="~amd64 ~x86"
MYOPTIONS="
- doc
+ gtk-doc
gstreamer_plugins:
alsa [[ description = [ S/PDIF audio output using ALSA ] ]]
apex [[ description = [ AirPort Express Wireless Support ] ]]
@@ -50,7 +50,7 @@ MYOPTIONS="
DEPENDENCIES="
build:
dev-util/pkg-config
- doc? ( dev-doc/gtk-doc[>=1.3] )
+ gtk-doc? ( dev-doc/gtk-doc[>=1.3] )
build+run:
media-libs/gstreamer:0.10[>=0.10.30]
media-plugins/gst-plugins-base:0.10[>=0.10.30]
@@ -93,10 +93,8 @@ DEPENDENCIES="
|| ( x11-libs/gtk+:3.0 x11-libs/gtk+:2[>=2.12] )
"
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch"
- "${FILES}/gst-plugins-bad-0.10.20-api-fix-for-gst-camera.patch" )
-
DEFAULT_SRC_CONFIGURE_PARAMS=(
+'--disable-examples'
'--enable-experimental'
'--enable-adpcmdec'
'--enable-adpcmenc'
@@ -189,7 +187,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
'--enable-vcd'
)
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc'
+DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'gtk-doc'
'gstreamer_plugins:alsa'
'gstreamer_plugins:apex apexsink'
'gstreamer_plugins:ass assrender'