rpms/xorg-x11-server/devel xorg-x11-server-1.1.0-loader-diet.patch, 1.1, 1.2 xorg-x11-server.spec, 1.88, 1.89
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 19 23:51:36 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18976
Modified Files:
xorg-x11-server-1.1.0-loader-diet.patch xorg-x11-server.spec
Log Message:
Bump to -17, disable the loader work since it's broken.
xorg-x11-server-1.1.0-loader-diet.patch:
configure.ac | 6
hw/xfree86/Makefile.am | 2
hw/xfree86/common/xf86Globals.c | 7
hw/xfree86/loader/Makefile.am | 33 -
hw/xfree86/loader/dlloader.c | 107 ++---
hw/xfree86/loader/dlloader.h | 8
hw/xfree86/loader/loader.c | 808 ----------------------------------------
hw/xfree86/loader/loader.h | 196 ---------
hw/xfree86/loader/loaderProcs.h | 7
hw/xfree86/loader/loadext.c | 5
hw/xfree86/loader/loadfont.c | 4
hw/xfree86/loader/loadmod.c | 84 +---
hw/xfree86/loader/os.c | 4
include/xorg-config.h.in | 6
include/xorg-server.h.in | 6
15 files changed, 101 insertions(+), 1182 deletions(-)
Index: xorg-x11-server-1.1.0-loader-diet.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.0-loader-diet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.0-loader-diet.patch 19 Jun 2006 21:22:27 -0000 1.1
+++ xorg-x11-server-1.1.0-loader-diet.patch 19 Jun 2006 23:51:32 -0000 1.2
@@ -1,20 +1,27 @@
---- xorg-server-1.1.0/include/xorg-server.h.in.loader-diet 2005-12-02 01:02:44.000000000 -0500
-+++ xorg-server-1.1.0/include/xorg-server.h.in 2006-06-19 16:48:07.000000000 -0400
-@@ -28,12 +28,6 @@
- /* Use OsVendorInit */
- #undef DDXOSINIT
+--- xorg-server-1.1.0/configure.ac.loader-diet 2006-05-22 13:18:49.000000000 -0400
++++ xorg-server-1.1.0/configure.ac 2006-06-19 18:56:30.000000000 -0400
+@@ -1041,7 +1041,7 @@
+ XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+ XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
+ XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
+- XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
++ XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $XPSTUBS_LIB $OS_LIB"
--/* Prefer dlloader modules to elfloader */
--#undef DLOPEN_HACK
--
--/* Building with libdl */
--#undef DLOPEN_SUPPORT
--
- /* Build DPMS extension */
- #undef DPMSExtension
+ AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
+@@ -1250,10 +1250,6 @@
+ AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+- # XXX HACK! if anyone cares about elfloader in 7.0 you need to
+- # XXX do something smarter here.
+- AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader])
+- AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader])
+ AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
+ AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
+ AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])
--- xorg-server-1.1.0/include/xorg-config.h.in.loader-diet 2006-03-15 16:25:38.000000000 -0500
-+++ xorg-server-1.1.0/include/xorg-config.h.in 2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/include/xorg-config.h.in 2006-06-19 18:56:30.000000000 -0400
@@ -30,12 +30,6 @@
/* URL to go to for support. */
#undef __VENDORDWEBSUPPORT__
@@ -28,21 +35,23 @@
/* Built-in output drivers. */
#undef DRIVERS
---- xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c.loader-diet 2006-05-09 14:04:29.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c 2006-06-19 16:48:07.000000000 -0400
-@@ -247,10 +247,3 @@
- _X_EXPORT Bool xf86inSuspend = FALSE;
- Bool xorgHWAccess = FALSE;
- PciBusId xf86IsolateDevice;
+--- xorg-server-1.1.0/include/xorg-server.h.in.loader-diet 2005-12-02 01:02:44.000000000 -0500
++++ xorg-server-1.1.0/include/xorg-server.h.in 2006-06-19 18:56:30.000000000 -0400
+@@ -28,12 +28,6 @@
+ /* Use OsVendorInit */
+ #undef DDXOSINIT
+
+-/* Prefer dlloader modules to elfloader */
+-#undef DLOPEN_HACK
-
--#ifdef DLOPEN_HACK
--/*
-- * This stuff is a hack to allow dlopen() modules to work. It is intended
-- * only to be used when using dlopen() modules for debugging purposes.
-- */
--#endif
+-/* Building with libdl */
+-#undef DLOPEN_SUPPORT
+-
+ /* Build DPMS extension */
+ #undef DPMSExtension
+
--- xorg-server-1.1.0/hw/xfree86/loader/loadmod.c.loader-diet 2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loadmod.c 2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/loadmod.c 2006-06-19 18:56:30.000000000 -0400
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadmod.c,v 1.73 2003/11/03 05:11:51 tsi Exp $ */
-
@@ -211,86 +220,53 @@
}
if (name)
xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
---- xorg-server-1.1.0/hw/xfree86/loader/os.c.loader-diet 2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/os.c 2006-06-19 16:48:07.000000000 -0400
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
+--- xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h.loader-diet 2006-03-11 19:11:34.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h 2006-06-19 18:56:30.000000000 -0400
+@@ -1,7 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loaderProcs.h,v 1.21 2003/10/15 16:29:04 dawes Exp $ */
-
/*
- * Copyright (c) 1999-2002 by The XFree86 Project, Inc.
+- *
+ * Copyright 1995-1998 by Metro Link, Inc.
*
-@@ -38,6 +36,7 @@
- * loader and by OS-specific modules.
- */
+ * Permission to use, copy, modify, distribute, and sell this software and its
+@@ -78,9 +75,7 @@
+ const XF86ModuleVersionInfo *VersionInfo;
+ } ModuleDesc, *ModuleDescPtr;
-+#ifndef OSNAME
- #if defined(__linux__)
- #define OSNAME "linux"
- #elif defined(__FreeBSD__)
-@@ -67,6 +66,7 @@
- #else
- #define OSNAME "unknown"
- #endif
-+#endif
+-/*
+- * Extenal API for the loader
+- */
++/* External API for the loader */
- /* Return the OS name, and run-time OS version */
+ void LoaderInit(void);
---- xorg-server-1.1.0/hw/xfree86/loader/Makefile.am.loader-diet 2005-12-02 01:02:41.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/Makefile.am 2006-06-19 16:48:07.000000000 -0400
-@@ -1,10 +1,6 @@
- noinst_LIBRARIES = libloader.a
--INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
-- -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
-- -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
-- -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb \
-- -I$(srcdir)/../dixmods/extmod -I$(srcdir)/../../../miext/cw \
-- -I$(srcdir)/../../../miext/damage
-+
-+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser
+--- xorg-server-1.1.0/hw/xfree86/loader/loadfont.c.loader-diet 2006-03-25 14:52:04.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/loadfont.c 2006-06-19 18:56:30.000000000 -0400
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadfont.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
+ /*
+ * Copyright (c) 1998 by The XFree86 Project, Inc.
+ *
+@@ -37,6 +36,7 @@
+ #include "misc.h"
+ #include "xf86.h"
- #AM_LDFLAGS = -r
- AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
-@@ -13,22 +9,10 @@
- SPARC_SOURCES = SparcMulDiv.S
- endif
++/* XXX this should be static, but xorgcfg needs it, nngh */
+ FontModule *FontModuleList = NULL;
+ static int numFontModules = 0;
--sdk_HEADERS = \
-- elf.h
--
- EXTRA_DIST = \
-- aout.h \
-- aoutloader.h \
-- ar.h \
-- coff.h \
-- coffloader.h \
- dlloader.h \
-- elf.h \
-- elfloader.h \
-- hash.h \
- loader.h \
- loaderProcs.h \
-- sym.h \
- SparcMulDiv.S
+@@ -62,7 +62,7 @@
+ }
+ }
- libloader_a_SOURCES = \
-@@ -37,15 +21,6 @@
- loadext.c \
- loadmod.c \
- loadfont.c \
-- aoutloader.c \
- dlloader.c \
-- elfloader.c \
-- coffloader.c \
- os.c \
-- dixsym.c \
-- extsym.c \
-- fontsym.c \
-- misym.c \
-- xf86sym.c \
-- hash.c \
- $(SPARC_SOURCES)
+-_X_EXPORT void
++_X_EXPORT __attribute__((used)) void
+ LoadFont(FontModule * f)
+ {
+ FontModule *newfont;
--- xorg-server-1.1.0/hw/xfree86/loader/loader.h.loader-diet 2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loader.h 2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/loader.h 2006-06-19 18:56:30.000000000 -0400
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.h,v 1.28 2003/11/06 18:38:14 tsi Exp $ */
-
@@ -539,8 +515,66 @@
-extern void _loader_debug_state(void);
#endif /* _LOADER_H */
+--- xorg-server-1.1.0/hw/xfree86/loader/Makefile.am.loader-diet 2005-12-02 01:02:41.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/Makefile.am 2006-06-19 19:13:41.000000000 -0400
+@@ -1,10 +1,6 @@
+ noinst_LIBRARIES = libloader.a
+-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
+- -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
+- -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
+- -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb \
+- -I$(srcdir)/../dixmods/extmod -I$(srcdir)/../../../miext/cw \
+- -I$(srcdir)/../../../miext/damage
++
++INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser
+
+ #AM_LDFLAGS = -r
+ AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+@@ -13,22 +9,10 @@
+ SPARC_SOURCES = SparcMulDiv.S
+ endif
+
+-sdk_HEADERS = \
+- elf.h
+-
+ EXTRA_DIST = \
+- aout.h \
+- aoutloader.h \
+- ar.h \
+- coff.h \
+- coffloader.h \
+ dlloader.h \
+- elf.h \
+- elfloader.h \
+- hash.h \
+ loader.h \
+ loaderProcs.h \
+- sym.h \
+ SparcMulDiv.S
+
+ libloader_a_SOURCES = \
+@@ -37,15 +21,10 @@
+ loadext.c \
+ loadmod.c \
+ loadfont.c \
+- aoutloader.c \
+ dlloader.c \
+- elfloader.c \
+- coffloader.c \
+ os.c \
+- dixsym.c \
+- extsym.c \
+- fontsym.c \
+- misym.c \
+- xf86sym.c \
+- hash.c \
+ $(SPARC_SOURCES)
++
++all: libloader.o
++libloader.o: $(libloader_a_OBJECTS)
++ ld -r $@ $<
--- xorg-server-1.1.0/hw/xfree86/loader/loader.c.loader-diet 2006-03-28 02:21:50.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loader.c 2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/loader.c 2006-06-19 18:56:30.000000000 -0400
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.71 2003/11/06 18:38:13 tsi Exp $ */
-
@@ -1507,65 +1541,8 @@
unsigned long LoaderOptions = 0;
void
---- xorg-server-1.1.0/hw/xfree86/loader/dlloader.h.loader-diet 2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.h 2006-06-19 16:48:07.000000000 -0400
-@@ -19,19 +19,15 @@
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */
--
- #ifdef HAVE_XORG_CONFIG_H
- #include <xorg-config.h>
- #endif
-
- #ifndef _DLLOADER_H
- #define _DLLOADER_H
--extern void *DLLoadModule(loaderPtr, int, LOOKUP **, int flags);
--extern void DLResolveSymbols(void *);
--extern int DLCheckForUnresolved(void *);
-+
-+extern void *DLLoadModule(loaderPtr, int, int flags);
- extern void DLUnloadModule(void *);
- extern void *DLFindSymbol(const char *name);
--extern void *DLFindSymbolLocal(pointer module, const char *name);
-
- #endif
---- xorg-server-1.1.0/hw/xfree86/loader/loadext.c.loader-diet 2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loadext.c 2006-06-19 16:48:07.000000000 -0400
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadext.c,v 1.8 2003/10/15 16:29:04 dawes Exp $ */
- /*
- * Copyright (c) 2000 by The XFree86 Project, Inc.
- *
-@@ -37,6 +36,10 @@
- #include "misc.h"
- #include "xf86.h"
-
-+/*
-+ * This should be static, but miinitext wants it. FIXME: make extension
-+ * initialization not completely terrible.
-+ */
- ExtensionModule *ExtensionModuleList = NULL;
- static int numExtensionModules = 0;
-
---- xorg-server-1.1.0/hw/xfree86/loader/loadfont.c.loader-diet 2006-03-25 14:52:04.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loadfont.c 2006-06-19 16:48:07.000000000 -0400
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadfont.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
- /*
- * Copyright (c) 1998 by The XFree86 Project, Inc.
- *
-@@ -37,6 +36,7 @@
- #include "misc.h"
- #include "xf86.h"
-
-+/* XXX this should be static, but xorgcfg needs it, nngh */
- FontModule *FontModuleList = NULL;
- static int numFontModules = 0;
-
--- xorg-server-1.1.0/hw/xfree86/loader/dlloader.c.loader-diet 2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.c 2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.c 2006-06-19 18:56:30.000000000 -0400
@@ -1,7 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.c,v 1.13 2003/10/15 16:29:02 dawes Exp $ */
-
@@ -1783,29 +1760,87 @@
- xf86loaderfree(modptr);
+ free(modptr);
}
---- xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h.loader-diet 2006-03-11 19:11:34.000000000 -0500
-+++ xorg-server-1.1.0/hw/xfree86/loader/loaderProcs.h 2006-06-19 16:48:07.000000000 -0400
-@@ -1,7 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loaderProcs.h,v 1.21 2003/10/15 16:29:04 dawes Exp $ */
+--- xorg-server-1.1.0/hw/xfree86/loader/dlloader.h.loader-diet 2006-03-11 19:11:34.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/dlloader.h 2006-06-19 18:56:30.000000000 -0400
+@@ -19,19 +19,15 @@
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */
-
+ #ifdef HAVE_XORG_CONFIG_H
+ #include <xorg-config.h>
+ #endif
+
+ #ifndef _DLLOADER_H
+ #define _DLLOADER_H
+-extern void *DLLoadModule(loaderPtr, int, LOOKUP **, int flags);
+-extern void DLResolveSymbols(void *);
+-extern int DLCheckForUnresolved(void *);
++
++extern void *DLLoadModule(loaderPtr, int, int flags);
+ extern void DLUnloadModule(void *);
+ extern void *DLFindSymbol(const char *name);
+-extern void *DLFindSymbolLocal(pointer module, const char *name);
+
+ #endif
+--- xorg-server-1.1.0/hw/xfree86/loader/loadext.c.loader-diet 2006-03-25 14:52:04.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/loadext.c 2006-06-19 18:56:30.000000000 -0400
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadext.c,v 1.8 2003/10/15 16:29:04 dawes Exp $ */
/*
-- *
- * Copyright 1995-1998 by Metro Link, Inc.
+ * Copyright (c) 2000 by The XFree86 Project, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -78,9 +75,7 @@
- const XF86ModuleVersionInfo *VersionInfo;
- } ModuleDesc, *ModuleDescPtr;
+@@ -37,6 +36,10 @@
+ #include "misc.h"
+ #include "xf86.h"
--/*
-- * Extenal API for the loader
-- */
-+/* External API for the loader */
++/*
++ * This should be static, but miinitext wants it. FIXME: make extension
++ * initialization not completely terrible.
++ */
+ ExtensionModule *ExtensionModuleList = NULL;
+ static int numExtensionModules = 0;
- void LoaderInit(void);
+--- xorg-server-1.1.0/hw/xfree86/loader/os.c.loader-diet 2006-03-25 14:52:04.000000000 -0500
++++ xorg-server-1.1.0/hw/xfree86/loader/os.c 2006-06-19 18:56:30.000000000 -0400
+@@ -1,5 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */
+-
+ /*
+ * Copyright (c) 1999-2002 by The XFree86 Project, Inc.
+ *
+@@ -38,6 +36,7 @@
+ * loader and by OS-specific modules.
+ */
++#ifndef OSNAME
+ #if defined(__linux__)
+ #define OSNAME "linux"
+ #elif defined(__FreeBSD__)
+@@ -67,6 +66,7 @@
+ #else
+ #define OSNAME "unknown"
+ #endif
++#endif
+
+ /* Return the OS name, and run-time OS version */
+
+--- xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c.loader-diet 2006-05-09 14:04:29.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/common/xf86Globals.c 2006-06-19 18:56:30.000000000 -0400
+@@ -247,10 +247,3 @@
+ _X_EXPORT Bool xf86inSuspend = FALSE;
+ Bool xorgHWAccess = FALSE;
+ PciBusId xf86IsolateDevice;
+-
+-#ifdef DLOPEN_HACK
+-/*
+- * This stuff is a hack to allow dlopen() modules to work. It is intended
+- * only to be used when using dlopen() modules for debugging purposes.
+- */
+-#endif
--- xorg-server-1.1.0/hw/xfree86/Makefile.am.loader-diet 2006-05-09 14:04:29.000000000 -0400
-+++ xorg-server-1.1.0/hw/xfree86/Makefile.am 2006-06-19 16:48:07.000000000 -0400
++++ xorg-server-1.1.0/hw/xfree86/Makefile.am 2006-06-19 18:56:30.000000000 -0400
@@ -36,11 +36,11 @@
XORG_LIBS = \
@XORG_CORE_LIBS@ \
@@ -1815,29 +1850,7 @@
parser/libxf86config.a \
dummylib/libdummy.a \
dixmods/libdixmods.la \
-+ loader/libloader.a \
++ loader/libloader.o \
@XORG_LIBS@
Xorg_LDADD = $(XORG_LIBS) \
---- xorg-server-1.1.0/configure.ac.loader-diet 2006-05-22 13:18:49.000000000 -0400
-+++ xorg-server-1.1.0/configure.ac 2006-06-19 16:48:34.000000000 -0400
-@@ -1041,7 +1041,7 @@
- XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
- XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
- XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-- XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
-+ XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $LBX_LIB $XPSTUBS_LIB $OS_LIB"
-
- AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl")
-
-@@ -1250,10 +1250,6 @@
- AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-- # XXX HACK! if anyone cares about elfloader in 7.0 you need to
-- # XXX do something smarter here.
-- AC_DEFINE(DLOPEN_HACK, 1, [Prefer dlloader modules to elfloader])
-- AC_DEFINE(DLOPEN_SUPPORT, 1, [Use libdl-based loader])
- AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
- AC_DEFINE(DRIVERS, {}, [Built-in output drivers (none)])
- AC_DEFINE(IDRIVERS, {}, [Built-in input drivers (none)])
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- xorg-x11-server.spec 19 Jun 2006 21:22:27 -0000 1.88
+++ xorg-x11-server.spec 19 Jun 2006 23:51:32 -0000 1.89
@@ -4,7 +4,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.1.0
-Release: 16
+Release: 17
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -38,7 +38,7 @@
Patch2000: xorg-x11-server-1.1.0-cw-crash-fix.patch
Patch2001: xorg-x11-server-1.1.0-pci-scan-fixes.patch
Patch2002: xorg-x11-server-1.1.0-hush-crash-message.patch
-Patch2003: xorg-x11-server-1.1.0-loader-diet.patch
+#Patch2003: xorg-x11-server-1.1.0-loader-diet.patch
# autoconfiguration feature patches
#Patch3000: xorg-x11-server-1.1.0-input-autoconfig-2.patch
@@ -299,7 +299,7 @@
%patch2000 -p1 -b .cw-crash
%patch2001 -p1 -b .pci-scan
%patch2002 -p1 -b .crash-message
-%patch2003 -p1 -b .loader-diet
+#%patch2003 -p1 -b .loader-diet
%patch3001 -p1 -b .edid1
%patch3002 -p1 -b .cvt
@@ -605,7 +605,7 @@
- Disable filling in monitor gamma info from EDID momentarily, since drivers
will use that field to set the card's gamma ramp.
- Backport some stuff from git: cw crash fix, faster pci scanning, some
- log message cleanup, and a massive debloating of the loader.
+ log message cleanup.
* Fri Jun 16 2006 Mike A. Harris <mharris at redhat.com> 1.1.0-16
- Enable spec support for s390, s390x, alpha, sparc, and sparc64 architectures.
More information about the fedora-cvs-commits
mailing list