From af48397096325a068dc8edfb6992898574dd85e4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 23 Mar 2008 17:20:07 +0000 Subject: [PATCH] revert EFL SRCDATE back to 20080129. Some time after that, the E folks broke module detection (at least) in ecore configure.in --- conf/distro/include/sane-srcdates.inc | 2 +- packages/efl1/ecore-native_cvs.bb | 4 +--- packages/efl1/eet-native_cvs.bb | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 13498ac7bc..9c14f9a018 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080321" +EFL_SRCDATE = "20080129" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb index b7d16b54ba..0ef5dec32f 100644 --- a/packages/efl1/ecore-native_cvs.bb +++ b/packages/efl1/ecore-native_cvs.bb @@ -4,9 +4,6 @@ DEPENDS = "eet-native evas-native" PR = "r3" EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - \ --enable-ecore-txt \ --disable-ecore-config \ --disable-ecore-x-xcb \ @@ -16,6 +13,7 @@ EXTRA_OECONF = "\ --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ + --enable-ecore-evas-fb \ --disable-ecore-evas-x11-gl \ --disable-ecore-evas-xrender \ --disable-ecore-evas-dfb \ diff --git a/packages/efl1/eet-native_cvs.bb b/packages/efl1/eet-native_cvs.bb index de162df5d5..096fd02524 100644 --- a/packages/efl1/eet-native_cvs.bb +++ b/packages/efl1/eet-native_cvs.bb @@ -1,3 +1,6 @@ require eet_cvs.bb inherit native DEPENDS = "zlib-native jpeg-native" +# we no longer inherit pkgconfig, so we need to state this explicitly +# (see explanation in efl.bbclass and autotools.bbclass) +DEPENDS += "pkgconfig-native" -- 2.39.5