From fc8f37239f3af088819c18f5632b2608954af73a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 4 Jul 2012 10:36:18 +0200 Subject: mesa xserver git update 4 Jul 2012 --- xorg-server/hw/xfree86/Makefile.am | 6 +++--- xorg-server/hw/xfree86/common/xf86Init.c | 14 +++++++------- xorg-server/hw/xfree86/common/xf86Module.h | 2 +- xorg-server/hw/xfree86/common/xf86Xinput.h | 6 +++--- xorg-server/hw/xfree86/dri/Makefile.am | 2 +- xorg-server/hw/xfree86/dri2/Makefile.am | 2 +- xorg-server/hw/xfree86/i2c/Makefile.am | 5 +---- xorg-server/hw/xfree86/loader/loader.c | 2 +- xorg-server/hw/xfree86/loader/loadmod.c | 5 +++-- xorg-server/hw/xfree86/os-support/shared/sigio.c | 4 ++++ xorg-server/hw/xfree86/xaa/Makefile.am | 3 ++- 11 files changed, 27 insertions(+), 24 deletions(-) (limited to 'xorg-server/hw') diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am index e50cb88c2..4d5d576a3 100644 --- a/xorg-server/hw/xfree86/Makefile.am +++ b/xorg-server/hw/xfree86/Makefile.am @@ -26,9 +26,9 @@ INT10_SUBDIR = int10 endif SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ - ramdac $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \ - loader modes . i2c dixmods fbdevhw shadowfb exa \ - $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) doc man + ramdac $(VGAHW_SUBDIR) loader modes . $(VBE_SUBDIR) \ + $(XAA_SUBDIR) $(DRI_SUBDIR) $(DRI2_SUBDIR) i2c dixmods \ + fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ parser ramdac shadowfb vbe vgahw xaa \ diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c index ca6efd44e..84c866944 100644 --- a/xorg-server/hw/xfree86/common/xf86Init.c +++ b/xorg-server/hw/xfree86/common/xf86Init.c @@ -1058,16 +1058,16 @@ void OsVendorFatalError(const char *f, va_list args) { #ifdef VENDORSUPPORT - ErrorF("\nPlease refer to your Operating System Vendor support pages\n" - "at %s for support on this crash.\n", VENDORSUPPORT); + ErrorFSigSafe("\nPlease refer to your Operating System Vendor support " + "pages\nat %s for support on this crash.\n", VENDORSUPPORT); #else - ErrorF("\nPlease consult the " XVENDORNAME " support \n" - "\t at " __VENDORDWEBSUPPORT__ "\n for help. \n"); + ErrorFSigSafe("\nPlease consult the " XVENDORNAME " support \n\t at " + __VENDORDWEBSUPPORT__ "\n for help. \n"); #endif if (xf86LogFile && xf86LogFileWasOpened) - ErrorF("Please also check the log file at \"%s\" for additional " - "information.\n", xf86LogFile); - ErrorF("\n"); + ErrorFSigSafe("Please also check the log file at \"%s\" for additional " + "information.\n", xf86LogFile); + ErrorFSigSafe("\n"); } int diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h index bf56acd05..7671cea5d 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(13, 0) -#define ABI_XINPUT_VERSION SET_ABI_VERSION(17, 0) +#define ABI_XINPUT_VERSION SET_ABI_VERSION(18, 0) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(6, 0) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h index 1d4363a50..35c38a554 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.h +++ b/xorg-server/hw/xfree86/common/xf86Xinput.h @@ -68,14 +68,14 @@ /* This holds the input driver entry and module information. */ typedef struct _InputDriverRec { int driverVersion; - char *driverName; + const char *driverName; void (*Identify) (int flags); int (*PreInit) (struct _InputDriverRec * drv, struct _InputInfoRec * pInfo, int flags); void (*UnInit) (struct _InputDriverRec * drv, struct _InputInfoRec * pInfo, int flags); pointer module; - char **default_options; + const char **default_options; } InputDriverRec, *InputDriverPtr; /* This is to input devices what the ScrnInfoRec is to screens. */ @@ -98,7 +98,7 @@ typedef struct _InputInfoRec { int fd; DeviceIntPtr dev; pointer private; - char *type_name; + const char *type_name; InputDriverPtr drv; pointer module; XF86OptionPtr options; diff --git a/xorg-server/hw/xfree86/dri/Makefile.am b/xorg-server/hw/xfree86/dri/Makefile.am index 194cf8e3f..9528d5370 100644 --- a/xorg-server/hw/xfree86/dri/Makefile.am +++ b/xorg-server/hw/xfree86/dri/Makefile.am @@ -13,7 +13,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ @LIBDRM_CFLAGS@ \ @DRI_CFLAGS@ libdri_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libdri_la_LIBADD = @LIBDRM_LIBS@ +libdri_la_LIBADD = @LIBDRM_LIBS@ $(PIXMAN_LIBS) libdri_ladir = $(moduledir)/extensions libdri_la_SOURCES = \ dri.c \ diff --git a/xorg-server/hw/xfree86/dri2/Makefile.am b/xorg-server/hw/xfree86/dri2/Makefile.am index 0e40fbcf2..390ed12c8 100644 --- a/xorg-server/hw/xfree86/dri2/Makefile.am +++ b/xorg-server/hw/xfree86/dri2/Makefile.am @@ -7,7 +7,7 @@ libdri2_la_CFLAGS = \ -I$(top_srcdir)/hw/xfree86/os-support/bus libdri2_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libdri2_la_LIBADD = @LIBDRM_LIBS@ +libdri2_la_LIBADD = @LIBDRM_LIBS@ $(PIXMAN_LIBS) libdri2_ladir = $(moduledir)/extensions libdri2_la_SOURCES = \ dri2.c \ diff --git a/xorg-server/hw/xfree86/i2c/Makefile.am b/xorg-server/hw/xfree86/i2c/Makefile.am index f08541cf0..cb18db188 100644 --- a/xorg-server/hw/xfree86/i2c/Makefile.am +++ b/xorg-server/hw/xfree86/i2c/Makefile.am @@ -25,10 +25,7 @@ bt829_drv_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) bt829_drv_la_SOURCES = bt829.c bt829.h bt829_module.c fi1236_drv_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -fi1236_drv_la_SOURCES = fi1236.c fi1236.h fi1236_module.c -if NO_UNDEFINED -fi1236_drv_la_LIBADD = tda9885_drv.la -endif +fi1236_drv_la_SOURCES = fi1236.c fi1236.h fi1236_module.c tda9885.c msp3430_drv_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) msp3430_drv_la_SOURCES = msp3430.c msp3430.h msp3430_module.c diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c index b72b8b89d..edaefb8f9 100644 --- a/xorg-server/hw/xfree86/loader/loader.c +++ b/xorg-server/hw/xfree86/loader/loader.c @@ -163,7 +163,7 @@ LoaderSymbol(const char *name) void LoaderUnload(const char *name, void *handle) { - xf86Msg(X_INFO, "Unloading %s\n", name); + LogMessageVerbSigSafe(X_INFO, 1, "Unloading %s\n", name); if (handle) dlclose(handle); } diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c index 706b9b3e8..72020a58c 100644 --- a/xorg-server/hw/xfree86/loader/loadmod.c +++ b/xorg-server/hw/xfree86/loader/loadmod.c @@ -1093,9 +1093,10 @@ UnloadModuleOrDriver(ModuleDescPtr mod) return; if (mod->parent) - xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name); + LogMessageVerbSigSafe(X_INFO, 3, "UnloadSubModule: \"%s\"\n", + mod->name); else - xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name); + LogMessageVerbSigSafe(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name); if (mod->TearDownData != ModuleDuplicated) { if ((mod->TearDownProc) && (mod->TearDownData)) diff --git a/xorg-server/hw/xfree86/os-support/shared/sigio.c b/xorg-server/hw/xfree86/os-support/shared/sigio.c index 12ae8a480..231d6c04f 100644 --- a/xorg-server/hw/xfree86/os-support/shared/sigio.c +++ b/xorg-server/hw/xfree86/os-support/shared/sigio.c @@ -99,6 +99,8 @@ xf86SIGIO(int sig) int save_errno = errno; /* do not clobber the global errno */ int r; + inSignalContext = TRUE; + ready = xf86SigIOMask; to.tv_sec = 0; to.tv_usec = 0; @@ -114,6 +116,8 @@ xf86SIGIO(int sig) } /* restore global errno */ errno = save_errno; + + inSignalContext = FALSE; } static int diff --git a/xorg-server/hw/xfree86/xaa/Makefile.am b/xorg-server/hw/xfree86/xaa/Makefile.am index f6480a713..5614d723a 100644 --- a/xorg-server/hw/xfree86/xaa/Makefile.am +++ b/xorg-server/hw/xfree86/xaa/Makefile.am @@ -11,8 +11,9 @@ POLYSEG = s-xaaLine.c s-xaaDashLine.c if XAA libxaa_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) +libxaa_la_LIBADD = $(PIXMAN_LIBS) if COMPOSITE -libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la +libxaa_la_LIBADD += $(top_builddir)/miext/cw/libcw.la endif module_LTLIBRARIES = libxaa.la -- cgit v1.2.3