diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 15:31:18 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 15:31:18 +0100 |
| commit | 028b68159ee1005025d666d73b1a355c4930f0c8 (patch) | |
| tree | e94a917ba4c7ec82f25dae8daf8e3d3d68a0f9da /patches/gst-plugins-gl-0.10.2 | |
| parent | ab071acfe59ec892d79879c36a6ec63f612bc161 (diff) | |
| download | ptxdist-028b68159ee1005025d666d73b1a355c4930f0c8.tar.gz ptxdist-028b68159ee1005025d666d73b1a355c4930f0c8.tar.xz | |
gst-plugins-gl: clean up patches
Based on a patch by Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/gst-plugins-gl-0.10.2')
| -rw-r--r-- | patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch (renamed from patches/gst-plugins-gl-0.10.2/disable-broken-example.diff) | 14 | ||||
| -rw-r--r-- | patches/gst-plugins-gl-0.10.2/series | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff b/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch index a4f7647a4..23000e7cd 100644 --- a/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff +++ b/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch @@ -1,5 +1,6 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> -Subject: make sure gtk example builds for non X gtk +Date: Sun, 30 Oct 2011 22:37:00 +0100 +Subject: [PATCH] make sure gtk example builds for non X gtk With this patch tests/examples/gtk/gstgtk.c will compile with non X gtk. It won't do anything usefull, though. @@ -7,16 +8,15 @@ It won't do anything usefull, though. Not for upstream. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> - --- tests/examples/gtk/gstgtk.c | 4 ---- - 1 file changed, 4 deletions(-) + 1 files changed, 0 insertions(+), 4 deletions(-) -Index: b/tests/examples/gtk/gstgtk.c -=================================================================== +diff --git a/tests/examples/gtk/gstgtk.c b/tests/examples/gtk/gstgtk.c +index 3a68e19..3d53325 100644 --- a/tests/examples/gtk/gstgtk.c +++ b/tests/examples/gtk/gstgtk.c -@@ -7,8 +7,6 @@ +@@ -26,8 +26,6 @@ #include <gdk/gdkx.h> #elif defined(GDK_WINDOWING_QUARTZ) #include <gdk/gdkquartz.h> @@ -25,7 +25,7 @@ Index: b/tests/examples/gtk/gstgtk.c #endif -@@ -23,8 +21,6 @@ gst_x_overlay_set_gtk_window (GstXOverla +@@ -42,8 +40,6 @@ gst_x_overlay_set_gtk_window (GstXOverlay *xoverlay, GtkWidget *window) (gulong)gdk_quartz_window_get_nswindow (window->window)); #elif defined(GDK_WINDOWING_X11) gst_x_overlay_set_xwindow_id (xoverlay, GDK_WINDOW_XWINDOW(window->window)); diff --git a/patches/gst-plugins-gl-0.10.2/series b/patches/gst-plugins-gl-0.10.2/series index e43a9baf4..bd9ef82d2 100644 --- a/patches/gst-plugins-gl-0.10.2/series +++ b/patches/gst-plugins-gl-0.10.2/series @@ -1 +1,4 @@ -disable-broken-example.diff +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-make-sure-gtk-example-builds-for-non-X-gtk.patch +# 2ea327771c70a99ce54d1e3f64e5c874 - git-ptx-patches magic |