From cfe12efb5ec9586dab6961f141d52b103bd8b1d1 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 22 Nov 2010 13:57:13 +0000 Subject: 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 --- .../recipes-support/iso-codes/iso-codes_3.3.bb | 14 +++++++++++++ .../libfribidi/files/libtool-update.patch | 11 ++++++++++ .../libfribidi/libfribidi_0.10.4.bb | 24 ++++++++++++++++++++++ .../openobex/files/disable-cable-test.patch | 16 +++++++++++++++ .../openobex/files/libusb_crosscompile_check.patch | 13 ++++++++++++ .../recipes-support/openobex/openobex_1.5.bb | 23 +++++++++++++++++++++ .../recipes-support/poppler/poppler-data_0.1.bb | 16 +++++++++++++++ .../recipes-support/poppler/poppler-fpu.inc | 6 ++++++ meta-demoapps/recipes-support/poppler/poppler.inc | 18 ++++++++++++++++ .../recipes-support/poppler/poppler_0.9.2.bb | 2 ++ 10 files changed, 143 insertions(+) create mode 100644 meta-demoapps/recipes-support/iso-codes/iso-codes_3.3.bb create mode 100644 meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch create mode 100644 meta-demoapps/recipes-support/libfribidi/libfribidi_0.10.4.bb create mode 100644 meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch create mode 100644 meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch create mode 100644 meta-demoapps/recipes-support/openobex/openobex_1.5.bb create mode 100644 meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb create mode 100644 meta-demoapps/recipes-support/poppler/poppler-fpu.inc create mode 100644 meta-demoapps/recipes-support/poppler/poppler.inc create mode 100644 meta-demoapps/recipes-support/poppler/poppler_0.9.2.bb (limited to 'meta-demoapps/recipes-support') diff --git a/meta-demoapps/recipes-support/iso-codes/iso-codes_3.3.bb b/meta-demoapps/recipes-support/iso-codes/iso-codes_3.3.bb new file mode 100644 index 0000000000..23d025f4d2 --- /dev/null +++ b/meta-demoapps/recipes-support/iso-codes/iso-codes_3.3.bb @@ -0,0 +1,14 @@ +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-demoapps/recipes-support/libfribidi/files/libtool-update.patch b/meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch new file mode 100644 index 0000000000..c7031008fd --- /dev/null +++ b/meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch @@ -0,0 +1,11 @@ +--- 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-demoapps/recipes-support/libfribidi/libfribidi_0.10.4.bb b/meta-demoapps/recipes-support/libfribidi/libfribidi_0.10.4.bb new file mode 100644 index 0000000000..d60a190cbd --- /dev/null +++ b/meta-demoapps/recipes-support/libfribidi/libfribidi_0.10.4.bb @@ -0,0 +1,24 @@ +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-demoapps/recipes-support/openobex/files/disable-cable-test.patch b/meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch new file mode 100644 index 0000000000..95b636dd8f --- /dev/null +++ b/meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch @@ -0,0 +1,16 @@ + +# +# 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-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch b/meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch new file mode 100644 index 0000000000..20ac70bd1e --- /dev/null +++ b/meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch @@ -0,0 +1,13 @@ +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-demoapps/recipes-support/openobex/openobex_1.5.bb b/meta-demoapps/recipes-support/openobex/openobex_1.5.bb new file mode 100644 index 0000000000..dc07ae1353 --- /dev/null +++ b/meta-demoapps/recipes-support/openobex/openobex_1.5.bb @@ -0,0 +1,23 @@ +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}/*" diff --git a/meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb b/meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb new file mode 100644 index 0000000000..ca22e4dba0 --- /dev/null +++ b/meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." +LICENSE = "Adobe" +PR = "r0" + +SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" + +do_compile() { +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + +FILES_${PN} += "${datadir}" +PACKAGE_ARCH = "all" + diff --git a/meta-demoapps/recipes-support/poppler/poppler-fpu.inc b/meta-demoapps/recipes-support/poppler/poppler-fpu.inc new file mode 100644 index 0000000000..a26273020a --- /dev/null +++ b/meta-demoapps/recipes-support/poppler/poppler-fpu.inc @@ -0,0 +1,6 @@ + +def get_poppler_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--enable-fixedpoint" + return "" + diff --git a/meta-demoapps/recipes-support/poppler/poppler.inc b/meta-demoapps/recipes-support/poppler/poppler.inc new file mode 100644 index 0000000000..645e734e8b --- /dev/null +++ b/meta-demoapps/recipes-support/poppler/poppler.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." +DEPENDS = "fontconfig jpeg zlib gtk+ cairo" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = " --enable-xpdf-headers \ + --disable-gtk-test \ + --disable-poppler-qt --disable-poppler-qt4 \ + --enable-zlib \ + " + +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require poppler-fpu.inc +EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}" diff --git a/meta-demoapps/recipes-support/poppler/poppler_0.9.2.bb b/meta-demoapps/recipes-support/poppler/poppler_0.9.2.bb new file mode 100644 index 0000000000..92c25bc0ac --- /dev/null +++ b/meta-demoapps/recipes-support/poppler/poppler_0.9.2.bb @@ -0,0 +1,2 @@ +require poppler.inc +PR = "r2" -- cgit v1.2.3-54-g00ecf