From 86f158c3534c6a030977d8ace5f457a980ff3820 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Fri, 17 Jun 2005 12:40:07 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/17 14:01:29+02:00 utwente.nl!koen Push various uncommitted fixes gpe-todo_0.53.bb: inherit pkgconfig too libglade_2.4.2.bb: fix up glade build gnumeric_1.5.1.bb: change default preference gphoto2_2.1.5.bb: fix src_uri matchbox-panel_0.9.1.bb: enable small icons for small devices mysql-native_4.1.10a.bb: build embedded mysql too roadster_cvs.bb: adjust depends BKrev: 42b2c4a7wA8zM9I9s3xzB6fVB6IpIg --- packages/gnumeric/gnumeric_1.5.1.bb | 1 - packages/gpe-todo/gpe-todo_0.53.bb | 11 +++++++++ packages/gphoto2/gphoto2_2.1.5.bb | 8 ++++++ packages/libglade/libglade_2.4.2.bb | 33 +++++++++++++++++++++++++ packages/matchbox-panel/matchbox-panel_0.9.1.bb | 8 +++++- packages/mysql/mysql-native_4.1.10a.bb | 17 +++++++++++++ packages/roadster/roadster_cvs.bb | 16 ++++++++++++ 7 files changed, 92 insertions(+), 2 deletions(-) diff --git a/packages/gnumeric/gnumeric_1.5.1.bb b/packages/gnumeric/gnumeric_1.5.1.bb index d8cf3157d9..d1de728d66 100644 --- a/packages/gnumeric/gnumeric_1.5.1.bb +++ b/packages/gnumeric/gnumeric_1.5.1.bb @@ -4,7 +4,6 @@ PR = "r0" S = "${WORKDIR}/gnumeric-${PV}" DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" DESCRIPTION = "Gnumeric spreadsheet for GNOME" -DEFAULT_PREFERENCE=-1 inherit gnome flow-lossage diff --git a/packages/gpe-todo/gpe-todo_0.53.bb b/packages/gpe-todo/gpe-todo_0.53.bb index e69de29bb2..3eb0c9d786 100644 --- a/packages/gpe-todo/gpe-todo_0.53.bb +++ b/packages/gpe-todo/gpe-todo_0.53.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +inherit gpe autotools pkgconfig + +DESCRIPTION = "GPE to-do list" +DEPENDS = "gtk+ libgpewidget libgpepimc libtododb" +MAINTAINER = "Phil Blundell " +SECTION = "gpe" +PRIORITY = "optional" + +SRC_URI="http://ftp.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.bz2" + diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb index e69de29bb2..51dacccd0f 100644 --- a/packages/gphoto2/gphoto2_2.1.5.bb +++ b/packages/gphoto2/gphoto2_2.1.5.bb @@ -0,0 +1,8 @@ +LICENSE = GPL +SECTION = "console/utils" +DEPENDS = "libgphoto2 popt" +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/libglade/libglade_2.4.2.bb b/packages/libglade/libglade_2.4.2.bb index e69de29bb2..5bf46b7d96 100644 --- a/packages/libglade/libglade_2.4.2.bb +++ b/packages/libglade/libglade_2.4.2.bb @@ -0,0 +1,33 @@ +LICENSE = LGPL +DESCRIPTION = "Runtime support for GTK interface builder" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "gtk+ gtk-doc" +MAINTAINER = "Phil Blundell " + +inherit autotools pkgconfig gnome + +PR = "r0" + +SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1" + +EXTRA_OECONF += "--without-libxml2" + +CFLAGS += "-lz" + +PACKAGES += " ${PN}-data" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd" +FILES_${PN}-dev += "${bindir}/libglade-convert" +#RDEPENDS_${PN} = "${PN}-data" + +headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h" + +do_stage () { + oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade + for i in ${headers}; do + install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i + done +} diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb index dd7df982fc..d22391ea1c 100644 --- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb +++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb @@ -12,7 +12,13 @@ inherit autotools pkgconfig gettext CFLAGS += "-D_GNU_SOURCE" -EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons" +EXTRA_OECONF = "--enable-startup-notification --enable-dnotify" +EXTRA_OECONF_append_h3600 = " --enable-small-icons " +EXTRA_OECONF_append_h3900 = " --enable-small-icons " +EXTRA_OECONF_append_collie = " --enable-small-icons " +EXTRA_OECONF_append_poodle = " --enable-small-icons " +EXTRA_OECONF_append_ramses = " --enable-small-icons " + FILES_${PN} = "${bindir} \ ${datadir}/applications \ diff --git a/packages/mysql/mysql-native_4.1.10a.bb b/packages/mysql/mysql-native_4.1.10a.bb index e69de29bb2..f3b1b0e1ae 100644 --- a/packages/mysql/mysql-native_4.1.10a.bb +++ b/packages/mysql/mysql-native_4.1.10a.bb @@ -0,0 +1,17 @@ +SECTION = "console/network" +include mysql_${PV}.bb +inherit native + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/mysql-4.1', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" +DEPENDS = "ncurses-native" +EXTRA_OEMAKE = "" +EXTRA_OECONF = " --with-embedded-server " + +do_stage() { + install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ +} + +do_install() { + : +} diff --git a/packages/roadster/roadster_cvs.bb b/packages/roadster/roadster_cvs.bb index e69de29bb2..a1f39086f1 100644 --- a/packages/roadster/roadster_cvs.bb +++ b/packages/roadster/roadster_cvs.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Roadster aims to be easy-to-use and open-source mapping software." +LICENSE = "GPL" +HOMEPAGE = "http://linuxadvocate.org/projects/roadster/" +MAINTAINER = "Koen Kooi " +PV = "0.0+cvs${CVSDATE}" + +DEPENDS = "tcp-wrappers mysql gpsd gtk+ cairo libxml2 libgnomeui libglade" +RDEPENDS = "gpsd gtk+ cairo libxml2" + +SRC_URI = "cvs://anoncvs@cvs.cairographics.org/cvs/cairo;module=roadster" +S = "${WORKDIR}/${PN}" + +EXTRA_OECONF = " --with-gpsd=${STAGING_DIR}/${TARGET_SYS} " +inherit autotools + +CFLAGS += " -I{$STAGING_INCDIR} " -- cgit 1.2.3-korg