[oe-commits] org.oe.dev merge of '19384222035eabe4e0ef0f06f73f2c03d05d00df'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sun Sep 9 06:08:25 UTC 2007
merge of '19384222035eabe4e0ef0f06f73f2c03d05d00df'
and '4729eb31f6fe3cce83429d33cadc1bd888d55396'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 824a2834a0da85846fd46c99800d62eb14ebe522
ViewMTN: http://monotone.openembedded.org/revision/info/824a2834a0da85846fd46c99800d62eb14ebe522
Files:
1
packages/xorg-lib/pixman-0.9.5
packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
packages/xorg-lib/pixman_0.9.5.bb
packages/tasks/task-openmoko-debug.bb
packages/tasks/task-openmoko-feed.bb
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
Diffs:
#
# mt diff -r19384222035eabe4e0ef0f06f73f2c03d05d00df -r824a2834a0da85846fd46c99800d62eb14ebe522
#
#
# no changes
#
#
# mt diff -r4729eb31f6fe3cce83429d33cadc1bd888d55396 -r824a2834a0da85846fd46c99800d62eb14ebe522
#
#
#
# add_dir "packages/xorg-lib/pixman-0.9.5"
#
# add_file "packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch"
# content [f9ead67f673f8b94031c97dc5ddf241cfdc1f1f9]
#
# add_file "packages/xorg-lib/pixman_0.9.5.bb"
# content [a1d9ac4b531840f65e199d595e964afe0302e838]
#
# patch "packages/tasks/task-openmoko-debug.bb"
# from [194fcf90f766fbdbc057be3fec031b632534283d]
# to [6f16b58858e9a8858a34530bccc7db757e1303ab]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [01ec7973326fd891a5d4f0027ab7b8e779582db2]
# to [3e0c4deba5c39f74c4f4c2cfd0dc885a7958ef28]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [86e1b089b2f42f09683cf1ca12c13536f5e4392e]
# to [69820edb24da782a8f84fb3676ee676aa0293a7a]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [e8a1f377f5a46ff991e1c83c538827b48f5f3229]
# to [9942a34a0ec3c2a5eca955706e5a9bf22f0b22ee]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
# from [6006f4a33e9017387993d00c8f97b256f0f29b1f]
# to [5d4c1648cee1599f242309505ed0ccb3ea412b96]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [a073b2cf6fabe9e21d85dd47d1a5d7235eec93ac]
# to [f1d269441b9c1ea3d35fa9d2311f41849ec9952e]
#
============================================================
--- packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch f9ead67f673f8b94031c97dc5ddf241cfdc1f1f9
+++ packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch f9ead67f673f8b94031c97dc5ddf241cfdc1f1f9
@@ -0,0 +1,29 @@
+From: Carl Worth <cworth at cworth.org>
+
+Don't copy unused bits to an alpha channel
+
+This bug was identified by cairo's rgb24-ignore-alpha test which
+blends RGB24 over ARGB32 and notices that "alpha" values are
+making it from the source to the destination.
+
+Index: a/pixman/pixman-pict.c
+===================================================================
+--- a/pixman/pixman-pict.c b8b7b767b3ed1fc57ba177c38187e1eb3daf4de8
++++ b/pixman/pixman-pict.c c7d73fc532c2da313041906ac0f48dba1b10d3bc
+@@ -1778,7 +1778,6 @@ pixman_image_composite (pixman_op_t
+ break;
+ case PIXMAN_x8r8g8b8:
+ switch (pDst->bits.format) {
+- case PIXMAN_a8r8g8b8:
+ case PIXMAN_x8r8g8b8:
+ #ifdef USE_MMX
+ if (pixman_have_mmx())
+@@ -1790,7 +1789,6 @@ pixman_image_composite (pixman_op_t
+ }
+ case PIXMAN_x8b8g8r8:
+ switch (pDst->bits.format) {
+- case PIXMAN_a8b8g8r8:
+ case PIXMAN_x8b8g8r8:
+ #ifdef USE_MMX
+ if (pixman_have_mmx())
+
============================================================
--- packages/xorg-lib/pixman_0.9.5.bb a1d9ac4b531840f65e199d595e964afe0302e838
+++ packages/xorg-lib/pixman_0.9.5.bb a1d9ac4b531840f65e199d595e964afe0302e838
@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Library for lowlevel pixel operations"
+DEPENDS = "virtual/libx11"
+
+SRC_URI += "file://dont-copy-unused-bits-to-alpha-channel.patch;patch=1"
============================================================
--- packages/tasks/task-openmoko-debug.bb 194fcf90f766fbdbc057be3fec031b632534283d
+++ packages/tasks/task-openmoko-debug.bb 6f16b58858e9a8858a34530bccc7db757e1303ab
@@ -1,7 +1,7 @@
-DESCRIPTION = "OpenMoko: Debugging Tools"
+DESCRIPTION = "OpenMoko: Debugging and Benchmarking Tools"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r57"
+PR = "r58"
inherit task
@@ -11,26 +11,27 @@ RDEPENDS_task-openmoko-debug = "\
alsa-utils-aconnect \
alsa-utils-alsamixer \
alsa-utils-speakertest \
- madplay \
- vorbis-tools \
- strace \
- ltrace \
+ bonnie++ \
+ cu \
+ dbench \
+ fbgrab \
+ fstests \
gdb \
gdbserver \
+ madplay \
+ lrzsz \
+ lsof \
+ ltrace \
+ memtester \
+# sensors-i2cdetect sensors-i2cdump sensors-i2cset \
+ strace \
tcpdump \
tslib-calibrate \
tslib-tests \
- fbgrab \
- fstests \
- lsof \
- lrzsz \
udev-utils \
usbutils \
uucp \
- cu \
-# sensors-i2cdetect sensors-i2cdump sensors-i2cset \
+ vorbis-tools \
+ x11perf \
xev \
- bonnie++ \
- memtester \
- dbench \
"
============================================================
--- packages/tasks/task-openmoko-feed.bb 01ec7973326fd891a5d4f0027ab7b8e779582db2
+++ packages/tasks/task-openmoko-feed.bb 3e0c4deba5c39f74c4f4c2cfd0dc885a7958ef28
@@ -1,13 +1,15 @@ LICENSE = "MIT"
DESCRIPTION = "OpenMoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
inherit task
RDEPENDS_task-openmoko-feed = "\
aspell enchant \
bluez-hcidump \
+ eet evas ecore embryo epsilon edje efreet emotion epdf \
+ exhibit edje-viewer \
gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \
ipkg-link \
kbdd \
@@ -17,11 +19,10 @@ RDEPENDS_task-openmoko-feed = "\
nano \
ntpclient ntp \
openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
- python \
- python-pygtk \
- python-pyserial \
+ python python-pygtk python-pyserial \
ruby \
timezones \
tor \
vnc \
"
+
============================================================
--- packages/xorg-xserver/xserver-kdrive-common.inc 86e1b089b2f42f09683cf1ca12c13536f5e4392e
+++ packages/xorg-xserver/xserver-kdrive-common.inc 69820edb24da782a8f84fb3676ee676aa0293a7a
@@ -92,11 +92,8 @@ KDRIVE_COMMON_PATCHES = " \
file://kmode.patch;patch=1 \
file://disable-apm.patch;patch=1 \
file://no-serial-probing.patch;patch=1 \
- file://kdrive-evdev.patch;patch=1 \
- file://kdrive-use-evdev.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1 \
file://enable-builtin-fonts.patch;patch=1 \
- file://disable-xf86-dga-xorgcfg.patch;patch=1 \
file://optional-xkb.patch;patch=1 \
file://enable-epson.patch;patch=1 \
file://enable-tslib.patch;patch=1 \
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb e8a1f377f5a46ff991e1c83c538827b48f5f3229
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 9942a34a0ec3c2a5eca955706e5a9bf22f0b22ee
@@ -12,6 +12,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
file://enable-xcalibrate.patch;patch=1 \
file://fbcompositesrc8888revnpx0565.patch;patch=1 \
file://kdrive-vidmemarea.patch;patch=1 \
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.2.0.bb 6006f4a33e9017387993d00c8f97b256f0f29b1f
+++ packages/xorg-xserver/xserver-kdrive_1.2.0.bb 5d4c1648cee1599f242309505ed0ccb3ea412b96
@@ -7,6 +7,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
file://enable-xcalibrate.patch;patch=1 \
file://w100.patch;patch=1 \
file://w100-fix-offscreen-bmp.patch;patch=1 \
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb a073b2cf6fabe9e21d85dd47d1a5d7235eec93ac
+++ packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb f1d269441b9c1ea3d35fa9d2311f41849ec9952e
@@ -7,6 +7,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
file://fix_default_mode.patch;patch=1 \
file://enable-xcalibrate.patch;patch=1 \
file://hide-cursor-and-ppm-root.patch;patch=1 \
More information about the Openembedded-commits
mailing list