aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-10-29 06:41:31 +0000
committermarha <marha@users.sourceforge.net>2010-10-29 06:41:31 +0000
commit5c8222f5274c5d56e260d72192d536a7228cfbc8 (patch)
treeb6b265decf4a31eed6fb5cb2939bfb69365b3cac
parenta769e525374f80f0650699a2c97ad020cc76ea6d (diff)
parent3eee9271d2345cb54c1778629ba3cf3b804c2671 (diff)
downloadvcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.gz
vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.tar.bz2
vcxsrv-5c8222f5274c5d56e260d72192d536a7228cfbc8.zip
svn merge ^/branches/released .
-rw-r--r--libX11/nls/locale.alias.pre2
-rw-r--r--libXdmcp/configure.ac2
-rw-r--r--libXext/configure.ac2
-rw-r--r--libXinerama/COPYING2
-rw-r--r--libXinerama/configure.ac4
-rw-r--r--libXinerama/man/Makefile.am2
-rw-r--r--libXinerama/man/Xinerama.man2
-rw-r--r--pixman/configure.ac7
-rw-r--r--pixman/test/alphamap.c5
9 files changed, 18 insertions, 10 deletions
diff --git a/libX11/nls/locale.alias.pre b/libX11/nls/locale.alias.pre
index be26de621..25f06d430 100644
--- a/libX11/nls/locale.alias.pre
+++ b/libX11/nls/locale.alias.pre
@@ -10,10 +10,12 @@ POSIX: C
POSIX-UTF2: C
C_C.C: C
C.en: C
+C.ASCII: C
C.iso88591: en_US.ISO8859-1
Cextend: en_US.ISO8859-1
Cextend.en: en_US.ISO8859-1
English_United-States.437: C
+C.UTF-8: en_US.UTF-8
XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
a3: a3_AZ.KOI8-C
a3_AZ: a3_AZ.KOI8-C
diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac
index a5cfc8762..bacd8c877 100644
--- a/libXdmcp/configure.ac
+++ b/libXdmcp/configure.ac
@@ -38,8 +38,6 @@ XORG_WITH_XMLTO(0.0.20)
XORG_WITH_FOP
XORG_CHECK_SGML_DOCTOOLS(1.5)
-AC_PROG_CC
-AC_PROG_INSTALL
AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
diff --git a/libXext/configure.ac b/libXext/configure.ac
index b3b60e869..631b774cc 100644
--- a/libXext/configure.ac
+++ b/libXext/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.60])
AC_INIT([libXext],
- [1.1.2],
+ [1.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXext])
diff --git a/libXinerama/COPYING b/libXinerama/COPYING
index 2abdec8cb..c9816b684 100644
--- a/libXinerama/COPYING
+++ b/libXinerama/COPYING
@@ -1,4 +1,4 @@
-Copyright © 2007 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/libXinerama/configure.ac b/libXinerama/configure.ac
index f03c4defa..0dec68bec 100644
--- a/libXinerama/configure.ac
+++ b/libXinerama/configure.ac
@@ -22,7 +22,9 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libXinerama, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
+AC_INIT([libXinerama], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXinerama])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/libXinerama/man/Makefile.am b/libXinerama/man/Makefile.am
index 312a14b93..d220ff5fd 100644
--- a/libXinerama/man/Makefile.am
+++ b/libXinerama/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright © 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
diff --git a/libXinerama/man/Xinerama.man b/libXinerama/man/Xinerama.man
index 89524eb8d..a68fd943f 100644
--- a/libXinerama/man/Xinerama.man
+++ b/libXinerama/man/Xinerama.man
@@ -1,5 +1,5 @@
.\"
-.\" Copyright © 2007 Sun Microsystems, Inc. All rights reserved.
+.\" Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
.\" copy of this software and associated documentation files (the "Software"),
diff --git a/pixman/configure.ac b/pixman/configure.ac
index c723337a9..2c32f00d8 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
#
m4_define([pixman_major], 0)
-m4_define([pixman_minor], 19)
-m4_define([pixman_micro], 7)
+m4_define([pixman_minor], 21)
+m4_define([pixman_micro], 1)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -726,7 +726,8 @@ if test $support_for__thread = no; then
PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"])
PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"])
-
+ PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"])
+
if test $support_for_pthread_setspecific = yes; then
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_DEFINE([HAVE_PTHREAD_SETSPECIFIC], [], [Whether pthread_setspecific() is supported])
diff --git a/pixman/test/alphamap.c b/pixman/test/alphamap.c
index 6d150cf69..ba3130e5d 100644
--- a/pixman/test/alphamap.c
+++ b/pixman/test/alphamap.c
@@ -82,6 +82,7 @@ create_image (pixman_format_code_t format, pixman_format_code_t alpha_format,
pixman_image_set_alpha_map (image, alpha,
alpha_origin_x, alpha_origin_y);
+ pixman_image_unref (alpha);
}
return image;
@@ -217,6 +218,10 @@ run_test (int s, int d, int sa, int da, int soff, int doff)
}
}
+ pixman_image_set_alpha_map (src, NULL, 0, 0);
+ pixman_image_set_alpha_map (dst, NULL, 0, 0);
+ pixman_image_set_alpha_map (orig_dst, NULL, 0, 0);
+
pixman_image_unref (src);
pixman_image_unref (dst);
pixman_image_unref (orig_dst);