From ba27083937da9c8aa927e3d5255afb35b90fc062 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 5 Mar 2008 15:06:15 +0000
Subject: pixman: upgraded to 0.9.6

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3943 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../dont-copy-unused-bits-to-alpha-channel.patch   | 29 ----------------------
 meta/packages/xorg-lib/pixman_0.9.5.bb             |  6 -----
 meta/packages/xorg-lib/pixman_0.9.6                |  6 +++++
 3 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 meta/packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
 delete mode 100644 meta/packages/xorg-lib/pixman_0.9.5.bb
 create mode 100644 meta/packages/xorg-lib/pixman_0.9.6

(limited to 'meta/packages')

diff --git a/meta/packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch b/meta/packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
deleted file mode 100644
index 05fe829a8..000000000
--- a/meta/packages/xorg-lib/pixman-0.9.5/dont-copy-unused-bits-to-alpha-channel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Carl Worth <cworth@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())
-
diff --git a/meta/packages/xorg-lib/pixman_0.9.5.bb b/meta/packages/xorg-lib/pixman_0.9.5.bb
deleted file mode 100644
index 518308416..000000000
--- a/meta/packages/xorg-lib/pixman_0.9.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-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"
diff --git a/meta/packages/xorg-lib/pixman_0.9.6 b/meta/packages/xorg-lib/pixman_0.9.6
new file mode 100644
index 000000000..518308416
--- /dev/null
+++ b/meta/packages/xorg-lib/pixman_0.9.6
@@ -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"
-- 
cgit v1.2.3