diff options
41 files changed, 415 insertions, 106 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/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index bb383b8a66..0376eadd00 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -6,25 +6,29 @@ # STANDARD UcSlugC DEFINITIONS #---------------------------------------------------------------------------------- DISTRO_NAME = "UcSlugC" -DISTRO_VERSION = "1-beta" +DISTRO_VERSION = "1.1-beta" DISTRO_TYPE ?= "beta" TARGET_FPU = "soft" TARGET_OS = "linux-uclibc" +# Select thumb-interwork and (TBD) thumb +ARM_INTERWORK = ":thumb-interwork" +#ARM_INSTRUCTION_SET = ":thumb" + USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" INHERIT += " package_ipk debian nslu2_flashimg" # The OVERRIDES are modified here so that 'openslug' overrides are picked up if -# present (ucslugc overrides take precedence), 'thumb' is used to factor out -# things where a pack assumes that an arm target implies 32 bit instruction -# support with no attention to thumb/arm mode (it indicates a bug if it is -# necessary to use this). -#NSLU2_THUMB_OVERRIDE = ":thumb" -NSLU2_THUMB_OVERRIDE = "" -OVERRIDES = "local:${MACHINE}:${DISTRO}:openslug:${TARGET_OS}${NSLU2_THUMB_OVERRIDE}:${TARGET_ARCH}:build-${BUILD_OS}" +# present (ucslugc overrides take precedence). +NSLU2_BASE_DISTRO = ":openslug" + +# We are building packages which are armvteb (big endian) for arm or thumbv5tb for +# thumb instructions. The PACKAGE_ARCH should reflect this because generated code +# requires that instruction set support. +PACKAGE_ARCH = "${NSLU2_PACKAGE_ARCH}" # NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see ucslugc-packages.conf in this @@ -51,28 +55,6 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${ #FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/unstable" #---------------------------------------------------------------------------------- -# OVERALL BUILD OPTIONS -#---------------------------------------------------------------------------------- -# -# TARGET_CC_ARCH is used to provide architecture specific definitions to the C -# compiler. For target compilation it is part of "CC" - not part of "CFLAGS" - -# in the hope that individual package builds will therefore not circumvent it -# (this doesn't always work, but it is more reliable than a simple setting of -# CFLAGS values). -# -# For UcSlugC the architecture value used is based on the standard NSLU2 value, -# however it selects both thumb interwork and thumb code generation to minimise -# build size. The distro allows the choice of thumb or arm code to be overridden -# on a per-package basis by setting NSLU2_THUMB (to empty) in the package .bb file. -# See also the 'override' above. -#NSLU2_THUMB = "-mthumb" -NSLU2_THUMB = "" -TARGET_CC_ARCH = "-march=armv5te -mtune=xscale -mthumb-interwork ${NSLU2_THUMB}" -TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale -mno-thumb-interwork -mno-thumb" -TARGET_LD_ARCH = "" -TARGET_LD_KERNEL_ARCH = "" - -#---------------------------------------------------------------------------------- # FIRMWARE CONFIGURATION #---------------------------------------------------------------------------------- # IMAGE BUILD OPTIONS diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 136c3187ce..3a9a9d9730 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,25 +2,55 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -TARGET_ARCH = "armeb" -# NOTE: this used to contain armv5te, but any package marked -# armv5te is almost certain to be little endian and all NSLU2 -# packages (openslug and unslung) are generated 'armeb', so -# this list accepts only armeb or nslu2 -IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +# NOTE: conf/${DISTRO}.conf is included after this file and may be +# used to modify variables set here. -IMAGE_ROOTFS_SIZE_ext2 = "10240" -IMAGE_ROOTFS_SIZE_ext2.gz = "10240" +#------------------------------------------------------------------------------- +# Processor and compilation options +#------------------------------------------------------------------------------- +#OVERRIDES +# ARM processors support both 32('arm') and 16('thumb') bit instruction sets, +# The procedure call standard has special provision for inter-calling without +# the need to know whether the instruction set of the target procedure +# ('interwork'). These options control the instruction set and whether or not +# interworking is supported. +# +# ARM_INTERWORK may be set to :thumb-interwork if required, empty otherwise. +# ARM_THUMB may be set to ":thumb" (exactly that, with the leading :) if thumb +# instructions are required, empty otherwise. +# +# These two variables define the instruction set used for compilation and +# whether the other (16 or 32 bit) instruction set is supported by the distro. +# These options may be changed on a per-package basis, however interwork is +# required if the package instruction set does not match the distro option. +# To set these in a package simply set the relevant variable to the correct +# value, in each case *non-empty* means 'true' - -mthumb-interwork or -mthumb +# in the compilation options. +#ARM_INTERWORK = ":thumb-interwork" +ARM_INTERWORK = "" +#ARM_INSTRUCTION_SET = ":thumb" +ARM_INSTRUCTION_SET = "" + +# The OVERRIDES are modified here so that 'NSLU2_BASE_DISTRO' overrides are +# picked up if present (${DISTRO} overrides take precedence), ARM_INTERWORK +# and ARM_INSTRUCTION_SET overrides are for handling bugs in packages which +# cannot deal with the -mthumb-interwork or -mthumb settings. +#NSLU2_BASE_DISTRO = ":openslug" +NSLU2_BASE_DISTRO = "" +OVERRIDES = "local:${MACHINE}:${DISTRO}${NSLU2_BASE_DISTRO}:${TARGET_OS}:${TARGET_ARCH}${ARM_INSTRUCTION_SET}${ARM_INTERWORK}:build-${BUILD_OS}" + +#COMPILER +# Compiler options - passed to TARGET_CC_ARCH +ARM_INTERWORK_M_OPT = "${@['-mthumb-interwork', '-mno-thumb-interwork'][bb.data.getVar('ARM_INTERWORK', d, 1) == '']}" +ARM_THUMB_M_OPT = "${@['-mthumb', '-mno-thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == '']}" # This was 'include tune-xscale.conf' but that doesn't work # (it would need to be conf/machine/tune-xscale.conf) and # anyway it sets the package architecture to armeb. -TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" -TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" +TARGET_CC_ARCH = "-march=armv5te -mtune=xscale ${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" +TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale -mno-thumb-interwork -mno-thumb" TARGET_LD_ARCH = "" TARGET_LD_KERNEL_ARCH = "" -PACKAGE_ARCH = "armeb" # Optimization settings. Os works fine and is significantly # better than O2. The other settings are somewhat arbitrary. @@ -39,10 +69,69 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \ # these functions must be disabled (this only occurs with -O) FULL_OPTIMIZATION_append_linux-uclibc = " -fno-builtin-sin -fno-builtin-cos" +#------------------------------------------------------------------------------- +# 'ARCH' options - package architecture and the 'target' architecture +#------------------------------------------------------------------------------- +# Historically the 'arch' is armeb, but this causes problems because it is +# generic ('armeb' should really only use instructions present on all ARM +# processors). Correcting it is difficult, however, because it is written in +# to so many places. +# +# TARGET_ARCH is *wrong* it should be armv5teb or, maybe, thumbv5teb +# however many packages have been modified to recognised 'armeb' inside +# configure scripts, fixing this up to handle arm*eb or thumb*eb is a +# lot of work, so has not yet been done. +#NOTE: do *not* change this is a distro.conf, a lot of work is required +# to get this fixed. +TARGET_ARCH = "armeb" + +# The list of valid architectures for thumb or arm on NSLU2. The arm list is +# derived from the architecture settings known to gcc, the thumb list is then +# derived from that (only the 't' architectures of course). Note: NSLU2 is +# assumed to imply 'big-endian', though in fact this need not be the case. +NSLU2_ARM_ARCHITECTURES = "armeb armv2b armv2ab armv3b armv3mb armv4b armv4tb armv5b armv5tb armv5eb armv5teb xscaleb" +NSLU2_THUMB_ARCHITECTURES = "thumbeb thumbv4tb thumbv5tb" + +# NOTE: this list contains just the things which rootfs_ipk.bbclass does not +# add, rootfs_ipk.bbclass evaluates: +# +# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}" +# +# This is a priority ordered list - most desireable architecture at the end, so +# put NSLU2_(ARM_INSTRUCTION_SET)_ARCHITECTURES at the end and, if ARM_INTERWORK +# precede this with the other architectures. +IPKG_ARCHS = "${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ + (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ + + (is_arm and arch_arm or arch_thumb)) \ + (bb.data.getVar('NSLU2_THUMB_ARCHITECTURES', d, 1), \ + bb.data.getVar('NSLU2_ARM_ARCHITECTURES', d, 1), \ + bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == '', \ + bb.data.getVar('ARM_INTERWORK', d, 1) != '')}" + +# The package architecture is 'wrong' - it should be armv5teb or thumbv5teb - +# however this setting is retained for backward compatibility as changing it +# would mean that old systems would not accept new packages! (armv5teb is not +# in the old system list). +#NOTE: new distros with independent feeds are encouraged to fix this, the +# variable NSLU2_PACKAGE_ARCH is provided for this purpose. +PACKAGE_ARCH = "armeb" +NSLU2_PACKAGE_ARCH = "${@['thumbv5tb', 'armv5teb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == '']}" + +#------------------------------------------------------------------------------- +# Miscellany +#------------------------------------------------------------------------------- +# JBowler(20050811): I don't think any of the following are required (now). +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +IMAGE_ROOTFS_SIZE_ext2 = "10240" +IMAGE_ROOTFS_SIZE_ext2.gz = "10240" + SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" +#------------------------------------------------------------------------------- +# Package versions +#------------------------------------------------------------------------------- CVSDATE_gnu-config ?= "20050713" CVSDATE_gnu-config-native ?= "20050713" CVSDATE_ipkg-utils-native ?= "20050713" 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/evoak/.mtn2git_empty b/packages/base-files/base-files/ipaq-pxa270/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/evoak/.mtn2git_empty +++ b/packages/base-files/base-files/ipaq-pxa270/.mtn2git_empty diff --git a/packages/base-files/base-files/ipaq-pxa270/fstab b/packages/base-files/base-files/ipaq-pxa270/fstab new file mode 100644 index 0000000000..8c38a5fda2 --- /dev/null +++ b/packages/base-files/base-files/ipaq-pxa270/fstab @@ -0,0 +1,9 @@ +/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 + +/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 0 0 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/engage_20050810.bb b/packages/e17/engage_20050810.bb new file mode 100644 index 0000000000..b74d21f028 --- /dev/null +++ b/packages/e17/engage_20050810.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "engage, 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" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +export EET_CONFIG = "${STAGING_BINDIR}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config" +export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" + +inherit autotools pkgconfig binconfig diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb index fc4d8c51af..ac454e7189 100644 --- a/packages/e17/entice_20050810.bb +++ b/packages/e17/entice_20050810.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Entice is a 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>" 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..07ed88c0f5 --- /dev/null +++ b/packages/e17/examine_20050810.bb @@ -0,0 +1,27 @@ +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" + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +export EET_CONFIG = "${STAGING_BINDIR}/eet-config" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config" +export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" + +inherit autotools pkgconfig binconfig 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" +RDEPENDS_${PN}-dev += "ncurses"
\ No newline at end of file diff --git a/packages/efl/edje-native_0.5.0.013.bb b/packages/efl/edje-native_0.5.0.013.bb index 8f15b4edab..d09bc2aaf0 100644 --- a/packages/efl/edje-native_0.5.0.013.bb +++ b/packages/efl/edje-native_0.5.0.013.bb @@ -1,6 +1,6 @@ include edje_${PV}.bb inherit native -DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native" +DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" EXTRA_OECONF = "--with-fb-only \ @@ -15,8 +15,8 @@ do_configure_prepend() { } do_stage_append() { - for i in ${BINARIES} - do - ${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/$i ${STAGING_BINDIR} - done + edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + # could also use ${STAGING_DATADIR}/edje/include + install -d $edje_data_dir/include + install -m 0644 data/include/edje.inc $edje_data_dir/include } diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb index 40c2002860..5cab345943 100644 --- a/packages/efl/edje_0.5.0.013.bb +++ b/packages/efl/edje_0.5.0.013.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Edje is a complex graphical design & layout library." -DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native" +# can also install vim data files +DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" LICENSE = "MIT" PR = "r0" inherit efl -EXTRA_OECONF = "--disable-edje-cc --enable-fb-only" LEAD_SONAME = "libedje.so" -libraries += "libedje_edit" +FILES_${PN}-dev += "${bindir}" -BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb" +RDEPENDS_${PN}-dev += "cpp"
\ No newline at end of file diff --git a/packages/efl/embryo-native_0.9.1.013.bb b/packages/efl/embryo-native_0.9.1.013.bb index ba24e954bc..a33adb7bd2 100644 --- a/packages/efl/embryo-native_0.9.1.013.bb +++ b/packages/efl/embryo-native_0.9.1.013.bb @@ -2,5 +2,6 @@ include embryo_${PV}.bb inherit native do_stage_append() { - ${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/embryo_cc ${STAGING_BINDIR} -} + install -d ${STAGING_DATADIR}/embryo/include + install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include +}
\ No newline at end of file diff --git a/packages/efl/embryo_0.9.1.013.bb b/packages/efl/embryo_0.9.1.013.bb index ee193e5c4d..54f3ddabad 100644 --- a/packages/efl/embryo_0.9.1.013.bb +++ b/packages/efl/embryo_0.9.1.013.bb @@ -7,4 +7,3 @@ LICENSE = "MIT" PR = "r0" inherit efl - diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb index 9fe32ce26b..5ca5214b94 100644 --- a/packages/efl/emotion_0.0.1.004.bb +++ b/packages/efl/emotion_0.0.1.004.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Emotion is a multimedia library based on libxine" LICENSE = "MIT" -DEPENDS = "libxine" +DEPENDS = "eet virtual/evas edje virtual/ecore embryo libxine" inherit efl diff --git a/packages/efl/engrave_20050810.bb b/packages/efl/engrave_20050810.bb index 13e68259a9..8ee284fb19 100644 --- a/packages/efl/engrave_20050810.bb +++ b/packages/efl/engrave_20050810.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Engrave is an Edje Editing Library" LICENSE = "MIT" -DEPENDS = "jpeg edb ecore-x11 evas-x11 edje imlib2-x11" +# also requires yacc and lex on host +DEPENDS = "virtual/evas virtual/ecore" inherit efl diff --git a/packages/efl/epsilon_0.3.0.004.bb b/packages/efl/epsilon_0.3.0.004.bb index d8dc08e11f..ab19043550 100644 --- a/packages/efl/epsilon_0.3.0.004.bb +++ b/packages/efl/epsilon_0.3.0.004.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \ that is complient with the freedesktop.org Thumbnail Managing Standard." LICENSE = "GPL" -DEPENDS = "edje epeg libpng virtual/imlib2" +DEPENDS = "virtual/imlib2 epeg libpng virtual/evas virtual/ecore perl-native edje" inherit efl diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb index 90b8aca6f9..beae7a7bc1 100644 --- a/packages/efl/esmart_0.9.0.004.bb +++ b/packages/efl/esmart_0.9.0.004.bb @@ -1,6 +1,6 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT" -DEPENDS = "edje-native eet evas-x11 ecore-x11 epsilon embryo imlib2-x11 jpeg libtool" +DEPENDS = "evas-x11 ecore-x11 virtual/imlib2 epsilon edje libtool" PR = "r1" inherit efl diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb index a29967a051..3eaa12cf9e 100644 --- a/packages/efl/evas-native_0.9.9.013.bb +++ b/packages/efl/evas-native_0.9.9.013.bb @@ -1,3 +1,3 @@ include evas-fb_${PV}.bb inherit native -DEPENDS = "freetype-native" +DEPENDS = "freetype-native libpng-native jpeg-native eet-native edb-native" diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 0588d8e28c..60f60f3c82 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -3,7 +3,8 @@ 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." LICENSE = "MIT" -DEPENDS = "libpng jpeg edb eet freetype" +# can also depend on valgrind (?) +DEPENDS = "freetype libpng jpeg eet edb" inherit efl diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb index 36d8c5c860..92db160a25 100644 --- a/packages/efl/ewl_0.0.4.004.bb +++ b/packages/efl/ewl_0.0.4.004.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library based on the enlightenment foundation libraries." -DEPENDS = "edb eet virtual/evas virtual/ecore etox edje" +DEPENDS = "edb virtual/evas virtual/ecore edje emotion" LICENSE = "MIT" PR = "r0" diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc index b4a2f267fc..a6982e21c7 100644 --- a/packages/efl/imlib2.inc +++ b/packages/efl/imlib2.inc @@ -1,5 +1,6 @@ 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" inherit efl diff --git a/packages/esound/esound-gpe_20020817.bb b/packages/esound/esound-gpe_20020817.bb index 4c7e80f7c6..c3cdb784af 100644 --- a/packages/esound/esound-gpe_20020817.bb +++ b/packages/esound/esound-gpe_20020817.bb @@ -11,7 +11,7 @@ SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \ S = "${WORKDIR}/esound" -inherit autotools pkgconfig +inherit autotools binconfig pkgconfig EXTRA_OECONF = "--disable-alsa" diff --git a/packages/evoak/evoak_0.0.1.bb b/packages/evoak/evoak_0.0.1.bb deleted file mode 100644 index 551dc8eca5..0000000000 --- a/packages/evoak/evoak_0.0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -HOMEPAGE = "http://www.enlightenment.org" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "ecore evas edje embryo eet" -LICENSE = "MIT" - -SRC_URI = "http://www.rasterman.com/files/evoak-${PV}.tar.gz" -S = "${WORKDIR}/evoak-${PV}" - -inherit autotools binconfig - -#FIXME: evoak fails to build, because it doesn't realize that -#our ecore was built without X support. Ecore should really -#be installing a copy of its config.h, and Evoak should be -#ifdefing blocks of code based on the ecore build options. -BROKEN = "1" - -do_stage () { - oe_libinstall -C src/lib libvoak ${STAGING_LIBDIR}/ - install -m 0644 ${S}/src/lib/Evoak.h ${STAGING_INCDIR}/ -} diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb index e97d862812..9795e88594 100644 --- a/packages/inkscape/inkscape_0.42.bb +++ b/packages/inkscape/inkscape_0.42.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \ blending, node editing, SVG to PNG export, and more. Its goal is for features \ similar to Illustrator, CorelDraw, Visio, etc." MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgc intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt" +DEPENDS = "libgc intltool-native gtk+ gtkmm glibmm libart-lgpl libxslt librsvg libxml2 libsigc++-1.2 popt" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2" diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index 82d9dfd633..44eb82cf58 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -43,6 +43,7 @@ UCSLUGC_PACKAGES = "\ gawk \ gcc \ gdb \ + gdbm \ glib-2.0 \ gnu-config \ gphoto2 \ @@ -62,13 +63,15 @@ UCSLUGC_PACKAGES = "\ libusb \ libvorbis \ libxml2 \ + lrzsz \ lsof \ m4 \ make \ mgetty \ miau \ microcom \ - monotone-4 monotone-5 \ + monotone-4 \ + monotone-5 \ mpd \ mt-daapd \ mutt \ @@ -94,6 +97,7 @@ UCSLUGC_PACKAGES = "\ puppy \ pwc \ python \ + python-core \ quilt \ reiserfsprogs reiser4progs \ rsync \ @@ -149,4 +153,4 @@ UCSLUGC_UNSUPPORTABLE_PACKAGES = "\ # The package-index at the end causes regeneration of the Packages.gz and # other control files. -DEPENDS = "openslug-image ${UCSLUGC_PACKAGES} package-index" +DEPENDS = "openslug-image ${UCSLUGC_PACKAGES} openslug-native package-index" diff --git a/packages/monotone/monotone-5_0.22.bb b/packages/monotone/monotone-5_0.22.bb new file mode 100644 index 0000000000..c646fc2724 --- /dev/null +++ b/packages/monotone/monotone-5_0.22.bb @@ -0,0 +1,11 @@ +include monotone.inc + +PR = "r0" + +SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \ + file://txt2c-cross.patch;patch=1 \ + file://configure.ac.patch;patch=1 \ + file://uclibc.database.hh.stdarg.patch;patch=1 \ + " + +ALTERNATIVE_PRIORITY = "50" diff --git a/packages/monotone/monotone.inc b/packages/monotone/monotone.inc index 7248a9843d..d13108a6e3 100644 --- a/packages/monotone/monotone.inc +++ b/packages/monotone/monotone.inc @@ -40,6 +40,4 @@ do_install_append() { PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" tsd = "/home/monotone/${PN}" FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" -RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch" -# The testsuite also requires the following - not yet available... -#RDEPENDS_${PN}-testsuite += "perl" +RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch perl perl-modules" diff --git a/packages/qpe-gaim/qpe-libgaim_1.4.0.bb b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb index 824dee5c39..824dee5c39 100644 --- a/packages/qpe-gaim/qpe-libgaim_1.4.0.bb +++ b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb |