From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 27/28] gst-plugins-gl: clean up patches
Date: Sun, 30 Oct 2011 23:00:58 +0100 [thread overview]
Message-ID: <1320012059-24971-27-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...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 <m.olbrich@pengutronix.de>
+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 <m.olbrich@pengutronix.de>
+---
+ 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 <m.olbrich@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.olbrich@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
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
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320012059-24971-27-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox