diff options
62 files changed, 554 insertions, 194 deletions
diff --git a/classes/efl.bbclass b/classes/efl.bbclass index f160ee8a90..752881314d 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -8,6 +8,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit autotools pkgconfig binconfig +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + INHIBIT_AUTO_STAGE_INCLUDES = "1" INHIBIT_NATIVE_STAGE_INSTALL = "1" @@ -42,11 +47,30 @@ do_stage_append () { do install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR} done + + # Install binaries automatically for native builds + if [ "${@binconfig_suffix(d)}" = "-native" ] + then + + # Most EFL binaries start with the package name + for i in src/bin/${SRCNAME}* + do + if [ -x $i -a -f $i ] + then + + # Don't install anything with an extension (.so, etc) + if echo $i | grep -v \\. + then + ${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR} + fi + fi + done + fi } PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}-themes ${SRCNAME}" FILES_${SRCNAME} = "${libdir}" -FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes" -FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig" +FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" +FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 3a6c743f0d..642587b630 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -149,7 +149,7 @@ pivot_image() { # Busybox's "mount" doesn't seem to like "-o loop" for some reason # It works on collie and b0rks on poodle. if [ "$IMAGE_TYPE" = "" ]; then - $IMAGE_TYPE = "auto" + IMAGE_TYPE="auto" fi mount -t $IMAGE_TYPE /dev/loop0 /media/image || die "mount /dev/loop0 /media/image failed!" diff --git a/packages/base-files/base-files/ipaq-pxa270/fstab b/packages/base-files/base-files/ipaq-pxa270/fstab index 5ef8d116e0..8c38a5fda2 100644 --- a/packages/base-files/base-files/ipaq-pxa270/fstab +++ b/packages/base-files/base-files/ipaq-pxa270/fstab @@ -1,5 +1,5 @@ -/dev/mtdblock/2 / jffs2 defaults 1 1 -/dev/mtdblock/3 /home jffs2 defaults 1 1 +/dev/mtdblock2 / jffs2 defaults 1 1 +/dev/mtdblock3 /home jffs2 defaults 1 1 proc /proc proc defaults 0 0 sys /sys sysfs defaults 0 0 diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb index 0d3c14cc06..9eae8a37b2 100644 --- a/packages/e17/e-iconbar_20050810.bb +++ b/packages/e17/e-iconbar_20050810.bb @@ -13,4 +13,4 @@ inherit autotools EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050810.bb new file mode 100644 index 0000000000..1764c21450 --- /dev/null +++ b/packages/e17/e-modules_20050810.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Enlightenment Window Manager Extra Modules" +DEPENDS = "virtual/ecore virtual/evas esmart edje eet e" +LICENSE = "MIT" +SECTION = "e/apps" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +CVSDATE = "${PV}" +PR = "r0" + +inherit autotools + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules" +S = "${WORKDIR}/e_modules" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050810.bb index 273c7622e6..00fa240264 100644 --- a/packages/e17/e-utils_20050810.bb +++ b/packages/e17/e-utils_20050810.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Enlightenment Window Manager Utilities" -DEPENDS = "freetype eet evas-x11 ecore-x11 edje engrave esmart epsilon ewl imlib2-x11 e17" +DEPENDS = "virtual/ecore virtual/evas esmart edje eet ewl engrave virtual/imlib2 e epsilon" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" diff --git a/packages/e17/e-wm/fudge_screen_edges_for_menu.patch b/packages/e17/e-wm/fudge_screen_edges_for_menu.patch new file mode 100644 index 0000000000..c203fd4ae0 --- /dev/null +++ b/packages/e17/e-wm/fudge_screen_edges_for_menu.patch @@ -0,0 +1,29 @@ +--- e/src/bin/e_menu.c.~1.38.~ 2005-07-25 02:55:44.000000000 -0700 ++++ e/src/bin/e_menu.c 2005-08-11 15:36:23.000000000 -0700 +@@ -1968,22 +1968,22 @@ + E_Menu *m; + + m = l->data; +- if (m->cur.x < m->zone->x) ++ if (m->cur.x < m->zone->x + 5) + { + i = m->zone->x - m->cur.x; + if (i > outl) outl = i; + } +- if (m->cur.y < m->zone->y) ++ if (m->cur.y < m->zone->y + 5) + { + i = m->zone->y - m->cur.y; + if (i > outt) outt = i; + } +- if ((m->cur.x + m->cur.w) > (m->zone->w)) ++ if ((m->cur.x + m->cur.w) > (m->zone->w - 5)) + { + i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w); + if (i > outr) outr = i; + } +- if ((m->cur.y + m->cur.h) > (m->zone->h)) ++ if ((m->cur.y + m->cur.h) > (m->zone->h - 5)) + { + i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h); + if (i > outb) outb = i; diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index 2f6b3c3443..180f2f8c86 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -1,5 +1,5 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native e" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" @@ -7,7 +7,8 @@ CVSDATE = "${PV}" PR = "r0" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ - file://fix-configure.patch;patch=1" + file://fix-configure.patch;patch=1 \ + file://fudge_screen_edges_for_menu.patch;patch=1" S = "${WORKDIR}/e" inherit autotools diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb new file mode 100644 index 0000000000..ba1e8fb10d --- /dev/null +++ b/packages/e17/eclair_20050810.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Eclair is the E17 multi media player" +SECTION = "e/apps" +DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native edje emotion libxml2 sqlite3 taglibc" +LICENSE = "MIT" +HOMEPAGE = "http://www.enlightenment.org" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +CVSDATE = "${PV}" +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair" +S = "${WORKDIR}/eclair" + +inherit autotools + +BROKEN = "1" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" + diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb new file mode 100644 index 0000000000..e8f9467239 --- /dev/null +++ b/packages/e17/engage_20050810.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Engage is the E17 icon dock" +DEPENDS = "esmart virtual/imlib2 edje virtual/ecore virtual/evas ewl e-wm" +LICENSE = "MIT" +SECTION = "e" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +PR = "r0" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage" +S = "${WORKDIR}/engage" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" + diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb index fc4d8c51af..667d3f4da8 100644 --- a/packages/e17/entice_20050810.bb +++ b/packages/e17/entice_20050810.bb @@ -1,6 +1,7 @@ -DESCRIPTION = "Entice is a picture viewer" +DESCRIPTION = "Entice is the E17 picture viewer" SECTION = "e/apps" -DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native" +# can also depend on GIMP for editing +DEPENDS = "virtual/evas edb virtual/ecore edje" LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" @@ -14,5 +15,5 @@ inherit autotools EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/entrance/Xserver.patch b/packages/e17/entrance/Xserver.patch new file mode 100644 index 0000000000..296a7bccf4 --- /dev/null +++ b/packages/e17/entrance/Xserver.patch @@ -0,0 +1,22 @@ +--- entrance/src/daemon/Entranced.h.~1.7.~ 2004-05-19 21:02:09.000000000 -0700 ++++ entrance/src/daemon/Entranced.h 2005-08-13 02:00:02.000000000 -0700 +@@ -18,7 +18,7 @@ + + #define ENTRANCED_DEBUG 1 + +-#define X_SERVER "/usr/X11R6/bin/X -quiet" ++#define X_SERVER "/etc/X11/Xserver" + //#define X_SERVER "/usr/X11R6/bin/Xnest -full" + #define X_DISP ":0" /* only used if DISPLAY variable is NOT set */ + #define ENTRANCE PREFIX "/bin/entrance_wrapper" +--- entrance/src/daemon/spawner.c.~1.25.~ 2005-05-28 02:31:14.000000000 -0700 ++++ entrance/src/daemon/spawner.c 2005-08-13 02:20:13.000000000 -0700 +@@ -155,7 +155,7 @@ + sigaction(SIGUSR1, &_entrance_x_sa, NULL); + /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */ + /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */ +- execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL); ++ execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL); + syslog(LOG_WARNING, "Could not execute X server."); + exit(1); + default: diff --git a/packages/e17/entrance/allow-missing-xsession.patch b/packages/e17/entrance/allow-missing-xsession.patch new file mode 100644 index 0000000000..c475e46fe2 --- /dev/null +++ b/packages/e17/entrance/allow-missing-xsession.patch @@ -0,0 +1,19 @@ +--- entrance/configure.in.~1.42.~ 2005-07-29 23:15:58.000000000 -0700 ++++ entrance/configure.in 2005-08-13 03:11:41.000000000 -0700 +@@ -190,11 +190,11 @@ + fi + ] + ) +-if test ! -x $xsession ; then +- AC_MSG_WARN([** no $xsession file on this system **]) +- AC_MSG_WARN([** Perhaps you need to specify --with-xsession **]) +- xsession="You should reconfigure --with-xsession" +-fi ++#if test ! -x $xsession ; then ++# AC_MSG_WARN([** no $xsession file on this system **]) ++# AC_MSG_WARN([** Perhaps you need to specify --with-xsession **]) ++# xsession="You should reconfigure --with-xsession" ++#fi + + AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession", [Xsession script]) + AC_SUBST(xsession) diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch new file mode 100644 index 0000000000..5e965057ba --- /dev/null +++ b/packages/e17/entrance/config-db.patch @@ -0,0 +1,56 @@ +--- entrance/data/config/build_config.sh.in~ 2005-08-13 02:56:11.000000000 -0700 ++++ entrance/data/config/build_config.sh.in 2005-08-13 02:56:35.000000000 -0700 +@@ -3,7 +3,7 @@ + rm -f $DB + + # set auth to 1 for pam, 2 for shadow +-edb_ed $DB add /entrance/auth int @auth_mode@ ++edb_ed $DB add /entrance/auth int 0 + + # uncomment the below to enable experimental OpenGL hardware acceleration + #edb_ed $DB add /entrance/engine int 1 +@@ -25,25 +25,25 @@ + edb_ed $DB add /entrance/session/0/icon str "default.png" + edb_ed $DB add /entrance/session/1/icon str "enlightenment.png" + edb_ed $DB add /entrance/session/1/title str "Enlightenment" +-edb_ed $DB add /entrance/session/1/session str "Enlightenment" +-edb_ed $DB add /entrance/session/2/session str "kde" +-edb_ed $DB add /entrance/session/2/title str "KDE" +-edb_ed $DB add /entrance/session/2/icon str "kde.png" +-edb_ed $DB add /entrance/session/3/session str "gnome" +-edb_ed $DB add /entrance/session/3/title str "Gnome" +-edb_ed $DB add /entrance/session/3/icon str "gnome.png" +-edb_ed $DB add /entrance/session/4/session str "blackbox" +-edb_ed $DB add /entrance/session/4/title str "Blackbox" +-edb_ed $DB add /entrance/session/4/icon str "blackbox.png" +-edb_ed $DB add /entrance/session/5/session str "sawfish" +-edb_ed $DB add /entrance/session/5/title str "Sawfish" +-edb_ed $DB add /entrance/session/5/icon str "default.png" +-edb_ed $DB add /entrance/session/6/session str "xfce" +-edb_ed $DB add /entrance/session/6/title str "XFce" +-edb_ed $DB add /entrance/session/6/icon str "xfce.png" +-edb_ed $DB add /entrance/session/7/session str "failsafe" +-edb_ed $DB add /entrance/session/7/title str "Failsafe" +-edb_ed $DB add /entrance/session/7/icon str "failsafe.png" ++edb_ed $DB add /entrance/session/1/session str "/etc/X11/Session/Enlightenment" ++#edb_ed $DB add /entrance/session/2/session str "kde" ++#edb_ed $DB add /entrance/session/2/title str "KDE" ++#edb_ed $DB add /entrance/session/2/icon str "kde.png" ++edb_ed $DB add /entrance/session/2/session str "/etc/X11/Session/GPE" ++edb_ed $DB add /entrance/session/2/title str "GPE" ++edb_ed $DB add /entrance/session/2/icon str "gnome.png" ++#edb_ed $DB add /entrance/session/4/session str "blackbox" ++#edb_ed $DB add /entrance/session/4/title str "Blackbox" ++#edb_ed $DB add /entrance/session/4/icon str "blackbox.png" ++#edb_ed $DB add /entrance/session/5/session str "sawfish" ++#edb_ed $DB add /entrance/session/5/title str "Sawfish" ++#edb_ed $DB add /entrance/session/5/icon str "default.png" ++#edb_ed $DB add /entrance/session/6/session str "xfce" ++#edb_ed $DB add /entrance/session/6/title str "XFce" ++#edb_ed $DB add /entrance/session/6/icon str "xfce.png" ++edb_ed $DB add /entrance/session/3/session str "/etc/X11/Session/Failsafe" ++edb_ed $DB add /entrance/session/3/title str "Failsafe" ++edb_ed $DB add /entrance/session/3/icon str "failsafe.png" + edb_ed $DB add /entrance/system/reboot int 1 + edb_ed $DB add /entrance/system/halt int 1 + edb_ed $DB add /entrance/user/remember int 1 diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index afc0e82825..251698c233 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -1,16 +1,24 @@ -DESCRIPTION = "Entrace is the Enlightenment login manager for X11" +DESCRIPTION = "Entrace is the Enlightenment login manager" SECTION = "e/apps" LICENSE = "MIT" -DEPENDS = "ecore-x11 edje-native embryo-native esmart" +# can also use pam and crypt +DEPENDS = "edb evas-x11 ecore-x11 edje esmart" +RDEPENDS += "bash" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" +PR = "r0" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ - file://longer-sleep.patch;patch=1" + file://longer-sleep.patch;patch=1 \ + file://Xserver.patch;patch=1 \ + file://config-db.patch;patch=1 \ + file://allow-missing-xsession.patch;patch=1" S = "${WORKDIR}/entrance" inherit autotools -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --with-xsession=/etc/X11/Xsession" +FILES += "${datadir}"
\ No newline at end of file diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb new file mode 100644 index 0000000000..6e79fd946f --- /dev/null +++ b/packages/e17/examine_20050810.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "examine, the program configurator" +DEPENDS = "virtual/ecore ewl" +LICENSE = "MIT" +SECTION = "e" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +PR = "r0" +CVSDATE = "${PV}" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine" +S = "${WORKDIR}/examine" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +inherit autotools pkgconfig binconfig + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb index 3451bd8d64..ff55d47360 100644 --- a/packages/efl/e_20050810.bb +++ b/packages/efl/e_20050810.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Enlightenment Window Mananger Library" -DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje" +DEPENDS = "virtual/evas virtual/ecore edje eet embryo" LICENSE = "MIT" CVSDATE = "${PV}" PR = "r0" @@ -25,7 +25,7 @@ do_compile() { oe_runmake -C src/lib } -headers = "E_Lib.h" +headers = "E_Lib.h ../bin/e_*.h" do_install() { oe_runmake -C src/lib install DESTDIR=${D} diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb index 30b6f78370..6968415d34 100644 --- a/packages/efl/ecore-native_0.9.9.013.bb +++ b/packages/efl/ecore-native_0.9.9.013.bb @@ -1,3 +1,3 @@ include ecore-fb_${PV}.bb inherit native -DEPENDS = "curl-native edb-native eet-native evas-native freetype-native" +DEPENDS = "curl-native eet-native evas-native" diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index 38c64e4615..ecd5fef642 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -3,7 +3,8 @@ foundation libraries. It makes makes doing selections, drag and drop, event loop timeouts and idle handlers fast, optimized, and convenient." LEAD_SONAME = "libecore.so" LICENSE = "MIT" -DEPENDS = "curl edb eet virtual/evas freetype edb-native" +# can also have openssl, dbus +DEPENDS = "virtual/evas curl eet" inherit efl diff --git a/packages/efl/edb-native_1.0.5.004.bb b/packages/efl/edb-native_1.0.5.004.bb index 234b0e05e5..d83a3b77c6 100644 --- a/packages/efl/edb-native_1.0.5.004.bb +++ b/packages/efl/edb-native_1.0.5.004.bb @@ -2,6 +2,8 @@ include edb_${PV}.bb inherit native DEPENDS = "zlib-native" +EXTRA_OECONF += "--disable-gtk --disable-ncurses" + do_stage_append () { install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR} } diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.004.bb index 2dace0cb07..a783a4d807 100644 --- a/packages/efl/edb_1.0.5.004.bb +++ b/packages/efl/edb_1.0.5.004.bb @@ -1,12 +1,14 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \ Berkeley DB 2.7.7 by Sleepycat Software." -DEPENDS = "zlib" +DEPENDS = "zlib ncurses" LICENSE = "BSD" PR = "r0" inherit efl -EXTRA_OECONF = "--disable-gtk --disable-ncurses" +EXTRA_OECONF += "--disable-gtk" libdirectory = "src" +FILES_${PN}-dev += "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" |