org.openmoko.dev: 19fbd95e2f673d079a65d491286661af6719985f

oe at monotone.openmoko.org oe at monotone.openmoko.org
Tue Apr 22 11:30:55 CEST 2008


revision:            19fbd95e2f673d079a65d491286661af6719985f
date:                2008-04-22T09:22:00
author:              john_lee at openembedded.org
branch:              org.openmoko.dev
changelog:
merge of '39e5f6a80d9fb6c05976e90c19a567c1e8248ab4'
     and '5f954b00ac8b90b199e9f83b3785f082c899b70c'

manifest:
format_version "1"

new_manifest [5082b21b85edb00ab15b5738dd3edab61c5d0142]

old_revision [39e5f6a80d9fb6c05976e90c19a567c1e8248ab4]

patch "conf/distro/include/moko-autorev.inc"
 from [03bc5e80481dfb6e8ef93d0031d1191c9031db0b]
   to [ad6ad5fd937f85a5c34752d8a7919ebb77fe646a]

old_revision [5f954b00ac8b90b199e9f83b3785f082c899b70c]

add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
 content [6cb1af5e1d744afaed49d06493a112c10cf8210b]

patch "packages/efl1/imlib2_cvs.bb"
 from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
   to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
-------------- next part --------------
#
#
# patch "conf/distro/include/moko-autorev.inc"
#  from [03bc5e80481dfb6e8ef93d0031d1191c9031db0b]
#    to [ad6ad5fd937f85a5c34752d8a7919ebb77fe646a]
#
============================================================
--- conf/distro/include/moko-autorev.inc	03bc5e80481dfb6e8ef93d0031d1191c9031db0b
+++ conf/distro/include/moko-autorev.inc	ad6ad5fd937f85a5c34752d8a7919ebb77fe646a
@@ -1,10 +1,24 @@
+
+
+
+
+
+
+
+
+
+EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
 SRCREV_pn-assassin ?= "${AUTOREV}"
-SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
-SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-assassin ?= "${AUTOREV}"
 SRCREV_pn-dfu-util ?= "${AUTOREV}"
 SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
+SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
+SRCREV_pn-diversity-nav ?= "${AUTOREV}"
+SRCREV_pn-diversity-nav ?= "${AUTOREV}"
 SRCREV_pn-illume ?= "${AUTOREV}"
-
+SRCREV_pn-illume ?= "${AUTOREV}"
+SRCREV_pn-illume-theme ?= "${AUTOREV}"
 SRCREV_pn-libgsmd ?= "${AUTOREV}"
 SRCREV_pn-libjana ?= "${AUTOREV}"
 SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
@@ -13,23 +27,13 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUT
 SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
-
-SRCREV_pn-assassin ?= "${AUTOREV}"
-SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
-SRCREV_pn-diversity-nav ?= "${AUTOREV}"
-SRCREV_pn-illume ?= "${AUTOREV}"
-SRCREV_pn-illume-theme ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}"
-#SRCREV_pn-opkg ?= "${AUTOREV}"
-#SRCREV_pn-opkg-native ?= "${AUTOREV}"
-
-SRCREV_pn-multitap-pad ?= "${AUTOREV}"
-
 SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}"
-SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
+SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
@@ -61,18 +65,12 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUT
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
-
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
-SRCREV_pn-opkg ?= "${AUTOREV}"
-SRCREV_pn-opkg-native ?= "${AUTOREV}"
-
+#SRCREV_pn-opkg ?= "${AUTOREV}"
+#SRCREV_pn-opkg-native ?= "${AUTOREV}"
 SRCREV_pn-python-gsmd ?= "${AUTOREV}"
-
 SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
 SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-usbpath ?= "${AUTOREV}"
 SRCREV_pn-usbpath-native ?= "${AUTOREV}"
-
-
-EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080422/91df8c0b/attachment.htm 
-------------- next part --------------
#
#
# add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
#  content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
# 
# patch "packages/efl1/imlib2_cvs.bb"
#  from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
#    to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
#
============================================================
--- packages/efl1/imlib2/remove-local-includes-20080421.patch	6cb1af5e1d744afaed49d06493a112c10cf8210b
+++ packages/efl1/imlib2/remove-local-includes-20080421.patch	6cb1af5e1d744afaed49d06493a112c10cf8210b
@@ -0,0 +1,15 @@
+Index: imlib2/configure.in
+===================================================================
+--- imlib2.orig/configure.in	2008-04-21 14:28:58.000000000 +0800
++++ imlib2/configure.in	2008-04-21 14:30:07.000000000 +0800
+@@ -191,9 +191,7 @@
+ 
+ if test "x$have_x" = "xyes"; then
+   AC_PATH_XTRA
+-  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"
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+   x_cflags=""
============================================================
--- packages/efl1/imlib2_cvs.bb	90324b9d8bfadfca430da3b72c2b1f9c7089ee52
+++ packages/efl1/imlib2_cvs.bb	41b7537a6af77e700c6236af3c40b2b7a8d80604
@@ -3,11 +3,13 @@ PV = "1.4.1.000+cvs${SRCDATE}"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
 PV = "1.4.1.000+cvs${SRCDATE}"
-PR = "r0"
+PR = "r0.01"
 
 inherit efl
 
-SRC_URI += "file://remove-local-includes.patch;patch=1"
+# The original patch was out of date in 20080420
+SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \
+            file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "
 
 EXTRA_OECONF = "--with-x"
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080422/91df8c0b/attachment-0001.htm 


More information about the commitlog mailing list