summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/ohm
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-11-22 13:57:13 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-22 13:57:13 +0000
commitcfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch)
tree7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-support/ohm
parent762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff)
downloadpoky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz
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>
Diffstat (limited to 'meta/recipes-support/ohm')
-rw-r--r--meta/recipes-support/ohm/ohm/fix_configure.patch39
-rw-r--r--meta/recipes-support/ohm/ohm_git.bb44
2 files changed, 0 insertions, 83 deletions
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 @@
1Index: git/configure.in
2===================================================================
3--- git.orig/configure.in 2007-12-19 13:43:52.000000000 +0000
4+++ git/configure.in 2008-03-06 23:59:57.000000000 +0000
5@@ -201,9 +201,6 @@
6 # Like AC_CHECK_HEADER, but it uses the already-computed -I directories.
7 AC_DEFUN(AC_CHECK_X_HEADER, [
8 ac_save_CPPFLAGS="$CPPFLAGS"
9- if test \! -z "$includedir" ; then
10- CPPFLAGS="$CPPFLAGS -I$includedir"
11- fi
12 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
13 AC_CHECK_HEADER([$1],[$2],[$3],[$4])
14 CPPFLAGS="$ac_save_CPPFLAGS"])
15@@ -211,9 +208,6 @@
16 # Like AC_TRY_COMPILE, but it uses the already-computed -I directories.
17 AC_DEFUN(AC_TRY_X_COMPILE, [
18 ac_save_CPPFLAGS="$CPPFLAGS"
19- if test \! -z "$includedir" ; then
20- CPPFLAGS="$CPPFLAGS -I$includedir"
21- fi
22 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
23 AC_TRY_COMPILE([$1], [$2], [$3], [$4])
24 CPPFLAGS="$ac_save_CPPFLAGS"])
25@@ -224,14 +218,8 @@
26 ac_save_CPPFLAGS="$CPPFLAGS"
27 ac_save_LDFLAGS="$LDFLAGS"
28 # ac_save_LIBS="$LIBS"
29- if test \! -z "$includedir" ; then
30- CPPFLAGS="$CPPFLAGS -I$includedir"
31- fi
32 # note: $X_CFLAGS includes $x_includes
33 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
34- if test \! -z "$libdir" ; then
35- LDFLAGS="$LDFLAGS -L$libdir"
36- fi
37 # note: $X_LIBS includes $x_libraries
38 LDFLAGS="$LDFLAGS $ALL_X_LIBS"
39 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 @@
1DESCRIPTION = "Open Hardware Manager"
2HOMEPAGE = "http://freedesktop.org/Software/ohm"
3LICENSE = "LGPL"
4
5DEPENDS = "gtk+ dbus-glib intltool-native hal"
6RDEPENDS_${PN} += "udev hal-info"
7SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
8 file://fix_configure.patch;patch=1"
9
10PV = "0.1.2+git-locrev${SRCREV}"
11PR = "r1"
12
13S = "${WORKDIR}/git"
14
15inherit autotools pkgconfig
16
17EXTRA_OECONF = "--with-distro=debian \
18 --without-xauth \
19 --disable-gtk-doc \
20 --disable-docbook-docs"
21
22do_configure_prepend() {
23 touch gtk-doc.make
24}
25
26OE_LT_RPATH_ALLOW=":${libdir}/libohm:"
27OE_LT_RPATH_ALLOW[export]="1"
28
29PACKAGES =+ "libohm ohm-plugin-x11"
30
31FILES_${PN}-dev += "${libdir}/ohm/*.a"
32
33FILES_${PN} = "${sysconfdir} \
34 ${bindir}/* \
35 ${sbindir}/* \
36 ${libdir}/ohm/*.so \
37 "
38
39FILES_libohm = "${libdir}/libohm.so.*"
40FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \
41 ${libdir}/ohm/libohm_idle.so \
42 ${sysconfdir}/ohm/plugins.d/x* \
43 ${sysconfdir}/ohm/plugins.d/idle* \
44 "