[oe-commits] org.oe.dev merge of '4c108250ef95743112aee6c23a4f206124025bbb'

[openmoko commit]

merge of '4c108250ef95743112aee6c23a4f206124025bbb'
     and 'd3620bd2aae6d0d9fd6b35e93a1d2a1e914dda31'

Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: 8c9220c895b42b3f09762f8253ea1eef2179f837
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8c9220c895b42b3f09762f8253ea1eef2179f837
Files:
1
packages/efl1/imlib2
packages/efl1/imlib2/remove-local-includes.patch
packages/efl1/imlib2_1.4.0.002.bb
packages/opentom
packages/xoscope
packages/opentom/ttimgextract.bb
packages/xoscope/xoscope_1.12.bb
packages/tasks/task-openmoko-feed.bb
Diffs:

#
# mt diff -r4c108250ef95743112aee6c23a4f206124025bbb -r8c9220c895b42b3f09762f8253ea1eef2179f837
#
# 
# 
# add_dir "packages/efl1/imlib2"
# 
# add_file "packages/efl1/imlib2/remove-local-includes.patch"
#  content [575153404b4483b1dc4a71f3af556661d52804e5]
# 
# patch "packages/efl1/imlib2_1.4.0.002.bb"
#  from [8b80e93373cdcb6aa046dbbdc02f134fddcd0004]
#    to [e017df241684fa755bba2f2f9b4d95dcf494b052]
# 
============================================================
--- packages/efl1/imlib2/remove-local-includes.patch	575153404b4483b1dc4a71f3af556661d52804e5
+++ packages/efl1/imlib2/remove-local-includes.patch	575153404b4483b1dc4a71f3af556661d52804e5
@@ -0,0 +1,15 @@
+Index: imlib2/configure.in
+===================================================================
+--- imlib2.orig/configure.in	2007-09-01 14:34:26.000000000 +0000
++++ imlib2/configure.in	2007-09-01 14:35:07.000000000 +0000
+@@ -188,9 +188,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"
+   AM_CONDITIONAL(BUILD_X11, true)
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
============================================================
--- packages/efl1/imlib2_1.4.0.002.bb	8b80e93373cdcb6aa046dbbdc02f134fddcd0004
+++ packages/efl1/imlib2_1.4.0.002.bb	e017df241684fa755bba2f2f9b4d95dcf494b052
@@ -1,11 +1,15 @@ LICENSE = "BSD"
 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"
-PR = "r1"
+DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
+PR = "r2"
 
 inherit efl_library
 
+SRC_URI += "file://remove-local-includes.patch;patch=1"
+
+EXTRA_OECONF = "--with-x"
+
 # TODO: Use more fine granular version
 #OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:"
 OE_LT_RPATH_ALLOW = "any"


#
# mt diff -rd3620bd2aae6d0d9fd6b35e93a1d2a1e914dda31 -r8c9220c895b42b3f09762f8253ea1eef2179f837
#
# 
# 
# add_dir "packages/opentom"
# 
# add_dir "packages/xoscope"
# 
# add_file "packages/opentom/ttimgextract.bb"
#  content [b372d95236cced5b56014edd4edb6a33f3da8a87]
# 
# add_file "packages/xoscope/xoscope_1.12.bb"
#  content [b2df507e8f99f8e467fe59524ffb800381cbda0f]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [4ff85f5e4e94bf5be8ffd72c0c3da03cf11f8d14]
#    to [556642537d4bd3763b3a455f2bd4eb77bd92deca]
# 
============================================================
--- packages/opentom/ttimgextract.bb	b372d95236cced5b56014edd4edb6a33f3da8a87
+++ packages/opentom/ttimgextract.bb	b372d95236cced5b56014edd4edb6a33f3da8a87
@@ -0,0 +1,17 @@
+LICENSE = "None"
+DESCRIPTION = "A tool to extract the ttsystem images into their components." 
+
+SRC_URI = "svn://svn.opentom.org/opentom/trunk/;module=ttimgextract;proto=http"
+
+PV = "0.0+svn${SRCDATE}"
+S = "${WORKDIR}/${PN}"
+
+
+do_compile() {
+        ${CC} -o ttimgextract ttimgextract.c -DPATH_MAX=4096 ${TARGET_CC_ARCH}
+}
+
+do_install () {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/ttimgextract ${D}${bindir}/
+}
============================================================
--- packages/xoscope/xoscope_1.12.bb	b2df507e8f99f8e467fe59524ffb800381cbda0f
+++ packages/xoscope/xoscope_1.12.bb	b2df507e8f99f8e467fe59524ffb800381cbda0f
@@ -0,0 +1,13 @@
+DESCRIPTION = "Scope for your soundcard of COMEDI device"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk+-1.2 esound"
+
+SRC_URI = "http://prdownloads.sourceforge.net/xoscope/xoscope-${PV}.tgz"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+FILES_${PN}-dbg += "${libexecdir}/xoscope/.debug"
+
============================================================
--- packages/tasks/task-openmoko-feed.bb	4ff85f5e4e94bf5be8ffd72c0c3da03cf11f8d14
+++ packages/tasks/task-openmoko-feed.bb	556642537d4bd3763b3a455f2bd4eb77bd92deca
@@ -1,13 +1,15 @@ LICENSE = "MIT"
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r4"
 
 inherit task
 
 RDEPENDS_task-openmoko-feed = "\
+  ntpclient \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python \
   python-pygtk \
   python-pyserial \
+  timezones \
 "