[oe-commits] org.oe.dev merge of '2690e38f2d62247f95e1eb15274c21741004c97e'
oe commit
openembedded-commits at lists.openembedded.org
Sun Oct 7 12:49:32 UTC 2007
merge of '2690e38f2d62247f95e1eb15274c21741004c97e'
and '87e7a524e83ef079ad7118cfaeac8180944da275'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: b6faf2a6dc98242794af36b6508ba20768cf5c33
ViewMTN: http://monotone.openembedded.org/revision/info/b6faf2a6dc98242794af36b6508ba20768cf5c33
Files:
1
packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch
conf/distro/angstrom-2008.1.conf
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/machine/include/zaurus-2.6.inc
packages/linux/linux-handhelds-2.6.inc
packages/rxvt-unicode/rxvt-unicode_7.9.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/llvm/llvm-native_2.0.bb
packages/llvm/llvm-native_2.1.bb
conf/checksums.ini
packages/icu/icu-3.6.inc
packages/llvm/llvm-gcc4-cross_svn.bb
packages/openmoko2/openmoko-sound-system2/session
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
Diffs:
#
# mt diff -r2690e38f2d62247f95e1eb15274c21741004c97e -rb6faf2a6dc98242794af36b6508ba20768cf5c33
#
#
#
# add_file "packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch"
# content [2ccfaa43986522f20a4d600872a7689d970b8c64]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [aa3a5caf95a0bb29ce59432c8870f9fceb2776fc]
# to [81bb16cb2088bddf29b51eba079066a6b5b95d68]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
# from [d71fcfba9c26f2bea8c29b29484b3c8788baced4]
# to [f0d0e9e8047b09eef4e513465a8e27652b9757d0]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [7baf3e010a9649ace2bc8172df240209ae4c83f0]
# to [6fd05921765dc1975a082049180e563ef15d17ae]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [81ad97e2eba4d17f9cb187c2c6f0a9b9383fbb8c]
# to [2f9c7e9494a48ee43b1aef28f54d40d6fad1f496]
#
# patch "packages/rxvt-unicode/rxvt-unicode_7.9.bb"
# from [ce13b2bc186b619fe7cb9b03cb1ab9fc5f27c115]
# to [a758bd14abdf6e8f4ec493eb7b6c485f9ab5ccc7]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [7f2e709c62424285446c1f454d2bd609e6ab405d]
# to [bc48ac913bf5619e2ef613e1dcc2f78c81bcd221]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch 2ccfaa43986522f20a4d600872a7689d970b8c64
+++ packages/xorg-xserver/xserver-kdrive/gumstix-kmode.patch 2ccfaa43986522f20a4d600872a7689d970b8c64
@@ -0,0 +1,23 @@
+--- /tmp/kmode.c 2007-10-07 11:49:52.000000000 +0200
++++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2007-10-07 11:51:57.962045000 +0200
+@@ -119,7 +119,19 @@
+ 0, 0, 0, KdSyncNegative, /* 59.940 */
+ },
+
+-
++
++/* gumstix console-vx */
++ { 480, 272, 60, 0, /* VESA */
++ 0, 0, 0, KdSyncNegative, /* 31.469 */
++ 0, 0, 0, KdSyncNegative, /* 59.940 */
++ },
++
++ { 272, 480, 60, 0, /* VESA */
++ 0, 0, 0, KdSyncNegative, /* 31.469 */
++ 0, 0, 0, KdSyncNegative, /* 59.940 */
++ },
++
++
+ /* 800x600 modes */
+ { 800, 600, 85, 56250, /* VESA */
+ 32, 152, 248, KdSyncPositive, /* 53.674 */
============================================================
--- conf/distro/angstrom-2008.1.conf aa3a5caf95a0bb29ce59432c8870f9fceb2776fc
+++ conf/distro/angstrom-2008.1.conf 81bb16cb2088bddf29b51eba079066a6b5b95d68
@@ -8,7 +8,7 @@
# Use Xorg R7.3 release
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
# This is a testbed for unstable and/or untested things, while angstrom-2007.1
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.3.inc d71fcfba9c26f2bea8c29b29484b3c8788baced4
+++ conf/distro/include/preferred-xorg-versions-X11R7.3.inc f0d0e9e8047b09eef4e513465a8e27652b9757d0
@@ -71,7 +71,7 @@ PREFERRED_VERSION_xdm ?= "1.1.6"
PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
PREFERRED_VERSION_xditview ?= "1.0.1"
PREFERRED_VERSION_xdm ?= "1.1.6"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.1"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
PREFERRED_VERSION_xdriinfo ?= "1.0.2"
PREFERRED_VERSION_xedit ?= "1.0.2"
PREFERRED_VERSION_xev ?= "1.0.1"
============================================================
--- conf/machine/include/zaurus-2.6.inc 7baf3e010a9649ace2bc8172df240209ae4c83f0
+++ conf/machine/include/zaurus-2.6.inc 6fd05921765dc1975a082049180e563ef15d17ae
@@ -21,8 +21,9 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
PCMCIA_MANAGER ?= "pcmciautils"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
============================================================
--- packages/linux/linux-handhelds-2.6.inc 81ad97e2eba4d17f9cb187c2c6f0a9b9383fbb8c
+++ packages/linux/linux-handhelds-2.6.inc 2f9c7e9494a48ee43b1aef28f54d40d6fad1f496
@@ -1,9 +1,9 @@ COMPATIBLE_HOST = "arm.*-linux"
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE ?= '(asus620|asus730|aximx50|aximx50v|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcuniversal|htcwallaby|hx4700|looxc550|jornada56x|magician|rx1950|rx3000)'
+COMPATIBLE_MACHINE ?= '(asus620|asus730|aximx50|aximx50v|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|looxc550|jornada56x|magician|rx1950|rx3000)'
# SRC_URI *must* be overriden in includer, but this is a good reference
SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
============================================================
--- packages/rxvt-unicode/rxvt-unicode_7.9.bb ce13b2bc186b619fe7cb9b03cb1ab9fc5f27c115
+++ packages/rxvt-unicode/rxvt-unicode_7.9.bb a758bd14abdf6e8f4ec493eb7b6c485f9ab5ccc7
@@ -13,7 +13,7 @@ SRC_URI = "http://dist.schmorp.de/rxvt-u
SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
file://xwc.patch;patch=1 \
file://signedchar.patch;patch=1"
-PR = "r0"
+PR = "r1"
inherit autotools update-alternatives
@@ -23,6 +23,10 @@ CFLAGS_append = " -fpermissive"
CFLAGS_append = " -fpermissive"
+# This is necessary so that the "tic" command executed during the install can
+# link with the correct libary in staging.
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
+
EXTRA_OECONF = "--enable-menubar --enable-xim \
--enable-utmp --enable-wtmp --enable-lastlog \
--disable-strings --with-term=rxvt --enable-keepscrolling \
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb 7f2e709c62424285446c1f454d2bd609e6ab405d
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb bc48ac913bf5619e2ef613e1dcc2f78c81bcd221
@@ -1,9 +1,9 @@ PE = "1"
require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r17"
+PR = "r19"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -19,7 +19,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
file://w100.patch;patch=1 \
file://w100-autofoo.patch;patch=1 \
file://w100-fix-offscreen-bmp.patch;patch=1 \
- "
+ file://kdrive-1.3-18bpp.patch;patch=1 \
+ file://gumstix-kmode.patch;patch=1 \
+"
S = "${WORKDIR}/xorg-server-${PV}"
#
# mt diff -r87e7a524e83ef079ad7118cfaeac8180944da275 -rb6faf2a6dc98242794af36b6508ba20768cf5c33
#
#
#
# rename "packages/llvm/llvm-native_2.0.bb"
# to "packages/llvm/llvm-native_2.1.bb"
#
# patch "conf/checksums.ini"
# from [6abbcaedc888cd8411607755f104327fcf5b1173]
# to [dc3823b4ab32da813380365a763fa30187f934f8]
#
# patch "packages/icu/icu-3.6.inc"
# from [98b0ef0d520fbacb6e1ea1a8152dd79bd03f8e3e]
# to [7932b55947e36c2c609908ef5686b177078bf8df]
#
# patch "packages/llvm/llvm-gcc4-cross_svn.bb"
# from [884f40c0da53dcbbb5f45f7872fdee34c10d45d6]
# to [41c96d704f8797712c3b1ae15dc6094b60a15cea]
#
# patch "packages/llvm/llvm-native_2.1.bb"
# from [6f47db9782233e0bc95af6f34d8e61983666454e]
# to [72cba3aaca39ab251f345c5d690060bbde77dc01]
#
# patch "packages/openmoko2/openmoko-sound-system2/session"
# from [440f08023fd2111ebd3ab7b3914fba30c36e0d59]
# to [963e0a668b32334f079f421e73b9a68bc5a9cfc5]
#
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
# from [2bbb752f84f5cd5d332df9a98b5ab1922ccc2320]
# to [6882dc76c7e1f498b428a3669944461e1b16a822]
#
# patch "packages/openmoko2/openmoko-sound-theme-standard2_svn.bb"
# from [8d7ac8b5a6221ab35c4c0a274a2edef6f114e8a9]
# to [b2778eab90cb33248599b19697944e169304f641]
#
============================================================
--- conf/checksums.ini 6abbcaedc888cd8411607755f104327fcf5b1173
+++ conf/checksums.ini dc3823b4ab32da813380365a763fa30187f934f8
@@ -6406,6 +6406,10 @@ sha256=17b82323151925ff5a7ad09a21781a0fa
md5=866ba97420f5ce978b6a6b1cb4338890
sha256=17b82323151925ff5a7ad09a21781a0fa50ead4b87a339cee262271e4ededa13
+[http://llvm.org/releases/2.1/llvm-2.1.tar.gz]
+md5=b930e7213b37acc934d0d163cf13af18
+sha256=8cabd422f249ada736d864fc8a1f4d14aabefacb6f860c9beefbc53f93e0f96c
+
[http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-0.9.3.tar.gz]
md5=9f54fc8a40e26edd61ce67902b315a66
sha256=07675051b60343820b235a818f2c2d528b86d2a19c2f56833213e3f574f9cd1a
============================================================
--- packages/icu/icu-3.6.inc 98b0ef0d520fbacb6e1ea1a8152dd79bd03f8e3e
+++ packages/icu/icu-3.6.inc 7932b55947e36c2c609908ef5686b177078bf8df
@@ -5,7 +5,7 @@ S = "${WORKDIR}/icu/source"
S = "${WORKDIR}/icu/source"
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
do_configure() {
libtoolize --force
============================================================
--- packages/llvm/llvm-gcc4-cross_svn.bb 884f40c0da53dcbbb5f45f7872fdee34c10d45d6
+++ packages/llvm/llvm-gcc4-cross_svn.bb 41c96d704f8797712c3b1ae15dc6094b60a15cea
@@ -1,10 +1,10 @@ DEPENDS = "llvm-native"
DESCRIPTION = "The Low Level Virtual Machine - gcc4 frontend"
HOMEPAGE = "http://llvm.org"
LICENSE = "various"
DEPENDS = "llvm-native"
-PV = "2.0+svnr${SRCREV}"
+PV = "2.1+svnr${SRCREV}"
inherit autotools cross
============================================================
--- packages/llvm/llvm-native_2.0.bb 6f47db9782233e0bc95af6f34d8e61983666454e
+++ packages/llvm/llvm-native_2.1.bb 72cba3aaca39ab251f345c5d690060bbde77dc01
@@ -1,6 +1,6 @@ require llvm.inc
require llvm.inc
-SRC_URI = "http://llvm.org/releases/2.0/llvm-${PV}.tar.gz"
+SRC_URI = "http://llvm.org/releases/2.1/llvm-${PV}.tar.gz"
inherit native
============================================================
--- packages/openmoko2/openmoko-sound-system2/session 440f08023fd2111ebd3ab7b3914fba30c36e0d59
+++ packages/openmoko2/openmoko-sound-system2/session 963e0a668b32334f079f421e73b9a68bc5a9cfc5
@@ -22,7 +22,7 @@ load-module module-x11-bell sample=x11-b
load-module module-x11-bell sample=x11-bell
# Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
============================================================
--- packages/openmoko2/openmoko-sound-system2_0.1.0.bb 2bbb752f84f5cd5d332df9a98b5ab1922ccc2320
+++ packages/openmoko2/openmoko-sound-system2_0.1.0.bb 6882dc76c7e1f498b428a3669944461e1b16a822
@@ -12,7 +12,7 @@ RPROVIDES = "openmoko-sound-system"
"
RREPLACES = "openmoko-sound-system"
RPROVIDES = "openmoko-sound-system"
-PR = "r1"
+PR = "r2"
inherit openmoko-base update-rc.d
============================================================
--- packages/openmoko2/openmoko-sound-theme-standard2_svn.bb 8d7ac8b5a6221ab35c4c0a274a2edef6f114e8a9
+++ packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b2778eab90cb33248599b19697944e169304f641
@@ -1,9 +1,9 @@ PV = "0.1+svnr${SRCREV}"
DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
SECTION = "openmoko/base"
RREPLACES = "openmoko-sound-theme-standard"
RPROVIDES = "openmoko-sound-theme-standard"
PV = "0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
inherit openmoko2 autotools
@@ -16,7 +16,7 @@ do_install() {
for i in *.mp3; do
cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
done
- for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
+ for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
done
}
More information about the Openembedded-commits
mailing list