Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/configs/linux-dri
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/drivers/dri/Makefile.template
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/dix/window.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwin.h
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xquartz/pbproxy/app-main.m
	xorg-server/hw/xquartz/pbproxy/pbproxy.h
	xorg-server/hw/xquartz/pbproxy/x-selection.m
	xorg-server/hw/xquartz/xpr/xpr.h
	xorg-server/hw/xquartz/xpr/xprEvent.c
	xorg-server/hw/xquartz/xpr/xprScreen.c
	xorg-server/include/privates.h
	xorg-server/include/protocol-versions.h
	xorg-server/test/Makefile.am
	xorg-server/xfixes/cursor.c
	xorg-server/xfixes/xfixes.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/de
	xorg-server/xkeyboard-config/symbols/lk
	xorg-server/xkeyboard-config/symbols/ru

3 files changed, 46 insertions, 7 deletions

diff --git a/xorg-server/hw/xquartz/pbproxy/app-main.m b/xorg-server/hw/xquartz/pbproxy/app-main.m
index 097994555..5758a33a7 100644
--- a/xorg-server/hw/xquartz/pbproxy/app-main.m
+++ b/xorg-server/hw/xquartz/pbproxy/app-main.m
@@ -63,6 +63,17 @@ ErrorF(const char * f, ...)
     va_end(args);

 }

 

+/* TODO: Have this actually log to ASL */

+void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) {

+#ifdef DEBUG

+    va_list args;

+

+    va_start(args, fmt);

+    vfprintf(stderr, fmt, args);

+    va_end(args);

+#endif

+}

+

 int main (int argc, const char *argv[]) {

     const char *s;

     int i;

diff --git a/xorg-server/hw/xquartz/pbproxy/pbproxy.h b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
index 3e5c93926..9d729531f 100644
--- a/xorg-server/hw/xquartz/pbproxy/pbproxy.h
+++ b/xorg-server/hw/xquartz/pbproxy/pbproxy.h
@@ -32,6 +32,8 @@
 

 #import  <Foundation/Foundation.h>

 

+#include <asl.h>

+

 #include <AvailabilityMacros.h>

 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1050

 #if __LP64__ || NS_BUILD_32_LIKE_64

@@ -80,13 +82,12 @@ extern BOOL xpbproxy_input_register (void);
 /* os/log.c or app-main.m */

 extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

 

-#ifdef DEBUG

-/* BEWARE: this can cause a string memory leak, according to the leaks program. */

-# define DebugF(msg, args...) ErrorF("%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args)

-#else

-# define DebugF(...) /* */

-#endif

+/* from darwin.h */

+_X_ATTRIBUTE_PRINTF(6,7)

+extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...);

 

-#define TRACE() DebugF("TRACE\n")

+#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args)

+#define DebugF(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpbproxy", msg, ##args)

+#define TRACE() DebugF("TRACE")

 

 #endif /* PBPROXY_H */

diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.m b/xorg-server/hw/xquartz/pbproxy/x-selection.m
index 8c099c6c9..0f48371d0 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.m
@@ -683,7 +683,11 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;

     }

 

+#ifdef __LP64__

+    DebugF ("pbtypes retainCount after containsObject: %lu\n", [pbtypes retainCount]);

+#else

     DebugF ("pbtypes retainCount after containsObject: %u\n", [pbtypes retainCount]);

+#endif

 

     data = [pb stringForType:NSStringPboardType];

 

@@ -704,7 +708,11 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	

 	if (length < 50) {

 	    DebugF ("UTF-8: %s\n", bytes);

+#ifdef __LP64__

+	    DebugF ("UTF-8 length: %lu\n", length); 

+#else

 	    DebugF ("UTF-8 length: %u\n", length); 

+#endif

 	}

     } 

     else 

@@ -1223,8 +1231,13 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;

     }

 

+#ifdef __LP64__

+    DebugF ("data retainCount before NSBitmapImageRep initWithData: %lu\n",

+	[data retainCount]);

+#else

     DebugF ("data retainCount before NSBitmapImageRep initWithData: %u\n",

 	[data retainCount]);

+#endif

 

     bmimage = [[NSBitmapImageRep alloc] initWithData:data];

 

@@ -1235,8 +1248,13 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;

     }

 

+#ifdef __LP64__

+    DebugF ("data retainCount after NSBitmapImageRep initWithData: %lu\n", 

+	[data retainCount]);

+#else

     DebugF ("data retainCount after NSBitmapImageRep initWithData: %u\n", 

 	[data retainCount]);

+#endif

 

     @try 

     {

@@ -1251,7 +1269,11 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 	return;

     }

     

+#ifdef __LP64__

+    DebugF ("bmimage retainCount after TIFFRepresentation %lu\n", [bmimage retainCount]);

+#else

     DebugF ("bmimage retainCount after TIFFRepresentation %u\n", [bmimage retainCount]);

+#endif

 

     pbtypes = [NSArray arrayWithObjects:NSTIFFPboardType, nil];

 

@@ -1270,7 +1292,12 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
 

     [data autorelease];

 

+#ifdef __LP64__

+    DebugF ("bmimage retainCount before release %lu\n", [bmimage retainCount]);

+#else

     DebugF ("bmimage retainCount before release %u\n", [bmimage retainCount]);

+#endif

+

     [bmimage autorelease];

 }