From 93ec531fc6350057fd4503c2d3d45b9164f5700a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 29 Jan 2008 20:59:20 +0000 Subject: efl: update to 20080129, fix some LICENSE entries, enable software-x11-16 engine again --- classes/efl_base.bbclass | 2 +- conf/distro/include/sane-srcdates.inc | 6 ++--- packages/e17/e-wm_0.16.999.041.bb | 50 ----------------------------------- packages/e17/e-wm_cvs.bb | 4 +-- packages/e17/rage_0.2.0.005.bb | 10 ------- packages/e17/rage_cvs.bb | 13 +++++++++ packages/efl1/ecore.inc | 8 +++--- packages/efl1/ecore_cvs.bb | 3 ++- packages/efl1/edje_cvs.bb | 7 +++-- packages/efl1/eet_cvs.bb | 9 +++---- packages/efl1/efreet_cvs.bb | 5 ++-- packages/efl1/embryo_cvs.bb | 10 +++---- packages/efl1/emotion_cvs.bb | 6 ++--- packages/efl1/epdf_cvs.bb | 8 +++--- packages/efl1/epsilon_cvs.bb | 4 +-- packages/efl1/esmart_cvs.bb | 4 +-- packages/efl1/etk_cvs.bb | 4 +-- packages/efl1/evas.inc | 10 ++----- packages/efl1/evas_cvs.bb | 2 +- packages/efl1/ewl_cvs.bb | 10 +++---- packages/efl1/imlib2_1.4.0.002.bb | 26 ------------------ packages/efl1/imlib2_1.4.1.000.bb | 26 ++++++++++++++++++ 22 files changed, 80 insertions(+), 147 deletions(-) delete mode 100644 packages/e17/e-wm_0.16.999.041.bb delete mode 100644 packages/e17/rage_0.2.0.005.bb create mode 100644 packages/e17/rage_cvs.bb delete mode 100644 packages/efl1/imlib2_1.4.0.002.bb create mode 100644 packages/efl1/imlib2_1.4.1.000.bb diff --git a/classes/efl_base.bbclass b/classes/efl_base.bbclass index 3865441779..023b2edf74 100644 --- a/classes/efl_base.bbclass +++ b/classes/efl_base.bbclass @@ -3,7 +3,7 @@ inherit autotools pkgconfig SECTION = "e/libs" HOMEPAGE = "http://www.enlightenment.org" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" -SRC_URI = "http://download.enlightenment.org/snapshots/2007-07-10/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "http://download.enlightenment.org/snapshots/2008-01-25/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" do_stage() { diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index cff6d7316b..aaf7b02a09 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080117" +EFL_SRCDATE = "20080129" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -107,9 +107,9 @@ SRCDATE_entice ?= "${EFL_SRCDATE}" SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" SRCDATE_e-wm ?= "${EFL_SRCDATE}" -SRCDATE_enna = "${EFL_SRCDATE}" -#SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_enna ?= "${EFL_SRCDATE}" SRCDATE_exquisite ?= "${EFL_SRCDATE}" +SRCDATE_rage ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/packages/e17/e-wm_0.16.999.041.bb b/packages/e17/e-wm_0.16.999.041.bb deleted file mode 100644 index 51e9e0d189..0000000000 --- a/packages/e17/e-wm_0.16.999.041.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "eet evas ecore edje efreet" -LICENSE = "MIT BSD" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -inherit e update-alternatives - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/enlightenment-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - file://set-autoscroll-defaults.patch;patch=1 \ - file://Xsession.d/98enlightenment \ - file://applications.menu \ - " - -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset" -FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la" -FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d - - install -d ${D}/${sysconfdir}/xdg/menus - install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ -} - -ALTERNATIVE_PATH = "${bindir}/enlightenment_start" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb index 04e2ec7d59..e7af400a1c 100644 --- a/packages/e17/e-wm_cvs.bb +++ b/packages/e17/e-wm_cvs.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DESCRIPTION = "The Enlightenment Window Mananger Version 17" DEPENDS = "eet evas ecore edje efreet" LICENSE = "MIT BSD" -PV = "0.16.999.041+cvs${SRCDATE}" +PV = "0.16.999.042+cvs${SRCDATE}" PR = "r0" inherit e update-alternatives diff --git a/packages/e17/rage_0.2.0.005.bb b/packages/e17/rage_0.2.0.005.bb deleted file mode 100644 index d2d6c3feae..0000000000 --- a/packages/e17/rage_0.2.0.005.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Rage is a media center application based on EFL" -AUTHOR = "Carsten 'The Rasterman' Heitzler" -HOMEPAGE = "http://www.rasterman.com" -LICENSE = "MIT BSD" -DEPENDS = "evas ecore edje" -SECTION = "x11/multimedia" - -SRC_URI = "http://download.enlightenment.org/snapshots/2007-08-26/rage-${PV}.tar.gz" - -inherit autotools diff --git a/packages/e17/rage_cvs.bb b/packages/e17/rage_cvs.bb new file mode 100644 index 0000000000..3b7bed7a11 --- /dev/null +++ b/packages/e17/rage_cvs.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Rage is a media center application based on EFL" +AUTHOR = "Carsten 'The Rasterman' Heitzler" +HOMEPAGE = "http://www.rasterman.com" +LICENSE = "MIT BSD" +DEPENDS = "evas ecore edje" +SECTION = "x11/multimedia" +PV = "0.3.0.042+cvs${SRCDATE}" + +inherit autotools + +SRC_URI = "${E_CVS};module=misc/rage" +S = "${WORKDIR}/rage" + diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index eacde2d012..6175c605c0 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -1,11 +1,9 @@ -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" +DESCRIPTION = "Ecore is the Enlightenment application framework library" +LICENSE = "MIT BSD" DEPENDS = "curl eet evas tslib" # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" -PV = "0.9.9.041+cvs${SRCDATE}" +PV = "0.9.9.042+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb index cea3d7602d..b0a2a24f98 100644 --- a/packages/efl1/ecore_cvs.bb +++ b/packages/efl1/ecore_cvs.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r2" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ @@ -15,6 +15,7 @@ EXTRA_OECONF = "\ --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ + --enable-ecore-evas-x11-16 \ --disable-ecore-evas-x11-gl \ --enable-ecore-evas-xrender \ --disable-ecore-evas-dfb \ diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb index 734dccf56e..e930fc4795 100644 --- a/packages/efl1/edje_cvs.bb +++ b/packages/efl1/edje_cvs.bb @@ -1,9 +1,8 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files +DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" -PV = "0.5.0.41+cvs${SRCDATE}" -PR = "r2" +PV = "0.5.0.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb index f2ab6a7408..370b385bf8 100644 --- a/packages/efl1/eet_cvs.bb +++ b/packages/efl1/eet_cvs.bb @@ -1,10 +1,7 @@ -DESCRIPTION = "EET is a tiny library designed to write an \ -arbitary set of chunks of data to a file and optionally compress \ -each chunk (very much like a zip file) and allow fast \ -random-access reading of the file later on." +DESCRIPTION = "EET is the Enlightenment data storage library" DEPENDS = "zlib jpeg" LICENSE = "MIT BSD" -PV = "0.9.10.041+cvs${SRCDATE}" -PR = "r1" +PV = "0.9.10.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb index 248dadd9bf..a1a027fc8f 100644 --- a/packages/efl1/efreet_cvs.bb +++ b/packages/efl1/efreet_cvs.bb @@ -1,8 +1,7 @@ -DESCRIPTION = "An implementation of freedesktop.org specs for the \ -Enlightenment Foundation Libraries" +DESCRIPTION = "The Enlightenment freedesktop.org library" DEPENDS = "ecore" LICENSE = "MIT BSD" -PV = "0.0.3.003+cvs${SRCDATE}" +PV = "0.0.3.042+cvs${SRCDATE}" PR = "r0" inherit efl_library diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb index 15546e206f..2f5ab176ce 100644 --- a/packages/efl1/embryo_cvs.bb +++ b/packages/efl1/embryo_cvs.bb @@ -1,10 +1,6 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." +DESCRIPTION = "The Enlightenment C-like scripting language for Edje" LICENSE = "MIT BSD" -PV = "0.9.1.041+cvs${SRCDATE}" -PR = "r1" +PV = "0.9.1.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb index 84302e4793..36a5065e7a 100644 --- a/packages/efl1/emotion_cvs.bb +++ b/packages/efl1/emotion_cvs.bb @@ -1,9 +1,9 @@ -DESCRIPTION = "Emotion is a multimedia library with backends: gstreamer and libxine" -LICENSE = "MIT" +DESCRIPTION = "The Enlightenment multimedia library" +LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" RRECOMMENDS_${PN} = "emotion-backend-gstreamer" -PV = "0.0.1+cvs${SRCDATE}" +PV = "0.1.0+cvs${SRCDATE}" PR = "r0" inherit efl_library diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb index 27c475c37d..fa4f4282e1 100644 --- a/packages/efl1/epdf_cvs.bb +++ b/packages/efl1/epdf_cvs.bb @@ -1,13 +1,11 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" -LICENSE = "BSD" -DEPENDS = "poppler evas ecore etk" +LICENSE = "MIT BSD" +DEPENDS = "poppler evas ecore etk ewl" PV = "0.1.0+cvs${SRCDATE}" -PR = "r2" +PR = "r0" inherit efl_library -EXTRA_OECONF = "--disable-ewl" - SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \ file://fix-plugin-path-check.patch;HACK=1;patch=1" diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb index be2934dec8..8c71ef3e3d 100644 --- a/packages/efl1/epsilon_cvs.bb +++ b/packages/efl1/epsilon_cvs.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \ that is compliant with the freedesktop.org Thumbnail Managing Standard." -LICENSE = "BSD" +LICENSE = "MIT BSD" # can also depend on xine for movie thumbnails DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native" -PV = "0.3.0+cvs${SRCDATE}" +PV = "0.3.0.012+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb index 17e1f42b95..fa35d60d30 100644 --- a/packages/efl1/esmart_cvs.bb +++ b/packages/efl1/esmart_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" -LICENSE = "MIT" +LICENSE = "MIT BSD" DEPENDS = "evas ecore edje imlib2 epsilon libtool" -PV = "0.9.0+cvs${SRCDATE}" +PV = "0.9.0.042+cvs${SRCDATE}" inherit efl_library diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb index 238d640a68..90df74e61c 100644 --- a/packages/efl1/etk_cvs.bb +++ b/packages/efl1/etk_cvs.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries." DEPENDS = "evas ecore edje" LICENSE = "MIT" -PV = "0.1.0+cvs${SRCDATE}" -PR = "r1" +PV = "0.1.0.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index e05397067b..77ec2db308 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -1,18 +1,12 @@ -DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \ -anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \ -down to using normal X11 primitives such as pixmaps, lines and rectangles if \ -your CPU or graphics hardware are too slow." +DESCRIPTION = "Evas is the Enlightenment canvas API" LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender" -PV = "0.9.9.041+cvs${SRCDATE}" +PV = "0.9.9.042+cvs${SRCDATE}" inherit efl_library -# SRC_URI += "file://fix-configure.patch;patch=1" - FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" - EXTRA_OECONF = "" python populate_packages_prepend () { diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index d30a03d7c1..862cc51370 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r2" +PR = "r0" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb index 193efcbe18..15a777df67 100644 --- a/packages/efl1/ewl_cvs.bb +++ b/packages/efl1/ewl_cvs.bb @@ -1,10 +1,8 @@ -DESCRIPTION = "The Enlightened Widget Library, \ -a simple-to-use general purpose widget library \ -based on the enlightenment foundation libraries." +DESCRIPTION = "The Enlightened Widget Library" DEPENDS = "evas ecore edje emotion efreet epsilon" -LICENSE = "MIT" -PV = "0.5.1+cvs${SRCDATE}" -PR = "r2" +LICENSE = "MIT BSD" +PV = "0.5.2.042+cvs${SRCDATE}" +PR = "r0" inherit efl_library diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.0.002.bb deleted file mode 100644 index baee4b62b0..0000000000 --- a/packages/efl1/imlib2_1.4.0.002.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." -LICENSE = "BSD" -# can also depend on tiff34, ungif or gif, z, bz2, id3tag -DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -PR = "r2" - -inherit efl_library - -SRC_URI += "file://remove-local-includes.patch;patch=1" - -EXTRA_OECONF = "--with-x" - -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/" -FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES_${PN}-bin = "${bindir}" -FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" -FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" -FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" -FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" diff --git a/packages/efl1/imlib2_1.4.1.000.bb b/packages/efl1/imlib2_1.4.1.000.bb new file mode 100644 index 0000000000..b0db13b5ce --- /dev/null +++ b/packages/efl1/imlib2_1.4.1.000.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." +LICENSE = "BSD" +# can also depend on tiff34, ungif or gif, z, bz2, id3tag +DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" +PR = "r0" + +inherit efl_library + +SRC_URI += "file://remove-local-includes.patch;patch=1" + +EXTRA_OECONF = "--with-x" + +# TODO: Use more fine granular version +#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" +OE_LT_RPATH_ALLOW = "any" +OE_LT_RPATH_ALLOW[export]="1" + +PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" +FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" +FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/" +FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" +FILES_${PN}-bin = "${bindir}" +FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" +FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" +FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" +FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" -- cgit v1.2.3