X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2Fxmir.patch;h=86248f9de7a962a9f192e210c88af6f30bfde8ef;hp=c6498890d9fc4e6d368eb455747810e2e559c77f;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index c649889..86248f9 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -631,6 +631,7 @@
+@@ -632,6 +632,7 @@ AC_ARG_ENABLE(windowswm,      AS_HELP_ST
  AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
  AC_ARG_ENABLE(clientids,      AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])
  AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes])
@@ -8,7 +8,7 @@
  AC_ARG_ENABLE(linux_acpi, AC_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes])
  AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes])
  
-@@ -1275,6 +1276,15 @@
+@@ -1334,6 +1335,15 @@ if test "x$XINERAMA" = xyes; then
  	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"
  fi
  
@@ -24,7 +24,7 @@
  AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])
  if test "x$XACE" = xyes; then
  	AC_DEFINE(XACE, 1, [Build X-ACE extension])
-@@ -2439,6 +2449,7 @@
+@@ -2510,6 +2520,7 @@ hw/xfree86/utils/Makefile
  hw/xfree86/utils/man/Makefile
  hw/xfree86/utils/cvt/Makefile
  hw/xfree86/utils/gtf/Makefile
@@ -34,7 +34,7 @@
  hw/dmx/doc/Makefile
 --- a/hw/xfree86/Makefile.am
 +++ b/hw/xfree86/Makefile.am
-@@ -30,15 +30,20 @@
+@@ -30,15 +30,20 @@ if INT10MODULE
  INT10_SUBDIR = int10
  endif
  
@@ -59,7 +59,7 @@
  nodist_Xorg_SOURCES = sdksyms.c
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -118,6 +118,7 @@
+@@ -118,6 +118,7 @@ static ModuleDefault ModuleDefaults[] =
      {.name = "fb",.toLoad = TRUE,.load_opt = NULL},
      {.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
  #endif
@@ -67,7 +67,7 @@
      {.name = NULL,.toLoad = FALSE,.load_opt = NULL}
  };
  
-@@ -260,6 +261,17 @@
+@@ -260,6 +261,17 @@ xf86ModulelistFromConfig(pointer **optli
          return NULL;
      }
  
@@ -87,7 +87,7 @@
           * not be loaded 
 --- a/hw/xfree86/common/xf86Events.c
 +++ b/hw/xfree86/common/xf86Events.c
-@@ -105,8 +105,6 @@
+@@ -105,8 +105,6 @@ extern fd_set EnabledDevices;
  extern void (*xf86OSPMClose) (void);
  #endif
  
@@ -96,7 +96,7 @@
  /*
   * Allow arbitrary drivers or other XFree86 code to register with our main
   * Wakeup handler.
-@@ -411,7 +409,7 @@
+@@ -411,7 +409,7 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
   * xf86VTSwitch --
   *      Handle requests for switching the vt.
   */
@@ -105,7 +105,7 @@
  xf86VTSwitch(void)
  {
      int i;
-@@ -471,7 +469,7 @@
+@@ -471,7 +469,7 @@ xf86VTSwitch(void)
  
          xf86AccessLeave();      /* We need this here, otherwise */
  
@@ -114,7 +114,7 @@
              /*
               * switch failed
               */
-@@ -530,7 +528,7 @@
+@@ -530,7 +528,7 @@ xf86VTSwitch(void)
      }
      else {
          DebugF("xf86VTSwitch: Entering\n");
@@ -125,7 +125,7 @@
  #ifdef XF86PM
 --- a/hw/xfree86/common/xf86Globals.c
 +++ b/hw/xfree86/common/xf86Globals.c
-@@ -206,3 +206,6 @@
+@@ -207,3 +207,6 @@ Bool xf86VidModeAllowNonLocal = FALSE;
  #endif
  RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
  Bool xorgHWAccess = FALSE;
@@ -134,7 +134,7 @@
 +const char *mirSocket = NULL;
 --- a/hw/xfree86/common/xf86Helper.c
 +++ b/hw/xfree86/common/xf86Helper.c
-@@ -100,7 +100,14 @@
+@@ -100,7 +100,14 @@ xf86DeleteDriver(int drvIndex)
          if (xf86DriverList[drvIndex]->module)
              UnloadModule(xf86DriverList[drvIndex]->module);
          free(xf86DriverList[drvIndex]);
@@ -152,7 +152,7 @@
  
 --- a/hw/xfree86/common/xf86Init.c
 +++ b/hw/xfree86/common/xf86Init.c
-@@ -554,7 +554,7 @@
+@@ -554,7 +554,7 @@ InitOutput(ScreenInfo * pScreenInfo, int
           * needed at this early stage.
           */
  
@@ -161,7 +161,7 @@
              xorgHWFlags flags = HW_IO;
  
              if (xf86DriverList[i]->Identify != NULL)
-@@ -565,11 +565,20 @@
+@@ -565,11 +565,20 @@ InitOutput(ScreenInfo * pScreenInfo, int
                                                GET_REQUIRED_HW_INTERFACES,
                                                &flags);
  
@@ -182,7 +182,7 @@
          }
  
          if (xorgHWOpenConsole)
-@@ -662,9 +671,13 @@
+@@ -662,9 +671,13 @@ InitOutput(ScreenInfo * pScreenInfo, int
          }
  
          /* Remove (unload) drivers that are not required */
@@ -198,7 +198,7 @@
  
          /*
           * At this stage we know how many screens there are.
-@@ -1490,6 +1503,17 @@
+@@ -1490,6 +1503,17 @@ ddxProcessArgument(int argc, char **argv
          xf86Info.ShareVTs = TRUE;
          return 1;
      }
@@ -216,7 +216,7 @@
  
      /* OS-specific processing */
      return xf86ProcessArgument(argc, argv, i);
-@@ -1563,6 +1587,8 @@
+@@ -1563,6 +1587,8 @@ ddxUseMsg(void)
      ErrorF
          ("-novtswitch            don't automatically switch VT at reset & exit\n");
      ErrorF("-sharevts              share VTs with another X server\n");
@@ -227,7 +227,7 @@
      ErrorF("\n");
 --- a/hw/xfree86/common/xf86Priv.h
 +++ b/hw/xfree86/common/xf86Priv.h
-@@ -93,6 +93,9 @@
+@@ -93,6 +93,9 @@ extern _X_EXPORT Bool xf86AttemptedFallb
  extern _X_EXPORT const char *xf86VisualNames[];
  extern _X_EXPORT int xf86Verbose;       /* verbosity level */
  extern _X_EXPORT int xf86LogVerbose;    /* log file verbosity level */
@@ -237,7 +237,7 @@
  
  extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable;
  
-@@ -149,6 +152,9 @@
+@@ -149,6 +152,9 @@ xf86HandlePMEvents(int fd, pointer data)
  extern _X_EXPORT int (*xf86PMGetEventFromOs) (int fd, pmEvent * events,
                                                int num);
  extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs) (int fd, pmEvent event);
@@ -249,7 +249,7 @@
  extern _X_EXPORT void
 --- a/hw/xfree86/ramdac/xf86Cursor.c
 +++ b/hw/xfree86/ramdac/xf86Cursor.c
-@@ -58,7 +58,12 @@
+@@ -58,7 +58,12 @@ xf86InitCursor(ScreenPtr pScreen, xf86Cu
      xf86CursorScreenPtr ScreenPriv;
      miPointerScreenPtr PointPriv;
  
@@ -265,7 +265,7 @@
      if (!dixRegisterPrivateKey(&xf86CursorScreenKeyRec, PRIVATE_SCREEN, 0))
 --- a/hw/xfree86/ramdac/xf86HWCurs.c
 +++ b/hw/xfree86/ramdac/xf86HWCurs.c
-@@ -114,8 +114,6 @@
+@@ -114,8 +114,6 @@ xf86InitHardwareCursor(ScreenPtr pScreen
          infoPtr->RealizeCursor = RealizeCursorInterleave0;
      }
  
@@ -1940,7 +1940,7 @@
 +#endif /* _XMIR_H */
 --- a/include/list.h
 +++ b/include/list.h
-@@ -184,6 +184,14 @@
+@@ -184,6 +184,14 @@ __xorg_list_del(struct xorg_list *prev,
      prev->next = next;
  }
  
@@ -1967,7 +1967,7 @@
  #endif /* _XORG_SERVER_H_ */
 --- a/test/Makefile.am
 +++ b/test/Makefile.am
-@@ -6,6 +6,9 @@
+@@ -6,6 +6,9 @@ if XORG
  # For now, requires xf86 ddx, could be adjusted to use another
  SUBDIRS += xi2
  noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
@@ -1977,7 +1977,7 @@
  endif
  check_LTLIBRARIES = libxservertest.la
  
-@@ -38,6 +41,8 @@
+@@ -38,6 +41,8 @@ touch_LDADD=$(TEST_LDADD)
  signal_logging_LDADD=$(TEST_LDADD)
  hashtabletest_LDADD=$(TEST_LDADD) $(top_srcdir)/Xext/hashtable.c
  os_LDADD=$(TEST_LDADD)