From d8432fdd4f13e9f9d1d44f5482faeb56562661a9 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 20 Dec 2009 21:08:15 +0000 Subject: Switched to xorg-server-1.7.99.2 --- xorg-server/hw/xfree86/loader/Makefile.in | 18 ++++++++++++++++-- xorg-server/hw/xfree86/loader/sdksyms.c | 4 ++++ 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'xorg-server/hw/xfree86/loader') diff --git a/xorg-server/hw/xfree86/loader/Makefile.in b/xorg-server/hw/xfree86/loader/Makefile.in index 875fd7b9d..d17b92392 100644 --- a/xorg-server/hw/xfree86/loader/Makefile.in +++ b/xorg-server/hw/xfree86/loader/Makefile.in @@ -56,7 +56,8 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libloader_la_LIBADD = +am__DEPENDENCIES_1 = +libloader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libloader_la_OBJECTS = loader.lo loadext.lo loadmod.lo dlloader.lo \ os.lo sdksyms.lo libloader_la_OBJECTS = $(am_libloader_la_OBJECTS) @@ -134,6 +135,7 @@ DGA_LIBS = @DGA_LIBS@ DIX_CFLAGS = @DIX_CFLAGS@ DIX_LIB = @DIX_LIB@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@ DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@ @@ -164,6 +166,13 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +FONT100DPIDIR = @FONT100DPIDIR@ +FONT75DPIDIR = @FONT75DPIDIR@ +FONTMISCDIR = @FONTMISCDIR@ +FONTOTFDIR = @FONTOTFDIR@ +FONTROOTDIR = @FONTROOTDIR@ +FONTTTFDIR = @FONTTTFDIR@ +FONTTYPE1DIR = @FONTTYPE1DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@ @@ -174,6 +183,7 @@ GREP = @GREP@ HAL_CFLAGS = @HAL_CFLAGS@ HAL_LIBS = @HAL_LIBS@ INSTALL = @INSTALL@ +INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -223,6 +233,8 @@ OBJCFLAGS = @OBJCFLAGS@ OBJCLINK = @OBJCLINK@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OS_LIB = @OS_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ @@ -247,6 +259,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@ @@ -337,7 +351,6 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ driverdir = @driverdir@ dvidir = @dvidir@ @@ -399,6 +412,7 @@ libloader_la_SOURCES = \ os.c \ sdksyms.c +libloader_la_LIBADD = $(DLOPEN_LIBS) CLEANFILES = sdksyms.c sdksyms.dep all: all-am diff --git a/xorg-server/hw/xfree86/loader/sdksyms.c b/xorg-server/hw/xfree86/loader/sdksyms.c index 37c8b641c..022ec73a9 100644 --- a/xorg-server/hw/xfree86/loader/sdksyms.c +++ b/xorg-server/hw/xfree86/loader/sdksyms.c @@ -1,4 +1,5 @@ /* This file is automatically generated by sdksyms.sh. */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #ifdef HAVE_XORG_CONFIG_H #include @@ -1478,6 +1479,7 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &xf86ValidateModesBandwidth, (void *) &xf86ValidateModesReducedBlanking, (void *) &xf86PruneInvalidModes, + (void *) &xf86PruneDuplicateModes, (void *) &xf86ValidateModesFlags, (void *) &xf86ValidateModesUserConfig, (void *) &xf86GetMonitorModes, @@ -1564,6 +1566,7 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &xf86DisplayIDMonitorSet, (void *) &FindDMTMode, (void *) &DMTModes, + (void *) &xf86MonitorIsHDMI, (void *) &xf86ConfigFile, (void *) &xf86AllowMouseOpenFail, (void *) &xf86fpFlag, @@ -2018,6 +2021,7 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &BasicComputeAcceleration, (void *) &FreeVelocityData, (void *) &InitializePredictableAccelerationProperties, + (void *) &DeletePredictableAccelerationProperties, (void *) &SetAccelerationProfile, (void *) &GetDevicePredictableAccelData, (void *) &SetDeviceSpecificAccelerationProfile, -- cgit v1.2.3