Signed-off-by: Robert Schwebel <[email protected]> --- ...ake-sure-gtk-example-builds-for-non-X-gtk.patch | 40 ++++++++++++++++++++ .../disable-broken-example.diff | 36 ------------------ patches/gst-plugins-gl-0.10.2/series | 1 - 3 files changed, 40 insertions(+), 37 deletions(-) create mode 100644 patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch delete mode 100644 patches/gst-plugins-gl-0.10.2/disable-broken-example.diff delete mode 100644 patches/gst-plugins-gl-0.10.2/series
diff --git a/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch b/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch new file mode 100644 index 0000000..d29c36e --- /dev/null +++ b/patches/gst-plugins-gl-0.10.2/0001-make-sure-gtk-example-builds-for-non-X-gtk.patch @@ -0,0 +1,40 @@ +From 95bedfa03edb6577d0164569d922063a6ef60c3e Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <[email protected]> +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. + +Not for upstream. + +Signed-off-by: Michael Olbrich <[email protected]> +--- + tests/examples/gtk/gstgtk.c | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +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 +@@ -26,8 +26,6 @@ + #include <gdk/gdkx.h> + #elif defined(GDK_WINDOWING_QUARTZ) + #include <gdk/gdkquartz.h> +-#else +-#error unimplemented GTK backend + #endif + + +@@ -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)); +-#else +-#error unimplemented GTK backend + #endif + + } +-- +1.7.7 + diff --git a/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff b/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff deleted file mode 100644 index a4f7647..0000000 --- a/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff +++ /dev/null @@ -1,36 +0,0 @@ -From: Michael Olbrich <[email protected]> -Subject: 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. - -Not for upstream. - -Signed-off-by: Michael Olbrich <[email protected]> - ---- - tests/examples/gtk/gstgtk.c | 4 ---- - 1 file changed, 4 deletions(-) - -Index: b/tests/examples/gtk/gstgtk.c -=================================================================== ---- a/tests/examples/gtk/gstgtk.c -+++ b/tests/examples/gtk/gstgtk.c -@@ -7,8 +7,6 @@ - #include <gdk/gdkx.h> - #elif defined(GDK_WINDOWING_QUARTZ) - #include <gdk/gdkquartz.h> --#else --#error unimplemented GTK backend - #endif - - -@@ -23,8 +21,6 @@ gst_x_overlay_set_gtk_window (GstXOverla - (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)); --#else --#error unimplemented GTK backend - #endif - - } diff --git a/patches/gst-plugins-gl-0.10.2/series b/patches/gst-plugins-gl-0.10.2/series deleted file mode 100644 index e43a9ba..0000000 --- a/patches/gst-plugins-gl-0.10.2/series +++ /dev/null @@ -1 +0,0 @@ -disable-broken-example.diff -- 1.7.7 -- ptxdist mailing list [email protected]
