[oe-commits] org.oe.dev merge of '294a7914d9ff32527dddf5266da757d7385372e7'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Aug 10 11:13:06 UTC 2007
merge of '294a7914d9ff32527dddf5266da757d7385372e7'
and '726f50fa46c4db4bf5fb2dc2f6390ca60337cdd0'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f92cc9b531a2b70cc6e5b390bdaa2a96dee683aa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f92cc9b531a2b70cc6e5b390bdaa2a96dee683aa
Files:
1
packages/openmoko2/openmoko-terminal2_1.0.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/musicpd/mpc_0.11.2.bb
packages/musicpd/mpd_0.11.2.bb
packages/musicpd/mpd_0.11.5.bb
packages/musicpd/mpc_0.12.0.bb
packages/musicpd/mpc_0.12.1.bb
packages/musicpd/mpd_svn.bb
packages/openmoko2/openmoko-common2_svn.bb
packages/openmoko2/openmoko-session2.bb
Diffs:
#
# mt diff -r294a7914d9ff32527dddf5266da757d7385372e7 -rf92cc9b531a2b70cc6e5b390bdaa2a96dee683aa
#
#
#
# patch "packages/openmoko2/openmoko-terminal2_1.0.0.bb"
# from [004503598ec2b6d3ed4f81cb2d826000ba15ad1e]
# to [8531e0d4c291c25ff4b4f7347aa4482504744c9a]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [d2388d51184156d1aec429601b0199f1af934529]
# to [eeb36e59b49d025119f1c675d7a876dc144a9de3]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [4f68087bab33a8806229c061aa719c9e47a35ce5]
# to [f577f4abd5a0266a816f433ba1f52d27966848b8]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [809cbe097eaad9b02cd18f06c813355b274c5d5a]
# to [c83be1216b1a852eff7f8d4ec37b350cce95f3b0]
#
============================================================
--- packages/openmoko2/openmoko-terminal2_1.0.0.bb 004503598ec2b6d3ed4f81cb2d826000ba15ad1e
+++ packages/openmoko2/openmoko-terminal2_1.0.0.bb 8531e0d4c291c25ff4b4f7347aa4482504744c9a
@@ -1,8 +1,11 @@ RDEPENDS += "mrxvt"
DESCRIPTION = "The OpenMoko Command Line Console"
SECTION = "openmoko/applications"
RDEPENDS += "mrxvt"
-PR = "r1"
+PR = "r2"
+RCONFLICTS = "openmoko-terminal"
+RREPLACES = "openmoko-terminal"
+
inherit openmoko2
SRC_URI = "file://openmoko-terminal.png \
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/Xserver d2388d51184156d1aec429601b0199f1af934529
+++ packages/xserver-kdrive-common/xserver-kdrive-common/Xserver eeb36e59b49d025119f1c675d7a876dc144a9de3
@@ -15,12 +15,12 @@ fi
if [ -f /usr/bin/Xomap ]; then
XSERVER=/usr/bin/Xomap
fi
-if [ -f /usr/bin/Xw100 ]; then
- XSERVER=Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
- XSERVER=Ximageon
-fi
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+fi
. /etc/profile
@@ -32,7 +32,7 @@ fallback_screen_arg() {
h=`echo $geom | awk '{ print $3 }'`
b=`echo $geom | awk '{ print $6 }'`
echo -n "${w}x${h}x${b}"
-}
+}
module_id() {
## used to read from assets, but sometimes assets is corrupted
@@ -59,35 +59,37 @@ case `module_id` in
# start off server in conventional location.
case `module_id` in
- "HP iPAQ H3100" | "HP iPAQ H3800")
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;
- "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
- ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
- "HP iPAQ H5400" | "HP iPAQ H2200")
- ARGS="$ARGS -dpi 100 -rgba rgb" ;;
- "HP iPAQ HX4700")
- ARGS="$ARGS -dpi 200" ;;
- "Ramses")
- # What is this "vt2" in aid of?
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
- # both 'Sharp-Collie' and just 'Collie' have been reported
- *Poodle)
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
- *Collie)
- ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270"
- ;;
- "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- ARGS="$ARGS -dpi 200 -rgba rgb" ;;
- "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
- ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
- "Simpad")
- ARGS="$ARGS -dpi 100 -rgba rgb" ;;
- "Generic OMAP1510/1610/1710")
- ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
- "Cellon C8000 Board")
- ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
- "HTC Universal")
- ARGS="$ARGS -dpi 225 -screen 480x640 at 270" ;;
+ "HP iPAQ H3100" | "HP iPAQ H3800")
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;
+ "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+ ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
+ "HP iPAQ H5400" | "HP iPAQ H2200")
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "HP iPAQ HX4700")
+ ARGS="$ARGS -dpi 200" ;;
+ "Ramses")
+ # What is this "vt2" in aid of?
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
+ # both 'Sharp-Collie' and just 'Collie' have been reported
+ *Poodle)
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
+ *Collie)
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270"
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -dpi 200 -rgba rgb" ;;
+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+ ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
+ "Simpad")
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Magician")
+ ARGS="$ARGS -dpi 142" ;;
+ "HTC Universal")
+ ARGS="$ARGS -dpi 225 -screen 480x640 at 270" ;;
"ARM-IntegratorCP" | "ARM-Versatile PB")
ARGS="$ARGS -rgba vrgb" ;;
"Compulab CM-x270")
@@ -101,7 +103,7 @@ case `module_id` in
*)
# Its a device we dont know about - in which case force
# kdrive to use the current framebuffer geometry otherwise
- # it will defualt to trying to achieve 1024x768
+ # it will defualt to trying to achieve 1024x768
S=`fallback_screen_arg`
ARGS="$ARGS -screen $S"
;;
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 4f68087bab33a8806229c061aa719c9e47a35ce5
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver f577f4abd5a0266a816f433ba1f52d27966848b8
@@ -15,12 +15,12 @@ fi
if [ -f /usr/bin/Xomap ]; then
XSERVER=/usr/bin/Xomap
fi
-if [ -f /usr/bin/Xw100 ]; then
- XSERVER=Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
- XSERVER=Ximageon
-fi
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+fi
. /etc/profile
@@ -32,7 +32,7 @@ fallback_screen_arg() {
h=`echo $geom | awk '{ print $3 }'`
b=`echo $geom | awk '{ print $6 }'`
echo -n "${w}x${h}x${b}"
-}
+}
module_id() {
## used to read from assets, but sometimes assets is corrupted
@@ -59,35 +59,37 @@ case `module_id` in
# start off server in conventional location.
case `module_id` in
- "HP iPAQ H3100" | "HP iPAQ H3800")
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;
- "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
- ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
- "HP iPAQ H5400" | "HP iPAQ H2200")
- ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
- "HP iPAQ HX4700")
- ARGS="$ARGS -br -dpi 200" ;;
- "Ramses")
- # What is this "vt2" in aid of?
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
- # both 'Sharp-Collie' and just 'Collie' have been reported
- *Poodle)
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
- *Collie)
- ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270"
- ;;
- "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
- "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
- ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
- "Simpad")
- ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
- "Generic OMAP1510/1610/1710")
- ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;;
- "Cellon C8000 Board")
- ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;; %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r726f50fa46c4db4bf5fb2dc2f6390ca60337cdd0 -rf92cc9b531a2b70cc6e5b390bdaa2a96dee683aa
#
#
#
# delete "packages/musicpd/mpc_0.11.2.bb"
#
# delete "packages/musicpd/mpd_0.11.2.bb"
#
# delete "packages/musicpd/mpd_0.11.5.bb"
#
# rename "packages/musicpd/mpc_0.12.0.bb"
# to "packages/musicpd/mpc_0.12.1.bb"
#
# patch "packages/musicpd/mpd_svn.bb"
# from [9e7edb243f26d9330c7157f043e53030877b1ba5]
# to [959dfc179254e580490251d58ab415e2bf869a5e]
#
# patch "packages/openmoko2/openmoko-common2_svn.bb"
# from [98d8c8b581dcfd5079b1d240bd737cd01254286a]
# to [13898cb7774ae7a674521a58eb62b930b1aef045]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [45984f14a8db3dfd4ede78052e7ed6bfebe0db4b]
# to [0610cd35d742d6cf43116eded09129d9323837f9]
#
============================================================
--- packages/musicpd/mpd_svn.bb 9e7edb243f26d9330c7157f043e53030877b1ba5
+++ packages/musicpd/mpd_svn.bb 959dfc179254e580490251d58ab415e2bf869a5e
@@ -1,25 +1,26 @@ DEPENDS = "libvorbis libogg libid3tag li
DESCRIPTION = "Music Player Daemon (mpd)"
HOMEPAGE = "http://www.musicpd.org"
SECTION = "console/multimedia"
LICENSE = "GPLv2"
DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
-SRCDATE = "20070120"
PV = "0.12.1+svn${SRCDATE}"
-PR = "r2"
+PR = "r0"
SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
- file://fix-mod-support.patch;patch=1;maxdate=20070302"
+ file://mpd/mpd.init"
# file://save-volume-state.patch;patch=1"
S = "${WORKDIR}/trunk"
-inherit autotools
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "mpd"
# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
# be built, instead we use the OE built versions which should be installed
# in staging - remove the --with and replace with --enable to use the local
# versions.
-EXTRA_OECONF = "--enable-ogg \
+EXTRA_OECONF = "\
+ --enable-ogg \
--with-id3tag-libraries=${STAGING_LIBDIR} \
--with-id3tag-includes=${STAGING_INCDIR} \
--with-mad-libraries=${STAGING_LIBDIR} \
============================================================
--- packages/openmoko2/openmoko-common2_svn.bb 98d8c8b581dcfd5079b1d240bd737cd01254286a
+++ packages/openmoko2/openmoko-common2_svn.bb 13898cb7774ae7a674521a58eb62b930b1aef045
@@ -1,7 +1,7 @@ PV = "0.0+svn${SRCDATE}"
DESCRIPTION = "Common files for the OpenMoko distribution"
SECTION = "openmoko/base"
PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r3"
inherit openmoko2
@@ -12,10 +12,11 @@ do_install() {
do_install() {
find ${WORKDIR} -name ".svn" | xargs rm -rf
- install -d ${D}${datadir}/openmoko/
+ install -d ${D}${datadir}
for i in ${dirs}; do
- cp -fpPR ${S}/$i ${D}${datadir}/openmoko/
+ cp -fpPR ${S}/$i ${D}${datadir}
done
}
+PACKAGE_ARCH = "all"
FILES_${PN} = "${datadir}"
============================================================
--- packages/openmoko2/openmoko-session2.bb 45984f14a8db3dfd4ede78052e7ed6bfebe0db4b
+++ packages/openmoko2/openmoko-session2.bb 0610cd35d742d6cf43116eded09129d9323837f9
@@ -1,10 +1,10 @@ RDEPENDS = "matchbox-common matchbox-app
DESCRIPTION = "Custom MB session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
-RDEPENDS+= "openmoko-common2 openmoko-today2 openmoko-dialer2"
+RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS = "openmoko-session"
-PR = "r28"
+PR = "r29"
SRC_URI = "file://etc"
S = ${WORKDIR}
@@ -29,3 +29,5 @@ gconftool-2 --config-source=xml::$D${sys
gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
}
+
+PACKAGE_ARCH = "all"
More information about the Openembedded-commits
mailing list