X Strike Force X.Org X11 SVN commit: r2912 - in branches/7.1/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-08-23 22:02:31 -0400 (Wed, 23 Aug 2006)
New Revision: 2912
Added:
branches/7.1/xserver/xorg-server/debian/patches/17_ignoreabi.diff
Modified:
branches/7.1/xserver/xorg-server/debian/changelog
branches/7.1/xserver/xorg-server/debian/patches/series
Log:
* Add 17_ignoreabi.diff to allow users to simply set a value in xorg.conf
rather than pass -ignoreABI to the server every time it starts
Modified: branches/7.1/xserver/xorg-server/debian/changelog
===================================================================
--- branches/7.1/xserver/xorg-server/debian/changelog 2006-08-23 09:55:27 UTC (rev 2911)
+++ branches/7.1/xserver/xorg-server/debian/changelog 2006-08-24 02:02:31 UTC (rev 2912)
@@ -13,8 +13,10 @@
[ David Nusinow ]
* Epoch bump
+ * Add 17_ignoreabi.diff to allow users to simply set a value in xorg.conf
+ rather than pass -ignoreABI to the server every time it starts
- -- David Nusinow <dnusinow@debian.org> Tue, 22 Aug 2006 20:43:43 +0000
+ -- David Nusinow <dnusinow@debian.org> Tue, 22 Aug 2006 21:31:52 +0000
xorg-server (1:1.1.1-3) unstable; urgency=low
Added: branches/7.1/xserver/xorg-server/debian/patches/17_ignoreabi.diff
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/17_ignoreabi.diff 2006-08-23 09:55:27 UTC (rev 2911)
+++ branches/7.1/xserver/xorg-server/debian/patches/17_ignoreabi.diff 2006-08-24 02:02:31 UTC (rev 2912)
@@ -0,0 +1,76 @@
+Index: xorg-server/hw/xfree86/common/xf86Config.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2006-08-23 21:59:22.000000000 +0000
++++ xorg-server/hw/xfree86/common/xf86Config.c 2006-08-23 22:01:00.000000000 +0000
+@@ -789,7 +789,8 @@
+ FLAG_RENDER_COLORMAP_MODE,
+ FLAG_HANDLE_SPECIAL_KEYS,
+ FLAG_RANDR,
+- FLAG_AIGLX
++ FLAG_AIGLX,
++ FLAG_IGNORE_ABI
+ } FlagValues;
+
+ static OptionInfoRec FlagOptions[] = {
+@@ -861,6 +862,8 @@
+ {0}, FALSE },
+ { FLAG_AIGLX, "AIGLX", OPTV_BOOLEAN,
+ {0}, FALSE },
++ { FLAG_IGNORE_ABI, "IgnoreABI", OPTV_BOOLEAN,
++ {0}, FALSE },
+ { -1, NULL, OPTV_NONE,
+ {0}, FALSE },
+ };
+@@ -919,6 +922,10 @@
+ &(xf86Info.grabInfo.allowDeactivate));
+ xf86GetOptValBool(FlagOptions, FLAG_ALLOW_CLOSEDOWN_GRABS,
+ &(xf86Info.grabInfo.allowClosedown));
++ xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
++ if (&xf86Info.ignoreABI) {
++ xf86Msg(X_CONFIG, "Ignoring ABI Version\n");
++ }
+
+ /*
+ * Set things up based on the config file information. Some of these
+Index: xorg-server/hw/xfree86/common/xf86Privstr.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2006-08-23 01:16:01.000000000 +0000
++++ xorg-server/hw/xfree86/common/xf86Privstr.h 2006-08-23 21:59:22.000000000 +0000
+@@ -167,6 +167,7 @@
+ MessageType randRFrom;
+ Bool aiglx;
+ MessageType aiglxFrom;
++ Bool ignoreABI;
+ struct {
+ Bool disabled; /* enable/disable deactivating
+ * grabs or closing the
+Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+===================================================================
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-23 21:59:21.000000000 +0000
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-23 21:59:22.000000000 +0000
+@@ -662,6 +662,10 @@
+ .B Terminate
+ action and, if found, use XKEYBOARD for processing actions, otherwise
+ the builtin handler will be used.
+++ .TP 7
+++ .BI "Option \*qIgnoreABI\*q \*q" boolean \*q
+++ Allow modules built for a different, potentially incompatible version of
+++ the X server to load. Disabled by default.
+ .SH "MODULE SECTION"
+ The
+ .B Module
+Index: xorg-server/hw/xfree86/common/xf86Init.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2006-08-23 21:59:33.000000000 +0000
++++ xorg-server/hw/xfree86/common/xf86Init.c 2006-08-23 22:00:17.000000000 +0000
+@@ -346,6 +346,10 @@
+ /* Tell the loader the default module search path */
+ LoaderSetPath(xf86ModulePath);
+
++ if (xf86Info.ignoreABI) {
++ LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
++ }
++
+ #ifdef TESTING
+ {
+ char **list, **l;
Modified: branches/7.1/xserver/xorg-server/debian/patches/series
===================================================================
--- branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-23 09:55:27 UTC (rev 2911)
+++ branches/7.1/xserver/xorg-server/debian/patches/series 2006-08-24 02:02:31 UTC (rev 2912)
@@ -14,3 +14,4 @@
14_debian_always_look_in_our_module_path.diff
15_symlink_mesa.diff
16_s390_fix.diff
+17_ignoreabi.diff
Reply to: