summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/angstrom-2008.1.conf1
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc2
-rw-r--r--conf/distro/include/sane-srcrevs.inc6
-rw-r--r--conf/machine/beagleboard.conf2
-rw-r--r--conf/machine/omap5912osk.conf4
-rw-r--r--packages/gtk+/gtk+.inc1
-rw-r--r--packages/gtk+/gtk+_2.12.0.bb2
-rw-r--r--packages/gtk+/gtk+_2.12.3.bb2
-rw-r--r--packages/openmoko-projects/illume/.mtn2git_empty0
-rw-r--r--packages/openmoko-projects/illume/illume-fix-includes.patch70
-rw-r--r--packages/openmoko-projects/illume_svn.bb7
-rw-r--r--packages/pango/files/pkgconfig_fixes.patch (renamed from packages/pango/pango-1.18.3/pkgconfig_fixes.patch)0
-rw-r--r--packages/pango/pango_1.8.2.bb3
-rw-r--r--packages/sysvinit/sysvinit_2.86.bb2
-rw-r--r--packages/vte/vte_0.16.13.bb1
15 files changed, 91 insertions, 12 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 7d69484e91..a78469c3d1 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -81,7 +81,6 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ ?= "2.12.3"
PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
-PREFERRED_VERSION_pango ?= "1.18.1"
PREFERRED_PROVIDER_avahi = "avahi"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 912bb72c7d..e326118a1a 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -3,6 +3,6 @@ PREFERRED_VERSION_dbus = "1.1.20"
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"
-PREFERRED_VERSION_vte = "0.16.10"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e871e92473..60d35f2bdb 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -137,9 +137,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4210"
-SRCREV_pn-opkg-native ?= "4210"
-SRCREV_pn-opkg-sdk ?= "4209"
+SRCREV_pn-opkg ?= "4235"
+SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg-sdk ?= "4235"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index a8e4d6cca8..76c27b153e 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -19,7 +19,7 @@ include conf/machine/include/tune-arm1136jf-s.inc
IMAGE_FSTYPES ?= "tar.bz2"
# Guesswork
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyS2"
# No kernel recipe yet
PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 7a7b5c1a60..5c7f5bed7f 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
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-module-ide-cs \
kernel-module-nls-base \
kernel-module-vfat \
kernel-module-ohci-hcd \
+ kernel-module-tlv320aic23 \
+ kernel-module-snd-omap-alsa-aic23 \
"
RDEPENDS_kernel-base = ""
diff --git a/packages/gtk+/gtk+.inc b/packages/gtk+/gtk+.inc
index 23a8b9bc70..2505c344bb 100644
--- a/packages/gtk+/gtk+.inc
+++ b/packages/gtk+/gtk+.inc
@@ -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"
diff --git a/packages/gtk+/gtk+_2.12.0.bb b/packages/gtk+/gtk+_2.12.0.bb
index 57ba24e796..61d6a81aa3 100644
--- a/packages/gtk+/gtk+_2.12.0.bb
+++ b/packages/gtk+/gtk+_2.12.0.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r1"
+PR = "r2"
DEPENDS += "cairo"
diff --git a/packages/gtk+/gtk+_2.12.3.bb b/packages/gtk+/gtk+_2.12.3.bb
index 689071d776..3d3bd0c8cf 100644
--- a/packages/gtk+/gtk+_2.12.3.bb
+++ b/packages/gtk+/gtk+_2.12.3.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r0"
+PR = "r1"
DEPENDS += "cairo"
diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects/illume/.mtn2git_empty
diff --git a/packages/openmoko-projects/illume/illume-fix-includes.patch b/packages/openmoko-projects/illume/illume-fix-includes.patch
new file mode 100644
index 0000000000..74418b31de
--- /dev/null
+++ b/packages/openmoko-projects/illume/illume-fix-includes.patch
@@ -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 */
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index 194eac8d42..f93108dca4 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
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_INCDIR}/X11 \
--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}:'
diff --git a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch b/packages/pango/files/pkgconfig_fixes.patch
index f021591a91..f021591a91 100644
--- a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch
+++ b/packages/pango/files/pkgconfig_fixes.patch
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index c80f7326a3..477a6f27da 100644
--- a/packages/pango/pango_1.8.2.bb
+++ b/packages/pango/pango_1.8.2.bb
@@ -11,7 +11,8 @@ PR = "r0"
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
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 480bc9d1ff..a6765c4508 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
SECTION = "base"
LICENSE = "GPL"
HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r39"
+PR = "r40"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
diff --git a/packages/vte/vte_0.16.13.bb b/packages/vte/vte_0.16.13.bb
new file mode 100644
index 0000000000..9453fee206
--- /dev/null
+++ b/packages/vte/vte_0.16.13.bb
@@ -0,0 +1 @@
+require vte.inc
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-06 22:21:26 +0000