Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de> --- .../disable-broken-example.diff | 36 -------------------- patches/gst-plugins-gl-0.10.1/series | 1 - .../disable-broken-example.diff | 36 ++++++++++++++++++++ patches/gst-plugins-gl-0.10.2/series | 1 + rules/gst-plugins-gl.make | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 patches/gst-plugins-gl-0.10.1/disable-broken-example.diff delete mode 100644 patches/gst-plugins-gl-0.10.1/series create mode 100644 patches/gst-plugins-gl-0.10.2/disable-broken-example.diff create mode 100644 patches/gst-plugins-gl-0.10.2/series
diff --git a/patches/gst-plugins-gl-0.10.1/disable-broken-example.diff b/patches/gst-plugins-gl-0.10.1/disable-broken-example.diff deleted file mode 100644 index a4f7647..0000000 --- a/patches/gst-plugins-gl-0.10.1/disable-broken-example.diff +++ /dev/null @@ -1,36 +0,0 @@ -From: Michael Olbrich <m.olbr...@pengutronix.de> -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 <m.olbr...@pengutronix.de> - ---- - 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.1/series b/patches/gst-plugins-gl-0.10.1/series deleted file mode 100644 index e43a9ba..0000000 --- a/patches/gst-plugins-gl-0.10.1/series +++ /dev/null @@ -1 +0,0 @@ -disable-broken-example.diff 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 new file mode 100644 index 0000000..a4f7647 --- /dev/null +++ b/patches/gst-plugins-gl-0.10.2/disable-broken-example.diff @@ -0,0 +1,36 @@ +From: Michael Olbrich <m.olbr...@pengutronix.de> +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 <m.olbr...@pengutronix.de> + +--- + 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 new file mode 100644 index 0000000..e43a9ba --- /dev/null +++ b/patches/gst-plugins-gl-0.10.2/series @@ -0,0 +1 @@ +disable-broken-example.diff diff --git a/rules/gst-plugins-gl.make b/rules/gst-plugins-gl.make index 828de69..f4764d3 100644 --- a/rules/gst-plugins-gl.make +++ b/rules/gst-plugins-gl.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GL) += gst-plugins-gl # # Paths and names # -GST_PLUGINS_GL_VERSION := 0.10.1 +GST_PLUGINS_GL_VERSION := 0.10.2 GST_PLUGINS_GL := gst-plugins-gl-$(GST_PLUGINS_GL_VERSION) GST_PLUGINS_GL_SUFFIX := tar.bz2 GST_PLUGINS_GL_URL := http://gstreamer.freedesktop.org/src/gst-plugins-gl/$(GST_PLUGINS_GL).$(GST_PLUGINS_GL_SUFFIX) -- 1.7.2.3 -- ptxdist mailing list ptxdist@pengutronix.de