[oe-commits] org.oe.dev merge of '8e267e53f5ff3974ea907c65e0425b4bc3d49be6'
oe commit
oe at amethyst.openembedded.net
Thu Mar 20 21:22:09 UTC 2008
merge of '8e267e53f5ff3974ea907c65e0425b4bc3d49be6'
and 'bcbf3f86a64a7efd40e705f7468f43fbe17c6f84'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f7df80732af56b59315ef203e69f092313ec2ddd
ViewMTN: http://monotone.openembedded.org/revision/info/f7df80732af56b59315ef203e69f092313ec2ddd
Files:
1
packages/pango/pango-1.18.3/pkgconfig_fixes.patch
packages/pango/files/pkgconfig_fixes.patch
packages/openmoko-projects/illume
packages/openmoko-projects/illume/illume-fix-includes.patch
conf/distro/include/angstrom-2008-preferred-versions.inc
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/gtk+/gtk+_2.12.3.bb
packages/openmoko-projects/illume_svn.bb
packages/pango/pango_1.8.2.bb
conf/machine/omap5912osk.conf
Diffs:
#
# mt diff -r8e267e53f5ff3974ea907c65e0425b4bc3d49be6 -rf7df80732af56b59315ef203e69f092313ec2ddd
#
#
#
# rename "packages/pango/pango-1.18.3/pkgconfig_fixes.patch"
# to "packages/pango/files/pkgconfig_fixes.patch"
#
# add_dir "packages/openmoko-projects/illume"
#
# add_file "packages/openmoko-projects/illume/illume-fix-includes.patch"
# content [9c77a2deb5117d5264a62d14acac593527d9ec08]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [a93dbc58945bc2a58e31dc23c8a49662edf1ff28]
# to [d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0]
#
# patch "packages/gtk+/gtk+.inc"
# from [1aaf588548db151300913d0a15d5cc12dc7cdaa8]
# to [8aedbf6c56434aa2961e5238b7863e3537faba35]
#
# patch "packages/gtk+/gtk+_2.12.0.bb"
# from [08e63663afbf9b3a26edfaf43148e2e60683e7df]
# to [b7951643e667231ff2d092dd865e23dde9666222]
#
# patch "packages/gtk+/gtk+_2.12.3.bb"
# from [7160ff887391b65883e37a5a1fbb1007a4356f49]
# to [0d9c399ba649e1291ca7948faac117dd90dce289]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [e5d4b34ba7ffcc19cf76941aa5f700a687147d15]
# to [c0608172fae13bd898686c009658f6f8179e9c46]
#
# patch "packages/pango/pango_1.8.2.bb"
# from [a17979a78d6ca8ee7191f00fd631befaadc5dcac]
# to [c5167cdc5d3b91d13bdc3a6bbbd7d2c772f3dedf]
#
============================================================
--- packages/openmoko-projects/illume/illume-fix-includes.patch 9c77a2deb5117d5264a62d14acac593527d9ec08
+++ packages/openmoko-projects/illume/illume-fix-includes.patch 9c77a2deb5117d5264a62d14acac593527d9ec08
@@ -0,0 +1,70 @@
+Index: src/e_mod_win.c
+===================================================================
+--- src/e_mod_win.c (revision 14)
++++ src/e_mod_win.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_win.h"
+ #include "e_slipshelf.h"
+ #include "e_slipwin.h"
+Index: src/e_kbd.c
+===================================================================
+--- src/e_kbd.c (revision 14)
++++ src/e_kbd.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_kbd.h"
+
+ /* internal calls */
+Index: src/e_slip.c
+===================================================================
+--- src/e_slip.c (revision 14)
++++ src/e_slip.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slip.h"
+
+ EAPI int E_EVENT_SLIP_DEL = 0;
+Index: src/e_mod_layout.c
+===================================================================
+--- src/e_mod_layout.c (revision 14)
++++ src/e_mod_layout.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_main.h"
+ #include "e_mod_layout.h"
+
+Index: src/e_mod_main.c
+===================================================================
+--- src/e_mod_main.c (revision 14)
++++ src/e_mod_main.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+
+ #include "e_kbd.h"
+ #include "e_slipshelf.h"
+Index: src/e_slipwin.c
+===================================================================
+--- src/e_slipwin.c (revision 14)
++++ src/e_slipwin.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipwin.h"
+
+ EAPI int E_EVENT_SLIPWIN_DEL = 0;
+Index: src/e_slipshelf.c
+===================================================================
+--- src/e_slipshelf.c (revision 14)
++++ src/e_slipshelf.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipshelf.h"
+
+ /* FIXME: break out gadcons for 2 swallow areas */
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc a93dbc58945bc2a58e31dc23c8a49662edf1ff28
+++ conf/distro/include/angstrom-2008-preferred-versions.inc d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0
@@ -3,5 +3,6 @@ PREFERRED_VERSION_libtool = "1.5.10"
PREFERRED_VERSION_glib-2.0 = "2.16.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_pango = "1.18.3"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
============================================================
--- packages/gtk+/gtk+.inc 1aaf588548db151300913d0a15d5cc12dc7cdaa8
+++ packages/gtk+/gtk+.inc 8aedbf6c56434aa2961e5238b7863e3537faba35
@@ -23,6 +23,7 @@ FILES_${PN}-dev += " \
${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
${bindir}/gdk-pixbuf-csource \
${bindir}/gtk-builder-convert"
============================================================
--- packages/gtk+/gtk+_2.12.0.bb 08e63663afbf9b3a26edfaf43148e2e60683e7df
+++ packages/gtk+/gtk+_2.12.0.bb b7951643e667231ff2d092dd865e23dde9666222
@@ -1,6 +1,6 @@ require gtk+.inc
require gtk+.inc
-PR = "r1"
+PR = "r2"
DEPENDS += "cairo"
============================================================
--- packages/gtk+/gtk+_2.12.3.bb 7160ff887391b65883e37a5a1fbb1007a4356f49
+++ packages/gtk+/gtk+_2.12.3.bb 0d9c399ba649e1291ca7948faac117dd90dce289
@@ -1,6 +1,6 @@ require gtk+.inc
require gtk+.inc
-PR = "r0"
+PR = "r1"
DEPENDS += "cairo"
============================================================
--- packages/openmoko-projects/illume_svn.bb e5d4b34ba7ffcc19cf76941aa5f700a687147d15
+++ packages/openmoko-projects/illume_svn.bb c0608172fae13bd898686c009658f6f8179e9c46
@@ -2,11 +2,13 @@ LICENSE = "MIT/BSD"
HOMEPAGE = "http://illume.projects.openmoko.org/"
LICENSE = "MIT/BSD"
-DEPENDS = "eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
PV = "0.0+svnr${SRCREV}"
+PR = "r1"
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+ file://illume-fix-includes.patch;patch=1;pnum=0;minrev=14"
S = "${WORKDIR}/${PN}"
@@ -17,6 +19,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
--enable-simple-x11 \
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+export CFLAGS += "-DE_TYPEDEFS=1"
do_configure_append() {
find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
============================================================
--- packages/pango/pango_1.8.2.bb a17979a78d6ca8ee7191f00fd631befaadc5dcac
+++ packages/pango/pango_1.8.2.bb c5167cdc5d3b91d13bdc3a6bbbd7d2c772f3dedf
@@ -11,7 +11,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
FULL_OPTIMIZATION_arm = "-O2"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
- file://no-tests.patch;patch=1"
+ file://no-tests.patch;patch=1 \
+ file://pkgconfig_fixes.patch;patch=1"
inherit autotools pkgconfig
#
# mt diff -rbcbf3f86a64a7efd40e705f7468f43fbe17c6f84 -rf7df80732af56b59315ef203e69f092313ec2ddd
#
#
#
# patch "conf/machine/omap5912osk.conf"
# from [0e95b09a1be375036ac3d8c2bde78501405ef4e3]
# to [550c9fd932094e999a41c4ac6321b068c9efec66]
#
============================================================
--- conf/machine/omap5912osk.conf 0e95b09a1be375036ac3d8c2bde78501405ef4e3
+++ conf/machine/omap5912osk.conf 550c9fd932094e999a41c4ac6321b068c9efec66
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
+UBOOT_ENTRYPOINT="0x10c08000"
+
# PREFERRED_VERSION_u-boot = "1.1.6"
SERIAL_CONSOLE ?= "115200 ttyS0"
@@ -26,6 +28,8 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modu
kernel-module-nls-base \
kernel-module-vfat \
kernel-module-ohci-hcd \
+ kernel-module-tlv320aic23 \
+ kernel-module-snd-omap-alsa-aic23 \
"
RDEPENDS_kernel-base = ""
More information about the Openembedded-commits
mailing list