diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-07 13:37:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-07 13:37:10 +0000 |
| commit | 2d478aafe8e20986fe5329cc1ebdbe49461abed1 (patch) | |
| tree | a434887ee39e4759ba89ce0934427263c415ccaa /packages | |
| parent | 5a4d1ac56a5590c38c514ba8fa0fa2081c9da74d (diff) | |
| parent | 32e58b5cfad9dd0334676123b9cc1b915c404895 (diff) | |
merge of '53d5f0675c5830e564fb6c225499e149b8d5b836'
and '672d779f4a20adab617645d603796e2df04f86bf'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/popt/popt_1.14.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-lib/pixman/pixman-x888-565.patch | 68 | ||||
| -rw-r--r-- | packages/xorg-lib/pixman_0.11.8.bb | 3 |
3 files changed, 71 insertions, 2 deletions
diff --git a/packages/popt/popt_1.14.bb b/packages/popt/popt_1.14.bb index d78d8dc337..240ac52275 100644 --- a/packages/popt/popt_1.14.bb +++ b/packages/popt/popt_1.14.bb @@ -1,6 +1,6 @@ require popt.inc -DEPENDS = "gettext virtual/libintl" +DEPENDS = "gettext-native virtual/libintl" PR = "r1" diff --git a/packages/xorg-lib/pixman/pixman-x888-565.patch b/packages/xorg-lib/pixman/pixman-x888-565.patch new file mode 100644 index 0000000000..a458e045b8 --- /dev/null +++ b/packages/xorg-lib/pixman/pixman-x888-565.patch @@ -0,0 +1,68 @@ +commit 8507756d8868b8d8c7a149bd2427a04262638156 +Author: Vladimir Vukicevic <vladimir@slide.(none)> +Date: Sat Sep 6 17:46:52 2008 -0700 + + Add SRC x888x0565 C fast path + +diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c +index eeefa33..b5fb0ff 100644 +--- a/pixman/pixman-pict.c ++++ b/pixman/pixman-pict.c +@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op, + } + } + ++ ++void ++fbCompositeSrc_x888x0565 (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) ++{ ++ uint16_t *dstLine, *dst; ++ uint32_t *srcLine, *src, s; ++ int dstStride, srcStride; ++ uint16_t w; ++ ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); ++ fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); ++ ++ while (height--) ++ { ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; ++ ++ while (w--) ++ { ++ s = READ(pSrc, src++); ++ WRITE(pDst, dst, cvt8888to0565(s)); ++ dst++; ++ } ++ } ++} ++ + void + fbCompositeSrcAdd_8000x8000 (pixman_op_t op, + pixman_image_t * pSrc, +@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[] = + { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 }, + { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 }, + #endif ++ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 }, ++ { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrc_x888x0565, 0 }, + { PIXMAN_OP_IN, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcIn_8x8, 0 }, + { PIXMAN_OP_IN, PIXMAN_solid, PIXMAN_a8, PIXMAN_a8, fbCompositeSolidMaskIn_nx8x8, 0 }, + { PIXMAN_OP_NONE }, diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb index a66041da74..239684e71f 100644 --- a/packages/xorg-lib/pixman_0.11.8.bb +++ b/packages/xorg-lib/pixman_0.11.8.bb @@ -3,10 +3,11 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PR = "r3" +PR = "r4" SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ file://pixman-arm.patch;patch=1 \ + file://pixman-x888-565.patch;patch=1 \ " inherit autotools |