diff options
| -rw-r--r-- | conf/machine/ipaq-pxa-2.6.conf | 11 | ||||
| -rw-r--r-- | packages/esmart/esmart_0.9.0.004.bb | 2 | ||||
| -rw-r--r-- | packages/evas/evas_0.9.9.013.inc | 2 | ||||
| -rw-r--r-- | packages/glibmm/glibmm_2.6.1.bb | 7 |
4 files changed, 6 insertions, 16 deletions
diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf deleted file mode 100644 index ad50bff395..0000000000 --- a/conf/machine/ipaq-pxa-2.6.conf +++ /dev/null @@ -1,11 +0,0 @@ -IPKG_ARCHS = "all arm h3900 ${MACHINE}" -TARGET_ARCH = arm -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel modutils-collateral module-init-tools" -BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools" -include conf/machine/handheld-common.conf - -GUI_MACHINE_CLASS = "smallscreen" - diff --git a/packages/esmart/esmart_0.9.0.004.bb b/packages/esmart/esmart_0.9.0.004.bb index 582090643a..e0f7272872 100644 --- a/packages/esmart/esmart_0.9.0.004.bb +++ b/packages/esmart/esmart_0.9.0.004.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" SECTION = "e/libs" LICENSE = "MIT" -DEPENDS = "eet evas-x11 ecore-x11 epsilon embryo imlib2 jpeg libtool" +DEPENDS = "eet evas-x11 ecore-x11 epsilon embryo virtual/imlib2 jpeg libtool" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" diff --git a/packages/evas/evas_0.9.9.013.inc b/packages/evas/evas_0.9.9.013.inc index a0c7dc8134..31b06c99ff 100644 --- a/packages/evas/evas_0.9.9.013.inc +++ b/packages/evas/evas_0.9.9.013.inc @@ -37,4 +37,4 @@ PACKAGES =+ "evas-examples" FILES_${PN} = "${libdir}/libevas*.so*" FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig" -FILES_evas-examples = "${bindir}/evas_fb_test ${bindir}/evas_software* ${datadir}" +FILES_evas-examples = "${bindir}/evas_*_test ${datadir}" diff --git a/packages/glibmm/glibmm_2.6.1.bb b/packages/glibmm/glibmm_2.6.1.bb index f65abf61bc..58944c0f69 100644 --- a/packages/glibmm/glibmm_2.6.1.bb +++ b/packages/glibmm/glibmm_2.6.1.bb @@ -1,3 +1,4 @@ +DEFAULT_PREFERENCE = "-1" DESCRIPTION = "C++ bindings for the glib library." HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" @@ -5,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>" LICENSE = "LGPL" DEPENDS = "gtk+ libsigc++-2.0" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-${PV}.tar.bz2" @@ -13,11 +14,11 @@ inherit autotools pkgconfig flow-lossage FILES_${PN} = "${libdir}/lib*.so.*" -LIBV = "2.6.1" +LIBV = "2.6.0" do_stage () { oe_libinstall -so -C glib/glibmm libglibmm-2.4 ${STAGING_LIBDIR} - oe_libinstall -so -C tools/extra_defs_gen libglibmm_generate_extra_defs-2.6 ${STAGING_LIBDIR} + oe_libinstall -so -C tools/extra_defs_gen libglibmm_generate_extra_defs-2.4 ${STAGING_LIBDIR} autotools_stage_includes |