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>

11 files changed, 46 insertions, 184 deletions

diff --git a/meta/recipes-support/consolekit/consolekit_0.3.0.bb b/meta/recipes-support/consolekit/consolekit_0.3.0.bb
new file mode 100644
index 0000000000..fcd735d7ad
--- /dev/null
+++ b/meta/recipes-support/consolekit/consolekit_0.3.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login sessions, and seats."
+LICENSE = "GPLv2"
+DEPENDS = "dbus"
+
+inherit gnome
+
+SRC_URI = "http://people.freedesktop.org/~mccann/dist/ConsoleKit-${PV}.tar.bz2 \
+           file://nopolkit.patch;patch=1"
+S = "${WORKDIR}/ConsoleKit-${PV}"
+
+FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit"
+
+
+
+
diff --git a/meta/recipes-support/consolekit/files/nopolkit.patch b/meta/recipes-support/consolekit/files/nopolkit.patch
new file mode 100644
index 0000000000..bebbcaffff
--- /dev/null
+++ b/meta/recipes-support/consolekit/files/nopolkit.patch
@@ -0,0 +1,16 @@
+Index: ConsoleKit-0.3.0/configure.ac
+===================================================================
+--- ConsoleKit-0.3.0.orig/configure.ac	2009-05-22 12:53:27.000000000 +0100
++++ ConsoleKit-0.3.0/configure.ac	2009-05-22 12:53:56.000000000 +0100
+@@ -55,10 +55,7 @@
+   gthread-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+ 
+-PKG_CHECK_MODULES(POLKIT,
+-  polkit >= $POLKIT_REQUIRED_VERSION,
+-  have_polkit=yes,
+-  have_polkit=no)
++have_polkit=no
+ if test "x$have_polkit" = "xyes" ; then
+        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
+ fi
diff --git a/meta/recipes-support/iso-codes/iso-codes_3.3.bb b/meta/recipes-support/iso-codes/iso-codes_3.3.bb
deleted file mode 100644
index 23d025f4d2..0000000000
--- a/meta/recipes-support/iso-codes/iso-codes_3.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-DESCRIPTION = "ISO language, territory, currency, script codes and their translations"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-SECTION = "libs"
-PACKAGE_ARCH = "all"
-
-SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.gz"
-
-inherit autotools
-
-FILES_${PN}-dev="${datadir}/pkgconfig/iso-codes.pc"
-FILES_${PN}="${datadir}/xml/iso-codes/ \
-             ${datadir}/iso-codes/"
diff --git a/meta/recipes-support/libexif/libexif_0.6.16.bb b/meta/recipes-support/libexif/libexif_0.6.16.bb
new file mode 100644
index 0000000000..e3b5c331a8
--- /dev/null
+++ b/meta/recipes-support/libexif/libexif_0.6.16.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures"
+HOMEPAGE = "http://sourceforge.net/projects/libexif"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "gettext"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_append() {
+	sed -i s:doc\ binary:binary:g Makefile
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
diff --git a/meta/recipes-support/libfribidi/files/libtool-update.patch b/meta/recipes-support/libfribidi/files/libtool-update.patch
deleted file mode 100644
index c7031008fd..0000000000
--- a/meta/recipes-support/libfribidi/files/libtool-update.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fribidi-0.10.4/configure.in~	2002-05-19 11:06:48.000000000 +0100
-+++ fribidi-0.10.4/configure.in	2004-08-03 17:42:28.000000000 +0100
-@@ -50,7 +50,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+#AC_PROG_RANLIB
- AC_PATH_PROG(SED, sed, $PATH)
- 
- 
diff --git a/meta/recipes-support/libfribidi/libfribidi_0.10.4.bb b/meta/recipes-support/libfribidi/libfribidi_0.10.4.bb
deleted file mode 100644
index d60a190cbd..0000000000
--- a/meta/recipes-support/libfribidi/libfribidi_0.10.4.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Fribidi library for bidirectional text"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-inherit autotools pkgconfig
-
-PR = "r0"
-
-S = "${WORKDIR}/fribidi-${PV}"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/fribidi/fribidi-${PV}.tar.bz2 \
-           file://libtool-update.patch;patch=1"
-
-#PACKAGES += " ${PN}-bin"
-FILES_${PN} = "${libdir}/lib*.so.*"
-#FILES_${PN}-bin = "${libdir}/uu*"
-
-do_configure_prepend () {
-# this version of libtool is old - we have to nobble this file to get it to litoolize
-	rm ltconfig
-	rm aclocal.m4
-	rm acinclude.m4
-}
diff --git a/meta/recipes-support/ohm/ohm/fix_configure.patch b/meta/recipes-support/ohm/ohm/fix_configure.patch
deleted file mode 100644
index e4b774e785..0000000000
--- a/meta/recipes-support/ohm/ohm/fix_configure.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: git/configure.in
-===================================================================
---- git.orig/configure.in	2007-12-19 13:43:52.000000000 +0000
-+++ git/configure.in	2008-03-06 23:59:57.000000000 +0000
-@@ -201,9 +201,6 @@
- # Like AC_CHECK_HEADER, but it uses the already-computed -I directories.
- AC_DEFUN(AC_CHECK_X_HEADER, [
-   ac_save_CPPFLAGS="$CPPFLAGS"
--  if test \! -z "$includedir" ; then 
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_CHECK_HEADER([$1],[$2],[$3],[$4])
-   CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -211,9 +208,6 @@
- # Like AC_TRY_COMPILE, but it uses the already-computed -I directories.
- AC_DEFUN(AC_TRY_X_COMPILE, [
-   ac_save_CPPFLAGS="$CPPFLAGS"
--  if test \! -z "$includedir" ; then 
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_TRY_COMPILE([$1], [$2], [$3], [$4])
-   CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -224,14 +218,8 @@
-   ac_save_CPPFLAGS="$CPPFLAGS"
-   ac_save_LDFLAGS="$LDFLAGS"
- #  ac_save_LIBS="$LIBS"
--  if test \! -z "$includedir" ; then 
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-   # note: $X_CFLAGS includes $x_includes
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
--  if test \! -z "$libdir" ; then
--    LDFLAGS="$LDFLAGS -L$libdir"
--  fi
-   # note: $X_LIBS includes $x_libraries
-   LDFLAGS="$LDFLAGS $ALL_X_LIBS"
-   AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5])
diff --git a/meta/recipes-support/ohm/ohm_git.bb b/meta/recipes-support/ohm/ohm_git.bb
deleted file mode 100644
index 2ba78b35ab..0000000000
--- a/meta/recipes-support/ohm/ohm_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "Open Hardware Manager"
-HOMEPAGE = "http://freedesktop.org/Software/ohm"
-LICENSE = "LGPL"
-
-DEPENDS = "gtk+ dbus-glib intltool-native hal"
-RDEPENDS_${PN} += "udev hal-info"
-SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
-           file://fix_configure.patch;patch=1"
-
-PV = "0.1.2+git-locrev${SRCREV}"
-PR = "r1"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-distro=debian \
-        --without-xauth \
-        --disable-gtk-doc \
-        --disable-docbook-docs"
-
-do_configure_prepend() {
-        touch gtk-doc.make
-}
-
-OE_LT_RPATH_ALLOW=":${libdir}/libohm:"
-OE_LT_RPATH_ALLOW[export]="1"
-
-PACKAGES =+ "libohm ohm-plugin-x11"
-
-FILES_${PN}-dev += "${libdir}/ohm/*.a"
-
-FILES_${PN} = "${sysconfdir} \
-               ${bindir}/* \
-               ${sbindir}/* \
-               ${libdir}/ohm/*.so \
-               "
-
-FILES_libohm = "${libdir}/libohm.so.*"
-FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \
-                        ${libdir}/ohm/libohm_idle.so \ 
-                        ${sysconfdir}/ohm/plugins.d/x* \
-                        ${sysconfdir}/ohm/plugins.d/idle* \
-                        "
diff --git a/meta/recipes-support/openobex/files/disable-cable-test.patch b/meta/recipes-support/openobex/files/disable-cable-test.patch
deleted file mode 100644
index 95b636dd8f..0000000000
--- a/meta/recipes-support/openobex/files/disable-cable-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- openobex-1.2/apps/Makefile.am~disable-cable-test
-+++ openobex-1.2/apps/Makefile.am
-@@ -6,7 +6,7 @@
- 	obex_io.c obex_io.h \
- 	obex_put_common.c obex_put_common.h
- 
--bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
-+bin_PROGRAMS = irxfer obex_tcp irobex_palm3
- 
- obex_test_SOURCES = \
- 	obex_test.c obex_test.h \
diff --git a/meta/recipes-support/openobex/files/libusb_crosscompile_check.patch b/meta/recipes-support/openobex/files/libusb_crosscompile_check.patch
deleted file mode 100644
index 20ac70bd1e..0000000000
--- a/meta/recipes-support/openobex/files/libusb_crosscompile_check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openobex-1.5/acinclude.m4
-===================================================================
---- openobex-1.5.orig/acinclude.m4	2009-02-08 18:30:22.000000000 +0000
-+++ openobex-1.5/acinclude.m4	2009-07-31 09:55:46.000000000 +0100
-@@ -158,7 +158,7 @@
- 		;;
- 	*)
- 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
--		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
-+		REQUIRES="libusb"
- 		;;
- 	esac
- 	AC_SUBST(USB_CFLAGS)
diff --git a/meta/recipes-support/openobex/openobex_1.5.bb b/meta/recipes-support/openobex/openobex_1.5.bb
deleted file mode 100644
index dc07ae1353..0000000000
--- a/meta/recipes-support/openobex/openobex_1.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "The Openobex project is an open source implementation of the \
-Object Exchange (OBEX) protocol."
-HOMEPAGE = "http://openobex.triq.net"
-SECTION = "libs"
-PROVIDES = "openobex-apps"
-DEPENDS = "libusb bluez4"
-LICENSE = "GPL"
-PR = "r4"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/bluetooth/openobex-${PV}.tar.gz \
-           file://disable-cable-test.patch;patch=1 \
-	   file://libusb_crosscompile_check.patch;patch=1"
-
-inherit autotools binconfig pkgconfig
-
-EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
-                --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
-
-# how to stop shlibrename from renaming -apps?
-PACKAGES += "openobex-apps"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/openobex-config"
-FILES_${PN}-apps = "${bindir}/*"