- updated

Changed files:
    debrix-modules.patch -> 1.2

diff --git a/debrix-modules.patch b/debrix-modules.patch
index d021f149ec029fd4213d3d91cfe9bcc100b12346..bb394c1da19053cffa634eaad9c50e713db2a74b 100644 (file)
--- a/debrix-modules.patch
+++ b/debrix-modules.patch
@@ -1,79 +1,18 @@
-Index: hw/xorg/loader/Makefile.am
-===================================================================
-RCS file: /cvs/xserver/debrix/hw/xorg/loader/Makefile.am,v
-retrieving revision 1.3
-diff -u -r1.3 Makefile.am
---- hw/xorg/loader/Makefile.am 28 Jun 2004 05:02:25 -0000      1.3
-+++ hw/xorg/loader/Makefile.am 29 Jun 2004 01:18:59 -0000
-@@ -1,8 +1,9 @@
- noinst_LIBRARIES = libloader.a
- AM_CFLAGS = $(XORG_CFLAGS) -DDLOPEN_SUPPORT -DHAS_SHM -DXFree86LOADER
- INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
--           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
--           -I$(srcdir)/../fbdevhw -I$(srcdir)/../xaa
-+         -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
-+         -I$(srcdir)/../fbdevhw -I$(srcdir)/../vgahw \
-+         -I$(srcdir)/../xaa -I$(srcdir)/../int10
+diff -ur debrix/hw/xorg/common/Makefile.am debrix-new/hw/xorg/common/Makefile.am
+--- debrix/hw/xorg/common/Makefile.am  2004-06-10 19:14:51.000000000 +0000
++++ debrix-new/hw/xorg/common/Makefile.am      2004-06-29 11:13:43.000000000 +0000
+@@ -58,7 +58,7 @@
+ INCLUDES = $(XORG_INCS) -I$(srcdir)/../loader -I$(srcdir)/../ddc \
+            -I$(srcdir)/../rac -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
+            -I$(srcdir)/../i2c -I$(srcdir)/../parser -I$(srcdir)/../vgahw \
+-           -I$(srcdir)/../scanpci -I$(top_srcdir)/Xi
++           -I$(srcdir)/../scanpci -I$(top_srcdir)/Xi -I$(srcdir)/..
  
- libloader_a_SOURCES = \
-         dlloader.c \
-Index: hw/xorg/loader/xf86sym.c
-===================================================================
-RCS file: /cvs/xserver/debrix/hw/xorg/loader/xf86sym.c,v
-retrieving revision 1.3
-diff -u -r1.3 xf86sym.c
---- hw/xorg/loader/xf86sym.c   28 Jun 2004 00:46:33 -0000      1.3
-+++ hw/xorg/loader/xf86sym.c   29 Jun 2004 01:18:59 -0000
-@@ -78,6 +78,9 @@
- #include "xf86cmap.h"
- #include "xf86fbman.h"
- #include "fbdevhw.h"
-+#include "vgaHW.h"
-+#include "xf86int10.h"
-+#include "xf86i2c.h"
- #include "dgaproc.h"
- #include "dpmsproc.h"
- #include "vidmodeproc.h"
-@@ -1158,6 +1161,15 @@
-     /* fbdevhw.c */
-     SYMVAR(fbdevHWValidMode)
- 
-+    /* vgaHW.c */
-+    SYMVAR(vgaHWInit)
-+
-+    /* int10 */
-+    SYMVAR(xf86InitInt10)
-+
-+    /* xf86i2c.c */
-+    SYMVAR(xf86CreateI2CBusRec)
-+
-     /* xaa */
-     SYMVAR(XAACopyROP)
- 
-Index: hw/xorg/common/xf86Init.c
-===================================================================
-RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86Init.c,v
-retrieving revision 1.3
-diff -u -r1.3 xf86Init.c
---- hw/xorg/common/xf86Init.c  10 Jun 2004 19:40:04 -0000      1.3
-+++ hw/xorg/common/xf86Init.c  29 Jun 2004 01:19:00 -0000
-@@ -117,8 +117,8 @@
- static char *baseModules[] = {
- #if 0 /* XXX DS */
-       "bitmap",
--#endif
-       "pcidata",
-+#endif
-       NULL
- };
- #endif
-Index: hw/xorg/common/xf86pciBus.c
-===================================================================
-RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86pciBus.c,v
-retrieving revision 1.3
-diff -u -r1.3 xf86pciBus.c
---- hw/xorg/common/xf86pciBus.c        10 Jun 2004 19:40:04 -0000      1.3
-+++ hw/xorg/common/xf86pciBus.c        29 Jun 2004 01:19:02 -0000
+ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
+                xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
+diff -ur debrix/hw/xorg/common/xf86pciBus.c debrix-new/hw/xorg/common/xf86pciBus.c
+--- debrix/hw/xorg/common/xf86pciBus.c 2004-06-10 19:40:04.000000000 +0000
++++ debrix-new/hw/xorg/common/xf86pciBus.c     2004-06-29 11:41:51.000000000 +0000
 @@ -1709,25 +1709,12 @@
      /*
       * Initialise the pcidata entry points.
@@ -100,20 +39,154 @@ diff -u -r1.3 xf86pciBus.c
  
      if (!xf86SetupPciIds())
        FatalError("xf86SetupPciIds() failed\n");
-Index: hw/xorg/int10/Makefile.am
-===================================================================
-RCS file: /cvs/xserver/debrix/hw/xorg/int10/Makefile.am,v
-retrieving revision 1.3
-diff -u -r1.3 Makefile.am
---- hw/xorg/int10/Makefile.am  27 Jun 2004 20:58:25 -0000      1.3
-+++ hw/xorg/int10/Makefile.am  29 Jun 2004 01:19:02 -0000
+diff -ur debrix/hw/xorg/ddc/Makefile.am debrix-new/hw/xorg/ddc/Makefile.am
+--- debrix/hw/xorg/ddc/Makefile.am     2004-06-27 21:20:53.000000000 +0000
++++ debrix-new/hw/xorg/ddc/Makefile.am 2004-06-29 11:13:21.000000000 +0000
+@@ -4,4 +4,4 @@
+ libddc_a_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
+                    interpret_vdif.c print_vdif.c ddcProperty.c
+ 
+-INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
++INCLUDES = $(XORG_INCS) -I$(srcdir)/..
+diff -ur debrix/hw/xorg/ddc/xf86DDC.h debrix-new/hw/xorg/ddc/xf86DDC.h
+--- debrix/hw/xorg/ddc/xf86DDC.h       2004-06-10 19:40:12.000000000 +0000
++++ debrix-new/hw/xorg/ddc/xf86DDC.h   2004-06-29 11:13:21.000000000 +0000
+@@ -18,7 +18,7 @@
+ # define XF86_DDC_H
+ 
+ #include "edid.h"
+-#include "xf86i2c.h"
++#include "i2c/xf86i2c.h"
+ #include "xf86str.h"
+ 
+ /* speed up / slow down */
+diff -ur debrix/hw/xorg/int10/Makefile.am debrix-new/hw/xorg/int10/Makefile.am
+--- debrix/hw/xorg/int10/Makefile.am   2004-06-27 21:20:53.000000000 +0000
++++ debrix-new/hw/xorg/int10/Makefile.am       2004-06-29 11:41:12.000000000 +0000
 @@ -3,7 +3,8 @@
  #ibxorgint10_a_SOURCES = stub.c
  
  libint10_a_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
 -                     xf86int10.c generic.c xf86int10module.c
 +                     xf86int10.c generic.c xf86int10module.c sys.c \
-+                   xf86x86emu.c decode.c prim_ops.c ops.c ops2.c fpu.c
++                     xf86x86emu.c decode.c prim_ops.c ops.c ops2.c fpu.c
  
  # FIXME: i386/amd64-only (and Linux-only!!)
  AM_CFLAGS = -D_PC -D_VM86_LINUX
+diff -ur debrix/hw/xorg/loader/Makefile.am debrix-new/hw/xorg/loader/Makefile.am
+--- debrix/hw/xorg/loader/Makefile.am  2004-06-28 10:25:18.000000000 +0000
++++ debrix-new/hw/xorg/loader/Makefile.am      2004-06-29 11:13:45.000000000 +0000
+@@ -1,8 +1,6 @@
+ noinst_LIBRARIES = libloader.a
+ AM_CFLAGS = $(XORG_CFLAGS) -DDLOPEN_SUPPORT -DHAS_SHM -DXFree86LOADER
+-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
+-           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
+-           -I$(srcdir)/../fbdevhw -I$(srcdir)/../xaa
++INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/..
+ 
+ libloader_a_SOURCES = \
+         dlloader.c \
+diff -ur debrix/hw/xorg/loader/xf86sym.c debrix-new/hw/xorg/loader/xf86sym.c
+--- debrix/hw/xorg/loader/xf86sym.c    2004-06-28 10:25:18.000000000 +0000
++++ debrix-new/hw/xorg/loader/xf86sym.c        2004-06-29 11:13:45.000000000 +0000
+@@ -77,17 +77,22 @@
+ #include "xf86xvmc.h"
+ #include "xf86cmap.h"
+ #include "xf86fbman.h"
+-#include "fbdevhw.h"
++#include "fbdevhw/fbdevhw.h"
++#include "vgahw/vgaHW.h"
++#include "int10/xf86int10.h"
++#include "i2c/xf86i2c.h"
++#include "ddc/xf86DDC.h"
++#include "ramdac/xf86Cursor.h"
+ #include "dgaproc.h"
+ #include "dpmsproc.h"
+ #include "vidmodeproc.h"
+ #include "xf86miscproc.h"
+ #include "loader.h"
+-#include "xaarop.h"
++#include "xaa/xaarop.h"
+ #define DONT_DEFINE_WRAPPERS
+ #include "xf86_ansic.h"
+ #include "xisb.h"
+-#include "vbe.h"
++#include "vbe/vbe.h"
+ #ifndef __OpenBSD__
+ #include "xf86sbusBus.h"
+ #endif
+@@ -1158,6 +1163,27 @@
+     /* fbdevhw.c */
+     SYMVAR(fbdevHWValidMode)
+ 
++    /* vgaHW.c */
++    SYMVAR(vgaHWInit)
++
++    /* ini10 */ 
++    SYMVAR(xf86int10Addr)
++
++    /* xf86i2c.c */
++    SYMVAR(xf86CreateI2CBusRec)
++
++    /* vbe.c */
++    SYMVAR(VBEInit)
++
++    /* xf86DDC.c */
++    SYMVAR(xf86DoEDID_DDC2)
++
++    /* print_edid.c */
++    SYMVAR(xf86PrintEDID)
++
++    /* xf86Cursor.c */
++    SYMVAR(xf86InitCursor)
++
+     /* xaa */
+     SYMVAR(XAACopyROP)
+ 
+diff -ur debrix/hw/xorg/vbe/Makefile.am debrix-new/hw/xorg/vbe/Makefile.am
+--- debrix/hw/xorg/vbe/Makefile.am     2004-06-27 21:20:53.000000000 +0000
++++ debrix-new/hw/xorg/vbe/Makefile.am 2004-06-29 11:13:22.000000000 +0000
+@@ -1,6 +1,5 @@
+ noinst_LIBRARIES = libvbe.a
+ libvbe_a_SOURCES = vbe.c vbeModes.c vbe_module.c
+-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
+-          -I$(srcdir)/../int10
++INCLUDES = $(XORG_INCS) -I$(srcdir)/..
+ 
+ sdk_HEADERS = vbe.h vbeModes.h
+diff -ur debrix/hw/xorg/vbe/vbe.h debrix-new/hw/xorg/vbe/vbe.h
+--- debrix/hw/xorg/vbe/vbe.h   2004-06-10 19:41:27.000000000 +0000
++++ debrix-new/hw/xorg/vbe/vbe.h       2004-06-29 11:13:22.000000000 +0000
+@@ -15,8 +15,8 @@
+ #endif
+ #ifndef _VBE_H
+ #define _VBE_H
+-#include "xf86int10.h"
+-#include "xf86DDC.h"
++#include "int10/xf86int10.h"
++#include "ddc/xf86DDC.h"
+ 
+ typedef enum {
+     DDC_UNCHECKED,
+diff -ur debrix/hw/xorg/vgahw/Makefile.am debrix-new/hw/xorg/vgahw/Makefile.am
+--- debrix/hw/xorg/vgahw/Makefile.am   2004-06-27 21:20:54.000000000 +0000
++++ debrix-new/hw/xorg/vgahw/Makefile.am       2004-06-29 11:13:35.000000000 +0000
+@@ -1,5 +1,5 @@
+ noinst_LIBRARIES = libvgahw.a
+ libvgahw_a_SOURCES = vgaHW.c vgaHWmodule.c
+-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
++INCLUDES = $(XORG_INCS) -I$(srcdir)/..
+ 
+ sdk_HEADERS = vgaHW.h
+diff -ur debrix/hw/xorg/vgahw/vgaHW.h debrix-new/hw/xorg/vgahw/vgaHW.h
+--- debrix/hw/xorg/vgahw/vgaHW.h       2004-06-10 19:41:30.000000000 +0000
++++ debrix-new/hw/xorg/vgahw/vgaHW.h   2004-06-29 11:13:35.000000000 +0000
+@@ -26,7 +26,7 @@
+ #include "xf86str.h"
+ #include "xf86Pci.h"
+ 
+-#include "xf86DDC.h"
++#include "ddc/xf86DDC.h"
+ 
+ #include "globals.h"
+ #define DPMS_SERVER