summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2010-12-18 16:09:26 -0800
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2010-12-19 09:27:27 -0800
commit12507d7f658883bcc13f8984fe642edbf21dafe5 (patch)
tree6487a184543c87a85ea6d37c73f746175957a1b7
parent2a7fc2873f2bb05db808b210f101b7a21ee58c0d (diff)
downloadgstreamer-12507d7f658883bcc13f8984fe642edbf21dafe5.tar.gz
gstreamer-12507d7f658883bcc13f8984fe642edbf21dafe5.tar.xz
version bump for gst-plugins-bad
-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-0 (renamed from packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.19.exheres-0)34
3 files changed, 107 insertions, 11 deletions
diff --git a/packages/media-plugins/gst-plugins-bad/files/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch b/packages/media-plugins/gst-plugins-bad/files/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch
new file mode 100644
index 0000000..b84f82c
--- /dev/null
+++ b/packages/media-plugins/gst-plugins-bad/files/18f38a747a0380b9ac61134c2f9fe8d9ed37c5f7.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 0000000..8d2b4c5
--- /dev/null
+++ b/packages/media-plugins/gst-plugins-bad/files/gst-plugins-bad-0.10.20-api-fix-for-gst-camera.patch
@@ -0,0 +1,44 @@
+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.19.exheres-0 b/packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.20.exheres-0
index ae956ec..cb9d0f1 100644
--- a/packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.19.exheres-0
+++ b/packages/media-plugins/gst-plugins-bad/gst-plugins-bad-0.10.20.exheres-0
@@ -20,7 +20,7 @@ MYOPTIONS="
dc1394 [[ description = [ Support for getting data from IIDC FireWire cameras using libdc1394 ] ]]
dirac [[ description = [ Dirac video stream encoding using the dirac-research library (it's recommended to use the Schroedinger implementation) ] ]]
dts [[ description = [ DTS (multichannel digital surround sound) audio decoding using libdca ] ]]
- dvdnav [[ description = [ DVD playback support ] ]]
+ exif [[ description = [ EXIF metadata ] ]]
faac [[ description = [ AAC audio encoding using faac ] ]]
faad [[ description = [ MPEG-2/4 AAC audio decoding using faad2 ] ]]
jack [[ description = [ Support for audio input/output via the Jack Audio Connection Kit ] ]]
@@ -50,20 +50,19 @@ DEPENDENCIES="
dev-util/pkg-config
doc? ( dev-doc/gtk-doc[>=1.3] )
build+run:
- media-libs/gstreamer:0.10[>=0.10.29]
- media-plugins/gst-plugins-base:0.10[>=0.10.29]
- dev-libs/glib:2[>=2.16]
- dev-libs/liboil[>=0.3.8]
+ media-libs/gstreamer:0.10[>=0.10.30]
+ media-plugins/gst-plugins-base:0.10[>=0.10.30]
+ dev-libs/glib:2[>=2.25]
+ dev-libs/orc:0.4[>=0.4.5]
gstreamer_plugins:alsa? ( sys-sound/alsa-lib[>=0.9.1] )
gstreamer_plugins:apex? ( dev-libs/openssl[>=0.9.5] )
gstreamer_plugins:ass? ( media-libs/libass[>=0.9.4] )
- gstreamer_plugins:celt? ( media-libs/celt[>=0.7] )
- gstreamer_plugins:cog? ( media-libs/libpng[>=1.2]
- dev-libs/orc:0.4[>=0.4.3] )
+ gstreamer_plugins:celt? ( media-libs/celt[>=0.8] )
+ gstreamer_plugins:cog? ( media-libs/libpng[>=1.2] )
gstreamer_plugins:dc1394? ( media-libs/libdc1394:2[>=2.0.0] )
gstreamer_plugins:dirac? ( media-libs/dirac[>=0.10] )
gstreamer_plugins:dts? ( media-libs/libdca )
- gstreamer_plugins:dvdnav? ( media-libs/libdvdnav[>=4.1.2] )
+ gstreamer_plugins:exif? ( media-libs/libexif[>=0.6.16] )
gstreamer_plugins:faac? ( media-libs/faac )
gstreamer_plugins:faad? ( media-libs/faad2[>=2.0] )
gstreamer_plugins:jack? ( media-sound/jack-audio-connection-kit[>=0.99.10] )
@@ -77,7 +76,7 @@ DEPENDENCIES="
gstreamer_plugins:musepack? ( media-libs/libmpcdec )
gstreamer_plugins:musicbrainz? ( media-libs/libmusicbrainz:2[>=2.1.0] )
gstreamer_plugins:mjpeg? ( media-video/mjpegtools[>=1.6.1.93] )
- gstreamer_plugins:neon? ( net-misc/neon[>=0.26.0&<=0.29.99] )
+ gstreamer_plugins:neon? ( net-misc/neon[>=0.27.0&<=0.29.99] )
gstreamer_plugins:ofa? ( media-libs/libofa[>=0.9.3] )
gstreamer_plugins:schroedinger? ( media-libs/schroedinger[>=1.0.7][-gstreamer(-)] )
gstreamer_plugins:sdl? ( media-libs/SDL )
@@ -92,6 +91,9 @@ 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=(
'--enable-experimental'
'--enable-adpcmdec'
@@ -103,6 +105,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
'--enable-bayer'
'--enable-camerabin'
'--enable-cdxaparse'
+'--enable-coloreffects'
'--enable-dccp'
'--enable-debugutils'
'--enable-dtmf'
@@ -110,11 +113,16 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
'--enable-festival'
'--enable-freeze'
'--enable-frei0r'
+'--enable-gaudieffects'
+'--enable-geometrictransform'
+'--enable-gsettings'
'--enable-h264parse'
'--enable-hdvparse'
'--enable-id3tag'
'--enable-invtelecine'
+'--enable-ivfparse'
'--enable-jpegformat'
+'--enable-legacyresample'
'--enable-librfb'
'--enable-liveadder'
'--enable-mpegdemux'
@@ -126,6 +134,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
'--enable-mxf'
'--enable-nsf'
'--enable-nuvdemux'
+'--enable-orc'
'--enable-pcapparse'
'--enable-pnm'
'--enable-qtmux'
@@ -136,12 +145,14 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
'--enable-sdp'
'--enable-segmentclip'
'--enable-selector'
+'--enable-shm'
'--enable-siren'
'--enable-speed'
'--enable-subenc'
'--enable-stereo'
'--enable-tta'
'--enable-valve'
+'--enable-videomaxrate'
'--enable-videomeasure'
'--enable-videosignal'
'--enable-vmnc'
@@ -164,6 +175,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
'--disable-mythtv'
'--disable-nas'
'--disable-quicktime'
+'--disable-rtmp'
'--disable-spc'
'--disable-timidity'
'--disable-wildmidi'
@@ -183,8 +195,8 @@ DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( 'doc gtk-doc'
'gstreamer_plugins:cog'
'gstreamer_plugins:dc1394'
'gstreamer_plugins:dirac'
-'gstreamer_plugins:dvdnav'
'gstreamer_plugins:dts'
+'gstreamer_plugins:exif'
'gstreamer_plugins:faac'
'gstreamer_plugins:faad'
'gstreamer_plugins:jack'