[oe-commits] org.oe.dev merge of '8fb06f47da36b8b2158bea8339a80be10a144e3c'
xora commit
openembedded-commits at lists.openembedded.org
Wed Mar 5 17:11:39 UTC 2008
merge of '8fb06f47da36b8b2158bea8339a80be10a144e3c'
and 'a064a0293b3a138710553a3fa279c7f690061da8'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 05ad3485b42ecb00f88755641322f85ba7842784
ViewMTN: http://monotone.openembedded.org/revision/info/05ad3485b42ecb00f88755641322f85ba7842784
Files:
1
packages/libsexy/files
packages/vte/files
packages/libsexy/files/libsexy-pkgconfig-fixes.patch
packages/libxslt/libxslt_1.1.22.bb
packages/vte/files/vte-pkgconfig-fixes.patch
packages/xserver-common/xserver-common_1.22.bb
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
contrib/angstrom/build-release.sh
packages/apmd/files/90-wifi-off
packages/libsexy/libsexy.inc
packages/libsexy/libsexy_0.1.11.bb
packages/mtd/mtd-utils_1.0.0+git.bb
packages/mtd/mtd-utils_1.1.0.bb
packages/vte/vte.inc
packages/vte/vte_0.16.9.bb
packages/xoo/xoo_svn.bb
site/arm-linux-uclibc
conf/distro/chinook-compat.conf
Diffs:
#
# mt diff -r8fb06f47da36b8b2158bea8339a80be10a144e3c -r05ad3485b42ecb00f88755641322f85ba7842784
#
#
#
# add_dir "packages/libsexy/files"
#
# add_dir "packages/vte/files"
#
# add_file "packages/libsexy/files/libsexy-pkgconfig-fixes.patch"
# content [e5931663a5d7b15ab427404822b3ef7e492a63ed]
#
# add_file "packages/libxslt/libxslt_1.1.22.bb"
# content [79128c5d67c70cbfa31d1f46637bcb63e408194e]
#
# add_file "packages/vte/files/vte-pkgconfig-fixes.patch"
# content [c3812437766ebd9403b28e7a4c06406c02369202]
#
# add_file "packages/xserver-common/xserver-common_1.22.bb"
# content [14f7d103bf373a302fc67211bc1c91f71605d7fb]
#
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
# from [340506c9f1360260d8ad4ca3914b04642d150348]
# to [6d3aaaaa7a79cacb60e353fc0bd6e8a27dc724c3]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [01ee3170eaa5eed037d9883335321e74296e2d19]
# to [4df38dd4bd7877c6cda9662121aa501342783f9b]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [d67a23a7afbb9f344b8a06ad56a59f59f0f95d05]
# to [cee3f2f2e6478f02a5022c31afb8da91f4680f4a]
#
# patch "contrib/angstrom/build-release.sh"
# from [b708ec70fd4e4e0c2756d122aa95b1d653019a9e]
# to [ba8f992bfe8e6c725b91b12fbe667c9f9423659b]
#
# patch "packages/apmd/files/90-wifi-off"
# from [dd2b60322fc6d9136495d7c41f7c1f9e73ed8937]
# to [e98ddd9efd82319c1c9c5b627403f60431827290]
#
# patch "packages/libsexy/libsexy.inc"
# from [424dc70640ac7ef7e37a4ade193b1b68ee41b529]
# to [bb7627ce4dd6e965c92b807b73ce50885842782e]
#
# patch "packages/libsexy/libsexy_0.1.11.bb"
# from [fea8d167b7e7ad5419021a08a604bf8d7af3166f]
# to [a76f7dce9c8ab42df42de99cb8a9b523bb2f18a2]
#
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
# from [7eddd005976dfff21ab5df1d7f4010a0cb36c45a]
# to [84c980d81b31831e212ab06f383190f75f5c49f6]
#
# patch "packages/mtd/mtd-utils_1.1.0.bb"
# from [55322b9b44a9887ed3b3f6a0dc04916c921b45f7]
# to [62670e998ad85120543b4c4d96eb8c4d85363ab3]
#
# patch "packages/vte/vte.inc"
# from [695b3ba40c29481f179d025379ad74da6577664b]
# to [863acadee923ffdfe020719fff0419292035e52e]
#
# patch "packages/vte/vte_0.16.9.bb"
# from [c930d8d34a3c5132f815de63792d7e7cea7195ee]
# to [71f52484bb2f0ca15b87f47ffa57f655d4fb08b2]
#
# patch "packages/xoo/xoo_svn.bb"
# from [f8b0b32f636f02a8b0d654f47abc6342070b8da4]
# to [35f551e76ef5e61eb58905109dfd8a57d676dcbf]
#
# patch "site/arm-linux-uclibc"
# from [94f267f4c0c4331759de49a8fee575984350b930]
# to [ec92512a83b5986fb0052e62aec4fd766fe519c7]
#
============================================================
--- packages/libsexy/files/libsexy-pkgconfig-fixes.patch e5931663a5d7b15ab427404822b3ef7e492a63ed
+++ packages/libsexy/files/libsexy-pkgconfig-fixes.patch e5931663a5d7b15ab427404822b3ef7e492a63ed
@@ -0,0 +1,15 @@
+Index: libsexy-0.1.11/libsexy.pc.in
+===================================================================
+--- libsexy-0.1.11.orig/libsexy.pc.in 2005-11-10 10:21:18.000000000 +0000
++++ libsexy-0.1.11/libsexy.pc.in 2008-03-05 14:36:39.000000000 +0000
+@@ -6,7 +6,8 @@
+ Name: libsexy
+ Description: Doing naughty things to good widgets
+ Version: @VERSION@
+-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
+-Cflags: -I${includedir} @PACKAGE_CFLAGS@
+
++Requires: pango glib-2.0 gtk+-2.0 libxml
++Libs: -L${libdir} -lsexy
++Cflags: -I${includedir}
+
============================================================
--- packages/libxslt/libxslt_1.1.22.bb 79128c5d67c70cbfa31d1f46637bcb63e408194e
+++ packages/libxslt/libxslt_1.1.22.bb 79128c5d67c70cbfa31d1f46637bcb63e408194e
@@ -0,0 +1,28 @@
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2 (>=2.6.27)"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+# Something is wrong inside configure.ac, so we need to resort to sed in this stage :(
+# Koen - 20080305
+do_compile_append() {
+ sed -i -e s:-L${STAGING_LIBDIR}::g libexslt.pc
+ sed -i -e s:-L${STAGING_LIBDIR}::g libxslt.pc
+}
+
+do_stage () {
+ autotools_stage_all
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
============================================================
--- packages/vte/files/vte-pkgconfig-fixes.patch c3812437766ebd9403b28e7a4c06406c02369202
+++ packages/vte/files/vte-pkgconfig-fixes.patch c3812437766ebd9403b28e7a4c06406c02369202
@@ -0,0 +1,47 @@
+Index: vte-0.16.9/configure.in
+===================================================================
+--- vte-0.16.9.orig/configure.in 2007-09-17 23:07:18.000000000 +0100
++++ vte-0.16.9/configure.in 2008-03-05 15:59:04.000000000 +0000
+@@ -381,8 +381,6 @@
+
+ # Search for the required modules.
+ PKG_CHECK_MODULES(VTE,[$wantedmodules])
+-NEEDEDPACKAGES="$wantedmodules"
+-AC_SUBST(NEEDEDPACKAGES)
+
+ # Check for various optional functions within those modules
+ save_CFLAGS="$CFLAGS"
+@@ -403,10 +401,12 @@
+
+ # Require Freetype2. First see if there is suitable pkgconfig file...
+ PKG_CHECK_EXISTS(freetype2 >= 6.1.0,
+- [PKG_CHECK_MODULES(FT2, freetype2)], [
++ [PKG_CHECK_MODULES(FT2, freetype2)
++ wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [
+ # We use our local copy of the macro because packages of
+ # freetype's development files don't always include the proper macro.
+- VTE_CHECK_FT2(6.1.0,,
++ VTE_CHECK_FT2(6.1.0,[
++ wantedmodules="$wantedmodules freetype2 >= 6.1.0" ],
+ [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])])
+
+ # Temporarily pull in the Freetype cflags and libs for checking what's
+@@ -508,6 +508,8 @@
+ CFLAGS="$savecflags"
+ CPPFLAGS="$savecppflags"
+
++NEEDEDPACKAGES="$wantedmodules"
++AC_SUBST(NEEDEDPACKAGES)
+
+ wcs_funcs_includes="
+ #ifdef HAVE_STRING_H
+Index: vte-0.16.9/vte.pc.in
+===================================================================
+--- vte-0.16.9.orig/vte.pc.in 2007-02-26 21:05:19.000000000 +0000
++++ vte-0.16.9/vte.pc.in 2008-03-05 15:56:37.000000000 +0000
+@@ -11,4 +11,4 @@
+ Requires: @NEEDEDPACKAGES@
+ Libs: -L${libdir} -lvte @OTHERLIBS@
+ Libs.private: @FT2_LIBS@
+-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@
++Cflags: -I${includedir} @OTHERCFLAGS@
============================================================
--- packages/xserver-common/xserver-common_1.22.bb 14f7d103bf373a302fc67211bc1c91f71605d7fb
+++ packages/xserver-common/xserver-common_1.22.bb 14f7d103bf373a302fc67211bc1c91f71605d7fb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko-versions.inc 340506c9f1360260d8ad4ca3914b04642d150348
+++ conf/distro/include/angstrom-2007-for-openmoko-versions.inc 6d3aaaaa7a79cacb60e353fc0bd6e8a27dc724c3
@@ -1111,8 +1111,8 @@ PREFERRED_VERSION_libxsettings-client ?=
PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
PREFERRED_VERSION_libxsettings ?= "0.11"
PREFERRED_VERSION_libxsettings-client ?= "0.17"
-PREFERRED_VERSION_libxslt ?= "1.1.21"
-PREFERRED_VERSION_libxslt-native ?= "1.1.21"
+PREFERRED_VERSION_libxslt ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.22"
PREFERRED_VERSION_libxt ?= "1.0.5"
PREFERRED_VERSION_libxtrap ?= "1.0.0"
PREFERRED_VERSION_libxtst ?= "1.0.3"
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc 01ee3170eaa5eed037d9883335321e74296e2d19
+++ conf/distro/include/angstrom-2008-preferred-versions.inc 4df38dd4bd7877c6cda9662121aa501342783f9b
@@ -1,5 +1,5 @@ PREFERRED_VERSION_busybox = "1.9.1"
PREFERRED_VERSION_busybox = "1.9.1"
-PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_dbus = "1.1.20"
PREFERRED_VERSION_glib-2.0 = "2.15.6"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
============================================================
--- conf/distro/include/sane-srcrevs.inc d67a23a7afbb9f344b8a06ad56a59f59f0f95d05
+++ conf/distro/include/sane-srcrevs.inc cee3f2f2e6478f02a5022c31afb8da91f4680f4a
@@ -154,5 +154,5 @@ SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
-SRCREV_pn-xoo ?= "1623"
+SRCREV_pn-xoo ?= "1971"
============================================================
--- contrib/angstrom/build-release.sh b708ec70fd4e4e0c2756d122aa95b1d653019a9e
+++ contrib/angstrom/build-release.sh ba8f992bfe8e6c725b91b12fbe667c9f9423659b
@@ -5,6 +5,22 @@ do_build() {
do_build() {
echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+ if [ $DO_UCLIBC = 1 ]
+ then
+ BUILD_MODE="uclibc"
+ echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+
+ for target in $BUILD_TARGETS
+ do
+ bitbake $target && do_report_success
+ done
+ fi
+
BUILD_MODE="glibc"
if [ "$BUILD_CLEAN" != "" ]
then
@@ -15,22 +31,6 @@ do_build() {
do
bitbake $target && do_report_success
done
-
- if [ $DO_UCLIBC = 1 ]
- then
- BUILD_MODE="uclibc"
- echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
-
- if [ "$BUILD_CLEAN" != "" ]
- then
- bitbake -c clean $BUILD_CLEAN
- fi
-
- for target in $BUILD_TARGETS
- do
- bitbake $target && do_report_success
- done
- fi
}
do_report_success() {
@@ -79,7 +79,7 @@ do
do
BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
- BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image"
+ BUILD_TARGETS="initramfs-bootmenu-image base-image console-image minimal-gpe-image x11-image"
do_build
done
============================================================
--- packages/apmd/files/90-wifi-off dd2b60322fc6d9136495d7c41f7c1f9e73ed8937
+++ packages/apmd/files/90-wifi-off e98ddd9efd82319c1c9c5b627403f60431827290
@@ -1,9 +1,9 @@
#!/bin/sh
#Author: Rolf Leggewie
#
# turn off wifi cards before suspend so they are fully reloaded upon resume
-wifislot = `pccardctl ls|egrep '(hostap|orinoco)'|cut -f 2 -d " "`
+wifislot = `pccardctl ls|egrep '(hostap|orinoco|libertas)'|cut -f 2 -d " "`
if test $wifislot
then
for slot in $wifislot; do
============================================================
--- packages/libsexy/libsexy.inc 424dc70640ac7ef7e37a4ade193b1b68ee41b529
+++ packages/libsexy/libsexy.inc bb7627ce4dd6e965c92b807b73ce50885842782e
@@ -5,7 +5,8 @@ DEPENDS = "gtk+ enchant libxml2"
DEPENDS = "gtk+ enchant libxml2"
-SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \
+ file://libsexy-pkgconfig-fixes.patch;patch=1"
inherit autotools pkgconfig
============================================================
--- packages/libsexy/libsexy_0.1.11.bb fea8d167b7e7ad5419021a08a604bf8d7af3166f
+++ packages/libsexy/libsexy_0.1.11.bb a76f7dce9c8ab42df42de99cb8a9b523bb2f18a2
@@ -1,2 +1,2 @@ require libsexy.inc
require libsexy.inc
+PR = "r1"
-PR = "r0"
============================================================
--- packages/mtd/mtd-utils_1.0.0+git.bb 7eddd005976dfff21ab5df1d7f4010a0cb36c45a
+++ packages/mtd/mtd-utils_1.0.0+git.bb 84c980d81b31831e212ab06f383190f75f5c49f6
@@ -36,12 +36,12 @@ do_install () {
do_install () {
install -d ${D}${bindir}
- install -d ${D}${includedir}
+ install -d ${D}${includedir}/mtd
for binary in ${mtd_utils}; do
install -m 0755 $binary ${D}${bindir}
done
for f in ${S}/include/mtd/*.h; do
- install -m 0644 $f ${D}${includedir}
+ install -m 0644 $f ${D}${includedir}/mtd
done
}
============================================================
--- packages/mtd/mtd-utils_1.1.0.bb 55322b9b44a9887ed3b3f6a0dc04916c921b45f7
+++ packages/mtd/mtd-utils_1.1.0.bb 62670e998ad85120543b4c4d96eb8c4d85363ab3
@@ -33,12 +33,12 @@ do_install () {
do_install () {
install -d ${D}${bindir}
- install -d ${D}${includedir}
+ install -d ${D}${includedir}/mtd
for binary in ${mtd_utils}; do
install -m 0755 $binary ${D}${bindir}
done
for f in ${S}/include/mtd/*.h; do
- install -m 0644 $f ${D}${includedir}
+ install -m 0644 $f ${D}${includedir}/mtd
done
}
============================================================
--- packages/vte/vte.inc 695b3ba40c29481f179d025379ad74da6577664b
+++ packages/vte/vte.inc 863acadee923ffdfe020719fff0419292035e52e
@@ -5,6 +5,8 @@ inherit gnome
inherit gnome
+SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
+
EXTRA_OECONF = "--disable-gtk-doc"
do_stage() {
============================================================
--- packages/vte/vte_0.16.9.bb c930d8d34a3c5132f815de63792d7e7cea7195ee
+++ packages/vte/vte_0.16.9.bb 71f52484bb2f0ca15b87f47ffa57f655d4fb08b2
@@ -1,2 +1,2 @@ require vte.inc
require vte.inc
+PR = "r4"
-PR = "r3"
============================================================
--- packages/xoo/xoo_svn.bb f8b0b32f636f02a8b0d654f47abc6342070b8da4
+++ packages/xoo/xoo_svn.bb 35f551e76ef5e61eb58905109dfd8a57d676dcbf
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "Xoo is a GTK2 based graphical wrapper around a windowed X Server. \
It is intended for embedded developers that want to simulate a target device \
(with an accurate display size, working hardware buttons, etc) on a desktop machine."
HOMEPAGE = "http://projects.o-hand.com/xoo"
LICENSE = "GPL"
-DEPENDS = "virtual/libx11 libxtst gtk+ libglade"
+DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat"
PV = "0.7+svnr${SRCREV}"
PR = "r1"
============================================================
--- site/arm-linux-uclibc 94f267f4c0c4331759de49a8fee575984350b930
+++ site/arm-linux-uclibc ec92512a83b5986fb0052e62aec4fd766fe519c7
@@ -1,9 +1,10 @@ ac_cv_func_posix_getpwuid_r=${ac_cv_func
ac_cv_func_getpgrp_void=yes
ac_cv_func_setpgrp_void=yes
ac_cv_func_setgrent_void=yes
ac_cv_func_malloc_0_nonnull=yes
ac_cv_func_malloc_works=yes
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
ac_cv_func_setvbuf_reversed=no
ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
#
# mt diff -ra064a0293b3a138710553a3fa279c7f690061da8 -r05ad3485b42ecb00f88755641322f85ba7842784
#
#
#
# patch "conf/distro/chinook-compat.conf"
# from [cc908008b4aa26b9b4c0e937044d55dd7905f01d]
# to [ef075089c0bffc9cb8f4e103e1aaccbb75ac73de]
#
============================================================
--- conf/distro/chinook-compat.conf cc908008b4aa26b9b4c0e937044d55dd7905f01d
+++ conf/distro/chinook-compat.conf ef075089c0bffc9cb8f4e103e1aaccbb75ac73de
@@ -145,7 +145,7 @@ PREFERRED_VERSION_gnutls = "1.4.5"
PREFERRED_VERSION_libsoup = "2.2.7"
PREFERRED_VERSION_libglade = "2.4.2"
PREFERRED_VERSION_gnutls = "1.4.5"
-PREFERRED_VERSION_libgpg-error = "1.0"
+PREFERRED_VERSION_libgpg-error = "1.4"
PREFERRED_VERSION_libgcrypt = "1.2.3"
PREFERRED_VERSION_gpe-scap = "1.3"
@@ -164,12 +164,15 @@ PREFERRED_PROVIDER_virtual/javac-native
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_VERSION_classpath = "0.97"
+
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
# Does not compile with the CodeSourcery compiler .. :(
-PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
-PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
+#PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
+#PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120"
# WARNING: If you change these values after the respective package has
# been built the change will have no effect. Edit the package's file in
More information about the Openembedded-commits
mailing list