Module Name: xsrc
Committed By: mrg
Date: Tue Nov 23 22:21:17 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e_driver.c
xsrc/external/mit/xf86-video-crime/dist/src: crime_driver.c
xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c
xsrc/external/mit/xf86-video-imstt/dist/src: imstt_driver.c
xsrc/external/mit/xf86-video-intel/dist/src: i810_driver.c
xsrc/external/mit/xf86-video-newport/dist/src: newport_driver.c
xsrc/external/mit/xf86-video-nvxbox/dist/src: nv_driver.c
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_driver.c
xsrc/external/mit/xf86-video-radeonhd/dist/src: rhd_driver.c
xsrc/external/mit/xf86-video-vga/dist/src: generic.c
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
copy a hack from the vmware driver, and avoid using xf86LoaderReqSymLists()
and LoaderRefSymLists() in xorg-server >= 1.7.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-vga/dist/src/generic.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c
diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.3 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.4
--- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c:1.3 Tue Jun 23 15:40:20 2009
+++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c Tue Nov 23 22:21:15 2010
@@ -46,6 +46,11 @@
#include "ag10e.h"
#include "xf86sbusBus.h"
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
static const OptionInfoRec * AG10EAvailableOptions(int chipid, int busid);
static void AG10EIdentify(int flags);
static Bool AG10EProbe(DriverPtr drv, int flags);
Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.6 xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.7
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.6 Tue Oct 6 06:51:21 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c Tue Nov 23 22:21:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_driver.c,v 1.6 2009/10/06 06:51:21 macallan Exp $ */
+/* $NetBSD: crime_driver.c,v 1.7 2010/11/23 22:21:15 mrg Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -70,6 +70,11 @@
#include <sys/mman.h>
#endif
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
#define CRIME_DEFAULT_DEV "/dev/ttyE0"
/* Prototypes */
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.2 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.3
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.2 Thu May 20 07:55:20 2010
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Tue Nov 23 22:21:15 2010
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.2 2010/05/20 07:55:20 macallan Exp $ */
+/* $NetBSD: igs_driver.c,v 1.3 2010/11/23 22:21:15 mrg Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -82,6 +82,11 @@
#include <sys/mman.h>
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
#define DEBUG 0
#if DEBUG
Index: xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c
diff -u xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c:1.2 xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c:1.3
--- xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c:1.2 Fri Aug 7 20:03:00 2009
+++ xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c Tue Nov 23 22:21:15 2010
@@ -55,6 +55,11 @@
#include "imstt.h"
#include "imstt_reg.h"
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
/* To get it to build on non-PPC */
#ifndef __powerpc__
Index: xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.3 xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.3 Tue Nov 23 09:01:18 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c Tue Nov 23 22:21:16 2010
@@ -89,6 +89,11 @@
#include "dri.h"
#endif
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
/* Required Functions: */
static void I810Identify(int flags);
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.5 xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.6
--- xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.5 Tue Oct 6 20:28:14 2009
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c Tue Nov 23 22:21:16 2010
@@ -65,6 +65,11 @@
#include <string.h>
#include <stdio.h>
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
#define NEWPORT_VERSION 4000
#define NEWPORT_NAME "NEWPORT"
#define NEWPORT_DRIVER_NAME "newport"
Index: xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c:1.1.1.1 xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c:1.2
--- xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c:1.1.1.1 Sun Sep 21 02:09:25 2008
+++ xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c Tue Nov 23 22:21:16 2010
@@ -39,6 +39,11 @@
#include "xf86int10.h"
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
/*
* Forward definitions for the functions that make up the driver.
*/
Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.1 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.2
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c:1.1 Wed Aug 26 22:28:26 2009
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c Tue Nov 23 22:21:16 2010
@@ -20,7 +20,7 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: pnozz_driver.c,v 1.1 2009/08/26 22:28:26 macallan Exp $ */
+/* $NetBSD: pnozz_driver.c,v 1.2 2010/11/23 22:21:16 mrg Exp $ */
/*
* this driver has been tested on SPARCbook 3GX and 3TX, it supports full
@@ -49,6 +49,11 @@
#include "xf86cmap.h"
#include "pnozz.h"
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
static const OptionInfoRec * PnozzAvailableOptions(int chipid, int busid);
static void PnozzIdentify(int flags);
static Bool PnozzProbe(DriverPtr drv, int flags);
Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c:1.1.1.4 xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c:1.2
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c:1.1.1.4 Mon Nov 9 01:43:56 2009
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c Tue Nov 23 22:21:16 2010
@@ -135,6 +135,11 @@
/* ??? */
#include "servermd.h"
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
/* Mandatory functions */
static const OptionInfoRec * RHDAvailableOptions(int chipid, int busid);
#ifdef XSERVER_LIBPCIACCESS
Index: xsrc/external/mit/xf86-video-vga/dist/src/generic.c
diff -u xsrc/external/mit/xf86-video-vga/dist/src/generic.c:1.2 xsrc/external/mit/xf86-video-vga/dist/src/generic.c:1.3
--- xsrc/external/mit/xf86-video-vga/dist/src/generic.c:1.2 Fri Jun 12 01:51:34 2009
+++ xsrc/external/mit/xf86-video-vga/dist/src/generic.c Tue Nov 23 22:21:17 2010
@@ -59,6 +59,11 @@
#include "xf86Resources.h"
#include "xf86int10.h"
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
/* Some systems #define VGA for their own purposes */
#undef VGA
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.7 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.8
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.7 Thu Dec 31 05:43:56 2009
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Tue Nov 23 22:21:17 2010
@@ -96,6 +96,11 @@
#define WSFB_DEFAULT_DEV "/dev/ttyC0"
#endif
+#if HAVE_XORG_SERVER_1_7_0
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
#define DEBUG 0
#if DEBUG
