Major layout change to the packages directory

Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

18 files changed, 335 insertions, 0 deletions

diff --git a/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
new file mode 100644
index 0000000000..550423b0f8
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-driver-common.inc
@@ -0,0 +1,29 @@
+DESCRIPTION = "X driver"
+HOMEPAGE = "http://www.x.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11/drivers"
+LICENSE = "MIT-X"
+
+PE = "1"
+PR = "r0"
+
+DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
+
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
+
+inherit autotools pkgconfig
+
+# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
+# macro that simply assumes the test succeeds. 
+do_configure_prepend () {
+    echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
+    sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
+    mv configure.ac.new configure.ac
+}
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-common.inc b/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
new file mode 100644
index 0000000000..6fc88cf9d0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-common.inc
@@ -0,0 +1,7 @@
+include xf86-driver-common.inc
+
+DEPENDS += "inputproto kbproto "
+
+FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb
new file mode 100644
index 0000000000..fad47fbc00
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.4.0.bb
@@ -0,0 +1,7 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4ad82cd33b1432eacb1798a43c092"
+
+PR = "r1"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
new file mode 100644
index 0000000000..1efb505e27
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.4.0.bb
@@ -0,0 +1,7 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=eae2c98cbb8c60401893ff9313ff3826"
+
+PR = "r1"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
new file mode 100644
index 0000000000..a6744bda64
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_git.bb
@@ -0,0 +1,9 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+PV = "1.3.2+git${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard;protocol=git"
+S = "${WORKDIR}/git"
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
new file mode 100644
index 0000000000..665b320df1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/unbreak.patch
@@ -0,0 +1,19 @@
+Unbreak the linux mouse driver by using config.h
+
+RP - 4/11/07
+
+Index: git/src/lnx_mouse.c
+===================================================================
+--- git.orig/src/lnx_mouse.c    2008-11-04 23:46:05.000000000 +0000
++++ git/src/lnx_mouse.c 2008-11-04 23:46:15.000000000 +0000
+@@ -3,8 +3,8 @@
+  * Copyright 1999 by The XFree86 Project, Inc.
+  */
+ 
+-#ifdef HAVE_XORG_CONFIG_H
+-#include <xorg-config.h>
++#ifdef HAVE_CONFIG_H
++#include <config.h>
+ #endif
+ 
+ #include <X11/X.h>
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb
new file mode 100644
index 0000000000..44d60bf753
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.5.0.bb
@@ -0,0 +1,5 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=43eb754a9f368985c40a2a5370fc364a"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
new file mode 100644
index 0000000000..94dedf104d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_git.bb
@@ -0,0 +1,11 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+
+PV = "1.3.0+git${SRCPV}"
+PR = "r2"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git \
+           file://unbreak.patch;patch=1"
+S = "${WORKDIR}/git"
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
new file mode 100644
index 0000000000..81128394c3
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.2.1.bb
@@ -0,0 +1,5 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+DEPENDS += "libxi"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
new file mode 100644
index 0000000000..f7dc3b731c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_git.bb
@@ -0,0 +1,10 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+PV = "0.15.2+git${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
+S = "${WORKDIR}/git"
+
+DEPENDS += "libxi"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb
new file mode 100644
index 0000000000..36418ad59e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.6.9.bb
@@ -0,0 +1,8 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- VMWare mouse input driver"
+PR = "r0"
+
+RDEPENDS_${PN} += "xf86-input-mouse"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d1f16420e5ed7ed2133768425dfdab50"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-common.inc b/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
new file mode 100644
index 0000000000..f2e28170e7
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-common.inc
@@ -0,0 +1,4 @@
+include xf86-driver-common.inc
+
+DEPENDS =+ "renderproto videoproto xextproto fontsproto"
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
new file mode 100644
index 0000000000..968c20167f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.12.0.bb
@@ -0,0 +1,10 @@
+require xf86-video-common.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+
+EXTRA_OECONF += "--disable-xvmc"
+
+DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
+            virtual/libgl xineramaproto xf86driproto libpciaccess"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
new file mode 100644
index 0000000000..7011b7ea79
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -0,0 +1,16 @@
+require xf86-video-common.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
+            virtual/libgl xineramaproto libpciaccess"
+
+PV = "2.10.0+git${SRCPV}"
+PR = "r0"
+
+EXTRA_OECONF += "--disable-xvmc --enable-dri --disable-static"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git"
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_HOST = '(i.86|x86_4).*-linux'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
new file mode 100644
index 0000000000..325ca66f0c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
@@ -0,0 +1,146 @@
+--- /tmp/image-format-conversions.h     2009-02-03 10:18:04.000000000 +0100
++++ git/src/image-format-conversions.h  2009-02-03 10:19:18.000000000 +0100
+@@ -30,6 +30,8 @@
+ /* Basic C implementation of YV12/I420 to UYVY conversion */
+ void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
+ 
++/* NEON implementation of YV12/I420 to UYVY conversion */
++void uv12_to_uyvy_neon(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest);
+ 
+ #endif /* __IMAGE_FORMAT_CONVERSIONS_H__ */
+ 
+--- /tmp/image-format-conversions.c     2009-02-03 10:18:04.000000000 +0100
++++ git/src/image-format-conversions.c  2009-02-03 10:16:47.000000000 +0100
+@@ -2,6 +2,7 @@
+  * Copyright 2008 Kalle Vahlman, <zuh@iki.fi>
+  *                Ilpo Ruotsalainen, <lonewolf@iki.fi>
+  *                Tuomas Kulve, <tuomas.kulve@movial.com>
++ *                Ian Rickards, <ian.rickards@arm.com>
+  *                
+  *
+  * Permission to use, copy, modify, distribute and sell this software and its
+@@ -89,3 +90,104 @@
+        }
+ }
+ 
++void uv12_to_uyvy_neon(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest)
++{
++    int x, y;
++    uint8_t *dest_even = dest;
++    uint8_t *dest_odd = dest + w * 2;
++    uint8_t *y_p_even = y_p;
++    uint8_t *y_p_odd = y_p + y_pitch;
++
++    /*ErrorF("in uv12_to_uyvy, w: %d, pitch: %d\n", w, pitch);*/
++    if (w<16)
++    {
++        for (y=0; y<h; y+=2)
++        {
++            for (x=0; x<w; x+=2)
++            {
++                /* Output two 2x1 macroblocks to form a 2x2 block from input */
++                uint8_t u_val = *u_p++;
++                uint8_t v_val = *v_p++;
++
++                /* Even row, first pixel */
++                *dest_even++ = u_val;
++                *dest_even++ = *y_p_even++;
++
++                /* Even row, second pixel */
++                *dest_even++ = v_val;
++                *dest_even++ = *y_p_even++;
++
++                /* Odd row, first pixel */
++                *dest_odd++ = u_val;
++                *dest_odd++ = *y_p_odd++;
++
++                /* Odd row, second pixel */
++                *dest_odd++ = v_val;
++                *dest_odd++ = *y_p_odd++;
++            }
++
++            dest_even += w * 2;
++            dest_odd += w * 2;
++
++            u_p += ((uv_pitch << 1) - w) >> 1;
++            v_p += ((uv_pitch << 1) - w) >> 1;
++
++            y_p_even += (y_pitch - w) + y_pitch;
++            y_p_odd += (y_pitch - w) + y_pitch;
++        }
++    }
++    else
++    {
++        for (y=0; y<h; y+=2)
++        {
++            x=w;
++            do {
++                // avoid using d8-d15 (q4-q7) aapcs callee-save registers
++                asm volatile (
++                        "1:\n\t"
++                        "vld1.u8   {d0}, [%[u_p]]!\n\t"
++                        "sub       %[x],%[x],#16\n\t"
++                        "cmp       %[x],#16\n\t"
++                        "vld1.u8   {d1}, [%[v_p]]!\n\t"
++                        "vld1.u8   {q1}, [%[y_p_even]]!\n\t"
++                        "vzip.u8   d0, d1\n\t"
++                        "vld1.u8   {q2}, [%[y_p_odd]]!\n\t"
++                // use 2-element struct stores to zip up y with y&v
++                        "vst2.u8   {q0,q1}, [%[dest_even]]!\n\t"
++                        "vmov.u8   q1, q2\n\t"
++                        "vst2.u8   {q0,q1}, [%[dest_odd]]!\n\t"
++                        "bhs       1b\n\t"
++                        : [u_p] "+r" (u_p), [v_p] "+r" (v_p), [y_p_even] "+r" (y_p_even), [y_p_odd] "+r" (y_p_odd),
++                          [dest_even] "+r" (dest_even), [dest_odd] "+r" (dest_odd),
++                          [x] "+r" (x)
++                        :
++                        : "cc", "memory", "d0","d1","d2","d3","d4","d5"
++                        );
++                if (x!=0)
++                {
++                    // overlap final 16-pixel block to process requested width exactly
++                    x = 16-x;
++                    u_p -= x/2;
++                    v_p -= x/2;
++                    y_p_even -= x;
++                    y_p_odd -= x;
++                    dest_even -= x*2;
++                    dest_odd -= x*2;
++                    x = 16;
++                    // do another 16-pixel block
++                }
++            }
++            while (x!=0);
++
++            dest_even += w * 2;
++            dest_odd += w * 2;
++
++            u_p += ((uv_pitch << 1) - w) >> 1;
++            v_p += ((uv_pitch << 1) - w) >> 1;
++
++            y_p_even += (y_pitch - w) + y_pitch;
++            y_p_odd += (y_pitch - w) + y_pitch;
++        }
++    }
++}
++
+--- /tmp/omapfb-xv-generic.c    2009-02-03 10:52:18.000000000 +0100
++++ git/src/omapfb-xv-generic.c 2009-02-03 10:52:24.000000000 +0100
+@@ -240,7 +240,7 @@
+                        uint8_t *yb = buf;
+                        uint8_t *ub = yb + (src_y_pitch * src_h);
+                        uint8_t *vb = ub + (src_uv_pitch * (src_h / 2));
+-                       uv12_to_uyvy(src_w & ~15,
++                       uv12_to_uyvy_neon(src_w & ~15,
+                                     src_h & ~15,
+                                     src_y_pitch,
+                                     src_uv_pitch,
+@@ -256,7 +256,7 @@
+                        uint8_t *yb = buf;
+                        uint8_t *vb = yb + (src_y_pitch * src_h);
+                        uint8_t *ub = vb + (src_uv_pitch * (src_h / 2));
+-                       uv12_to_uyvy(src_w & ~15,
++                       uv12_to_uyvy_neon(src_w & ~15,
+                                     src_h & ~15,
+                                     src_y_pitch,
+                                     src_uv_pitch,
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
new file mode 100644
index 0000000000..15bef87198
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -0,0 +1,21 @@
+require xf86-driver-common.inc
+
+DESCRIPTION = "X.Org X server -- OMAP display driver"
+DEPENDS += "virtual/libx11"
+
+PE = "1"
+PR = "r1"
+PV = "0.1.1+git${SRCPV}"
+
+SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http \
+        "
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF_armv7a = " --enable-neon "
+CFLAGS += " -I${STAGING_INCDIR}/xorg "
+
+# Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
+do_compile_prepend_armv7a () {
+        sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
+}
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
new file mode 100644
index 0000000000..3212004db7
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.0.bb
@@ -0,0 +1,9 @@
+require xf86-video-common.inc
+
+EXTRA_OECONF += "--disable-xvmc"
+
+DESCRIPTION = "X.Org X server -- Generic Vesa display driver"
+DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
+            virtual/libgl xineramaproto xf86driproto libpciaccess"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb
new file mode 100644
index 0000000000..56daa86c86
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_11.0.1.bb
@@ -0,0 +1,12 @@
+require xf86-video-common.inc
+
+DESCRIPTION = "X.Org X server -- VMware SVGA II display driver"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
+
+DEPENDS += "virtual/libx11 libxvmc drm glproto \
+            virtual/libgl xineramaproto libpciaccess"
+
+PR = "r1"
+
+COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'