diff options
author | Koen Kooi <koen@openembedded.org> | 2006-02-04 09:58:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-04 09:58:37 +0000 |
commit | 9a4afa4e347b3849b08a8fbac8883ab558025a24 (patch) | |
tree | e4586a44bfc246a81f4ee6b2f9b4924e9c3a141b /packages | |
parent | 07b158305169ef976ad32e2bfbc87a1808ed58fd (diff) | |
parent | 81b2d93f4ec268fe52f47d414b2881f754458d13 (diff) |
merge of 6f3628b0dba700cfacce31a608706bb638c5c134
and e7ddf084f75a5ee0d7e8ea106ce96c37362b4e64
Diffstat (limited to 'packages')
-rw-r--r-- | packages/e17/e-wm_0.16.999.023.bb (renamed from packages/e17/e-wm_0.16.999.022.bb) | 2 | ||||
-rw-r--r-- | packages/e17/entrance_0.9.0.005.bb | 38 | ||||
-rw-r--r-- | packages/efl/e_0.16.999.023.bb (renamed from packages/efl/e_0.16.999.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/ecore-fb_0.9.9.023.bb (renamed from packages/efl/ecore-fb_0.9.9.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/ecore-native_0.9.9.023.bb (renamed from packages/efl/ecore-native_0.9.9.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/ecore-x11_0.9.9.023.bb (renamed from packages/efl/ecore-x11_0.9.9.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/edb-native_1.0.5.005.bb (renamed from packages/efl/edb-native_1.0.5.004.bb) | 0 | ||||
-rw-r--r-- | packages/efl/edb_1.0.5.005.bb (renamed from packages/efl/edb_1.0.5.004.bb) | 0 | ||||
-rw-r--r-- | packages/efl/edje-native_0.5.0.023.bb (renamed from packages/efl/edje-native_0.5.0.022.bb) | 2 | ||||
-rw-r--r-- | packages/efl/edje_0.5.0.023.bb (renamed from packages/efl/edje_0.5.0.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/eet-native_0.9.10.023.bb (renamed from packages/efl/eet-native_0.9.10.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/eet_0.9.10.023.bb (renamed from packages/efl/eet_0.9.10.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/embryo-native_0.9.1.023.bb (renamed from packages/efl/embryo-native_0.9.1.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/embryo_0.9.1.023.bb (renamed from packages/efl/embryo_0.9.1.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/emotion_20060128.bb | 1 | ||||
-rw-r--r-- | packages/efl/epeg_0.9.0.005.bb (renamed from packages/efl/epeg_0.9.0.004.bb) | 0 | ||||
-rw-r--r-- | packages/efl/epsilon_0.3.0.005.bb (renamed from packages/efl/epsilon_0.3.0.004.bb) | 9 | ||||
-rw-r--r-- | packages/efl/esmart-fb_0.9.0.005.bb (renamed from packages/efl/esmart-fb_0.9.0.004.bb) | 0 | ||||
-rw-r--r-- | packages/efl/esmart-fb_20060128.bb | 3 | ||||
-rw-r--r-- | packages/efl/esmart-x11_0.9.0.005.bb (renamed from packages/efl/esmart-x11_0.9.0.004.bb) | 7 | ||||
-rw-r--r-- | packages/efl/esmart-x11_20060128.bb | 3 | ||||
-rw-r--r-- | packages/efl/esmart.inc | 9 | ||||
-rw-r--r-- | packages/efl/evas-fb_0.9.9.023.bb (renamed from packages/efl/evas-fb_0.9.9.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/evas-native_0.9.9.023.bb (renamed from packages/efl/evas-native_0.9.9.022.bb) | 3 | ||||
-rw-r--r-- | packages/efl/evas-x11_0.9.9.023.bb (renamed from packages/efl/evas-x11_0.9.9.022.bb) | 0 | ||||
-rw-r--r-- | packages/efl/evas.inc | 2 | ||||
-rw-r--r-- | packages/efl/evas/fix-configure-0.9.9.023.patch | 35 | ||||
-rw-r--r-- | packages/efl/evas/fix-configure-20060113.patch (renamed from packages/efl/evas/fix-configure.patch) | 0 | ||||
-rw-r--r-- | packages/efl/ewl_0.0.4.005.bb (renamed from packages/efl/ewl_0.0.4.004.bb) | 0 | ||||
-rw-r--r-- | packages/efl/imlib2-fb_1.2.1.010.bb (renamed from packages/efl/imlib2-fb_1.2.1.009.bb) | 0 | ||||
-rw-r--r-- | packages/efl/imlib2-native_1.2.1.010.bb (renamed from packages/efl/imlib2-native_1.2.1.009.bb) | 0 | ||||
-rw-r--r-- | packages/efl/imlib2-x11_1.2.1.010.bb (renamed from packages/efl/imlib2-x11_1.2.1.009.bb) | 0 | ||||
-rw-r--r-- | packages/meta/meta-e-x11-core.bb | 28 | ||||
-rw-r--r-- | packages/meta/meta-e-x11.bb | 17 | ||||
-rw-r--r-- | packages/meta/meta-e.bb | 15 | ||||
-rw-r--r-- | packages/meta/task-e-x11.bb | 27 |
36 files changed, 145 insertions, 56 deletions
diff --git a/packages/e17/e-wm_0.16.999.022.bb b/packages/e17/e-wm_0.16.999.023.bb index 60d5fe6571..ef0162a174 100644 --- a/packages/e17/e-wm_0.16.999.022.bb +++ b/packages/e17/e-wm_0.16.999.023.bb @@ -8,9 +8,9 @@ PR = "r3" SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://remove-large-fonts.patch;patch=1 \ - file://disable-splash.patch;patch=1 \ file://Xsession.d/98enlightenment \ cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" +# file://disable-splash.patch;patch=1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ diff --git a/packages/e17/entrance_0.9.0.005.bb b/packages/e17/entrance_0.9.0.005.bb new file mode 100644 index 0000000000..b79e26d4a4 --- /dev/null +++ b/packages/e17/entrance_0.9.0.005.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Entrance is the Enlightenment login manager" +SECTION = "e/apps" +LICENSE = "MIT" +# can also use pam and crypt +DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" +RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" +HOMEPAGE = "http://www.enlightenment.org" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +PR = "r11" + +SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \ + file://config-db.patch;patch=1 \ + file://allow-missing-xsession.patch;patch=1 \ + file://run-Xinit.patch;patch=1 \ + file://set-display-env.patch;patch=1 \ + file://fix-auth-mode.patch;patch=1 \ + file://use-bash.patch;patch=1 \ + file://Sessions" + +S = "${WORKDIR}/entrance-${PV}" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "entrance" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --with-xsession=/etc/X11/Xsession \ + --with-auth-mode=0" + +FILES += "${datadir}" + +do_install_append() { + install -d ${D}/etc/X11/Xsession.d + install -d ${D}/etc/X11/Sessions + + install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions +} diff --git a/packages/efl/e_0.16.999.022.bb b/packages/efl/e_0.16.999.023.bb index 35bb776269..35bb776269 100644 --- a/packages/efl/e_0.16.999.022.bb +++ b/packages/efl/e_0.16.999.023.bb diff --git a/packages/efl/ecore-fb_0.9.9.022.bb b/packages/efl/ecore-fb_0.9.9.023.bb index a5a843aeb4..a5a843aeb4 100644 --- a/packages/efl/ecore-fb_0.9.9.022.bb +++ b/packages/efl/ecore-fb_0.9.9.023.bb diff --git a/packages/efl/ecore-native_0.9.9.022.bb b/packages/efl/ecore-native_0.9.9.023.bb index 299470841c..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.022.bb +++ b/packages/efl/ecore-native_0.9.9.023.bb diff --git a/packages/efl/ecore-x11_0.9.9.022.bb b/packages/efl/ecore-x11_0.9.9.023.bb index 0927b59e03..0927b59e03 100644 --- a/packages/efl/ecore-x11_0.9.9.022.bb +++ b/packages/efl/ecore-x11_0.9.9.023.bb diff --git a/packages/efl/edb-native_1.0.5.004.bb b/packages/efl/edb-native_1.0.5.005.bb index d83a3b77c6..d83a3b77c6 100644 --- a/packages/efl/edb-native_1.0.5.004.bb +++ b/packages/efl/edb-native_1.0.5.005.bb diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.005.bb index 30c14d3d58..30c14d3d58 100644 --- a/packages/efl/edb_1.0.5.004.bb +++ b/packages/efl/edb_1.0.5.005.bb diff --git a/packages/efl/edje-native_0.5.0.022.bb b/packages/efl/edje-native_0.5.0.023.bb index 523c38ba46..44b4e80c20 100644 --- a/packages/efl/edje-native_0.5.0.022.bb +++ b/packages/efl/edje-native_0.5.0.023.bb @@ -18,6 +18,8 @@ do_configure_prepend() { sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c # sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c # sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c } do_stage_append() { diff --git a/packages/efl/edje_0.5.0.022.bb b/packages/efl/edje_0.5.0.023.bb index 9315639af2..9315639af2 100644 --- a/packages/efl/edje_0.5.0.022.bb +++ b/packages/efl/edje_0.5.0.023.bb diff --git a/packages/efl/eet-native_0.9.10.022.bb b/packages/efl/eet-native_0.9.10.023.bb index fa20c9fb30..fa20c9fb30 100644 --- a/packages/efl/eet-native_0.9.10.022.bb +++ b/packages/efl/eet-native_0.9.10.023.bb diff --git a/packages/efl/eet_0.9.10.022.bb b/packages/efl/eet_0.9.10.023.bb index c0f89b1064..c0f89b1064 100644 --- a/packages/efl/eet_0.9.10.022.bb +++ b/packages/efl/eet_0.9.10.023.bb diff --git a/packages/efl/embryo-native_0.9.1.022.bb b/packages/efl/embryo-native_0.9.1.023.bb index a33adb7bd2..a33adb7bd2 100644 --- a/packages/efl/embryo-native_0.9.1.022.bb +++ b/packages/efl/embryo-native_0.9.1.023.bb diff --git a/packages/efl/embryo_0.9.1.022.bb b/packages/efl/embryo_0.9.1.023.bb index 1802da1bca..1802da1bca 100644 --- a/packages/efl/embryo_0.9.1.022.bb +++ b/packages/efl/embryo_0.9.1.023.bb diff --git a/packages/efl/emotion_20060128.bb b/packages/efl/emotion_20060128.bb index e450cf1d3a..a567c030cc 100644 --- a/packages/efl/emotion_20060128.bb +++ b/packages/efl/emotion_20060128.bb @@ -5,6 +5,7 @@ RDEPENDS += "libemotion-themes libemotion-plugins" PR = "r2" #FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11 +DEFAULT_PREFERENCE = "-1" inherit efl diff --git a/packages/efl/epeg_0.9.0.004.bb b/packages/efl/epeg_0.9.0.005.bb index c35ec63606..c35ec63606 100644 --- a/packages/efl/epeg_0.9.0.004.bb +++ b/packages/efl/epeg_0.9.0.005.bb diff --git a/packages/efl/epsilon_0.3.0.004.bb b/packages/efl/epsilon_0.3.0.005.bb index ab19043550..d454a538a6 100644 --- a/packages/efl/epsilon_0.3.0.004.bb +++ b/packages/efl/epsilon_0.3.0.005.bb @@ -5,4 +5,11 @@ DEPENDS = "virtual/imlib2 epeg libpng virtual/evas virtual/ecore perl-native edj inherit efl -SRC_URI += "file://compile-fix.patch;patch=1" +SRC_URI += "file://compile-fix.patch;patch=1 \ + cvs://anonymous@thinktux.net/root;module=e17/libs/epsilon/m4;date=20060101" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} diff --git a/packages/efl/esmart-fb_0.9.0.004.bb b/packages/efl/esmart-fb_0.9.0.005.bb index 35bef239ee..35bef239ee 100644 --- a/packages/efl/esmart-fb_0.9.0.004.bb +++ b/packages/efl/esmart-fb_0.9.0.005.bb diff --git a/packages/efl/esmart-fb_20060128.bb b/packages/efl/esmart-fb_20060128.bb index 06360528a2..302fb95159 100644 --- a/packages/efl/esmart-fb_20060128.bb +++ b/packages/efl/esmart-fb_20060128.bb @@ -4,7 +4,8 @@ PR = "r0" SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}" S = "${WORKDIR}/esmart" -SRC_URI += "file://disable-x-only-features.patch;patch=1" +SRC_URI += "file://disable-x-only-features.patch;patch=1 \ + file://compile-fix.patch;patch=1" myheaders = "esmart_container/Esmart_Container.h \ esmart_draggies/Esmart_Draggies.h \ diff --git a/packages/efl/esmart-x11_0.9.0.004.bb b/packages/efl/esmart-x11_0.9.0.005.bb index 7c6737dd55..cb5cc1da91 100644 --- a/packages/efl/esmart-x11_0.9.0.004.bb +++ b/packages/efl/esmart-x11_0.9.0.005.bb @@ -1,24 +1,23 @@ include esmart.inc PR = "r2" -SRC_URI += "file://ecore-fix.patch;patch=1 \ - file://include-stdio.patch;patch=1" +SRC_URI += "file://include-stdio.patch;patch=1" myheaders = "esmart_container/Esmart_Container.h \ esmart_draggies/Esmart_Draggies.h \ esmart_file_dialog/Esmart_File_Dialog.h \ esmart_text_entry/Esmart_Text_Entry.h \ - esmart_textarea/Esmart_Textarea.h \ esmart_thumb/Esmart_Thumb.h \ esmart_trans_x11/Esmart_Trans_X11.h" +# esmart_textarea/Esmart_Textarea.h \ mylibraries = "esmart_container \ esmart_draggies \ esmart_file_dialog \ esmart_text_entry \ - esmart_textarea \ esmart_thumb \ esmart_trans_x11" +# esmart_textarea \ do_compile_prepend() { find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' diff --git a/packages/efl/esmart-x11_20060128.bb b/packages/efl/esmart-x11_20060128.bb index 88684e6851..cccb7c36ff 100644 --- a/packages/efl/esmart-x11_20060128.bb +++ b/packages/efl/esmart-x11_20060128.bb @@ -3,7 +3,8 @@ PR = "r2" SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}" SRC_URI += "file://ecore-fix.patch;patch=1 \ - file://include-stdio.patch;patch=1" + file://include-stdio.patch;patch=1 \ + file://compile-fix.patch;patch=1" S = "${WORKDIR}/esmart" myheaders = "esmart_container/Esmart_Container.h \ diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc index c93ebc233b..b1b82d5ed1 100644 --- a/packages/efl/esmart.inc +++ b/packages/efl/esmart.inc @@ -6,7 +6,14 @@ PROVIDES += "virtual/esmart" inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \ - file://compile-fix.patch;patch=1" + cvs://anonymous@thinktux.net/root;module=e17/libs/esmart/m4;date=20060101" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} + S = "${WORKDIR}/esmart-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/esmart" diff --git a/packages/efl/evas-fb_0.9.9.022.bb b/packages/efl/evas-fb_0.9.9.023.bb index b0c9d5bdb6..b0c9d5bdb6 100644 --- a/packages/efl/evas-fb_0.9.9.022.bb +++ b/packages/efl/evas-fb_0.9.9.023.bb diff --git a/packages/efl/evas-native_0.9.9.022.bb b/packages/efl/evas-native_0.9.9.023.bb index 60bf7f6ae5..cb4336dfab 100644 --- a/packages/efl/evas-native_0.9.9.022.bb +++ b/packages/efl/evas-native_0.9.9.023.bb @@ -1,4 +1,5 @@ include evas-fb_${PV}.bb inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PROVIDES = "evas-native"
\ No newline at end of file +PROVIDES = "evas-native" +EXTRA_OECONF += "--enable-buffer" diff --git a/packages/efl/evas-x11_0.9.9.022.bb b/packages/efl/evas-x11_0.9.9.023.bb index 75a080a26c..75a080a26c 100644 --- a/packages/efl/evas-x11_0.9.9.022.bb +++ b/packages/efl/evas-x11_0.9.9.023.bb diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 3f25fd5767..37f0efaab1 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -12,7 +12,7 @@ inherit efl export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ + file://fix-configure-${PV}.patch;patch=1 \ cvs://anonymous@thinktux.net/root;module=e17/libs/evas/m4;date=20050926" S = "${WORKDIR}/evas-${PV}" diff --git a/packages/efl/evas/fix-configure-0.9.9.023.patch b/packages/efl/evas/fix-configure-0.9.9.023.patch new file mode 100644 index 0000000000..61e2446c24 --- /dev/null +++ b/packages/efl/evas/fix-configure-0.9.9.023.patch @@ -0,0 +1,35 @@ +--- evas-0.9.9.023/configure.in~ 2006-01-11 21:34:57.000000000 -0800 ++++ evas-0.9.9.023/configure.in 2006-02-03 12:15:45.000000000 -0800 +@@ -152,9 +152,7 @@ + [ + AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) + AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="-lX11 -lXext" + ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" + ], + [ +@@ -423,10 +421,10 @@ + AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) + AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) + AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) +- x_dir=${x_dir:-/usr/X11R6}; ++ x_dir=${x_dir:-}; + x_cflags=${x_cflags:--I$x_dir/include} + x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" +- gl_cflags="-I/usr/include" ++ gl_cflags="" + gl_libs="-lGL -lGLU -lpthread" + gl_dir="" + ENGINE_GL_X11_PRG="evas_gl_x11_test" +@@ -489,7 +487,7 @@ + AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) + AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) + AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) +- x_dir="/usr/X11R6"; ++ x_dir=""; + x_cflags="-I"$x_dir"/include" + x_libs="-L"$x_dir"/lib -lX11 -lXext" + ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test" diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure-20060113.patch index acd50c0282..acd50c0282 100644 --- a/packages/efl/evas/fix-configure.patch +++ b/packages/efl/evas/fix-configure-20060113.patch diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.005.bb index 85b85e0c05..85b85e0c05 100644 --- a/packages/efl/ewl_0.0.4.004.bb +++ b/packages/efl/ewl_0.0.4.005.bb diff --git a/packages/efl/imlib2-fb_1.2.1.009.bb b/packages/efl/imlib2-fb_1.2.1.010.bb index 09fecdaf8b..09fecdaf8b 100644 --- a/packages/efl/imlib2-fb_1.2.1.009.bb +++ b/packages/efl/imlib2-fb_1.2.1.010.bb diff --git a/packages/efl/imlib2-native_1.2.1.009.bb b/packages/efl/imlib2-native_1.2.1.010.bb index 6f8ebe477a..6f8ebe477a 100644 --- a/packages/efl/imlib2-native_1.2.1.009.bb +++ b/packages/efl/imlib2-native_1.2.1.010.bb diff --git a/packages/efl/imlib2-x11_1.2.1.009.bb b/packages/efl/imlib2-x11_1.2.1.010.bb index 165321355c..165321355c 100644 --- a/packages/efl/imlib2-x11_1.2.1.009.bb +++ b/packages/efl/imlib2-x11_1.2.1.010.bb diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb index efd7430529..fdd3d195b2 100644 --- a/packages/meta/meta-e-x11-core.bb +++ b/packages/meta/meta-e-x11-core.bb @@ -1,22 +1,10 @@ -DESCRIPTION = "Meta-package for Enlightenment/X11 Core" -PACKAGES = "task-e-x11-core" -PROVIDES = "task-e-x11-core" -PR = "r6" - -FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ - e##http://openzaurus.org/official/unstable/3.5.2/feed/e" - -PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11" - +DESCRIPTION = "Meta-package for Enlightenment/X11" +SECTION = "x11/base" ALLOW_EMPTY = 1 +PR = "r1" +PACKAGE_ARCH = "all" +LICENSE = "MIT" +BUILD_ALL_DEPS=1 -# -# X -# -RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera chkhinge" - -# -# E-core -# -RDEPENDS_task-e-x11-core += "entrance e-wm" +DEPENDS = "task-e-x11-core" +RDEPENDS = "task-e-x11-core" diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 82a6055089..3f9459c7d4 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,13 +1,10 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" -PACKAGES = "task-e-x11" -PROVIDES = "task-e-x11" -PR = "r6" - -FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ - e##http://openzaurus.org/official/unstable/3.5.2/feed/e" - +SECTION = "x11/base" ALLOW_EMPTY = 1 +PR = "r1" +PACKAGE_ARCH = "all" +LICENSE = "MIT" +BUILD_ALL_DEPS=1 -RDEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules" -# e-utils elitaire - +DEPENDS = "task-e-x11" +RDEPENDS = "task-e-x11" diff --git a/packages/meta/meta-e.bb b/packages/meta/meta-e.bb deleted file mode 100644 index e933cc7415..0000000000 --- a/packages/meta/meta-e.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Meta-package for the Enlightenment Palmtop Environment (Codename: EpiCenter)" -PACKAGES = "e e-libs e-base" - -FEED_URIS += "e##http://openzaurus.org/official/unstable/3.5.2/feed/e" - -ALLOW_EMPTY = 1 - -task-e-libs = "evas edb ecore eet embryo edje etox ewl" -task-e-base = "" - -RDEPENDS_e-libs = "${task-e-libs}" - -RDEPENDS_e-base = "${task-e-base}" - -LICENSE = MIT diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb new file mode 100644 index 0000000000..759bcd22ea --- /dev/null +++ b/packages/meta/task-e-x11.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Tasks for Enlightenment/X11" +PACKAGES = "task-e-x11-core task-e-x11" +PROVIDES = "task-e-x11-core task-e-x11" +PR = "r7" + +FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ + e##http://openzaurus.org/official/unstable/3.5.2/feed/e" + +PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11" + +ALLOW_EMPTY = 1 + +# +# X +# +RDEPENDS_task-e-x11-core = "rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera chkhinge" + +# +# E-core +# +RDEPENDS_task-e-x11-core += "entrance e-wm" + + +RDEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules" +DEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules" +# e-utils elitaire |