Meta: Recipe Reogranization

This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.

A number of recipes were modified since dependencies need to be
corrected.

Signed-off-by: Saul Wold <Saul.Wold@intel.com>

41 files changed, 10 insertions, 893 deletions

diff --git a/meta/recipes-graphics/clutter/aaina.inc b/meta/recipes-graphics/clutter/aaina.inc
deleted file mode 100644
index afbc022cd..000000000
--- a/meta/recipes-graphics/clutter/aaina.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Aaina Clutter Demo"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "GPL"
-
-DEPENDS = "clutter-0.6 libxml2 gtk+ neon"
-
-inherit autotools pkgconfig
diff --git a/meta/recipes-graphics/clutter/aaina_git.bb b/meta/recipes-graphics/clutter/aaina_git.bb
deleted file mode 100644
index a348cd3d4..000000000
--- a/meta/recipes-graphics/clutter/aaina_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require aaina.inc
-
-PV = "0.3.0+git${SRCPV}"
-
-SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git"
-
-S = "${WORKDIR}/git/aaina"
diff --git a/meta/recipes-graphics/clutter/clutter-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-0.6_git.bb
deleted file mode 100644
index 5a8ccec16..000000000
--- a/meta/recipes-graphics/clutter/clutter-0.6_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require clutter.inc
-
-PV = "0.6.0+gitr${SRCPV}"
-PR = "r5"
-
-PACKAGES =+ "clutter-examples-0.6"
-FILES_clutter-examples-0.6 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-6 \
-           file://symconflict.patch;patch=1 \
-	   file://enable_tests-0.6.patch;patch=1 "
-
-S = "${WORKDIR}/git"
-
diff --git a/meta/recipes-graphics/clutter/clutter-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-0.8_git.bb
deleted file mode 100644
index 71e619803..000000000
--- a/meta/recipes-graphics/clutter/clutter-0.8_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require clutter.inc
-
-PV = "0.8.0+gitr${SRCREV}"
-PR = "r2"
-
-PACKAGES =+ "clutter-examples-0.8"
-FILES_clutter-examples-0.8 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \
-	   file://enable_tests-0.8.patch;patch=1 \
-     file://build-fix.patch;patch=1"
-
-S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc
index 1a107c399..08861958c 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d.inc
+++ b/meta/recipes-graphics/clutter/clutter-box2d.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter Box2D"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "GPLv2"
 
-DEPENDS = "clutter-0.8"
+DEPENDS = "clutter-1.0"
 
 # The main clutter lib is machine specific so we need to be too
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb
deleted file mode 100644
index 3b7f6a9be..000000000
--- a/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require clutter-cairo.inc
-
-PV = "0.6.0+git${SRCREV}"
-PR = "r1"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-6 \
-           file://enable_examples-0.6.patch;patch=1"
-
-S = "${WORKDIR}/git"
-
-
diff --git a/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb
deleted file mode 100644
index cb8482b74..000000000
--- a/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clutter-cairo.inc
-
-PV = "0.8.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-8 \
-           file://enable_examples.patch;patch=1"
-
-S = "${WORKDIR}/git"
-
-
diff --git a/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb
deleted file mode 100644
index a0f874db2..000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.10.0+git${SRCPV}"
-
-DEPENDS += "clutter-1.0"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0.10"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-       # Disable DOLT
-       sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb
deleted file mode 100644
index 09979f9e0..000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.6.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-6"
-
-S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb
deleted file mode 100644
index c5348ecef..000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.8.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-8"
-
-S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb
deleted file mode 100644
index d0613277a..000000000
--- a/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.10.3+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0.10"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "clutter-1.0"
-
-EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb
deleted file mode 100644
index d2633ff2d..000000000
--- a/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.6.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-6"
-
-S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb
deleted file mode 100644
index 506d3fb15..000000000
--- a/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.8.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-8"
-
-S = "${WORKDIR}/git"
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/tidy.inc b/meta/recipes-graphics/clutter/tidy.inc
index 3fa387c04..7d5862b18 100644
--- a/meta/recipes-graphics/clutter/tidy.inc
+++ b/meta/recipes-graphics/clutter/tidy.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Tidy library"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPL"
 
-STDDEPENDS = "clutter-0.8"
+STDDEPENDS = "clutter-1.0"
 BASE_CONF = "--disable-gtk-doc"
 
 DEPENDS = "${STDDEPENDS}"
diff --git a/meta/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch b/meta/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
deleted file mode 100644
index 4aaafb2b1..000000000
--- a/meta/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libxklavier-3.7/libxklavier.pc.in
-===================================================================
---- libxklavier-3.7.orig/libxklavier.pc.in	2009-06-10 15:58:46.000000000 +0100
-+++ libxklavier-3.7/libxklavier.pc.in	2009-06-10 16:00:45.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- Name: libxklavier
- Description: libxklavier library
--Requires: libxml-2.0
-+Requires: libxml-2.0 glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
--Cflags: -I${includedir} @GLIB_CFLAGS@
-+Libs: -L${libdir} -lxklavier
-+Cflags: -I${includedir}
diff --git a/meta/recipes-graphics/libxklavier/libxklavier_3.9.bb b/meta/recipes-graphics/libxklavier/libxklavier_3.9.bb
deleted file mode 100644
index 1d9b6f21a..000000000
--- a/meta/recipes-graphics/libxklavier/libxklavier_3.9.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Utility library to make using XKB easier"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
-LICENSE = "LGPL"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \
-           file://pkgconfigfix.patch;patch=1"
-
-inherit autotools
-
diff --git a/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c b/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
deleted file mode 100644
index 41cebc58a..000000000
--- a/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * Pong Clock - A clock that plays pong. 
- *             See http://mocoloco.com/archives/001766.php for the inspiration.
- *
- * Copyright (C) 2005 Matthew Allum
- *
- * Author: Matthew Allum mallum@openedhand.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-
-/* Tweak values for different hw setups */
-
-#define FPS          50
-#define RESX         40
-#define RESY         40
-#define TO_MISS_SECS 55
-#define BALLDX       16
-#define BALLDY       4
-
-
-typedef struct PongClock
-{
-  Display *xdpy;
-  int      xscreen;
-  Window   xwin, xwin_root;
-  Pixmap   backbuffer;
-  GC       xgc;
-  int      xwin_width, xwin_height;
-  int      pixelw, pixelh;
-
-  int      ball_x, ball_y, ball_dx, ball_dy;
-  int      bata_y, batb_y;
-  Bool     bata_to_miss, batb_to_miss;
-
-} 
-PongClock;
-
-void
-get_time(int *hour, int *min, int *sec)
-{
-  struct timeval   tv;
-  struct tm       *localTime = NULL; 
-  time_t           actualTime;
-
-  gettimeofday(&tv, 0);
-  actualTime = tv.tv_sec;
-  localTime = localtime(&actualTime);
-
-  if (hour)
-    *hour = localTime->tm_hour;
-  
-  if (min)
-    *min  = localTime->tm_min;
-
-  if (sec)
-    *sec  = localTime->tm_sec;
-}
-
-void
-draw_rect (PongClock *pong_clock, 
-	   int        x,
-	   int        y,
-	   int        width,
-	   int        height)
-{
-  XFillRectangle (pong_clock->xdpy,
-		  pong_clock->backbuffer,
-		  pong_clock->xgc,
-		  x * pong_clock->pixelw,
-		  y * pong_clock->pixelh,
-		  width * pong_clock->pixelw,
-		  height * pong_clock->pixelh);
-}
-
-void
-draw_field (PongClock *pong_clock)
-{
-  int i;
-
-  draw_rect (pong_clock, 0, 0, RESX+1, 1);  
-  draw_rect (pong_clock, 0, RESY-1, RESX+1, 1);  
-
-  for (i=0; i < RESY/2; i++)
-    draw_rect (pong_clock, (RESX/2)-1, i*2, 2, 1);  
-}
-
-void
-draw_digit (PongClock *pong_clock, 
-	    int        x,
-	    int        y,
-	    int        digit)
-{
-  int digits[] = { 0x1f8c63f, 0x1f21086, 0x1f0fe1f, 0x1f87e1f, 0x1087e31,
-		   0x1f87c3f, 0x1f8fc3f, 0x84421f,  0x1f8fe3f, 0x1087e3f };
-
-  XRectangle rects[5*5];
-  int i,j,k;
-
-  i = 0;
-
-  for (k=0; k<5; k++) 
-    for (j=0; j<5; j++)	
-      if (digits[digit] & (1 << ((k*5)+j)))
-	{
-	  rects[i].x      = (x + j) * pong_clock->pixelw; 
-	  rects[i].y      = (y + k) * pong_clock->pixelh; 
-	  rects[i].width  = pong_clock->pixelw;
-	  rects[i].height = pong_clock->pixelh;  
-	  i++;
-	}
-
-  XFillRectangles (pong_clock->xdpy,
-		   pong_clock->backbuffer,
-		   pong_clock->xgc,
-		   rects, i);
-} 
-
-void
-draw_time (PongClock *pong_clock)
-{
-  int hour, min;
-
-  get_time(&hour, &min, NULL);
-
-  draw_digit (pong_clock, 
-	      (RESX/2) - 14,
-	      5,
-	      hour / 10 );
-
-  draw_digit (pong_clock, 
-	      (RESX/2) - 8,
-	      5,
-	      hour % 10 );
-
-  draw_digit (pong_clock, 
-	      (RESX/2) + 3,
-	      5,
-	      min / 10 );
-
-  draw_digit (pong_clock, 
-	      (RESX/2) + 9,
-	      5,
-	      min % 10 );
-}
-
-void
-draw_bat_and_ball (PongClock *pong_clock)
-{
-  /* ball */
-
-  XFillRectangle (pong_clock->xdpy,
-		  pong_clock->backbuffer,
-		  pong_clock->xgc,
-		  pong_clock->ball_x,
-		  pong_clock->ball_y,
-		  pong_clock->pixelw,
-		  pong_clock->pixelh);
-
-  /* bat a */
-
-  XFillRectangle (pong_clock->xdpy,
-		  pong_clock->backbuffer,
-		  pong_clock->xgc,
-		  0,
-		  pong_clock->bata_y - (2 * pong_clock->pixelh),
-		  pong_clock->pixelw,
-		  pong_clock->pixelh * 5);
-
-  /* bat b */
-
-  XFillRectangle (pong_clock->xdpy,
-		  pong_clock->backbuffer,
-		  pong_clock->xgc,
-		  (pong_clock->xwin_width - pong_clock->pixelw),
-		  pong_clock->batb_y - (2 * pong_clock->pixelh),
-		  pong_clock->pixelw,
-		  pong_clock->pixelh * 5);
-
-}
-
-void
-update_state (PongClock *pong_clock)
-{
-  int sec, min, hour;
-
-  get_time(&hour, &min, &sec);
-
-  /* Check ball is on field and no ones dues to miss a shot.
-  */
-  if ( (pong_clock->ball_x < 0 && !pong_clock->bata_to_miss) 
-      || (pong_clock->ball_x > (pong_clock->xwin_width - pong_clock->pixelw)
-	  && !pong_clock->batb_to_miss) )
-    pong_clock->ball_dx *= -1;
-
-  if ((pong_clock->ball_y < pong_clock->pixelh)
-      || pong_clock->ball_y > (pong_clock->xwin_height - (2*pong_clock->pixelh)))
-    pong_clock->ball_dy *= -1; 
-
-  pong_clock->ball_x += pong_clock->ball_dx;
-  pong_clock->ball_y += pong_clock->ball_dy;
-
-  /* Set up someone to miss if we getting close to an hour or min. 
-   */
-  if (sec > TO_MISS_SECS)
-    {
-      if (min == 59)
-	pong_clock->batb_to_miss = True;	
-      else
-	pong_clock->bata_to_miss = True;
-    }
-  else
-    {
-      /* Reset the game */
-      if (pong_clock->bata_to_miss)
-	{
-	  pong_clock->bata_to_miss = False;
-	  pong_clock->ball_y = pong_clock->bata_y; 
-	  pong_clock->ball_x = pong_clock->pixelw; 
-	  pong_clock->ball_dx *= -1;
-	}
-
-      if (pong_clock->batb_to_miss)
-	{
-	  pong_clock->batb_to_miss = False;
-	  pong_clock->ball_y = pong_clock->batb_y; 
-	  pong_clock->ball_x = pong_clock->xwin_width - pong_clock->pixelw;
-	  pong_clock->ball_dx *= -1; 
-	}
-    }
-
-  /* Keep bats on field and only move in not setup to miss */
-  if (pong_clock->ball_y >= (3*pong_clock->pixelh)
-      && pong_clock->ball_y <=  (pong_clock->xwin_height - (5*pong_clock->pixelh)))
-  {
-    if (!pong_clock->batb_to_miss) 
-      pong_clock->batb_y = pong_clock->ball_y;
-
-    if (!pong_clock->bata_to_miss)
-      pong_clock->bata_y = pong_clock->ball_y;
-  }
-}
-
-void
-draw_frame (PongClock *pong_clock)
-{
-  update_state (pong_clock);
-
-  /* Clear playfield */
-  XSetForeground (pong_clock->xdpy,
-		  pong_clock->xgc,
-		  BlackPixel(pong_clock->xdpy, 
-			     pong_clock->xscreen));
-
-  XFillRectangle (pong_clock->xdpy,
-		  pong_clock->backbuffer,
-		  pong_clock->xgc,
-		  0, 0,
-		  pong_clock->xwin_width, 
-		  pong_clock->xwin_height);
-
-  XSetForeground (pong_clock->xdpy,
-		  pong_clock->xgc,
-		  WhitePixel(pong_clock->xdpy, 
-			     pong_clock->xscreen));
-
-  draw_field (pong_clock);
-
-  draw_time (pong_clock);
-
-  draw_bat_and_ball (pong_clock);
-
-  /* flip 'backbuffer' */
-  XSetWindowBackgroundPixmap (pong_clock->xdpy, 
-			      pong_clock->xwin,
-			      pong_clock->backbuffer);
-  XClearWindow(pong_clock->xdpy, pong_clock->xwin);
-
-  XSync(pong_clock->xdpy, False);
-}
-
-int
-main (int argc, char **argv)
-{
-  XGCValues  gcv;
-  Atom       atoms_WINDOW_STATE, atoms_WINDOW_STATE_FULLSCREEN;
-  PongClock *pong_clock;
-
-  pong_clock = malloc(sizeof(PongClock));
-  memset(pong_clock, 0, sizeof(PongClock));
-
-  if ((pong_clock->xdpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) {
-    fprintf(stderr, "Cannot connect to X server on display %s.",
-	    getenv("DISPLAY"));
-    exit(-1);
-  }
-
-  pong_clock->xscreen     = DefaultScreen(pong_clock->xdpy);
-  pong_clock->xwin_root   = DefaultRootWindow(pong_clock->xdpy);
-  pong_clock->xwin_width  = DisplayWidth(pong_clock->xdpy, 
-					 pong_clock->xscreen);
-  pong_clock->xwin_height = DisplayHeight(pong_clock->xdpy, 
-					  pong_clock->xscreen);
-
-  pong_clock->pixelw  = pong_clock->xwin_width  / RESX;
-  pong_clock->pixelh  = pong_clock->xwin_height / RESY;
-
-  pong_clock->ball_x = 0; 
-  pong_clock->ball_y = pong_clock->xwin_height / 2; 
-
-  pong_clock->ball_dx = BALLDX; 
-  pong_clock->ball_dy = BALLDY; 
-
-  pong_clock->batb_y = pong_clock->bata_y = pong_clock->ball_y;
-
-  gcv.background = BlackPixel(pong_clock->xdpy, 
-			      pong_clock->xscreen);
-  gcv.foreground = WhitePixel(pong_clock->xdpy, 
-			      pong_clock->xscreen);
-  gcv.graphics_exposures = False;
-
-  pong_clock->xgc = XCreateGC (pong_clock->xdpy, pong_clock->xwin_root, 
-			       GCForeground|GCBackground|GCGraphicsExposures,
-			       &gcv);
-
-  atoms_WINDOW_STATE
-    = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE",False);
-  atoms_WINDOW_STATE_FULLSCREEN
-    = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE_FULLSCREEN",False);
-
-  pong_clock->xwin = XCreateSimpleWindow(pong_clock->xdpy, 
-					 pong_clock->xwin_root, 
-					 0, 0,
-					 pong_clock->xwin_width, 
-					 pong_clock->xwin_height, 
-					 0,
-					 WhitePixel(pong_clock->xdpy, 
-						    pong_clock->xscreen),
-					 BlackPixel(pong_clock->xdpy, 
-						    pong_clock->xscreen));
-
-  pong_clock->backbuffer = XCreatePixmap(pong_clock->xdpy, 
-					 pong_clock->xwin_root,
-					 pong_clock->xwin_width, 
-					 pong_clock->xwin_height, 
-					 DefaultDepth(pong_clock->xdpy, 
-						      pong_clock->xscreen));
-
-  XSelectInput(pong_clock->xdpy, pong_clock->xwin, KeyPressMask);
-  
-
-  /* Set the hints for fullscreen */
-  XChangeProperty(pong_clock->xdpy, 
-		  pong_clock->xwin, 
-		  atoms_WINDOW_STATE, 
-		  XA_ATOM, 
-		  32, 
-		  PropModeReplace, 
-		  (unsigned char *) &atoms_WINDOW_STATE_FULLSCREEN, 1);
-
-  XMapWindow(pong_clock->xdpy, pong_clock->xwin);
-  
-  while (True) 
-    {
-      struct timeval timeout;
-      XEvent         xev;
-
-      timeout.tv_sec  = 0;
-      timeout.tv_usec = 1000000 / FPS; 
-      select (0, NULL, NULL, NULL, &timeout);
-
-      draw_frame (pong_clock);
-
-      XFlush(pong_clock->xdpy);
-
-      if (XPending(pong_clock->xdpy))
-	{
-	  if (XCheckMaskEvent(pong_clock->xdpy, 
-			      KeyPressMask,
-			      &xev))
-	    exit(-1);
-	}
-    }
-}
diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
deleted file mode 100644
index 8d3659ff9..000000000
--- a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "A clock combined with a game of pong"
-LICENSE = "GPLv2+"
-DEPENDS = "virtual/libx11 xdmcp xau"
-
-SRC_URI = "file://pong-clock-no-flicker.c"
-
-S = "${WORKDIR}"
-
-do_compile () {
-	${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp`
-}
-
-do_install () {
-	install -d ${D}${bindir}
-	install -m 0755 pong-clock ${D}${bindir}
-}
diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
index ae72bb0c3..153ba9cbf 100644
--- a/meta/recipes-graphics/tasks/task-poky-clutter.bb
+++ b/meta/recipes-graphics/tasks/task-poky-clutter.bb
@@ -21,17 +21,15 @@ PACKAGES = "\
 ALLOW_EMPTY = "1"
 
 RDEPENDS_task-poky-clutter-core = "\
-    clutter-0.8 \
-    clutter-cairo-0.8 \
-    clutter-gst-0.8 \
-    clutter-gtk-0.8"
+    clutter-1.0 \
+    clutter-cairo-1.0 \
+    clutter-gst-1.0 \
+    clutter-gtk-1.0"
 
 RDEPENDS_task-poky-clutter-tests = "\
-    clutter-cairo-0.8-examples \
-    clutter-gst-0.8-examples \
-    clutter-gtk-0.8-examples"
+    clutter-cairo-1.0-examples \
+    clutter-gst-1.0-examples \
+    clutter-gtk-1.0-examples"
 
 RDEPENDS_task-poky-clutter-apps = "\
-    aaina \
-    clutter-box2d \
-    table"
+    clutter-box2d "
diff --git a/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb b/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb
deleted file mode 100644
index 78804d734..000000000
--- a/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X Backlight Utility"
-DEPENDS += "libxrender libxrandr"
diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
deleted file mode 100644
index 9f515e8c7..000000000
--- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
+++ /dev/null
@@ -1,80 +0,0 @@
----
- xev.c |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: xev-1.0.2/xev.c
-===================================================================
---- xev-1.0.2.orig/xev.c	2006-06-02 00:25:44.000000000 +0100
-+++ xev-1.0.2/xev.c	2007-05-10 15:22:07.000000000 +0100
-@@ -109,7 +109,7 @@ do_KeyPress (XEvent *eventp)
-     nbytes = XLookupString (e, str, 256, &ks, NULL);
- 
-     /* not supposed to call XmbLookupString on a key release event */
--    if (e->type == KeyPress && xic) {
-+    /*if (e->type == KeyPress && xic) {
-         do {
-             nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status);
-             buf[nmbbytes] = '\0';
-@@ -119,7 +119,7 @@ do_KeyPress (XEvent *eventp)
-                 buf = realloc (buf, bsize);
-             }
-         } while (status == XBufferOverflow);
--    }
-+    }*/
- 
-     if (ks == NoSymbol)
- 	ksname = "NoSymbol";
-@@ -149,7 +149,7 @@ do_KeyPress (XEvent *eventp)
-     }
- 
-     /* not supposed to call XmbLookupString on a key release event */
--    if (e->type == KeyPress && xic) {
-+    /*if (e->type == KeyPress && xic) {
-         printf ("    XmbLookupString gives %d bytes: ", nmbbytes);
-         if (nmbbytes > 0) {
-            dump (buf, nmbbytes);
-@@ -157,7 +157,7 @@ do_KeyPress (XEvent *eventp)
-         } else {
-     	   printf ("\n");
-         }
--    }
-+    } */
- 
-     printf ("    XFilterEvent returns: %s\n", 
- 	    XFilterEvent (eventp, e->window) ? "True" : "False");
-@@ -804,7 +804,7 @@ main (int argc, char **argv)
-         fprintf (stderr, "%s:  XSetLocaleModifiers failed\n", ProgramName);
-     }
- 
--    xim = XOpenIM (dpy, NULL, NULL, NULL);
-+    /*xim = XOpenIM (dpy, NULL, NULL, NULL);
-     if (xim == NULL) {
-         fprintf (stderr, "%s:  XOpenIM failed\n", ProgramName);
-     }
-@@ -831,7 +831,7 @@ main (int argc, char **argv)
-             }
-             XFree (xim_styles);
-         }
--    } 
-+    }*/
- 
-     screen = DefaultScreen (dpy);
- 
-@@ -891,7 +891,7 @@ main (int argc, char **argv)
- 	printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
-     }
- 
--    if (xim && xim_style) {
-+    /*if (xim && xim_style) {
-         xic = XCreateIC (xim, 
-                          XNInputStyle, xim_style, 
-                          XNClientWindow, w, 
-@@ -901,7 +901,7 @@ main (int argc, char **argv)
-         if (xic == NULL) {
-             fprintf (stderr, "XCreateIC failed\n");
-         }
--    }
-+    }*/
- 
-     for (done = 0; !done; ) {
- 	XEvent event;
diff --git a/meta/recipes-graphics/xorg-app/xev_1.0.3.bb b/meta/recipes-graphics/xorg-app/xev_1.0.3.bb
deleted file mode 100644
index b7a4070a8..000000000
--- a/meta/recipes-graphics/xorg-app/xev_1.0.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X Event Viewer"
-LICENSE = "MIT"
-PE = "1"
-
-SRC_URI += "file://diet-x11.patch;patch=1"
diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb
deleted file mode 100644
index 07ce0724f..000000000
--- a/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxau libxt libxext libxmu"
diff --git a/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh b/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
deleted file mode 100644
index 08d8beca3..000000000
--- a/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -e $HOME/.Xdefaults ]; then
-    xrdb -merge -nocpp < $HOME/.Xdefaults
-fi
diff --git a/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb b/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb
deleted file mode 100644
index 906d7d852..000000000
--- a/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "r2"
-
-SRC_URI += "file://60XDefaults.sh"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}/X11/Xsession.d/
-    install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/
-}
diff --git a/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb
deleted file mode 100644
index bc502fb50..000000000
--- a/meta/recipes-graphics/xorg-lib/libapplewm_1.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require xorg-lib-common.inc
-
-DEPENDS += "libxext applewmproto"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libAppleWM"
diff --git a/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb
deleted file mode 100644
index 010aa311e..000000000
--- a/meta/recipes-graphics/xorg-lib/libfs_1.0.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 Font Services library"
-DEPENDS += "xproto fontsproto xtrans"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libFS"
diff --git a/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch b/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
deleted file mode 100644
index 029d761d9..000000000
--- a/meta/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-During the build process the mkg3states binary needs to be run. This patch
-allows it to be built with the build systems gcc allowing this to work.
-
-RP 31/3/10
-
-Index: liblbxutil-1.1.0/configure.ac
-===================================================================
---- liblbxutil-1.1.0.orig/configure.ac	2009-12-04 22:52:04.000000000 +0000
-+++ liblbxutil-1.1.0/configure.ac	2010-03-31 15:26:33.000000000 +0100
-@@ -50,4 +50,5 @@
- 
- AC_OUTPUT([Makefile
- 	   src/Makefile
-+	   src/image/Makefile
- 	   lbxutil.pc])
-Index: liblbxutil-1.1.0/src/Makefile.am
-===================================================================
---- liblbxutil-1.1.0.orig/src/Makefile.am	2009-12-04 23:03:17.000000000 +0000
-+++ liblbxutil-1.1.0/src/Makefile.am	2010-03-31 15:27:25.000000000 +0100
-@@ -3,10 +3,7 @@
- AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
- INCLUDES = -I$(top_srcdir)/include
- 
--noinst_PROGRAMS = mkg3states
--
--mkg3states_SOURCES =				\
--	$(srcdir)/image/mkg3states.c
-+SUBDIRS = image
- 
- liblbxutil_la_SOURCES =				\
- 	$(srcdir)/lbx_zlib/reqstats.h		\
-@@ -38,9 +35,8 @@
- 
- $(srcdir)/image/dfaxg42d.c: g3states.h
- 
--g3states.h: mkg3states
--	-rm -f g3states.h
--	$(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-+g3states.h: image/mkg3states
-+	./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
- 
- liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- 
-Index: liblbxutil-1.1.0/src/image/Makefile.am
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ liblbxutil-1.1.0/src/image/Makefile.am	2010-03-31 15:26:33.000000000 +0100
-@@ -0,0 +1,15 @@
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
-+
-+noinst_PROGRAMS = mkg3states
-+
-+mkg3states_SOURCES =				\
-+	mkg3states.c
-+
-+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
-+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
deleted file mode 100644
index cdf350924..000000000
--- a/meta/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "XFIXES Extension"
-DEPENDS += " libxext xextproto xproto zlib"
-PROVIDES = "lbxutil"
-PE = "1"
-PR = "r1"
-
-SRC_URI += "file://mkg3states.patch;patch=1"
-
-export CC_FOR_BUILD = "gcc"
diff --git a/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb b/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb
deleted file mode 100644
index 84470cbc7..000000000
--- a/meta/recipes-graphics/xorg-lib/liboldx_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-lib-common.inc
-
-DEPENDS += " virtual/libx11"
-PE = "1"
-
-XORG_PN = "liboldX"
diff --git a/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb b/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb
deleted file mode 100644
index a03d49505..000000000
--- a/meta/recipes-graphics/xorg-lib/libwindowswm_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-lib-common.inc
-
-DEPENDS += "libxext windowswmproto"
-PE = "1"
-
-XORG_PN = "libWindowsWM"
diff --git a/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
deleted file mode 100644
index 489f45664..000000000
--- a/meta/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Athena Widget Set"
-DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PROVIDES = "xaw"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXaw"
-
-do_install_append () {
-	ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
-	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
-	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so
-}
-
-PACKAGES =+ "libxaw6 libxaw7 libxaw8"
-
-FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
-FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
-FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
diff --git a/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
deleted file mode 100644
index 6c6b4595a..000000000
--- a/meta/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 EvIE extension library"
-DEPENDS += "libxext evieext"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXevie"
diff --git a/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
deleted file mode 100644
index 9a3f5f132..000000000
--- a/meta/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 keyboard UI presentation library"
-LICENSE= "GPL"
-DEPENDS += "virtual/libx11 libxt libxkbfile"
-PROVIDES = "xkbui"
-PR = "r1"
-PE = "1"
diff --git a/meta/recipes-graphics/xorg-proto/applewmproto_1.4.1.bb b/meta/recipes-graphics/xorg-proto/applewmproto_1.4.1.bb
deleted file mode 100644
index 9f09fff7b..000000000
--- a/meta/recipes-graphics/xorg-proto/applewmproto_1.4.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-proto-common.inc
-
-PR = "r1"
-PE = "1"
diff --git a/meta/recipes-graphics/xorg-proto/windowswmproto_1.0.4.bb b/meta/recipes-graphics/xorg-proto/windowswmproto_1.0.4.bb
deleted file mode 100644
index 9f09fff7b..000000000
--- a/meta/recipes-graphics/xorg-proto/windowswmproto_1.0.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-proto-common.inc
-
-PR = "r1"
-PE = "1"
diff --git a/meta/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb b/meta/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
deleted file mode 100644
index 9c3d9efa7..000000000
--- a/meta/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-PROVIDES="xproxymngproto"
-PR = "r1"
-PE = "1"
diff --git a/meta/recipes-graphics/xorg-util/imake_1.0.2.bb b/meta/recipes-graphics/xorg-util/imake_1.0.2.bb
deleted file mode 100644
index e533ece46..000000000
--- a/meta/recipes-graphics/xorg-util/imake_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "C preprocessor interface to the make utility"
-DEPENDS = "util-macros"
-RDEPENDS = "perl xproto"
-
-PR = "r1"
-PE = "1"
diff --git a/meta/recipes-graphics/xorg-util/lndir_1.0.1.bb b/meta/recipes-graphics/xorg-util/lndir_1.0.1.bb
deleted file mode 100644
index b7bd0ad54..000000000
--- a/meta/recipes-graphics/xorg-util/lndir_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "create a shadow directory of symbolic links to another directory tree"
-DEPENDS += "xproto util-macros"
-PR = "r1"
-PE = "1"
diff --git a/meta/recipes-graphics/xorg-util/xorg-cf-files_1.0.3.bb b/meta/recipes-graphics/xorg-util/xorg-cf-files_1.0.3.bb
deleted file mode 100644
index 7c3fb8d7e..000000000
--- a/meta/recipes-graphics/xorg-util/xorg-cf-files_1.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-util-common.inc
-
-DESCRIPTION = "X Window System CF files"
-
-PR = "r1"
-PE = "1"
-
-FILES_${PN} += " /usr/lib/X11/config"