[oe-commits] org.oe.dev merge of '0f79b6f78930662f9b32b4435d31c155b3ea0269'

[openmoko commit]

merge of '0f79b6f78930662f9b32b4435d31c155b3ea0269'
     and 'b2ce7bfc971ce67a16e41e21a7810b2ee2763fc6'

Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: 07a74b59f4e9de4044085d427a87ec5200e7f713
ViewMTN: http://monotone.openembedded.org/revision/info/07a74b59f4e9de4044085d427a87ec5200e7f713
Files:
1
packages/psplash/files/openmoko/psplash-hand-img.h
packages/e17/e-wm_0.16.999.041.bb
Diffs:

#
# mt diff -r0f79b6f78930662f9b32b4435d31c155b3ea0269 -r07a74b59f4e9de4044085d427a87ec5200e7f713
#
# 
# 
# patch "packages/psplash/files/openmoko/psplash-hand-img.h"
#  from [9768cb0382b02aad7a1b357e402696ea202c216c]
#    to [ec19809957258bb981503c2162ddc0efb54a3dfe]
# 
============================================================
--- packages/psplash/files/openmoko/psplash-hand-img.h	9768cb0382b02aad7a1b357e402696ea202c216c
+++ packages/psplash/files/openmoko/psplash-hand-img.h	ec19809957258bb981503c2162ddc0efb54a3dfe
@@ -1,10 +1,10 @@
 /* GdkPixbuf RGB C-Source image dump 1-byte-run-length-encoded */
 
-#define _IMG_ROWSTRIDE (1440)
-#define _IMG_WIDTH (480)
-#define _IMG_HEIGHT (640)
-#define _IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
-#define _IMG_RLE_PIXEL_DATA ((uint8*) \
+#define HAND_IMG_ROWSTRIDE (1440)
+#define HAND_IMG_WIDTH (480)
+#define HAND_IMG_HEIGHT (640)
+#define HAND_IMG_BYTES_PER_PIXEL (3) /* 3:RGB, 4:RGBA */
+#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
   "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" \
   "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0" \
   "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" \


#
# mt diff -rb2ce7bfc971ce67a16e41e21a7810b2ee2763fc6 -r07a74b59f4e9de4044085d427a87ec5200e7f713
#
# 
# 
# add_file "packages/e17/e-wm_0.16.999.041.bb"
#  content [5b5487dd36444b2311993eda6fd92201cc77756c]
# 
============================================================
--- packages/e17/e-wm_0.16.999.041.bb	5b5487dd36444b2311993eda6fd92201cc77756c
+++ packages/e17/e-wm_0.16.999.041.bb	5b5487dd36444b2311993eda6fd92201cc77756c
@@ -0,0 +1,48 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "eet evas ecore edje efreet"
+LICENSE = "MIT"
+PR = "r0"
+
+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"