From ecf66d49a103b87d07da8b7d0f9a3629681e6643 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 29 Mar 2012 11:47:19 +0200 Subject: xserver fontconfig mesa git update 29 Mar 2012 --- fontconfig/Makefile.am | 5 +-- fontconfig/config-fixups.h | 44 ++++++++++++++++++++++++++ fontconfig/configure.in | 4 ++- fontconfig/src/fcarch.h | 13 -------- mesalib/configure.ac | 7 ---- xorg-server/hw/xfree86/common/xf86Module.h | 2 +- xorg-server/test/xi2/protocol-common.c | 14 ++++++++ xorg-server/test/xi2/protocol-xiqueryversion.c | 1 + xorg-server/test/xtest.c | 13 ++++++++ 9 files changed, 79 insertions(+), 24 deletions(-) create mode 100644 fontconfig/config-fixups.h diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am index 9342f8e80..1b943672d 100644 --- a/fontconfig/Makefile.am +++ b/fontconfig/Makefile.am @@ -25,14 +25,15 @@ DOCSRC=@DOCSRC@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \ fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \ conf.d $(DOCSRC) test - + EXTRA_DIST = \ fontconfig.pc.in \ fonts.conf.in \ fonts.dtd \ fontconfig.spec.in \ fontconfig.spec \ - fontconfig-zip.in + fontconfig-zip.in \ + config-fixups.h CLEANFILES = fonts.conf DISTCLEANFILES = config.cache doltcompile MAINTAINERCLEANFILES = \ diff --git a/fontconfig/config-fixups.h b/fontconfig/config-fixups.h new file mode 100644 index 000000000..0e708462e --- /dev/null +++ b/fontconfig/config-fixups.h @@ -0,0 +1,44 @@ +/* + * Copyright 息 2006 Keith Packard + * Copyright 息 2010 Behdad Esfahbod + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the author(s) not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. The authors make no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ +#ifndef _CONFIG_FIXUPS_H_ +#define _CONFIG_FIXUPS_H_ + +/* This header file is supposed to be included in config.h */ + +/* just a hack to build the fat binaries: + * https://bugs.freedesktop.org/show_bug.cgi?id=20208 + */ +#ifdef __APPLE__ +# include +# undef SIZEOF_VOID_P +# undef ALIGNOF_DOUBLE +# ifdef __LP64__ +# define SIZEOF_VOID_P 8 +# define ALIGNOF_DOUBLE 8 +# else +# define SIZEOF_VOID_P 4 +# define ALIGNOF_DOUBLE 4 +# endif +#endif + +#endif /* _CONFIG_FIXUPS_H_ */ diff --git a/fontconfig/configure.in b/fontconfig/configure.in index 3204f2e5d..e0aba1992 100644 --- a/fontconfig/configure.in +++ b/fontconfig/configure.in @@ -496,7 +496,9 @@ AC_C_BIGENDIAN AC_CHECK_SIZEOF([void *]) AC_CHECK_ALIGNOF([double]) - +dnl include the header file for workaround of miscalculating size on autoconf +dnl particularly for fat binaries +AH_BOTTOM([#include "config-fixups.h"]) AC_OUTPUT([ Makefile diff --git a/fontconfig/src/fcarch.h b/fontconfig/src/fcarch.h index 22e6f8e13..cf7fd3c9f 100644 --- a/fontconfig/src/fcarch.h +++ b/fontconfig/src/fcarch.h @@ -46,19 +46,6 @@ * be64 1234 8 8 */ -#ifdef __APPLE__ -# include -# undef SIZEOF_VOID_P -# undef ALIGNOF_DOUBLE -# ifdef __LP64__ -# define SIZEOF_VOID_P 8 -# define ALIGNOF_DOUBLE 8 -# else -# define SIZEOF_VOID_P 4 -# define ALIGNOF_DOUBLE 4 -# endif -#endif - #if defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN # define FC_ARCH_ENDIAN "le" #elif defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN diff --git a/mesalib/configure.ac b/mesalib/configure.ac index ac7d49f1f..1c437e7ba 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1844,15 +1844,12 @@ gallium_check_st() { fi if test "x$HAVE_ST_XVMC" = xyes && test "x$5" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" - NEED_G3DVL_DRI="yes" fi if test "x$HAVE_ST_VDPAU" = xyes && test "x$6" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6" - NEED_G3DVL_DRI="yes" fi if test "x$HAVE_ST_VA" = xyes && test "x$7" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7" - NEED_G3DVL_DRI="yes" fi } @@ -1932,10 +1929,6 @@ if test "x$with_gallium_drivers" != x; then done fi -if test "x$NEED_G3DVL_DRI" = xyes; then - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS g3dvl/dri" -fi - dnl Tell Automake which drivers to build for driver in $GALLIUM_DRIVERS_DIRS; do case "x$driver" in diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h index 894b93f59..31f5c6a86 100644 --- a/xorg-server/hw/xfree86/common/xf86Module.h +++ b/xorg-server/hw/xfree86/common/xf86Module.h @@ -83,7 +83,7 @@ typedef enum { */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(12, 0) -#define ABI_XINPUT_VERSION SET_ABI_VERSION(16, 0) +#define ABI_XINPUT_VERSION SET_ABI_VERSION(17, 0) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(6, 0) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) diff --git a/xorg-server/test/xi2/protocol-common.c b/xorg-server/test/xi2/protocol-common.c index 32c056797..e2b0b8ba3 100644 --- a/xorg-server/test/xi2/protocol-common.c +++ b/xorg-server/test/xi2/protocol-common.c @@ -30,6 +30,7 @@ #include "exglobals.h" #include "xkbsrv.h" /* for XkbInitPrivates */ #include "xserver-properties.h" +#include "syncsrv.h" #include #include "protocol-common.h" @@ -38,6 +39,7 @@ struct devices devices; ScreenRec screen; WindowRec root; WindowRec window; +static ClientRec server_client; void *userdata; @@ -214,6 +216,11 @@ device_cursor_init(DeviceIntPtr dev, ScreenPtr screen) return TRUE; } +static void +device_cursor_cleanup(DeviceIntPtr dev, ScreenPtr screen) +{ +} + static Bool set_cursor_pos(DeviceIntPtr dev, ScreenPtr screen, int x, int y, Bool event) { @@ -231,6 +238,7 @@ init_simple(void) screen.width = 640; screen.height = 480; screen.DeviceCursorInitialize = device_cursor_init; + screen.DeviceCursorCleanup = device_cursor_cleanup; screen.SetCursorPosition = set_cursor_pos; dixResetPrivates(); @@ -245,6 +253,12 @@ init_simple(void) init_window(&root, NULL, ROOT_WINDOW_ID); init_window(&window, &root, CLIENT_WINDOW_ID); + serverClient = &server_client; + InitClient(serverClient, 0, (pointer) NULL); + if (!InitClientResources(serverClient)) /* for root resources */ + FatalError("couldn't init server resources"); + SyncExtensionInit(); + devices = init_devices(); } diff --git a/xorg-server/test/xi2/protocol-xiqueryversion.c b/xorg-server/test/xi2/protocol-xiqueryversion.c index 3d50fa888..2552307f2 100644 --- a/xorg-server/test/xi2/protocol-xiqueryversion.c +++ b/xorg-server/test/xi2/protocol-xiqueryversion.c @@ -115,6 +115,7 @@ request_XIQueryVersion(int smaj, int smin, int cmaj, int cmin, int error) rc = ProcXIQueryVersion(&client); assert(rc == error); + client = init_client(request.length, &request); client.swapped = TRUE; swaps(&request.length); diff --git a/xorg-server/test/xtest.c b/xorg-server/test/xtest.c index aeca669d8..99e218541 100644 --- a/xorg-server/test/xtest.c +++ b/xorg-server/test/xtest.c @@ -32,6 +32,7 @@ #include "exevents.h" #include "xkbsrv.h" #include "xserver-properties.h" +#include "syncsrv.h" /** */ @@ -46,10 +47,16 @@ device_cursor_init(DeviceIntPtr dev, ScreenPtr screen) return TRUE; } +static void +device_cursor_cleanup(DeviceIntPtr dev, ScreenPtr screen) +{ +} + static void xtest_init_devices(void) { ScreenRec screen; + ClientRec server_client; /* random stuff that needs initialization */ memset(&screen, 0, sizeof(screen)); @@ -60,8 +67,14 @@ xtest_init_devices(void) screen.width = 640; screen.height = 480; screen.DeviceCursorInitialize = device_cursor_init; + screen.DeviceCursorCleanup = device_cursor_cleanup; dixResetPrivates(); + serverClient = &server_client; + InitClient(serverClient, 0, (pointer) NULL); + if (!InitClientResources(serverClient)) /* for root resources */ + FatalError("couldn't init server resources"); InitAtoms(); + SyncExtensionInit(); XkbInitPrivates(); -- cgit v1.2.3