From 0e3699334faf92f508b6c187a261548b656b0dd3 Mon Sep 17 00:00:00 2001
From: marha
Date: Fri, 20 Apr 2012 17:07:15 +0200
Subject: fontconfig libX11 mesa pixman xserver git update 20 april 2012
---
fontconfig/configure.in | 44 +-
fontconfig/doc/fccache.fncs | 9 +
fontconfig/fc-cache/fc-cache.c | 93 +--
fontconfig/fontconfig/fontconfig.h | 3 +
fontconfig/src/fccache.c | 91 +++
fontconfig/src/fcint.h | 2 +
libX11/specs/libX11/AppC.xml | 97 +--
libX11/specs/libX11/CH01.xml | 3 +-
libX11/specs/libX11/CH09.xml | 3 +-
mesalib/Makefile | 2 +-
mesalib/configure.ac | 4 +-
mesalib/docs/download.html | 43 +-
mesalib/docs/install.html | 251 ++++---
mesalib/src/gallium/auxiliary/util/u_blit.c | 17 +-
mesalib/src/gallium/auxiliary/util/u_blit.h | 191 +++--
mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c | 17 +-
mesalib/src/gallium/auxiliary/util/u_gen_mipmap.h | 134 ++--
mesalib/src/gallium/auxiliary/util/u_inlines.h | 2 +-
mesalib/src/glsl/ast_function.cpp | 29 +-
mesalib/src/glsl/ast_to_hir.cpp | 70 ++
mesalib/src/glsl/ir.h | 13 +
mesalib/src/glsl/main.cpp | 2 +-
mesalib/src/glsl/opt_array_splitting.cpp | 53 +-
mesalib/src/glsl/opt_structure_splitting.cpp | 739 +++++++++----------
mesalib/src/mesa/main/attrib.c | 3 -
mesalib/src/mesa/main/context.c | 5 +-
mesalib/src/mesa/main/ff_fragment_shader.cpp | 2 +-
mesalib/src/mesa/main/mtypes.h | 2 +-
mesalib/src/mesa/main/readpix.c | 62 +-
mesalib/src/mesa/main/state.c | 22 +-
mesalib/src/mesa/main/varray.c | 2 +-
mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 124 ++--
mesalib/src/mesa/state_tracker/st_cb_clear.c | 95 +--
mesalib/src/mesa/state_tracker/st_cb_clear.h | 101 ++-
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 33 +-
mesalib/src/mesa/state_tracker/st_cb_drawtex.c | 26 +-
mesalib/src/mesa/state_tracker/st_cb_flush.c | 324 +++++----
mesalib/src/mesa/state_tracker/st_context.c | 3 +
mesalib/src/mesa/state_tracker/st_context.h | 20 +-
mesalib/src/mesa/vbo/vbo_context.c | 13 +-
mesalib/src/mesa/vbo/vbo_context.h | 10 -
mesalib/src/mesa/vbo/vbo_exec.c | 4 +
mesalib/src/mesa/vbo/vbo_exec.h | 1 +
mesalib/src/mesa/vbo/vbo_exec_api.c | 10 +-
mesalib/src/mesa/vbo/vbo_exec_array.c | 100 +--
mesalib/src/mesa/vbo/vbo_exec_draw.c | 12 +-
mesalib/src/mesa/vbo/vbo_save.c | 10 +-
mesalib/src/mesa/vbo/vbo_save_draw.c | 10 +-
pixman/configure.ac | 2 +-
xorg-server/Xext/Makefile.am | 2 +-
xorg-server/Xext/hashtable.c | 291 ++++++++
xorg-server/Xext/hashtable.h | 137 ++++
xorg-server/Xext/xres.c | 829 +++++++++++++++++++++-
xorg-server/Xi/exevents.c | 92 ++-
xorg-server/composite/compext.c | 25 +
xorg-server/composite/compint.h | 2 +-
xorg-server/composite/compositeext.h | 2 +
xorg-server/configure.ac | 27 +-
xorg-server/dix/dispatch.c | 9 +-
xorg-server/dix/events.c | 55 +-
xorg-server/dix/resource.c | 383 +++++++++-
xorg-server/dix/touch.c | 117 +--
xorg-server/hw/xfree86/Makefile.am | 18 +-
xorg-server/hw/xfree86/common/xf86Config.c | 5 +
xorg-server/hw/xfree86/common/xf86Init.c | 7 +
xorg-server/hw/xfree86/dixmods/Makefile.am | 24 +-
xorg-server/hw/xfree86/dixmods/extmod/Makefile.am | 2 +-
xorg-server/hw/xfree86/dri/Makefile.am | 3 +-
xorg-server/hw/xfree86/dri2/Makefile.am | 3 +-
xorg-server/hw/xfree86/exa/Makefile.am | 4 +-
xorg-server/hw/xfree86/fbdevhw/Makefile.am | 2 +-
xorg-server/hw/xfree86/i2c/Makefile.am | 17 +-
xorg-server/hw/xfree86/loader/loadmod.c | 18 +
xorg-server/hw/xfree86/man/xorg.conf.man | 2 +-
xorg-server/hw/xfree86/modes/xf86Crtc.c | 2 +
xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 2 +-
xorg-server/hw/xfree86/sdksyms.sh | 2 +
xorg-server/hw/xfree86/shadowfb/Makefile.am | 3 +-
xorg-server/hw/xfree86/vbe/Makefile.am | 5 +-
xorg-server/hw/xfree86/xaa/Makefile.am | 2 +-
xorg-server/include/input.h | 6 +-
xorg-server/include/protocol-versions.h | 2 +-
xorg-server/include/resource.h | 58 +-
xorg-server/render/picture.c | 24 +
xorg-server/test/Makefile.am | 3 +-
xorg-server/test/hashtabletest.c | 162 +++++
xorg-server/xkeyboard-config/ABOUT-NLS | 768 --------------------
xorg-server/xkeyboard-config/autogen.sh | 5 +-
xorg-server/xkeyboard-config/config.rpath | 0
xorg-server/xkeyboard-config/configure.in | 5 +-
xorg-server/xorg-server.pc.in | 2 +-
91 files changed, 3669 insertions(+), 2366 deletions(-)
create mode 100644 xorg-server/Xext/hashtable.c
create mode 100644 xorg-server/Xext/hashtable.h
create mode 100644 xorg-server/test/hashtabletest.c
delete mode 100644 xorg-server/xkeyboard-config/ABOUT-NLS
delete mode 100644 xorg-server/xkeyboard-config/config.rpath
diff --git a/fontconfig/configure.in b/fontconfig/configure.in
index 9c9de30e7..9bb0988ec 100644
--- a/fontconfig/configure.in
+++ b/fontconfig/configure.in
@@ -150,7 +150,11 @@ AC_DEFINE_UNQUOTED(USE_REGEX,$use_regex,[Use regex.])
AC_ARG_WITH(libiconv,
[AC_HELP_STRING([--with-libiconv=DIR],
[Use libiconv in DIR])],
- [libiconv_prefix=$withval],
+ [if test "x$withval" = "xyes"; then
+ libiconv_prefix=$prefix
+ else
+ libiconv_prefix=$withval
+ fi],
[libiconv_prefix=auto])
AC_ARG_WITH(libiconv-includes,
[AC_HELP_STRING([--with-libiconv-includes=DIR],
@@ -163,33 +167,33 @@ AC_ARG_WITH(libiconv-lib,
[libiconv_lib=$withval],
[libiconv_lib=auto])
-# if none of libiconv,libiconv-includes,libiconv-libs are specified
-if test "$libiconv_prefix" != "auto" -o "$libiconv_includes" != "auto" -o "$libiconv_lib" != "auto"; then
- if test "$libiconv_includes" != "auto" -a -r ${libiconv_includes}/iconv.h; then
- libiconv_cflags="-I${libiconv_includes}"
- elif test "$libiconv_prefix" != "auto" -a -r ${libiconv_prefix}/include/iconv.h; then
- libiconv_cflags="-I${libiconv_prefix}/include"
- else
- libiconv_cflags=""
- fi
- if test "$libiconv_lib" != "auto"; then
- libiconv_lib="-L${libiconv_lib} -liconv"
- elif test "$libiconv_prefix" != "auto"; then
- libiconv_lib="-L${libiconv_prefix}/lib -liconv"
- elif test "x$libiconv_cflags" != "x"; then
- libiconv_lib="-liconv"
+# if no libiconv,libiconv-includes,libiconv-lib are specified,
+# libc's iconv has a priority.
+if test "$libiconv_includes" != "auto" -a -r ${libiconv_includes}/iconv.h; then
+ libiconv_cflags="-I${libiconv_includes}"
+elif test "$libiconv_prefix" != "auto" -a -r ${libiconv_prefix}/include/iconv.h; then
+ libiconv_cflags="-I${libiconv_prefix}/include"
+else
+ libiconv_cflags=""
+fi
+libiconv_libs=""
+if test "x$libiconv_cflags" != "x"; then
+ if test "$libiconv_lib" != "auto" -a -d ${libiconv_lib}; then
+ libiconv_libs="-L${libiconv_lib} -liconv"
+ elif test "$libiconv_prefix" != "auto" -a -d ${libiconv_prefix}/lib; then
+ libiconv_libs="-L${libiconv_prefix}/lib -liconv"
else
- libiconv_lib=""
+ libiconv_libs="-liconv"
fi
fi
use_iconv=0
AC_MSG_CHECKING([for a usable iconv])
-if test "x$libiconv_cflags" != "x" -o "x$libiconv_lib" != "x"; then
+if test "x$libiconv_cflags" != "x" -o "x$libiconv_libs" != "x"; then
iconvsaved_CFLAGS="$CFLAGS"
iconvsaved_LIBS="$LIBS"
CFLAGS="$CFLAGS $libiconv_cflags"
- LIBS="$LIBS $libiconv_lib"
+ LIBS="$LIBS $libiconv_libs"
AC_TRY_LINK([#include ],
[iconv_open ("from", "to");],
@@ -200,7 +204,7 @@ if test "x$libiconv_cflags" != "x" -o "x$libiconv_lib" != "x"; then
CFLAGS="$iconvsaved_CFLAGS"
LIBS="$iconvsaved_LIBS"
ICONV_CFLAGS="$libiconv_cflags"
- ICONV_LIBS="$libiconv_lib"
+ ICONV_LIBS="$libiconv_libs"
fi
if test "x$use_iconv" = "x0"; then
AC_TRY_LINK([#include ],
diff --git a/fontconfig/doc/fccache.fncs b/fontconfig/doc/fccache.fncs
index f35c5d7cb..2f5fa4766 100644
--- a/fontconfig/doc/fccache.fncs
+++ b/fontconfig/doc/fccache.fncs
@@ -66,3 +66,12 @@ This returns the total number of subdirectories in the cache.
This returns the number of fonts which would be included in the return from
FcCacheCopySet.
@@
+
+@RET@ FcBool
+@FUNC@ FcDirCacheClean
+@TYPE1@ const FcChar8 * @ARG1@ cache_dir
+@TYPE2@ FcBool @ARG2@ verbose
+@PURPOSE@
+This tries to clean up the cache directory of cache_dir.
+This returns FcTrue if the operation is successfully complete. otherwise FcFalse.
+@@
diff --git a/fontconfig/fc-cache/fc-cache.c b/fontconfig/fc-cache/fc-cache.c
index 24bb2ec9f..b42fd3545 100644
--- a/fontconfig/fc-cache/fc-cache.c
+++ b/fontconfig/fc-cache/fc-cache.c
@@ -32,7 +32,6 @@
#endif
#include
-#include "../src/fcarch.h"
#include
#include
#include
@@ -318,96 +317,6 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
return ret;
}
-static FcBool
-cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
-{
- DIR *d;
- struct dirent *ent;
- FcChar8 *dir_base;
- FcBool ret = FcTrue;
- FcBool remove;
- FcCache *cache;
- struct stat target_stat;
-
- dir_base = FcStrPlus (dir, (FcChar8 *) "/");
- if (!dir_base)
- {
- fprintf (stderr, "%s: out of memory\n", dir);
- return FcFalse;
- }
- if (access ((char *) dir, W_OK) != 0)
- {
- if (verbose)
- printf ("%s: not cleaning %s cache directory\n", dir,
- access ((char *) dir, F_OK) == 0 ? "unwritable" : "non-existent");
- FcStrFree (dir_base);
- return FcTrue;
- }
- if (verbose)
- printf ("%s: cleaning cache directory\n", dir);
- d = opendir ((char *) dir);
- if (!d)
- {
- perror ((char *) dir);
- FcStrFree (dir_base);
- return FcFalse;
- }
- while ((ent = readdir (d)))
- {
- FcChar8 *file_name;
- const FcChar8 *target_dir;
-
- if (ent->d_name[0] == '.')
- continue;
- /* skip cache files for different architectures and */
- /* files which are not cache files at all */
- if (strlen(ent->d_name) != 32 + strlen ("-" FC_ARCHITECTURE FC_CACHE_SUFFIX) ||
- strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX))
- continue;
-
- file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
- if (!file_name)
- {
- fprintf (stderr, "%s: allocation failure\n", dir);
- ret = FcFalse;
- break;
- }
- remove = FcFalse;
- cache = FcDirCacheLoadFile (file_name, NULL);
- if (!cache)
- {
- if (verbose)
- printf ("%s: invalid cache file: %s\n", dir, ent->d_name);
- remove = FcTrue;
- }
- else
- {
- target_dir = FcCacheDir (cache);
- if (stat ((char *) target_dir, &target_stat) < 0)
- {
- if (verbose)
- printf ("%s: %s: missing directory: %s \n",
- dir, ent->d_name, target_dir);
- remove = FcTrue;
- }
- }
- if (remove)
- {
- if (unlink ((char *) file_name) < 0)
- {
- perror ((char *) file_name);
- ret = FcFalse;
- }
- }
- FcDirCacheUnload (cache);
- FcStrFree (file_name);
- }
-
- closedir (d);
- FcStrFree (dir_base);
- return ret;
-}
-
static FcBool
cleanCacheDirectories (FcConfig *config, FcBool verbose)
{
@@ -419,7 +328,7 @@ cleanCacheDirectories (FcConfig *config, FcBool verbose)
return FcFalse;
while ((cache_dir = FcStrListNext (cache_dirs)))
{
- if (!cleanCacheDirectory (config, cache_dir, verbose))
+ if (!FcDirCacheClean (cache_dir, verbose))
{
ret = FcFalse;
break;
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 8936d8337..0e2ca509d 100644
--- a/fontconfig/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig/fontconfig.h
@@ -328,6 +328,9 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config);
FcPublic FcBool
FcDirCacheValid (const FcChar8 *cache_file);
+FcPublic FcBool
+FcDirCacheClean (const FcChar8 *cache_dir, FcBool verbose);
+
/* fccfg.c */
FcPublic FcChar8 *
FcConfigHome (void);
diff --git a/fontconfig/src/fccache.c b/fontconfig/src/fccache.c
index 343ece9a7..b7ba1fd1e 100644
--- a/fontconfig/src/fccache.c
+++ b/fontconfig/src/fccache.c
@@ -1020,6 +1020,97 @@ FcDirCacheWrite (FcCache *cache, FcConfig *config)
return FcFalse;
}
+FcBool
+FcDirCacheClean (const FcChar8 *cache_dir, FcBool verbose)
+{
+ DIR *d;
+ struct dirent *ent;
+ FcChar8 *dir_base;
+ FcBool ret = FcTrue;
+ FcBool remove;
+ FcCache *cache;
+ struct stat target_stat;
+
+ dir_base = FcStrPlus (cache_dir, (FcChar8 *) FC_DIR_SEPARATOR_S);
+ if (!dir_base)
+ {
+ fprintf (stderr, "Fontconfig error: %s: out of memory\n", cache_dir);
+ return FcFalse;
+ }
+ if (access ((char *) cache_dir, W_OK) != 0)
+ {
+ if (verbose || FcDebug () & FC_DBG_CACHE)
+ printf ("%s: not cleaning %s cache directory\n", cache_dir,
+ access ((char *) cache_dir, F_OK) == 0 ? "unwritable" : "non-existent");
+ goto bail0;
+ }
+ if (verbose || FcDebug () & FC_DBG_CACHE)
+ printf ("%s: cleaning cache directory\n", cache_dir);
+ d = opendir ((char *) cache_dir);
+ if (!d)
+ {
+ perror ((char *) cache_dir);
+ ret = FcFalse;
+ goto bail0;
+ }
+ while ((ent = readdir (d)))
+ {
+ FcChar8 *file_name;
+ const FcChar8 *target_dir;
+
+ if (ent->d_name[0] == '.')
+ continue;
+ /* skip cache files for different architectures and */
+ /* files which are not cache files at all */
+ if (strlen(ent->d_name) != 32 + strlen ("-" FC_ARCHITECTURE FC_CACHE_SUFFIX) ||
+ strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX))
+ continue;
+
+ file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
+ if (!file_name)
+ {
+ fprintf (stderr, "Fontconfig error: %s: allocation failure\n", cache_dir);
+ ret = FcFalse;
+ break;
+ }
+ remove = FcFalse;
+ cache = FcDirCacheLoadFile (file_name, NULL);
+ if (!cache)
+ {
+ if (verbose || FcDebug () & FC_DBG_CACHE)
+ printf ("%s: invalid cache file: %s\n", cache_dir, ent->d_name);
+ remove = FcTrue;
+ }
+ else
+ {
+ target_dir = FcCacheDir (cache);
+ if (stat ((char *) target_dir, &target_stat) < 0)
+ {
+ if (verbose || FcDebug () & FC_DBG_CACHE)
+ printf ("%s: %s: missing directory: %s \n",
+ cache_dir, ent->d_name, target_dir);
+ remove = FcTrue;
+ }
+ }
+ if (remove)
+ {
+ if (unlink ((char *) file_name) < 0)
+ {
+ perror ((char *) file_name);
+ ret = FcFalse;
+ }
+ }
+ FcDirCacheUnload (cache);
+ FcStrFree (file_name);
+ }
+
+ closedir (d);
+ bail0:
+ FcStrFree (dir_base);
+
+ return ret;
+}
+
/*
* Hokey little macro trick to permit the definitions of C functions
* with the same name as CPP macros
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h
index 0dfc23659..ba4b388ea 100644
--- a/fontconfig/src/fcint.h
+++ b/fontconfig/src/fcint.h
@@ -64,8 +64,10 @@ typedef HRESULT (WINAPI *pfnSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR);
extern pfnGetSystemWindowsDirectory pGetSystemWindowsDirectory;
extern pfnSHGetFolderPathA pSHGetFolderPathA;
# define FC_SEARCH_PATH_SEPARATOR ';'
+# define FC_DIR_SEPARATOR_S "\\"
#else
# define FC_SEARCH_PATH_SEPARATOR ':'
+# define FC_DIR_SEPARATOR_S "/"
#endif
#define FC_DBG_MATCH 1
diff --git a/libX11/specs/libX11/AppC.xml b/libX11/specs/libX11/AppC.xml
index c2e7f54fb..df250275e 100644
--- a/libX11/specs/libX11/AppC.xml
+++ b/libX11/specs/libX11/AppC.xml
@@ -37,9 +37,9 @@ and should use minor opcodes to distinguish the requests.
The symbols and macros used for writing stubs to Xlib are listed in
.
-
-Basic Protocol Support Routines
+
+Basic Protocol Support Routines
The basic protocol requests for extensions are
@@ -202,9 +202,10 @@ The
function frees the memory allocated by
.
-
-Hooking into Xlib
+
+
+Hooking into Xlib
These functions allow you to hook into the library.
@@ -350,9 +351,9 @@ function allocates the
structure, bumps the extension number count,
and chains the extension onto the extension list.
(This permits extensions to Xlib without requiring server extensions.)
-
-Hooks into the Library
+
+Hooks into the Library
These functions allow you to define procedures that are to be
@@ -1536,9 +1537,10 @@ The data argument specifies a portion of the outgoing data buffer,
and its length in bytes is specified by the len argument.
Your procedure must not alter the contents of the data and must not
do additional protocol requests to the same display.
-
-Hooks onto Xlib Data Structures
+
+
+Hooks onto Xlib Data Structures
Various Xlib data structures have provisions for extension procedures
@@ -1817,9 +1819,11 @@ To correctly handle automatic reuse of resource IDs, you must call
when requesting multiple resource IDs. This call might generate
protocol requests.
-
-GC Caching
+
+
+
+GC Caching
GCs are cached by the library to allow merging of independent change
@@ -1922,12 +1926,11 @@ Specifies the GC.
-
-
-Graphics Batching
-
+
+
+Graphics Batching
If you extend X to add more poly graphics primitives, you may be able to
@@ -2010,9 +2013,10 @@ Note that
is called before picking up the value of last_req,
because it may modify this field.
-
-Writing Extension Stubs
+
+
+Writing Extension Stubs
All X requests always contain the length of the request,
@@ -2023,10 +2027,11 @@ Some servers may not support single requests of such a length.
The value of dpy->max_request_size contains the maximum length as
defined by the server implementation.
For further information,
-see ``X Window System Protocol.''
-
-Requests, Replies, and Xproto.h
+see X Window System Protocol.
+
+Requests, Replies, and Xproto.h
The
@@ -2068,9 +2073,10 @@ that looks similar to this:
In your extension header file,
this will be a minor opcode,
instead of a major opcode.
-
-Request Format
+
+
+Request Format
Every request contains an 8-bit major opcode and a 16-bit length field
@@ -2269,9 +2275,10 @@ Instead, they use the
xGenericReply
structure, which contains only a type, length,
and sequence number (and sufficient padding to make it 32 bytes long).
-
-Starting to Write a Stub Procedure
+
+
+Starting to Write a Stub Procedure
An Xlib stub procedure should start like this:
@@ -2299,9 +2306,10 @@ The following is an example:
xDoSomethingReply rep;
-
-Locking Data Structures
+
+
+Locking Data Structures
To lock the display structure for systems that
@@ -2343,12 +2351,11 @@ Specifies the connection to the X server.
-
-
-Sending the Protocol Request and Arguments
-
+
+
+Sending the Protocol Request and Arguments
After the variable declarations,
@@ -2462,9 +2469,10 @@ which is the same as
except that it takes an additional argument (the number of
extra bytes to allocate in the output buffer after the request structure).
This number should always be a multiple of four.
-
-Variable Length Arguments
+
+
+Variable Length Arguments
Some protocol requests take additional variable-length data that
@@ -2544,9 +2552,10 @@ copying it into the output buffer (which would later be flushed
anyway by the following call on
),
it is faster.
-
-Replies
+
+
+Replies
If the protocol request has a reply,
@@ -2995,9 +3004,10 @@ reads and discards up to three additional pad bytes.
Each protocol request is a little different.
For further information,
see the Xlib sources for examples.
-
-Synchronous Calling
+
+
+Synchronous Calling
Each procedure should have a call, just before returning to the user,
@@ -3008,9 +3018,10 @@ If synchronous mode is enabled (see
the request is sent immediately.
The library, however, waits until any error the procedure could generate
at the server has been handled.
-
-Allocating and Deallocating Memory
+
+
+Allocating and Deallocating Memory
To support the possible reentry of these procedures,
@@ -3181,9 +3192,10 @@ Specifies the size of the buffer.
You must pass back the same pointer and size that were returned by
.
-
-Portability Considerations
+
+
+Portability Considerations
Many machine architectures,
@@ -3252,9 +3264,10 @@ The
PackData
macro is a half-hearted attempt to deal with the possibility of 32 bit shorts.
However, much more work is needed to make this work properly.
-
-Deriving the Correct Extension Opcode
+
+
+Deriving the Correct Extension Opcode
The remaining problem a writer of an extension stub procedure faces that
@@ -3310,4 +3323,6 @@ structure.
+
+
diff --git a/libX11/specs/libX11/CH01.xml b/libX11/specs/libX11/CH01.xml
index 8d2092420..081e80c46 100644
--- a/libX11/specs/libX11/CH01.xml
+++ b/libX11/specs/libX11/CH01.xml
@@ -26,7 +26,8 @@ programming language. Other higher-level abstractions (for example,
those provided by the toolkits for X) are built on top of the Xlib
library. For further information about these higher-level libraries,
see the appropriate toolkit documentation.
-The X Window System Protocol provides the
+The X Window System Protocol provides the
definitive word on the behavior of X.
Although additional information appears here, the protocol document is
the ruling document.
diff --git a/libX11/specs/libX11/CH09.xml b/libX11/specs/libX11/CH09.xml
index e239db2e9..5636df149 100644
--- a/libX11/specs/libX11/CH09.xml
+++ b/libX11/specs/libX11/CH09.xml
@@ -1434,7 +1434,8 @@ setup.
Servers also can implement other access control policies in addition to
or in place of this host access facility.
For further information about other access control implementations,
-see ``X Window System Protocol.''
+see X Window System Protocol.
Adding, Getting, or Removing Hosts
diff --git a/mesalib/Makefile b/mesalib/Makefile
index 1368b44ea..0f88071aa 100644
--- a/mesalib/Makefile
+++ b/mesalib/Makefile
@@ -22,7 +22,7 @@ doxygen:
cd doxygen && $(MAKE)
check:
- cd src/glsl/tests/ && ./optimization-test
+ make -C src/glsl/tests check
make -C tests check
clean:
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 9d6cbeb96..1b571b95c 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -708,7 +708,7 @@ default_driver="xlib"
case "$host_os" in
linux*)
case "$host_cpu" in
- i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+ i*86|x86_64|powerpc*|sparc*|ia64*) default_driver="dri";;
esac
;;
*freebsd* | dragonfly* | *netbsd*)
@@ -1993,6 +1993,7 @@ dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf
src/gallium/drivers/Makefile
src/gallium/drivers/r300/Makefile
+ src/gallium/drivers/r600/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
src/egl/drivers/Makefile
@@ -2004,6 +2005,7 @@ AC_CONFIG_FILES([configs/autoconf
src/egl/wayland/wayland-egl/Makefile
src/egl/wayland/wayland-egl/wayland-egl.pc
src/egl/wayland/wayland-drm/Makefile
+ src/glsl/tests/Makefile
src/glx/Makefile
src/mapi/shared-glapi/Makefile
src/gtest/Makefile
diff --git a/mesalib/docs/download.html b/mesalib/docs/download.html
index 4e8fc2f02..6a9533aae 100644
--- a/mesalib/docs/download.html
+++ b/mesalib/docs/download.html
@@ -20,26 +20,12 @@ When a new release is coming, release candidates (betas) may be found
+Unpacking
+
-The Mesa package is named MesaLib-x.y.z.{tar.bz2, tar.gz, zip} where x.y.z
-is the version. There are three types of compressed archives.
-
-
-In the past, there was also MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which
-contained Mark Kilgard's GLUT library.
-Most Linux distributions include an implementation of GLUT (such as freeglut).
-
-
-In the past, the Mesa demos collection was distributed as
-MesaDemos-x.y.z.{tar.bz2, tar.gz, zip}.
-Now, the
-
-Mesa demos are distributed separately.
+Mesa releases are available in three formats: .tar.bz2, .tar.gz, and .zip
-
-Unpacking
-
To unpack .tar.gz files:
@@ -86,10 +72,6 @@ src/glu - libGLU source code
src/glx - sources for building libGL with full GLX and DRI support
-If you downloaded and unpacked the MesaGLUT.x.y.z package:
-
-src/glut - GLUT library source code
-
Proceed to the compilation and installation
@@ -97,5 +79,24 @@ instructions.
+Demos and GLUT
+
+
+A package of Mark Kilgard's GLUT library is available
+here
+
+
+
+The Mesa demos collection is available
+here
+
+
+
+In the past, GLUT and the Mesa demos were released in conjunction with
+Mesa releases. But since GLUT and the demos change infrequently, they
+were split off some time ago.
+
+
+