From 30f949e4bb7e30f79f3e58b91365ceb415b26a62 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 15 Jun 2009 13:34:47 +0100 Subject: [PATCH] clutter-gst: Update patch against upstream changes Signed-off-by: Richard Purdie --- .../clutter/clutter-gst/autofoo.patch | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/meta/packages/clutter/clutter-gst/autofoo.patch b/meta/packages/clutter/clutter-gst/autofoo.patch index 569b0d8be9..349391c786 100644 --- a/meta/packages/clutter/clutter-gst/autofoo.patch +++ b/meta/packages/clutter/clutter-gst/autofoo.patch @@ -3,21 +3,23 @@ examples/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: clutter-gst/examples/Makefile.am +Index: git/examples/Makefile.am =================================================================== ---- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 -+++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 -@@ -1,4 +1,4 @@ +--- git.orig/examples/Makefile.am 2009-06-15 13:32:10.000000000 +0100 ++++ git/examples/Makefile.am 2009-06-15 13:33:44.000000000 +0100 +@@ -1,6 +1,6 @@ + NULL = # + -noinst_PROGRAMS = video-player video-sink audio +bin_PROGRAMS = video-player video-sink audio - INCLUDES = -I$(top_srcdir)/ - -Index: clutter-gst/doc/reference/Makefile.am + INCLUDES = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \ +Index: git/doc/reference/Makefile.am =================================================================== ---- clutter-gst.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000 -+++ clutter-gst/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000 -@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make +--- git.orig/doc/reference/Makefile.am 2009-06-15 13:32:10.000000000 +0100 ++++ git/doc/reference/Makefile.am 2009-06-15 13:32:12.000000000 +0100 +@@ -77,4 +77,4 @@ # Other files to distribute # e.g. EXTRA_DIST += version.xml.in