From 36ec158df1ed6db4dc917d16fa7adb0f34fec0b4 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Tue, 26 Apr 2011 16:29:48 -0700
Subject: table: move old clutter demo to meta-demoapps

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta-demoapps/recipes-graphics/clutter/table.inc         | 13 +++++++++++++
 meta-demoapps/recipes-graphics/clutter/table/fixes.patch | 14 ++++++++++++++
 meta-demoapps/recipes-graphics/clutter/table_git.bb      | 14 ++++++++++++++
 meta/recipes-graphics/clutter/table.inc                  | 13 -------------
 meta/recipes-graphics/clutter/table/fixes.patch          | 14 --------------
 meta/recipes-graphics/clutter/table_git.bb               | 14 --------------
 6 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 meta-demoapps/recipes-graphics/clutter/table.inc
 create mode 100644 meta-demoapps/recipes-graphics/clutter/table/fixes.patch
 create mode 100644 meta-demoapps/recipes-graphics/clutter/table_git.bb
 delete mode 100644 meta/recipes-graphics/clutter/table.inc
 delete mode 100644 meta/recipes-graphics/clutter/table/fixes.patch
 delete mode 100644 meta/recipes-graphics/clutter/table_git.bb

diff --git a/meta-demoapps/recipes-graphics/clutter/table.inc b/meta-demoapps/recipes-graphics/clutter/table.inc
new file mode 100644
index 000000000..937ad56b9
--- /dev/null
+++ b/meta-demoapps/recipes-graphics/clutter/table.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Table Clutter Demo"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPLv2.1 & GPLv2"
+
+DEPENDS = "clutter-gst-1.4 gnome-vfs"
+
+inherit autotools pkgconfig
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/table ${D}${bindir}/table
+}
+
diff --git a/meta-demoapps/recipes-graphics/clutter/table/fixes.patch b/meta-demoapps/recipes-graphics/clutter/table/fixes.patch
new file mode 100644
index 000000000..a7cdc4371
--- /dev/null
+++ b/meta-demoapps/recipes-graphics/clutter/table/fixes.patch
@@ -0,0 +1,14 @@
+Index: table/Makefile
+===================================================================
+--- table.orig/Makefile	2007-07-10 13:24:18.000000000 +0100
++++ table/Makefile	2007-07-10 13:28:10.000000000 +0100
+@@ -8,7 +8,7 @@ all: table
+ 
+ 
+ table: table.o clutter-dominatrix.o clutter-video-player.o
+-	$(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
++	$(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
+ 
+ clean:
+ 	rm -fr *.o table
+\ No newline at end of file
diff --git a/meta-demoapps/recipes-graphics/clutter/table_git.bb b/meta-demoapps/recipes-graphics/clutter/table_git.bb
new file mode 100644
index 000000000..5a5091cc1
--- /dev/null
+++ b/meta-demoapps/recipes-graphics/clutter/table_git.bb
@@ -0,0 +1,14 @@
+require table.inc
+
+LIC_FILES_CHKSUM = "file://fluttr/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://script-viewer/COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+PV = "0.3.0+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git \
+           file://fixes.patch;patch=1"
+
+S = "${WORKDIR}/git/table"
+
+
diff --git a/meta/recipes-graphics/clutter/table.inc b/meta/recipes-graphics/clutter/table.inc
deleted file mode 100644
index 937ad56b9..000000000
--- a/meta/recipes-graphics/clutter/table.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Table Clutter Demo"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2.1 & GPLv2"
-
-DEPENDS = "clutter-gst-1.4 gnome-vfs"
-
-inherit autotools pkgconfig
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 ${S}/table ${D}${bindir}/table
-}
-
diff --git a/meta/recipes-graphics/clutter/table/fixes.patch b/meta/recipes-graphics/clutter/table/fixes.patch
deleted file mode 100644
index a7cdc4371..000000000
--- a/meta/recipes-graphics/clutter/table/fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: table/Makefile
-===================================================================
---- table.orig/Makefile	2007-07-10 13:24:18.000000000 +0100
-+++ table/Makefile	2007-07-10 13:28:10.000000000 +0100
-@@ -8,7 +8,7 @@ all: table
- 
- 
- table: table.o clutter-dominatrix.o clutter-video-player.o
--	$(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
-+	$(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
- 
- clean:
- 	rm -fr *.o table
-\ No newline at end of file
diff --git a/meta/recipes-graphics/clutter/table_git.bb b/meta/recipes-graphics/clutter/table_git.bb
deleted file mode 100644
index 5a5091cc1..000000000
--- a/meta/recipes-graphics/clutter/table_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require table.inc
-
-LIC_FILES_CHKSUM = "file://fluttr/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                    file://script-viewer/COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-PV = "0.3.0+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git \
-           file://fixes.patch;patch=1"
-
-S = "${WORKDIR}/git/table"
-
-
-- 
cgit v1.2.3