diff options
Diffstat (limited to 'packages/efl1')
-rw-r--r-- | packages/efl1/ecore-native_cvs.bb | 2 | ||||
-rw-r--r-- | packages/efl1/ecore.inc | 12 | ||||
-rw-r--r-- | packages/efl1/ecore_cvs.bb | 5 | ||||
-rw-r--r-- | packages/efl1/edbus_cvs.bb | 10 | ||||
-rw-r--r-- | packages/efl1/epdf/fix-plugin-path-check.patch | 24 | ||||
-rw-r--r-- | packages/efl1/epdf_cvs.bb | 3 | ||||
-rw-r--r-- | packages/efl1/etk_cvs.bb | 3 | ||||
-rw-r--r-- | packages/efl1/evas.inc | 16 | ||||
-rw-r--r-- | packages/efl1/evas_cvs.bb | 3 | ||||
-rw-r--r-- | packages/efl1/ewl_cvs.bb | 5 |
10 files changed, 54 insertions, 29 deletions
diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb index 92a30397e1..70d9490b50 100644 --- a/packages/efl1/ecore-native_cvs.bb +++ b/packages/efl1/ecore-native_cvs.bb @@ -1,7 +1,7 @@ require ecore.inc inherit native DEPENDS = "eet-native evas-native" -PR = "r2" +PR = "r0" EXTRA_OECONF = "\ --enable-ecore-txt \ diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index b71a4b7582..eacde2d012 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -2,17 +2,13 @@ DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \ foundation libraries. It makes makes doing selections, drag and drop, event loops, \ timeouts and idle handlers fast, optimized, and convenient." LICENSE = "MIT" -DEPENDS = "curl directfb eet evas tslib" +DEPENDS = "curl eet evas tslib" # optional -# DEPENDS += "openssl virtual/libiconv" +# DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" PV = "0.9.9.041+cvs${SRCDATE}" inherit efl_library -# SRC_URI += "file://configure.patch;patch=1 \ -# file://fix-tslib-configure.patch;patch=1 \ -# file://fix-directfb-include.patch;patch=1" - SRC_URI += "file://fix-directfb-include.patch;patch=1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" @@ -26,6 +22,8 @@ PACKAGES += "\ ${PN}-evas \ ${PN}-fb \ ${PN}-file \ + ${PN}-imf \ + ${PN}-imf-evas \ ${PN}-ipc \ ${PN}-job \ ${PN}-txt \ @@ -40,6 +38,8 @@ FILES_${PN}-sdl = "${libdir}/libecore_sdl.so.*" FILES_${PN}-evas = "${libdir}/libecore_evas.so.*" FILES_${PN}-fb = "${libdir}/libecore_fb.so.*" FILES_${PN}-file = "${libdir}/libecore_file.so.*" +FILES_${PN}-imf = "${libdir}/libecore_imf.so.*" +FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas.so.*" FILES_${PN}-ipc = "${libdir}/libecore_ipc.so.*" FILES_${PN}-job = "${libdir}/libecore_job.so.*" FILES_${PN}-txt = "${libdir}/libecore_txt.so.*" diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb index 53ee8642d8..6580957871 100644 --- a/packages/efl1/ecore_cvs.bb +++ b/packages/efl1/ecore_cvs.bb @@ -1,16 +1,17 @@ require ecore.inc -PR = "r5" +PR = "r1" EXTRA_OECONF = "\ --enable-ecore-txt \ --disable-ecore-x-xcb \ + --enable-simple-x11 \ --enable-ecore-x \ --enable-ecore-job \ --disable-ecore-directfb \ --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ - --disable-ecore-evas-gl \ + --disable-ecore-evas-x11-gl \ --enable-ecore-evas-xrender \ --enable-ecore-evas-dfb \ --disable-openssl \ diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb index db1547c3d4..755efcb9ec 100644 --- a/packages/efl1/edbus_cvs.bb +++ b/packages/efl1/edbus_cvs.bb @@ -1,12 +1,18 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore" LICENSE = "MIT" -PR = "r0" +PR = "r1" inherit efl_library -SRC_URI = "${E_CVS};module=e17/proto/e_dbus" +SRC_URI = "${E_CVS};module=e17/libs/e_dbus" S = "${WORKDIR}/e_dbus" # TODO increase package granularity +PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal" +FILES_${PN}-enotify = "${libdir}/libenotify.so.*" +FILES_${PN}-edbus = "${libdir}/libedbus.so.*" +FILES_${PN}-enm = "${libdir}/libenm.so.*" +FILES_${PN}-ehal = "${libdir}/libehal.so.*" + diff --git a/packages/efl1/epdf/fix-plugin-path-check.patch b/packages/efl1/epdf/fix-plugin-path-check.patch index dd5469c286..b218fffb7a 100644 --- a/packages/efl1/epdf/fix-plugin-path-check.patch +++ b/packages/efl1/epdf/fix-plugin-path-check.patch @@ -2,18 +2,18 @@ Index: epdf/configure.in =================================================================== --- epdf.orig/configure.in +++ epdf/configure.in -@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL, - [ - have_ewl="yes" - requirements="$requirements ewl" -- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" -- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" -+ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/" -+ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/" - AC_SUBST(EWL_TEST_LIBS_DIR) - AC_SUBST(EWL_TEST_SOURCE_DIR) - ], -@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON, +@@ -95,8 +95,8 @@ + [ + have_ewl="yes" + requirements="$requirements ewl" +- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" +- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" ++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/" ++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/" + AC_SUBST(EWL_TEST_LIBS_DIR) + AC_SUBST(EWL_TEST_SOURCE_DIR) + ], +@@ -144,7 +144,7 @@ [ have_epsilon="yes" requirements="$requirements epsilon imlib2" diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb index 8426b75a17..7ca33bf9d8 100644 --- a/packages/efl1/epdf_cvs.bb +++ b/packages/efl1/epdf_cvs.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" LICENSE = "BSD" -DEPENDS = "poppler0.6 evas ecore etk ewl" +DEPENDS = "poppler evas ecore etk ewl" PV = "0.1.0+cvs${SRCDATE}" - PR = "r1" inherit efl_library diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb index ad959edef6..238d640a68 100644 --- a/packages/efl1/etk_cvs.bb +++ b/packages/efl1/etk_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foun DEPENDS = "evas ecore edje" LICENSE = "MIT" PV = "0.1.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" inherit efl_library @@ -15,3 +15,4 @@ FILES_${PN}-engines = "${libdir}/etk/engines/*.so ${datadir}" FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la" FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/" +RRECOMMENDS_${PN} = "${PN}-engines" diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 179f03b0d8..0dc8f2d0e8 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -35,3 +35,19 @@ FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" FILES_${PN} = "${libdir}/libevas*.so*" PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*" + +RRECOMMENDS_${PN} = "\ + libevas-engine-buffer \ + libevas-engine-fb \ + libevas-engine-software-generic \ + libevas-engine-software-x11 \ + libevas-engine-software-16 \ + libevas-engine-software-16-x11 \ + libevas-engine-xrender-x11 \ + \ + libevas-loader-png \ + libevas-loader-jpeg \ + libevas-loader-eet \ + libevas-loader-svg \ +" + diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index 1bacbe3d1c..0734967992 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r3" +PR = "r1" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ @@ -10,6 +10,7 @@ EXTRA_OECONF = "\ --enable-buffer \ --disable-software-ddraw \ --disable-software-qtopia \ + --enable-simple-x11 \ --enable-software-x11 \ --enable-software-16-x11 \ --disable-software-xcb \ diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb index 8fb8521d62..193efcbe18 100644 --- a/packages/efl1/ewl_cvs.bb +++ b/packages/efl1/ewl_cvs.bb @@ -2,10 +2,9 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library \ based on the enlightenment foundation libraries." DEPENDS = "evas ecore edje emotion efreet epsilon" -RSUGGESTS_${PN} += "ewl-themes" LICENSE = "MIT" PV = "0.5.1+cvs${SRCDATE}" -PR = "r1" +PR = "r2" inherit efl_library @@ -31,3 +30,5 @@ FILES_${PN}-dbg += "${libdir}/ewl/*/.debug" FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*" FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*" + +RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes" |