diff options
| author | David Karlstrom <daka@thg.se> | 2005-08-21 21:56:36 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-21 21:56:36 +0000 |
| commit | 545530dcaaeef0c96685387bef6ed823b2b515fe (patch) | |
| tree | 38d33c7673cae392a2db83e5716151d8f8ad9b30 | |
| parent | d6bae3f42fc7ba5c928373498ef901713f2067d4 (diff) | |
| parent | 0fa1b9eda8502cf780be8f2e66bd42844c9e57a8 (diff) | |
merge of 4456e15f23db9a9f052dfcc702caeb50db1ee867
and 6a067ebc597af5f7a5d22be5966896abfeea9182
| -rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
| -rw-r--r-- | conf/distro/preferred-gpe-versions-2.7.inc | 7 | ||||
| -rw-r--r-- | packages/efl++/efl++.inc | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 6c76c86780..aba754b368 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -1,6 +1,8 @@ BBFILES := "\ +${PKGDIR}/packages/alsa/*.bb \ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ +${PKGDIR}/packages/aumix/*.bb \ ${PKGDIR}/packages/autoconf/*.bb \ ${PKGDIR}/packages/automake/*.bb \ ${PKGDIR}/packages/base-files/*.bb \ diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 0c028c5345..1d512fa292 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -9,16 +9,19 @@ CVSDATE_minimo=20050401 PREFERRED_PROVIDER_gconf=gconf-dbus #specify versions, as the header says :) -PREFERRED_VERSION_libmatchbox ?= "1.6" +PREFERRED_VERSION_libmatchbox ?= "1.7" PREFERRED_VERSION_matchbox ?= "0.9.1" PREFERRED_VERSION_matchbox-common ?= "0.9.1" PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-wm ?= "0.9.4" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" +PREFERRED_VERSION_atk ?= "1.9.0" PREFERRED_VERSION_cairo ?= "0.5.2" PREFERRED_VERSION_glib-2.0 ?= "2.6.4" PREFERRED_VERSION_gtk+ ?= "2.6.7" +PREFERRED_VERSION_pango ?= "1.8.1" +PREFERRED_VERSION_librsvg ?= "2.6.5" PREFERRED_VERSION_libgpewidget ?= "0.103" PREFERRED_VERSION_libgpepimc ?= "0.5" PREFERRED_VERSION_libgpevtype ?= "0.12" diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc index 3a0aa9f691..d575bfa9ee 100644 --- a/packages/efl++/efl++.inc +++ b/packages/efl++/efl++.inc @@ -14,7 +14,8 @@ inherit qmake PARALLEL_MAKE = "" QMAKE_PROFILES = "efl++.pro" -EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \ +EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/misc INCLUDEPATH+=${S}/src/common \ + INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \ LIBS+=-L${S} DESTDIR=${S} ${EFL_CONFIGURATION}" export OE_QMAKE_LINK="${CXX}" export EDIR="${S}" @@ -28,7 +29,7 @@ EOF } do_stage() { - for i in src/evas/*.h src/ecore/*.h src/edje/*.h + for i in src/common/*.h src/evas/*.h src/ecore/*.h src/edje/*.h do install -m 0644 $i ${STAGING_INCDIR} done @@ -38,7 +39,7 @@ do_stage() { do_install() { oe_libinstall -so -C ${S} libefl++ ${D}${libdir} install -d ${D}${bindir} - install edje-simple ${D}${bindir} + install *-* ${D}${bindir} install -d ${D}${datadir}/efl++ cp -a data/* ${D}${datadir}/efl++ } |