summaryrefslogtreecommitdiff
path: root/lib/pixman
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2007-12-10 21:30:22 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2007-12-10 21:30:22 +0000
commitecf842998f481acd5f71d91e4572f11f68fbf97b (patch)
treecdc17f0b40641e66977febc3b28cfb00c4cabae1 /lib/pixman
parent787595b066638d9ddf0ca460b4c06f06f75d3fd5 (diff)
Merge pixman 0.9.6. Valery Masiutsin and other report that it fixes some
X crashes on amd64. Bump major since one function was removed.
Diffstat (limited to 'lib/pixman')
-rw-r--r--lib/pixman/ChangeLog1184
-rw-r--r--lib/pixman/Makefile.bsd-wrapper4
-rw-r--r--lib/pixman/Makefile.in2
-rw-r--r--lib/pixman/configure119
-rw-r--r--lib/pixman/configure.ac45
-rw-r--r--lib/pixman/pixman/Makefile.in59
-rw-r--r--lib/pixman/test/Makefile.in2
7 files changed, 1344 insertions, 71 deletions
diff --git a/lib/pixman/ChangeLog b/lib/pixman/ChangeLog
index e69de29bb..6c22ff7ed 100644
--- a/lib/pixman/ChangeLog
+++ b/lib/pixman/ChangeLog
@@ -0,0 +1,1184 @@
+commit b39ca42fce85248f6c19459388f71bf73a147792
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Wed Oct 24 15:48:45 2007 -0400
+
+ Bump version number
+
+commit 28532430efeb4a1aba8f3e30a790531d2a9e1472
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed Oct 17 20:01:27 2007 -0400
+
+ Only compile with -msse on x86-64.
+
+commit ab6743b17074dfedffb0ee32fe2e37cad03769bf
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed Oct 17 19:20:55 2007 -0400
+
+ Make stride signed in various places. This should fix some the
+ crashers that people have reported in bug 12398.
+
+commit aca8b610d9ab178fcbcfa4a44d87e52aa7918ea4
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed Oct 17 18:43:13 2007 -0400
+
+ Remove comma from enumerator list. Bug 12621, reported by Matt Kraai.
+
+commit 089c3e6ad00105b2f9a1118d15b4f381653ea6ff
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed Oct 17 18:40:28 2007 -0400
+
+ Add README file based on text from Bjorn Lindquist
+
+commit 39a67d35f05aa47cf50191e0837a2125593a7bbc
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sat Sep 29 22:45:42 2007 +0200
+
+ Fixed the declaration of pixman_image_set_source_clipping().
+
+commit 7f820e15070c9b9618d78425b8cb1a4df722eb22
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Sep 27 12:46:46 2007 +0100
+
+ [pixman-image] [mlk] Free the locally allocated bits.
+
+ If we fail to allocate the image, remember to free the bits if we have
+ created the buffer on behalf of the caller.
+
+commit b4f0cc6eeaff8d5ea114734fcfa293fce1904ce4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Sep 27 12:44:44 2007 +0100
+
+ [pixman-image] Avoid a potential malloc(0).
+
+ Do not attempt to allocate bits if either the image width or height is
+ 0 - Cairo has a habit of attempting to create such surfaces when
+ generating glyphs. The malloc(0) may return a NULL pointer and be treated
+ as an out-of-memory error.
+
+commit 958a650b8eb1b61143122c3ad1f9b637b6467984
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Sep 27 12:40:59 2007 +0100
+
+ [pixman-image] Avoid integer overflow when allocating bits.
+
+ Check for potential overflows at every step of the calculation of the
+ buffer size required for the pixels.
+
+ (Fixes https://bugs.freedesktop.org/show_bug.cgi?id=11627)
+
+commit 5b60c91fd6865021aa6027ee65fa8371a4e2d297
+Author: Jeff Muizelaar <jeff@freiheit.infidigm.net>
+Date: Thu Sep 20 15:40:17 2007 -0400
+
+ Fix special case selection when the mask has a transform
+
+ http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=c19ece1d8c32dc81740a4036a642661f54064e75
+ was a mismerge that avoided setting the maskTransform condition when the mask
+ has a transform. This allowed a special case routine to be chosen when the
+ mask had a transform, which is not expected by the special case routines.
+
+commit 3be35594c99b7abd2af43b66349ca53bfa1462d6
+Author: Carl Worth <cworth@cworth.org>
+Date: Tue Sep 11 16:29:06 2007 +0100
+
+ Fix build breakage when under the influence of USE_MMX
+
+ This was recently broken (dc7c047d1c68f343b66e81d9e79084e4171e2634) when
+ removing an assignment to noinst_LTLIBRARIES.
+
+commit dc7c047d1c68f343b66e81d9e79084e4171e2634
+Author: Vladimir Vukicevic <vladimir@pobox.com>
+Date: Mon Sep 10 15:20:44 2007 -0700
+
+ [memlk] don't try to allocate new data for 0-rectangle regions
+
+commit 1b098ede1938d1225c32cf5639e4c7a891859897
+Author: Vladimir Vukicevic <vladimir@pobox.com>
+Date: Tue Sep 4 11:19:33 2007 -0700
+
+ [win32] Makefile and compilation fixes for win32
+
+commit 5fc4d5ab1fae8677f5a95f5eb0e4fad3a9e0bf82
+Author: Vladimir Vukicevic <vladimir@pobox.com>
+Date: Tue Sep 4 11:18:40 2007 -0700
+
+ compilation: build edge/compose with accessors separately
+
+ Simplify the build by creating a new file for pixman-compose and
+ pixman-edge built with accessor functions.
+
+commit 6b96b62ca419ac414d5715a4ba9f30664e510fcd
+Author: Carl Worth <cworth@cworth.org>
+Date: Tue Sep 4 17:24:04 2007 -0700
+
+ 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.
+
+commit 8ff7213f39edc1b2b8b60d6b0cc5d5f14ca1928d
+Author: Vladimir Vukicevic <vladimir@pobox.com>
+Date: Sat Aug 25 23:30:41 2007 -0700
+
+ rasterize traps that extend outside of the image bounds correctly
+
+ Traps that extend outside of the image bounds are rasterized incorrectly
+ currently; the problem is a signed vs. unsigned comparison that got
+ introduced when a width parameter went from int -> uint. This patch
+ puts it back to int (since it's stored as an int in the bits structure
+ to begin with), and also fixes a similar warning in the memset wrapper
+
+commit 028993aacb9ec48aa9d347d0d189250b464cf30f
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Fri Aug 24 16:49:29 2007 -0400
+
+ Set accessors for the destination image in composite-test.c
+
+commit 341be6a408e86d5b8976e63746e646ef973339bb
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Fri Aug 24 16:30:10 2007 -0400
+
+ Add missing comma in enum
+
+commit fb667257ab8f5cf9c6af399ac394b8aa7826fd96
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Fri Aug 24 16:19:31 2007 -0400
+
+ Remove trailing comma in enum
+
+commit c7dad7b9a038fbe94a2bdc67cc0a5f40f8a40d5c
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Fri Aug 24 16:12:30 2007 -0400
+
+ Add conjoint and disjoint operators to pixman.h
+
+commit 245a5e04eb4bf3b973d32ce5f21e6e2eac00b48b
+Merge: 25846ed... 9c09561...
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Aug 21 16:31:45 2007 -0400
+
+ Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/pixman
+
+commit 25846ed93a87fcaefbfdb397343e986c8f53f997
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Aug 21 14:11:54 2007 -0400
+
+ Fix bug 12039, based on Chris Wilson's patch.
+
+commit 9c09561a91debfd7c77a39b337b51b2ab16d6da9
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Aug 20 12:58:47 2007 -0700
+
+ Fix failure to set identity transform in pixman.
+
+ While here, optimize out a free/malloc in the case where a transform
+ existed previously and the new transform is non-identity.
+
+commit 3e74bc431908dd42775d8e82ca2e4d589de820cb
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri Aug 17 18:01:09 2007 -0400
+
+ Add pixman_image_set_source_clipping()
+
+commit c7bec5898891f3077986c141b48e5ff77f1d5046
+Author: Carl Worth <cworth@cworth.org>
+Date: Wed Aug 15 10:16:11 2007 -0700
+
+ Fix typo AC_MAJOR -> PIXMAN_MAJOR
+
+ This typo was causing build failures for some. Thanks to David Sharp for
+ pointing out the problem.
+
+commit d9b989c890724480d27aec471d5f5fbcc09c0a61
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Tue Aug 14 16:16:27 2007 -0700
+
+ Remove redundant defines.
+
+commit 7bdb9840eb414b41ad41871864baa4f2445d8c05
+Author: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
+Date: Mon Aug 13 17:37:59 2007 -0700
+
+ One more minor wrapping fix
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit 166b78295683d9bcf688702e98259e62f9b25c86
+Author: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
+Date: Mon Aug 13 15:20:18 2007 -0700
+
+ Remove unnecessary wrapping from fbFetch/fbStore.
+
+ These functions fetch from a picture to a scanline buffer, or store
+ from a scanline buffer to a picture. Since pixman allocates its own
+ scanline buffer, we don't need to wrap accesses to it.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit 7b1d0c091dd5ae8797b6f7a0ab3d40d5c3676fe9
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Aug 13 17:26:51 2007 -0700
+
+ Don't skip fbFetch/fbStore when PIXMAN_FB_ACCESSORS is enabled.
+
+ pixman_composite_rect_general_accessors skips the fetch / store steps by setting
+ store to NULL when the op is ADD or OVER and the dest format is [ax]8r8g8b8.
+ This optimization is only valid when no accessors are in play.
+
+commit 43370d1ce793ef2754c2e6f0fc08e534d4247793
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Aug 6 20:06:48 2007 -0700
+
+ Update .pc file for library version name change.
+
+commit 778a3f9d7136de062806473dd3604eb03ba5d866
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Wed Aug 1 14:16:55 2007 -0700
+
+ Return a bool from pixman_image_unref.
+
+ Returns TRUE when the refcount reaches 0 and the image is freed.
+
+commit 4838e2e9d9635883841e692a7074bcb2be96dcf5
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Aug 6 17:28:06 2007 -0400
+
+ Bump version number; fix typo in configure.ac
+
+commit 7b3c9cef49cdedef03112054925005fa21120bd5
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Aug 6 17:24:44 2007 -0400
+
+ Change the library name to pixman-1
+ Set the soname to something based on the library version.
+
+commit 19c46bf18b9cf6694fa3de9c836a3d1eed6c6dac
+Author: Vladimir Vukicevic <vladimir@pobox.com>
+Date: Fri Aug 3 15:24:03 2007 -0700
+
+ Fix OpenSolaris compilation
+
+commit 0c80a0cd84f30616563cef5910df9deb4f8ed687
+Author: Alan Coopersmith <alanc@sun.com>
+Date: Mon Jul 16 15:06:23 2007 -0400
+
+ Build fixes for Solaris.
+
+commit 0f392d81748ab1338d294de96e28c43270f24180
+Author: Jinghua Luo <sunmoon1997@gmail.com>
+Date: Tue Jul 10 14:47:28 2007 +0800
+
+ Fix bug in rasterizeEdges() where the stride should be signed.
+
+commit bbef73192e558695933d7f05befaa8c18550bb63
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Mon Jul 2 12:18:42 2007 -0400
+
+ Port Vlad's fixes for integer overflows with malloc().
+
+commit 2e61f30e4c8d0e01e175495e13a5f132521ad6f2
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Fri Jun 22 13:37:46 2007 -0400
+
+ Revert "Add a cache of images to reduce malloc/free time"
+
+ Revert the image cache since it isn't thread safe.
+
+ This reverts commit deb09d769ae4fc55cde595c170f417692284b3e8.
+
+commit 64e3146c5ddfad415663fa5f87f7b9ff327a8c56
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri Jun 22 00:58:05 2007 -0400
+
+ Don't treat void as a value. Bug 11322, Alan Coopersmith.
+
+commit 8216ba1cbd27c5428970b8d393722d0f4343efed
+Author: Vladimir Vukicevic <vladimir@pobox.com>
+Date: Wed Jun 20 15:13:30 2007 -0400
+
+ Add pixman_region_init_rects()
+
+commit f1194a8bc0599e3ecceb785795ad8283a7c04dc0
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Wed Jun 20 12:12:43 2007 -0400
+
+ Fix typo
+
+commit 3dbb2a56bd1918595091006c6e0de5260d43af09
+Author: Alex Larsson <alexl@redhat.com>
+Date: Wed Jun 20 12:01:12 2007 -0400
+
+ Add non-mmx fast paths for In_8x8 and In_nx8x8. Bug 4191, patch by
+ Alex Larsson.
+
+commit 658acaad4e73ac705f705f947a42a2cd0979042c
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Wed Jun 20 11:36:22 2007 -0400
+
+ Add fbCompositeSrc_8888xx888(); comment out
+ fbCompositeOver_x888x8x8888{mmx} since they are not actually faster
+ than the generic code.
+
+commit 440ed1da1c7ac600865c615cf257173cac2af214
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 14:41:04 2007 -0400
+
+ Optimize pixman_fill_rectangles() in a few more cases
+
+commit deb09d769ae4fc55cde595c170f417692284b3e8
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 12:41:21 2007 -0400
+
+ Add a cache of images to reduce malloc/free time
+
+commit 6cb74dfe3d395051f9a2e4b850979a018ac340ca
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 11:23:05 2007 -0400
+
+ Also store the g3 part correctly
+
+commit 07e73371ef096b42d3a983266105b71ea01b4cc8
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 11:19:43 2007 -0400
+
+ Fix fbStore_b2g3r3(). Pointed out by Dan Amelang
+
+commit d7f426806d25a9cea93a4c43a3f23e7ae9d67383
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 10:46:36 2007 -0400
+
+ Smplify the 1x1r optimization for the general compositing and fix the
+ 1xn and nx1 cases.
+
+commit 9ebec1f7dbe5576d572fede28d7560ea6000b566
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 10:40:58 2007 -0400
+
+ Fix pixman_fill() to return TRUE when it succeeded
+
+commit 15b5960bcb7cadfe6fe92036dc0f08a85a2009f1
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 00:57:33 2007 -0400
+
+ Add in 0xff alpha channel in Over_x888x8x8888mmx
+
+commit e73e000d5bd44a198e35b6d0c421a735d00e0b3f
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 19 00:35:58 2007 -0400
+
+ Fix solid fill optimization to compute the src correctly
+
+commit edbe099ad3906d7626de854d144fc23d78408357
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 18 14:29:02 2007 -0400
+
+ Add non-mmx solid fills. Update TODO
+
+commit f9454b3423b948022f36b7191db8c5f988f46273
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 18 13:37:20 2007 -0400
+
+ Make sure the output of fbCompositeOver_x888x8x8888 is actually stored
+
+commit 0e4292666de736a584a3d4e0bcfc6db7d2c6538d
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 23:10:23 2007 -0400
+
+ Also use this function in the xBGR case
+
+commit 80a61bfb3dcf26271766e36aa31d454889ee43a5
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 22:57:47 2007 -0400
+
+ Add new fbCompositeOver_x888x8x8888mmx() operation
+
+commit 19360d0df2ba55d34963101a662dd0ab51d84836
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 22:43:55 2007 -0400
+
+ Add fbCompositeOver_x888x8x8888() fast path
+
+commit ff4004f3fbd3c576f1c931c680ad293c5038846d
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 22:24:46 2007 -0400
+
+ Rename fbCompositeSrc_x888x8x8888 to x888xnx8888
+
+commit 30f198fe53949da59821d2f394f0cecb5bdaa646
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 18:50:00 2007 -0400
+
+ Remove accidentally committed use of TIMER_BEGIN/END
+
+commit e71844095ea75b4f9f66c85c87b4b3b6c287e02f
+Merge: 4f9f7ae... 647852d...
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 18:49:02 2007 -0400
+
+ Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/pixman
+
+commit 647852d714ddfe6e1d71af1f4aea0e272c459fc6
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sun Jun 17 18:55:37 2007 -0400
+
+ Add timer macros
+
+commit 4f9f7ae47ad258a1605a6b38c5ec268c9ee17150
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 18:02:06 2007 -0400
+
+ Update TODO
+
+commit ad80d4d2bc8c4e37a8266b98a2241c0ebd7f0e43
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sun Jun 17 01:00:07 2007 -0400
+
+ Optimize fill rectangles in the op=PIXMAN_OP_CLEAR case
+
+commit 9deaaae3f61f1701b022fe7daa1823a99fda7d00
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat Jun 16 23:08:53 2007 -0400
+
+ Use the general code in some cases even when a fast path is available
+
+ If src or mask are repeating 1x1 images and srcRepeat or
+ maskRepeat are still TRUE, it means the fast path we
+ selected does not actually handle repeating images.
+ So rather than call the "fast path" with a zillion
+ 1x1 requests, we just use the general code (which does
+ do something sensible with 1x1 repeating images).
+
+commit e0a501d9b7e5c4ca07115552a16c4c4953ec5702
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat Jun 16 22:10:36 2007 -0400
+
+ Remove ACCESS_MEM macro; define READ and WRITE to directly use the wrapper functions
+
+commit 9b3cfcc13d0613cfb9d15b21a6b90e4a91a1666f
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat Jun 16 21:40:43 2007 -0400
+
+ Move some utility functions from pixman-edge.c to pixman-utils.c
+ Set up so pixman-edge.c is compiled twice.
+
+commit 3cd36dae288ac0923f214b8ae81dbfc0f4d5b1b0
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat Jun 16 21:23:20 2007 -0400
+
+ Slight tweak to the definition of pixman_composeFunctions
+
+commit 68d6c68adaba3a1d538bceca7d7955129d6075de
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat Jun 16 21:19:51 2007 -0400
+
+ Add #defines etc to compile pixman-compose.c twice
+
+commit b5d07147fba7085d52966aa162db5d38164dfebf
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sat Jun 16 15:13:04 2007 -0400
+
+ Make fbCompositeSrc_8888x8888mmx() check if the mask is 0
+
+commit 5122f2b28bfbf08479cc88ff9ddfeb371f92264f
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sat Jun 16 14:56:25 2007 -0400
+
+ Unroll loop in fbComposite_x888x8x8888()
+
+commit 8fc40c3b0076e99cc996bd27a2479db4c94cc77b
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sat Jun 16 14:49:11 2007 -0400
+
+ Optimize 1x1 repeating images in the general case
+
+ Reinstate checks for empty masks in mmxCombineOverU() and mmxCombineMaskU()
+
+commit 15e5cf16a9770da682addeaff5df8b1793cf4b73
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sat Jun 16 12:55:59 2007 -0400
+
+ Add a few optimizations for solid fills
+
+commit 10854b9d63afe6893ac15fb67714eb98b7a8eca6
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sat Jun 16 01:40:07 2007 -0400
+
+ Plug leak of the gradient stops
+
+commit e365aaf7f34d9257fc53e8f180a84fa243edcb2c
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Sat Jun 16 01:15:05 2007 -0400
+
+ Plug leak in the bits=NULL case for pixman_image_create_bits()
+
+commit 451a0510324491e82269d8e0d997ee4707ba8df8
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri Jun 15 14:33:57 2007 -0400
+
+ When setting identity transformations store them as NULL to prevent
+
+ hitting the general compositing code.
+
+commit cd9c484f0d8cef0cc243a73de5a8d742b8678230
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Fri Jun 15 01:45:04 2007 -0400
+
+ Turn off debug spew for incorrect arguments
+
+commit e1dd17451cbe2c7d36205fe2fc4cea0092ee4141
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Fri Jun 15 00:15:03 2007 -0400
+
+ Disable source clipping by default
+
+commit 1426483f8af21553bd8b2ad997617680944be420
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Thu Jun 14 17:37:12 2007 -0400
+
+ Update TODO
+
+commit 7a8877bc0800ffcfe18bedec49068049c877fa5d
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Thu Jun 14 17:35:28 2007 -0400
+
+ Update TODO
+
+commit a0e161ca9aa562a0f4b55b15b1ab3b9380f0d9bb
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Thu Jun 14 17:34:42 2007 -0400
+
+ Update TODO
+
+commit 596bd530205e9835ede0bc8816c9b2dfff75e921
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Thu Jun 14 12:59:15 2007 -0400
+
+ Reset clip regions correctly when NULL is passed
+
+commit e8dfb54ccea26b7e7948ca9806c97194892f0791
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 23:50:04 2007 -0400
+
+ Make default clip region the full image
+
+commit 42192ad0fc7fe0fa7600f879646de867691351bb
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 23:37:25 2007 -0400
+
+ Don't complain if users try to read non-existing data from images
+
+commit 0e77667851869849cbddc30466db99ff5dc02b19
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 22:53:35 2007 -0400
+
+ Don't require rowstride to be a multiple of 4 when bits is NULL
+
+commit b6bdd8273cc3500d1f69402f39c3d6e718920a66
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 22:14:32 2007 -0400
+
+ Add pixman_fill_rectangles()
+
+commit 0ab81dc6383e843aa3fa78da289820a55f4a08f0
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 15:32:27 2007 -0400
+
+ Add pixman_add_trapezoids() function
+
+commit 756b54f6e45bb423ffabfcad2b6d8574130c6e53
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 15:27:31 2007 -0400
+
+ Add boolean returns to various setters
+
+commit 6d62986ee0be7191ad6ef938d82cbadbe995c377
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 14:30:53 2007 -0400
+
+ Allow bits to be NULL when bit images are created
+
+commit d466cf1d2f09f78baaafac713d6bc7d4f003b860
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue Jun 12 14:24:40 2007 -0400
+
+ Add various accessors; remove composite_rect
+
+commit b62b769c0da8d8eae68bd41a53f390c1f0917be0
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 22:02:03 2007 -0400
+
+ Bump version number
+
+commit c663029510c8a329dc87246cc895b21f0af79eb6
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 21:39:24 2007 -0400
+
+ Make use of pixman_fill_mmx() in various places. Delete #if0'ed code
+
+commit 3dca89a677528845ccaee7ff6d355207c631ddd2
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 21:35:14 2007 -0400
+
+ Add pixman_fill_mmx() function
+
+commit cf6b8f63d4dd2d96efcde673696e1703856a3787
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 14:55:31 2007 -0400
+
+ Forgotten fbHaveMMX()
+
+commit 02f6129400eda40167e91e0ff4724d7a5ae5a80d
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 14:54:44 2007 -0400
+
+ Rename fbHaveMMX() pixman_have_mmx()
+ Guard pixman_blt_mmx() with pixman_have_mmx()
+
+commit 105d398c4d061eb102747f824e6c04ab897cb5e1
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 14:41:01 2007 -0400
+
+ Add pixman_blt_mmx() based on fbBltmmx() from the X server.
+
+ Implement fbCompositeAreammx() in terms of it.
+
+ Uncomment calls to fbCompositeAreammx() in pixman-pict.c
+
+ Add public pixman_blt() that just returns false if not using mmx.
+
+commit 6a64eb109449806186164332383be1235ab9c21c
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 09:15:05 2007 -0400
+
+ Bump version number
+
+commit 30499e2e88985df2cd1ece82227802a316e31a32
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Mon Jun 11 00:22:19 2007 -0400
+
+ Add a version of miComputeCompositeRegion; call it from
+ pixman_image_composite(). Remove const from return value of
+ pixman_region_rectangles().
+
+commit 5ca61dc99b198243f08e6f1f3f96e3c87ff818b9
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Tue Jun 5 11:33:17 2007 -0400
+
+ Fix bug in pixman_image_set_filter() where only the parameters were
+ updated, not the filter type. Reported by Michel Dänzer.
+
+commit 808e2de3a6270b32a026722f59a49736d224d46c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu May 24 16:24:39 2007 +0300
+
+ Add .gitignore file
+
+commit d1ce3f95509bd86c0aa850d6b58c8a065517c84f
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu May 24 16:19:40 2007 +0300
+
+ Use canonical autogen.sh
+
+ Use the standard autogen.sh, which allows for srcdir != builddir.
+
+commit 8129984603de569e01563d810a334765c2ec5062
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 23 16:38:38 2007 -0400
+
+ Declare the two new trapezoid functions in pixman.h
+
+commit 4355cc5c57f3e402af9a508762c8ed3a5ac9f2ca
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed May 23 16:40:23 2007 -0400
+
+ Add pixman-trap with the trapezoid rasterization code from the X server.
+
+ Add two different trapezoid types that X makes use of.
+
+commit 35f99a530de11bcf0e98c372bc49b9bf0f2ecf37
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 23 16:09:49 2007 -0400
+
+ Make sure gradient-test.c builds when srcdir != buildir. Patch from
+ Julien Cristau <jcristau@debian.org>.
+
+commit d5e8a7b8bdd4b18e504859059683cb9723503b3c
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed May 23 15:39:03 2007 -0400
+
+ Fix bug in rasterizeEdges() where the stride was treated as if in
+ bytes, when it was in uint32_t's. Formatting fixes. Delete misleading
+ comment from pixman-private.h
+
+commit ee37469d6adad32cb31e52a95abafa32943b3e8d
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 23 12:18:09 2007 -0400
+
+ Fix function name
+
+commit 727b77983bd8b684764e69cdea38ce6290c60467
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 22 13:39:25 2007 -0400
+
+ Add more edge functions
+
+commit 4600c6823e4dea52a34fe881f5374691bc76f555
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 22 12:52:52 2007 -0400
+
+ Add implementation of edge rasterization
+
+commit 1413bb7a5ddc2d49109a1e9669fab155352bc3c7
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 22 11:58:46 2007 -0400
+
+ Add edge data types
+
+commit e32b240145ee7bbc2e69020b0bb00c33c68acf15
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue May 22 10:00:46 2007 -0400
+
+ Detect endianness
+
+commit e5cf135170198a33429b00f7c506a84054f0297e
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue May 22 09:54:19 2007 -0400
+
+ Include string.h in pixman-pict.c
+
+commit 097de78d135259c64c5cf8789680bfdc354c12f9
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue May 22 09:51:54 2007 -0400
+
+ Check for getisax() support
+
+commit 37f90ba0b2d9797de93477aaa9e113329e50f93d
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue May 22 09:49:23 2007 -0400
+
+ Check for MMX in the build system
+
+commit 56623268a76ab65228c41dba5fbf27463b1a5691
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue May 22 00:04:39 2007 -0400
+
+ Update TODO
+
+commit ed184ebb7c2f12010207ffa210975a9b22b152ef
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Tue May 22 00:03:31 2007 -0400
+
+ Make the mmx code compile
+
+commit 2db377de616c4c0826d1a56777d7a4f858049758
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Mon May 21 23:46:24 2007 -0400
+
+ Add pixman-mmx.[ch] and move macros around to make it compile.
+ Not yet hooked up.
+
+commit ce506999e6dc6ad07d2665277d0250e7d9e0b6a8
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Mon May 21 20:03:37 2007 -0400
+
+ Use the general code if the images have read/write functions
+
+commit a54096d554414dd88a3c6a7a53816552844a5b08
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Mon May 21 17:51:41 2007 -0400
+
+ Update TODO
+
+commit ccef70a685191bb3cd4b7891f1ebde1881b3aa13
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Mon May 21 15:03:41 2007 -0400
+
+ Fix bug in fbCompositeGetSolid() where a format was compared to a format type
+
+commit 154c4dd97896178cd54bdb1057bef2eab3870c0c
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Mon May 21 14:27:40 2007 -0400
+
+ Make pixman_image_composite() take a region parameter; comment out non-implemented functions from the switch of doom
+
+commit 4518de9fec813bcb19facbc944821e882a91671a
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Mon May 21 10:00:05 2007 -0400
+
+ Add slightly changed copy of miComputeCompositeRegion() to pixman-pict.c
+
+commit 4df446bb73b1ab89e119d6714a3feae8a384e113
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 19 17:19:39 2007 -0400
+
+ Move mod and div macros to pixman-private.h
+
+commit bcb4c8f02137178096473191a05c3b84e4ce5116
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 19 17:13:02 2007 -0400
+
+ Add fbComposeGetStart() macro
+
+commit e9e326eafe3e4ed221eefbb7ddbd46d5d983505d
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 19 17:05:23 2007 -0400
+
+ Add fbComposeGetSolid() macro
+
+commit 456ebbbb27381d5fff4d2426a261c4760eb0b8df
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 19 16:44:40 2007 -0400
+
+ Add implementation of can_get_solid()
+
+commit eabc2f48f07decb5fa15db985fffa9e648506568
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 19 16:40:10 2007 -0400
+
+ Various formatting/style tweaks
+
+commit bdb307ac4a6ad20e687f286491a3d9df6807567f
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 19 15:53:37 2007 -0400
+
+ Add macro FUNC that expands to __PRETTY_FUNCTION__ or __func__
+ depending on the compiler.
+
+commit 4c15a7838eadf9b608b28ebafccceb0aa25a83dc
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 19 12:04:21 2007 -0400
+
+ Include limits.h in pixman-compose.c; patch from Alan Coopersmith
+
+commit 595ca53c094b8dee6747670aaa471fb19f1a6d94
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 18 15:21:51 2007 -0400
+
+ Add pixman-pict.c which is a version of fbpict.c. It compiles, but
+ isn't hooked up to anything.
+
+commit e1328980457ce6f51ce2649d79feefa616408ce9
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 18 13:38:26 2007 -0400
+
+ Make pixman_image_set_indexed() not copy its argument
+
+commit e12ca669af9143581c4af4c8c885273fc6b12c2d
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 18 12:04:16 2007 -0400
+
+ Free the indexed table when the image is freed
+
+commit ff2e0e9636b1dd3690b5ab5e1dff04ff5c9a07ab
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 18 11:54:01 2007 -0400
+
+ Add new function pixman_image_set_indexed()
+
+commit 74b76ad9fefd39d7d60a059f2f8537b5f6b94652
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Thu May 17 10:19:29 2007 -0400
+
+ Fix wrong type in composite-test.c
+
+commit d25d77852d253042b859468f64b228d11c2a0f82
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Thu May 17 09:12:09 2007 -0400
+
+ Add a TODO file. Indent pixman-compose.c
+
+commit db3c13c8fea0e3d0be382d55d58fc9d0d01bba44
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed May 16 19:35:55 2007 -0400
+
+ Add macro magic in pixman-private.h to allow reading and writing to
+ happen through functions. Use them in pixman-compose.c; also delete
+ unnecessary READ and WRITE macros that always operate on host memory.
+ Add accessor functions to composite-test.c
+
+commit 57d6894ab06d2ac07e17108c01e8ba282fc51384
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 16 11:13:11 2007 -0400
+
+ Add an image argument to all the store functions
+
+ Some tweaks to composite-test.c
+
+commit 0cfb66104cc553ba365df546d7ba9b0e8415e30f
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 16 11:07:54 2007 -0400
+
+ Add an image argument to all the fetch functions
+
+commit a49e425933e3ccd1ae59c0e60ddbab8a88282639
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 16 11:03:09 2007 -0400
+
+ Move some macros from pixman-compose.c to pixman-private.h
+
+commit 24f8cfce32d3c5dcd3ff6d9ebd513c35cdacc972
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 16 10:56:08 2007 -0400
+
+ Add API to have accessor functions on pixman
+
+commit 195100527f6c678bf9848dc6c2a08658ed39a17d
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 15 16:40:40 2007 -0400
+
+ Various formatting fixes
+
+ Rename pixman_image_composite() to pixman_image_composite_rect()
+
+commit 97a4ce541c9fc72aeee0f05b8529d0ca87fb7863
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 15 12:15:46 2007 -0400
+
+ Fix typo in pixman.h
+
+commit 322659703d7c52d45ba3962b8386ac5f61e403db
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 15 12:13:01 2007 -0400
+
+ Replace hack to get standard integer types with #if/#elif construction
+
+commit ffbb4a6b1fb52dc46639d18bf0dd769fe53d3e88
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 15 11:08:24 2007 -0400
+
+ Don't build GTK+ test programs if GTK+ is not available
+
+commit b8d223d6837d37bc09efdf3c4d957ff24337004a
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 12 19:24:42 2007 -0400
+
+ Export pixman_region_reset
+
+commit 38c4ac5a1d25d96087bfe1e3d02816feaa6b8bf9
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 12 17:58:50 2007 -0400
+
+ Export a pixman_region_selfcheck
+
+commit f226c2b4f2465aba5f9e1f3fed48f0840d0b67c0
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 12 17:55:48 2007 -0400
+
+ Export pixman_region_equal()
+
+commit ecf9d36f6a62f4d77e2c025ee3109ac46f13f15d
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Sat May 12 17:32:43 2007 -0400
+
+ Add new pixman_region_set_static_pointers
+
+commit ffab43129163de418c324cffcf602e6254024f95
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Thu May 10 22:15:57 2007 -0400
+
+ Make the region data struct public
+
+commit e126ef091151372ed29562f3ff1a964774583b9b
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Thu May 10 16:14:40 2007 -0400
+
+ Make the pixman_transform_point_3d() function public
+
+commit f267e4dce73819a4a511ffaebd0cca9dcb3bd5fb
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Thu May 10 16:08:12 2007 -0400
+
+ Change the names of a few functions to prevent them from clashing with the X names
+
+commit c976db965862c0b2ba940122dc7e690cd23b5fa3
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Thu May 10 10:13:54 2007 -0400
+
+ Use a radial gradient in the gradien-test
+
+commit 7ad923eb6ff71b3865ea43b2ee247715607146da
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Thu May 10 09:30:17 2007 -0400
+
+ Make sure 64 bit fixed point types are signed
+
+commit a5a11df9024f9b7ee6194e0b842cd430f4fb5697
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Thu May 10 09:16:34 2007 -0400
+
+ Add a transformation to the gradient test
+
+commit 1a58e8478f6f87de3ffe31b0fd2b1ee06d08fe6c
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed May 9 18:18:38 2007 -0400
+
+ Use fixpoint instead of double in gradient test
+
+commit 0ebb7e31db85a179afdcd731fcc6b0e311084cb1
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Wed May 9 18:10:30 2007 -0400
+
+ Remove AM_MAINTAINER_MODE ; add new gradient-test
+
+commit dd670c29bf1de3e951f936dba834e4bfe07a9bd4
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 9 14:20:57 2007 -0400
+
+ Fix various stupid mistakes, such as inverted return_if_fail() tests
+ and only allocating space for a pointer instead of an image.
+
+commit 271c830eb0b817bd892704fb15856b19b0458d07
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 9 11:22:56 2007 -0400
+
+ Remove *error from solid fill constructor
+
+commit e9b1be0151d7bc677bd74f0a5a6836672c1ad9dd
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 9 11:12:21 2007 -0400
+
+ Various formatting fixes
+
+commit 059f62f3b02b6244b866e58d248bc8e6869f506e
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 9 11:09:59 2007 -0400
+
+ Handle setting of NULL properties
+
+commit 7529b47ee5f55e7b16bdfa750dd18dac11194210
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 9 11:00:06 2007 -0400
+
+ Make images ref counted. Memory management.
+
+commit 8bdb8b1d93bbbffafe111b4fc4dac0df9bbb6fe5
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 9 09:47:33 2007 -0400
+
+ Export pixman_gradient_stop; get rid of *error argument from init functions.
+
+ Add return_if_fail macros to pixman-private.h
+
+commit 4ea0d782092d9bd7c1570bcfccf3fe340a3d258a
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Wed May 9 08:20:43 2007 -0400
+
+ Change to use malloced image instead of stack allocated
+
+commit 45c261d75ae348cb4afc6c97d4daa90cfd50e890
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 8 17:02:44 2007 -0400
+
+ Apply bad hack to avoid including config.h
+
+commit 59df25cbe403112c3c301dd212cfaa7b8f848499
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 8 14:24:32 2007 -0400
+
+ Install header file in pixman/pixman.h
+
+commit 2f882e03614608a2a39690cf4e7105e4dde25e21
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 8 14:00:13 2007 -0400
+
+ Fix libpixman.pc.in
+
+commit 0c01cbedbaf068a9db4edefbb130c58f1f1c85ac
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 8 13:37:03 2007 -0400
+
+ Add setters for various properties
+
+commit e36c6a5eb4cc89da8cf8d66dd45d02b75584e243
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 8 13:19:51 2007 -0400
+
+ Make the test program test something useful.
+
+ Also add a check that the public image struct is big enough to contain the
+ private union.
+
+commit 4bd9ebc83d5a25141b5c9868513b918befd433d0
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 8 10:48:27 2007 -0400
+
+ Add a simple test program; fix linking problems
+
+commit 50289aace6a8699c08593a8cb93bf8dfc30ed818
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Tue May 8 10:32:54 2007 -0400
+
+ Implement pixman_image_composite() in terms of fbCompositeRect().
+
+commit df7570f0ad6b903d7b910734f1906d423928c048
+Author: Søren Sandmann <sandmann@redhat.com>
+Date: Mon May 7 22:36:15 2007 -0400
+
+ Add a version of fbcompose.c. Fixes and additions to make it compile
+
+commit 589604bfa36524809f3f44b96f624f7c7bedbee0
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Sun May 6 12:46:42 2007 -0400
+
+ Fix copyright notice
+
+commit c2602792aa8d5d4a376beb9557f544b78735c210
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 23:45:19 2007 -0400
+
+ Add fixed point macros, add declarations for image init functions
+
+commit da2510138584c4dd80b011f3bc767923c6ee443e
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 22:34:54 2007 -0400
+
+ Run configure from autogen.sh
+
+commit 560a2f52ade892526d5d64a1fb36471ade57ed45
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 22:34:22 2007 -0400
+
+ Don't run configure from autogen.sh
+
+commit eb90370859435390d0276d0c2c5f3251b32e431a
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 22:18:33 2007 -0400
+
+ Make autogen.sh run configure
+
+commit 97cdcabe18a2e910dbfa4892dd8f32354fb02463
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 22:16:40 2007 -0400
+
+ Changes to autogen.sh
+
+commit 261a293555d45245f34214e646131a410e8fd4a7
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 22:11:49 2007 -0400
+
+ Make autogen.sh run configure
+
+commit 9f40d13e9f9e23f62280375605f4234e71642c24
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 22:08:40 2007 -0400
+
+ Add pixman.pc.in
+
+commit 7f0b18c94cf84750b097fe96aa3c8ac9e1b406e3
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 22:07:19 2007 -0400
+
+ Add code to initialize images, based on picture.c from the X server
+
+commit af13f449087a5dd72abf5f1178234e85add33632
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 19:44:13 2007 -0400
+
+ Change autogen.sh to call autoreconf. Remove reference to libcomp.h
+
+commit 565f410a1c420da875cd9d13efa22126ad5fa567
+Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
+Date: Fri May 4 19:13:57 2007 -0400
+
+ Add the files.
diff --git a/lib/pixman/Makefile.bsd-wrapper b/lib/pixman/Makefile.bsd-wrapper
index 214564cb6..ca87d923f 100644
--- a/lib/pixman/Makefile.bsd-wrapper
+++ b/lib/pixman/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2007/10/20 20:24:01 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2007/12/10 21:30:21 matthieu Exp $
-SHARED_LIBS= pixman-1 9.5
+SHARED_LIBS= pixman-1 10.0
.include <bsd.xorg.mk>
diff --git a/lib/pixman/Makefile.in b/lib/pixman/Makefile.in
index 3f5b46d4a..38c1bc26c 100644
--- a/lib/pixman/Makefile.in
+++ b/lib/pixman/Makefile.in
@@ -145,6 +145,8 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_MMX_FALSE = @USE_MMX_FALSE@
USE_MMX_TRUE = @USE_MMX_TRUE@
+USE_SSE_FALSE = @USE_SSE_FALSE@
+USE_SSE_TRUE = @USE_SSE_TRUE@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
diff --git a/lib/pixman/configure b/lib/pixman/configure
index aa338043b..688f00808 100644
--- a/lib/pixman/configure
+++ b/lib/pixman/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for pixman 0.9.5.
+# Generated by GNU Autoconf 2.59 for pixman 0.9.6.
#
# Report bugs to <"sandmann@daimi.au.dk">.
#
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='pixman'
PACKAGE_TARNAME='pixman'
-PACKAGE_VERSION='0.9.5'
-PACKAGE_STRING='pixman 0.9.5'
+PACKAGE_VERSION='0.9.6'
+PACKAGE_STRING='pixman 0.9.6'
PACKAGE_BUGREPORT='"sandmann@daimi.au.dk"'
# Factoring default headers for most tests.
@@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PIXMAN_MAJOR LT_VERSION_INFO MMX_CFLAGS USE_MMX_TRUE USE_MMX_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE GTK_CFLAGS GTK_LIBS DEP_CFLAGS DEP_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PIXMAN_MAJOR LT_VERSION_INFO USE_MMX_TRUE USE_MMX_FALSE USE_SSE_TRUE USE_SSE_FALSE MMX_CFLAGS HAVE_GTK_TRUE HAVE_GTK_FALSE GTK_CFLAGS GTK_LIBS DEP_CFLAGS DEP_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -953,7 +953,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pixman 0.9.5 to adapt to many kinds of systems.
+\`configure' configures pixman 0.9.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1019,7 +1019,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pixman 0.9.5:";;
+ short | recursive ) echo "Configuration of pixman 0.9.6:";;
esac
cat <<\_ACEOF
@@ -1158,7 +1158,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-pixman configure 0.9.5
+pixman configure 0.9.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1172,7 +1172,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pixman $as_me 0.9.5, which was
+It was created by pixman $as_me 0.9.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1815,7 +1815,7 @@ fi
# Define the identity of the package.
PACKAGE='pixman'
- VERSION='0.9.5'
+ VERSION='0.9.6'
cat >>confdefs.h <<_ACEOF
@@ -18871,7 +18871,7 @@ esac
-LT_VERSION_INFO="9:5:9"
+LT_VERSION_INFO="9:6:9"
PIXMAN_MAJOR=0
@@ -18887,11 +18887,11 @@ if test "x$GCC" = "xyes"; then
*) CFLAGS="$CFLAGS -Wall" ;;
esac fi
-MMX_CFLAGS="-mmmx -msse -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
+MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
have_mmx_intrinsics=no
-echo "$as_me:$LINENO: checking For MMX/SSE intrinsics in the compiler" >&5
-echo $ECHO_N "checking For MMX/SSE intrinsics in the compiler... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether to use MMX intrinsics" >&5
+echo $ECHO_N "checking whether to use MMX intrinsics... $ECHO_C" >&6
xserver_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MMX_CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
@@ -18900,10 +18900,8 @@ cat >conftest.$ac_ext <<_ACEOF
#error "Need GCC >= 3.4 for MMX intrinsics"
#endif
#include <mmintrin.h>
-#include <xmmintrin.h>
int main () {
__m64 v = _mm_cvtsi32_si64 (1);
- v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
return _mm_cvtsi64_si32 (v);
}
_ACEOF
@@ -18952,7 +18950,6 @@ fi
-
if test $have_mmx_intrinsics = yes; then
USE_MMX_TRUE=
USE_MMX_FALSE='#'
@@ -18963,6 +18960,81 @@ fi
+
+have_sse_intrinsics=no
+echo "$as_me:$LINENO: checking whether to use SSE intrinsics" >&5
+echo $ECHO_N "checking whether to use SSE intrinsics... $ECHO_C" >&6
+xserver_save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -msse $MMX_CFLAGS"
+
+cat >conftest.$ac_ext <<_ACEOF
+
+#if !defined(__amd64__) && !defined(__x86_64__)
+#error "Need x86-64 for SSE"
+#endif
+#include <mmintrin.h>
+#include <xmmintrin.h>
+int main () {
+ __m64 v = _mm_cvtsi32_si64 (1);
+ v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
+ return _mm_cvtsi64_si32 (v);
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ have_sse_intrinsics=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS=$xserver_save_CFLAGS
+echo "$as_me:$LINENO: result: $have_sse_intrinsics" >&5
+echo "${ECHO_T}$have_sse_intrinsics" >&6
+
+if test $have_sse_intrinsics = yes ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SSE 1
+_ACEOF
+
+ MMX_CFLAGS="-msse $MMX_CFLAGS"
+fi
+
+
+
+if test $have_sse_intrinsics = yes; then
+ USE_SSE_TRUE=
+ USE_SSE_FALSE='#'
+else
+ USE_SSE_TRUE='#'
+ USE_SSE_FALSE=
+fi
+
+
+
+
#PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
HAVE_GTK=no
@@ -19101,6 +19173,13 @@ echo "$as_me: error: conditional \"USE_MMX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${USE_SSE_TRUE}" && test -z "${USE_SSE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"USE_SSE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_SSE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -19379,7 +19458,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by pixman $as_me 0.9.5, which was
+This file was extended by pixman $as_me 0.9.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19442,7 +19521,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-pixman config.status 0.9.5
+pixman config.status 0.9.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -19710,9 +19789,11 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@PIXMAN_MAJOR@,$PIXMAN_MAJOR,;t t
s,@LT_VERSION_INFO@,$LT_VERSION_INFO,;t t
-s,@MMX_CFLAGS@,$MMX_CFLAGS,;t t
s,@USE_MMX_TRUE@,$USE_MMX_TRUE,;t t
s,@USE_MMX_FALSE@,$USE_MMX_FALSE,;t t
+s,@USE_SSE_TRUE@,$USE_SSE_TRUE,;t t
+s,@USE_SSE_FALSE@,$USE_SSE_FALSE,;t t
+s,@MMX_CFLAGS@,$MMX_CFLAGS,;t t
s,@HAVE_GTK_TRUE@,$HAVE_GTK_TRUE,;t t
s,@HAVE_GTK_FALSE@,$HAVE_GTK_FALSE,;t t
s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
diff --git a/lib/pixman/configure.ac b/lib/pixman/configure.ac
index 3a235b564..edbc8c7af 100644
--- a/lib/pixman/configure.ac
+++ b/lib/pixman/configure.ac
@@ -42,7 +42,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 9)
-m4_define([pixman_micro], 5)
+m4_define([pixman_micro], 6)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -86,10 +86,10 @@ if test "x$GCC" = "xyes"; then
dnl ===========================================================================
dnl Check for MMX
-MMX_CFLAGS="-mmmx -msse -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
+MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
have_mmx_intrinsics=no
-AC_MSG_CHECKING(For MMX/SSE intrinsics in the compiler)
+AC_MSG_CHECKING(whether to use MMX intrinsics)
xserver_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MMX_CFLAGS"
AC_COMPILE_IFELSE([
@@ -97,10 +97,8 @@ AC_COMPILE_IFELSE([
#error "Need GCC >= 3.4 for MMX intrinsics"
#endif
#include <mmintrin.h>
-#include <xmmintrin.h>
int main () {
__m64 v = _mm_cvtsi32_si64 (1);
- v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
return _mm_cvtsi64_si32 (v);
}], have_mmx_intrinsics=yes)
CFLAGS=$xserver_save_CFLAGS
@@ -111,11 +109,46 @@ if test $have_mmx_intrinsics = yes ; then
else
MMX_CFLAGS=
fi
-AC_SUBST(MMX_CFLAGS)
AM_CONDITIONAL(USE_MMX, test $have_mmx_intrinsics = yes)
+dnl =======================================================
+
+dnl GCC 4.2 when compiling with -msse will generate SSE instructions
+dnl on its own. This means anything compiled with -mss can only be
+dnl run after a runtime check for SSE. Unfortunately, since we still
+dnl need to support MMX-but-not-SSE (such as the OLPC), this means we
+dnl can only use SSE when compiling for x86-64 (where SSE is always
+dnl supported).
+
+have_sse_intrinsics=no
+AC_MSG_CHECKING(whether to use SSE intrinsics)
+xserver_save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -msse $MMX_CFLAGS"
+
+AC_COMPILE_IFELSE([
+#if !defined(__amd64__) && !defined(__x86_64__)
+#error "Need x86-64 for SSE"
+#endif
+#include <mmintrin.h>
+#include <xmmintrin.h>
+int main () {
+ __m64 v = _mm_cvtsi32_si64 (1);
+ v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
+ return _mm_cvtsi64_si32 (v);
+}], have_sse_intrinsics=yes)
+CFLAGS=$xserver_save_CFLAGS
+AC_MSG_RESULT($have_sse_intrinsics)
+
+if test $have_sse_intrinsics = yes ; then
+ AC_DEFINE(USE_SSE, 1, [use SSE compiler intrinsics])
+ MMX_CFLAGS="-msse $MMX_CFLAGS"
+fi
+
+AM_CONDITIONAL(USE_SSE, test $have_sse_intrinsics = yes)
+
dnl ========================================================
+AC_SUBST(MMX_CFLAGS)
#PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
HAVE_GTK=no
diff --git a/lib/pixman/pixman/Makefile.in b/lib/pixman/pixman/Makefile.in
index ea24d3cc1..9405ac53f 100644
--- a/lib/pixman/pixman/Makefile.in
+++ b/lib/pixman/pixman/Makefile.in
@@ -37,10 +37,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-
-# mmx code
@USE_MMX_TRUE@am__append_1 = libpixman-mmx.la
-@USE_MMX_TRUE@am__append_2 = libpixman-mmx.la
subdir = pixman
DIST_COMMON = $(libpixmaninclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -62,12 +59,11 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
@USE_MMX_TRUE@am__DEPENDENCIES_1 = libpixman-mmx.la
-libpixman_1_la_DEPENDENCIES = libpixmanwrapper.la \
- $(am__DEPENDENCIES_1)
+libpixman_1_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libpixman_1_la_OBJECTS = pixman-region.lo pixman-image.lo \
- pixman-compose.lo pixman-pict.lo pixman-utils.lo \
- pixman-edge.lo pixman-trap.lo pixman-compute-region.lo \
- pixman-timer.lo
+ pixman-compose.lo pixman-compose-accessors.lo pixman-pict.lo \
+ pixman-utils.lo pixman-edge.lo pixman-edge-accessors.lo \
+ pixman-trap.lo pixman-compute-region.lo pixman-timer.lo
libpixman_1_la_OBJECTS = $(am_libpixman_1_la_OBJECTS)
am__DEPENDENCIES_2 =
@USE_MMX_TRUE@libpixman_mmx_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -76,11 +72,6 @@ am__libpixman_mmx_la_SOURCES_DIST = pixman-mmx.c pixman-mmx.h
@USE_MMX_TRUE@ libpixman_mmx_la-pixman-mmx.lo
libpixman_mmx_la_OBJECTS = $(am_libpixman_mmx_la_OBJECTS)
@USE_MMX_TRUE@am_libpixman_mmx_la_rpath =
-libpixmanwrapper_la_LIBADD =
-am_libpixmanwrapper_la_OBJECTS = \
- libpixmanwrapper_la-pixman-compose.lo \
- libpixmanwrapper_la-pixman-edge.lo
-libpixmanwrapper_la_OBJECTS = $(am_libpixmanwrapper_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -92,11 +83,9 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libpixman_1_la_SOURCES) $(libpixman_mmx_la_SOURCES) \
- $(libpixmanwrapper_la_SOURCES)
+SOURCES = $(libpixman_1_la_SOURCES) $(libpixman_mmx_la_SOURCES)
DIST_SOURCES = $(libpixman_1_la_SOURCES) \
- $(am__libpixman_mmx_la_SOURCES_DIST) \
- $(libpixmanwrapper_la_SOURCES)
+ $(am__libpixman_mmx_la_SOURCES_DIST)
libpixmanincludeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(libpixmaninclude_HEADERS)
ETAGS = etags
@@ -165,6 +154,8 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_MMX_FALSE = @USE_MMX_FALSE@
USE_MMX_TRUE = @USE_MMX_TRUE@
+USE_SSE_FALSE = @USE_SSE_FALSE@
+USE_SSE_TRUE = @USE_SSE_TRUE@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -211,17 +202,18 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LTLIBRARIES = libpixman-1.la
libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-libpixman_1_la_LIBADD = @DEP_LIBS@ -lm libpixmanwrapper.la \
- $(am__append_2)
+libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_1)
libpixman_1_la_SOURCES = \
pixman.h \
pixman-region.c \
pixman-private.h \
pixman-image.c \
pixman-compose.c \
+ pixman-compose-accessors.c \
pixman-pict.c \
pixman-utils.c \
pixman-edge.c \
+ pixman-edge-accessors.c \
pixman-edge-imp.h \
pixman-trap.c \
pixman-compute-region.c \
@@ -230,13 +222,8 @@ libpixman_1_la_SOURCES = \
libpixmanincludedir = $(includedir)/pixman-1/
libpixmaninclude_HEADERS = pixman.h
-# wrapper library
-noinst_LTLIBRARIES = libpixmanwrapper.la $(am__append_1)
-libpixmanwrapper_la_SOURCES = \
- pixman-compose.c \
- pixman-edge.c
-
-libpixmanwrapper_la_CFLAGS = $(DEP_CFLAGS) -DPIXMAN_FB_ACCESSORS
+# mmx code
+@USE_MMX_TRUE@noinst_LTLIBRARIES = libpixman-mmx.la
@USE_MMX_TRUE@libpixman_mmx_la_SOURCES = \
@USE_MMX_TRUE@ pixman-mmx.c \
@USE_MMX_TRUE@ pixman-mmx.h
@@ -316,8 +303,6 @@ libpixman-1.la: $(libpixman_1_la_OBJECTS) $(libpixman_1_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libpixman_1_la_LDFLAGS) $(libpixman_1_la_OBJECTS) $(libpixman_1_la_LIBADD) $(LIBS)
libpixman-mmx.la: $(libpixman_mmx_la_OBJECTS) $(libpixman_mmx_la_DEPENDENCIES)
$(LINK) $(am_libpixman_mmx_la_rpath) $(libpixman_mmx_la_LDFLAGS) $(libpixman_mmx_la_OBJECTS) $(libpixman_mmx_la_LIBADD) $(LIBS)
-libpixmanwrapper.la: $(libpixmanwrapper_la_OBJECTS) $(libpixmanwrapper_la_DEPENDENCIES)
- $(LINK) $(libpixmanwrapper_la_LDFLAGS) $(libpixmanwrapper_la_OBJECTS) $(libpixmanwrapper_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -326,10 +311,10 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixman_mmx_la-pixman-mmx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-compose-accessors.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-compose.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-compute-region.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-edge-accessors.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-edge.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-image.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixman-pict.Plo@am__quote@
@@ -366,20 +351,6 @@ libpixman_mmx_la-pixman-mmx.lo: pixman-mmx.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixman_mmx_la_CFLAGS) $(CFLAGS) -c -o libpixman_mmx_la-pixman-mmx.lo `test -f 'pixman-mmx.c' || echo '$(srcdir)/'`pixman-mmx.c
-libpixmanwrapper_la-pixman-compose.lo: pixman-compose.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -MT libpixmanwrapper_la-pixman-compose.lo -MD -MP -MF "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Tpo" -c -o libpixmanwrapper_la-pixman-compose.lo `test -f 'pixman-compose.c' || echo '$(srcdir)/'`pixman-compose.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Tpo" "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Plo"; else rm -f "$(DEPDIR)/libpixmanwrapper_la-pixman-compose.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixman-compose.c' object='libpixmanwrapper_la-pixman-compose.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -c -o libpixmanwrapper_la-pixman-compose.lo `test -f 'pixman-compose.c' || echo '$(srcdir)/'`pixman-compose.c
-
-libpixmanwrapper_la-pixman-edge.lo: pixman-edge.c
-@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -MT libpixmanwrapper_la-pixman-edge.lo -MD -MP -MF "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Tpo" -c -o libpixmanwrapper_la-pixman-edge.lo `test -f 'pixman-edge.c' || echo '$(srcdir)/'`pixman-edge.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Tpo" "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Plo"; else rm -f "$(DEPDIR)/libpixmanwrapper_la-pixman-edge.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pixman-edge.c' object='libpixmanwrapper_la-pixman-edge.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpixmanwrapper_la_CFLAGS) $(CFLAGS) -c -o libpixmanwrapper_la-pixman-edge.lo `test -f 'pixman-edge.c' || echo '$(srcdir)/'`pixman-edge.c
-
mostlyclean-libtool:
-rm -f *.lo
diff --git a/lib/pixman/test/Makefile.in b/lib/pixman/test/Makefile.in
index 5ca440284..24d22e5a4 100644
--- a/lib/pixman/test/Makefile.in
+++ b/lib/pixman/test/Makefile.in
@@ -139,6 +139,8 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_MMX_FALSE = @USE_MMX_FALSE@
USE_MMX_TRUE = @USE_MMX_TRUE@
+USE_SSE_FALSE = @USE_SSE_FALSE@
+USE_SSE_TRUE = @USE_SSE_TRUE@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 01:02:30 +0000