Hello community,
here is the log from the commit of package pixman for openSUSE:Factory
checked in at Mon Aug 9 16:33:36 CEST 2010.
--------
--- pixman/pixman.changes 2010-04-01 15:17:34.000000000 +0200
+++ pixman/pixman.changes 2010-06-22 23:29:14.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Jun 21 12:49:20 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 0.18.2:
+ + Add missing HAVE_CONFIG_H guards for config.h inclusion.
+ + Fix uninitialized cache when pthreads are used.
+ + Fixes for pthread thread local storage.
+ + [mmx] Fix mask creation bugs.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pixman-0.18.0.tar.bz2
New:
----
pixman-0.18.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pixman.spec ++++++
--- /var/tmp/diff_new_pack.lQGuZj/_old 2010-08-09 16:30:13.000000000 +0200
+++ /var/tmp/diff_new_pack.lQGuZj/_new 2010-08-09 16:30:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package pixman (Version 0.18.0)
+# spec file for package pixman (Version 0.18.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
Name: pixman
-Version: 0.18.0
+Version: 0.18.2
Release: 1
License: MIT License (or similar)
Summary: Pixel manipulation library
++++++ pixman-0.18.0.tar.bz2 -> pixman-0.18.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/README new/pixman-0.18.2/README
--- old/pixman-0.18.0/README 2009-12-03 12:53:47.000000000 +0100
+++ new/pixman-0.18.2/README 2010-05-12 22:15:41.000000000 +0200
@@ -3,16 +3,12 @@
Please submit bugs & patches to the libpixman bugzilla:
- https://bugs.freedesktop.org/enter_bug.cgi?product=pixman
+ https://bugs.freedesktop.org/enter_bug.cgi?product=pixman
-All questions regarding this software should be directed to either the
-Xorg mailing list:
+All questions regarding this software should be directed to the pixman
+mailing list:
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-or the cairo mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/cairo
+ http://lists.freedesktop.org/mailman/listinfo/pixman
The master development code repository can be found at:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/configure new/pixman-0.18.2/configure
--- old/pixman-0.18.0/configure 2010-04-01 11:23:58.000000000 +0200
+++ new/pixman-0.18.2/configure 2010-05-12 22:26:22.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for pixman 0.18.0.
+# Generated by GNU Autoconf 2.65 for pixman 0.18.2.
#
# Report bugs to <"pixman@lists.freedesktop.org">.
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='pixman'
PACKAGE_TARNAME='pixman'
-PACKAGE_VERSION='0.18.0'
-PACKAGE_STRING='pixman 0.18.0'
+PACKAGE_VERSION='0.18.2'
+PACKAGE_STRING='pixman 0.18.2'
PACKAGE_BUGREPORT='"pixman@lists.freedesktop.org"'
PACKAGE_URL=''
@@ -1466,7 +1466,7 @@
# 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.18.0 to adapt to many kinds of systems.
+\`configure' configures pixman 0.18.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1536,7 +1536,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pixman 0.18.0:";;
+ short | recursive ) echo "Configuration of pixman 0.18.2:";;
esac
cat <<\_ACEOF
@@ -1651,7 +1651,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pixman configure 0.18.0
+pixman configure 0.18.2
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2146,7 +2146,7 @@
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.18.0, which was
+It was created by pixman $as_me 0.18.2, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2954,7 +2954,7 @@
# Define the identity of the package.
PACKAGE='pixman'
- VERSION='0.18.0'
+ VERSION='0.18.2'
cat >>confdefs.h <<_ACEOF
@@ -11086,13 +11086,13 @@
-LT_VERSION_INFO="18:0:18"
+LT_VERSION_INFO="18:2:18"
PIXMAN_VERSION_MAJOR=0
PIXMAN_VERSION_MINOR=18
-PIXMAN_VERSION_MICRO=0
+PIXMAN_VERSION_MICRO=2
@@ -11910,6 +11910,9 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#ifdef __MINGW32__
+#error MinGW has broken __thread support
+#endif
__thread int x ;
int main () { return 0; }
@@ -12558,7 +12561,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pixman $as_me 0.18.0, which was
+This file was extended by pixman $as_me 0.18.2, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12624,7 +12627,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pixman config.status 0.18.0
+pixman config.status 0.18.2
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/configure.ac new/pixman-0.18.2/configure.ac
--- old/pixman-0.18.0/configure.ac 2010-04-01 11:23:07.000000000 +0200
+++ new/pixman-0.18.2/configure.ac 2010-05-12 22:26:16.000000000 +0200
@@ -54,7 +54,7 @@
m4_define([pixman_major], 0)
m4_define([pixman_minor], 18)
-m4_define([pixman_micro], 0)
+m4_define([pixman_micro], 2)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -524,6 +524,9 @@
AC_MSG_CHECKING(for __thread)
AC_COMPILE_IFELSE([
+#ifdef __MINGW32__
+#error MinGW has broken __thread support
+#endif
__thread int x ;
int main () { return 0; }
], support_for__thread=yes)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/pixman/pixman-compiler.h new/pixman-0.18.2/pixman/pixman-compiler.h
--- old/pixman-0.18.0/pixman/pixman-compiler.h 2010-03-28 00:39:02.000000000 +0100
+++ new/pixman-0.18.2/pixman/pixman-compiler.h 2010-05-12 22:15:42.000000000 +0200
@@ -77,6 +77,71 @@
# define PIXMAN_GET_THREAD_LOCAL(name) \
(&name)
+#elif defined(__MINGW32__) && !defined(__WIN64)
+
+/* We can't include as it causes carious clashes with
+ * identifiers in pixman, sigh. So just declare the functions we need
+ * here.
+ */
+extern __stdcall long InterlockedCompareExchange(long volatile *, long, long);
+#define InterlockedCompareExchangePointer(d,e,c) \
+ (void *)InterlockedCompareExchange((long volatile *)(d),(long)(e),(long)(c))
+extern __stdcall int TlsAlloc (void);
+extern __stdcall void *TlsGetValue (unsigned);
+extern __stdcall int TlsSetValue (unsigned, void *);
+extern __stdcall void *CreateMutexA(void *, int, char *);
+extern __stdcall int CloseHandle(void *);
+extern __stdcall unsigned WaitForSingleObject (void *, unsigned);
+extern __stdcall int ReleaseMutex (void *);
+
+# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
+ static volatile int tls_ ## name ## _initialized = 0; \
+ static void *tls_ ## name ## _mutex = NULL; \
+ static unsigned tls_ ## name ## _index; \
+ \
+ static type * \
+ tls_ ## name ## _alloc (void) \
+ { \
+ type *value = calloc (1, sizeof (type)); \
+ if (value) \
+ TlsSetValue (tls_ ## name ## _index, value); \
+ return value; \
+ } \
+ \
+ static force_inline type * \
+ tls_ ## name ## _get (void) \
+ { \
+ type *value; \
+ if (!tls_ ## name ## _initialized) \
+ { \
+ if (!tls_ ## name ## _mutex) \
+ { \
+ void *mutex = CreateMutexA (NULL, 0, NULL); \
+ if (InterlockedCompareExchangePointer ( \
+ &tls_ ## name ## _mutex, mutex, NULL) != NULL) \
+ { \
+ CloseHandle (mutex); \
+ } \
+ } \
+ WaitForSingleObject (tls_ ## name ## _mutex, 0xFFFFFFFF); \
+ if (!tls_ ## name ## _initialized) \
+ { \
+ tls_ ## name ## _index = TlsAlloc (); \
+ tls_ ## name ## _initialized = 1; \
+ } \
+ ReleaseMutex (tls_ ## name ## _mutex); \
+ } \
+ if (tls_ ## name ## _index == 0xFFFFFFFF) \
+ return NULL; \
+ value = TlsGetValue (tls_ ## name ## _index); \
+ if (!value) \
+ value = tls_ ## name ## _alloc (); \
+ return value; \
+ }
+
+# define PIXMAN_GET_THREAD_LOCAL(name) \
+ tls_ ## name ## _get ()
+
#elif defined(_MSC_VER)
# define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
@@ -99,16 +164,16 @@
} \
\
static type * \
- tls_ ## name ## _alloc (key) \
+ tls_ ## name ## _alloc (void) \
{ \
- type *value = malloc (sizeof (type)); \
+ type *value = calloc (1, sizeof (type)); \
if (value) \
- pthread_setspecific (key, value); \
+ pthread_setspecific (tls_ ## name ## _key, value); \
return value; \
} \
\
static force_inline type * \
- tls_ ## name ## _get (key) \
+ tls_ ## name ## _get (void) \
{ \
type *value = NULL; \
if (pthread_once (&tls_ ## name ## _once_control, \
@@ -116,13 +181,13 @@
{ \
value = pthread_getspecific (tls_ ## name ## _key); \
if (!value) \
- value = tls_ ## name ## _alloc (key); \
+ value = tls_ ## name ## _alloc (); \
} \
return value; \
}
# define PIXMAN_GET_THREAD_LOCAL(name) \
- tls_ ## name ## _get (tls_ ## name ## _key)
+ tls_ ## name ## _get ()
#else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/pixman/pixman-conical-gradient.c new/pixman-0.18.2/pixman/pixman-conical-gradient.c
--- old/pixman-0.18.0/pixman/pixman-conical-gradient.c 2010-03-28 00:39:02.000000000 +0100
+++ new/pixman-0.18.2/pixman/pixman-conical-gradient.c 2010-05-12 22:15:41.000000000 +0200
@@ -23,7 +23,11 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
+
+#ifdef HAVE_CONFIG_H
#include
+#endif
+
#include
#include
#include "pixman-private.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/pixman/pixman-image.c new/pixman-0.18.2/pixman/pixman-image.c
--- old/pixman-0.18.0/pixman/pixman-image.c 2010-03-28 00:39:02.000000000 +0100
+++ new/pixman-0.18.2/pixman/pixman-image.c 2010-05-12 22:15:41.000000000 +0200
@@ -394,8 +394,10 @@
}
}
- if (image->common.repeat != PIXMAN_REPEAT_NONE &&
- !PIXMAN_FORMAT_A (image->bits.format))
+ if (image->common.repeat != PIXMAN_REPEAT_NONE &&
+ !PIXMAN_FORMAT_A (image->bits.format) &&
+ PIXMAN_FORMAT_TYPE (image->bits.format) != PIXMAN_TYPE_GRAY &&
+ PIXMAN_FORMAT_TYPE (image->bits.format) != PIXMAN_TYPE_COLOR)
{
flags |= FAST_PATH_IS_OPAQUE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/pixman/pixman-mmx.c new/pixman-0.18.2/pixman/pixman-mmx.c
--- old/pixman-0.18.0/pixman/pixman-mmx.c 2010-03-28 00:39:02.000000000 +0100
+++ new/pixman-0.18.2/pixman/pixman-mmx.c 2010-05-12 22:15:41.000000000 +0200
@@ -1385,6 +1385,7 @@
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);
+ mask &= 0xff000000;
mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
vmask = load8888 (mask);
srca = MC (4x00ff);
@@ -1470,6 +1471,7 @@
PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);
+ mask &= 0xff000000;
mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
vmask = load8888 (mask);
srca = MC (4x00ff);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/pixman/pixman-version.h new/pixman-0.18.2/pixman/pixman-version.h
--- old/pixman-0.18.0/pixman/pixman-version.h 2010-04-01 11:24:11.000000000 +0200
+++ new/pixman-0.18.2/pixman/pixman-version.h 2010-05-12 22:27:28.000000000 +0200
@@ -33,9 +33,9 @@
#define PIXMAN_VERSION_MAJOR 0
#define PIXMAN_VERSION_MINOR 18
-#define PIXMAN_VERSION_MICRO 0
+#define PIXMAN_VERSION_MICRO 2
-#define PIXMAN_VERSION_STRING "0.18.0"
+#define PIXMAN_VERSION_STRING "0.18.2"
#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \
((major) * 10000) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/pixman/pixman.h new/pixman-0.18.2/pixman/pixman.h
--- old/pixman-0.18.0/pixman/pixman.h 2010-03-28 00:39:02.000000000 +0100
+++ new/pixman-0.18.2/pixman/pixman.h 2010-05-12 22:15:40.000000000 +0200
@@ -89,7 +89,8 @@
#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__) || defined (__HP_cc)
# include
-#elif defined (_MSC_VER)
+/* VS 2010 (_MSC_VER 1600) has stdint.h */
+#elif defined (_MSC_VER) && _MSC_VER < 1600
typedef __int8 int8_t;
typedef unsigned __int8 uint8_t;
typedef __int16 int16_t;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pixman-0.18.0/test/blitters-test.c new/pixman-0.18.2/test/blitters-test.c
--- old/pixman-0.18.0/test/blitters-test.c 2010-03-28 00:39:02.000000000 +0100
+++ new/pixman-0.18.2/test/blitters-test.c 2010-05-12 22:15:41.000000000 +0200
@@ -482,7 +482,7 @@
/* Predefined value for running with all the fastpath functions
disabled. It needs to be updated every time when changes are
introduced to this program or behavior of pixman changes! */
- if (crc == 0xA058F792)
+ if (crc == 0x8F9F7DC1)
{
printf ("blitters test passed\n");
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org