[oe-commits] org.oe.dev merge of '44cb388c967771c3afb8acffa545cc8473c203a9'
xora commit
openembedded-commits at lists.openembedded.org
Wed Mar 5 17:11:29 UTC 2008
merge of '44cb388c967771c3afb8acffa545cc8473c203a9'
and '795685d9c4cce2768321f029142a0224520964b7'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: a064a0293b3a138710553a3fa279c7f690061da8
ViewMTN: http://monotone.openembedded.org/revision/info/a064a0293b3a138710553a3fa279c7f690061da8
Files:
1
packages/apmd/files/90-wifi-off
packages/vte/files
packages/vte/files/vte-pkgconfig-fixes.patch
packages/xserver-common/xserver-common_1.22.bb
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
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
Diffs:
#
# mt diff -r44cb388c967771c3afb8acffa545cc8473c203a9 -ra064a0293b3a138710553a3fa279c7f690061da8
#
#
#
# patch "packages/apmd/files/90-wifi-off"
# from [dd2b60322fc6d9136495d7c41f7c1f9e73ed8937]
# to [e98ddd9efd82319c1c9c5b627403f60431827290]
#
============================================================
--- 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
#
# mt diff -r795685d9c4cce2768321f029142a0224520964b7 -ra064a0293b3a138710553a3fa279c7f690061da8
#
#
#
# add_dir "packages/vte/files"
#
# 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 "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]
#
============================================================
--- 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"
============================================================
--- 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"
More information about the Openembedded-commits
mailing list