xorg-server: Changes to 'ubuntu'

To: debian-x@lists.debian.org
Subject: xorg-server: Changes to 'ubuntu'
From: Christopher Halse Rogers <raof-guest@alioth.debian.org>
Date: Thu, 22 Aug 2013 04:27:24 +0000
Message-id: <[🔎] E1VCMUW-0003Mo-4V@vasks.debian.org>
 debian/changelog          |    6 ++
 debian/patches/xmir.patch |  101 +++++++++++++++++++++++-----------------------
 2 files changed, 57 insertions(+), 50 deletions(-)

New commits:
commit 205f86d3c8e8159267052f59acffb8a2c0f246af
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Thu Aug 22 14:26:39 2013 +1000

    Update for new Mir API

diff --git a/debian/changelog b/debian/changelog
index 9e33fb3..6d7b809 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.2.901-2ubuntu2) saucy; urgency=low
+
+  * xmir.patch: Update for new API
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 22 Aug 2013 14:23:40 +1000
+
 xorg-server (2:1.14.2.901-2ubuntu1) saucy; urgency=low
 
   * Merge from released debian-experimental.
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 58e5486..cb2c269 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,7 +1,7 @@
-Index: xorg-server/configure.ac
+Index: xserver/configure.ac
 ===================================================================
---- xorg-server.orig/configure.ac	2013-08-06 13:15:53.451098539 +0000
-+++ xorg-server/configure.ac	2013-08-06 13:15:53.579296059 +0000
+--- xserver.orig/configure.ac	2013-08-22 14:24:31.413804619 +1000
++++ xserver/configure.ac	2013-08-22 14:24:31.401804618 +1000
 @@ -639,6 +639,7 @@
  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])
@@ -34,10 +34,10 @@ Index: xorg-server/configure.ac
  hw/dmx/config/Makefile
  hw/dmx/config/man/Makefile
  hw/dmx/doc/Makefile
-Index: xorg-server/hw/xfree86/Makefile.am
+Index: xserver/hw/xfree86/Makefile.am
 ===================================================================
---- xorg-server.orig/hw/xfree86/Makefile.am	2013-08-06 13:14:07.176406286 +0000
-+++ xorg-server/hw/xfree86/Makefile.am	2013-08-06 13:15:53.579496055 +0000
+--- xserver.orig/hw/xfree86/Makefile.am	2013-08-22 14:24:31.413804619 +1000
++++ xserver/hw/xfree86/Makefile.am	2013-08-22 14:24:31.401804618 +1000
 @@ -25,15 +25,20 @@
  INT10_SUBDIR = int10
  endif
@@ -61,10 +61,10 @@ Index: xorg-server/hw/xfree86/Makefile.am
  
  bin_PROGRAMS = Xorg
  nodist_Xorg_SOURCES = sdksyms.c
-Index: xorg-server/hw/xfree86/common/xf86Config.c
+Index: xserver/hw/xfree86/common/xf86Config.c
 ===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c	2013-08-06 13:15:53.364100222 +0000
-+++ xorg-server/hw/xfree86/common/xf86Config.c	2013-08-06 13:15:53.579996045 +0000
+--- xserver.orig/hw/xfree86/common/xf86Config.c	2013-08-22 14:24:31.413804619 +1000
++++ xserver/hw/xfree86/common/xf86Config.c	2013-08-22 14:24:31.405804618 +1000
 @@ -117,6 +117,7 @@
      {.name = "fb",.toLoad = TRUE,.load_opt = NULL},
      {.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
@@ -91,10 +91,10 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
      if (xf86configptr->conf_modules) {
          /* Walk the disable list and let people know what we've parsed to
           * not be loaded 
-Index: xorg-server/hw/xfree86/common/xf86Globals.c
+Index: xserver/hw/xfree86/common/xf86Globals.c
 ===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Globals.c	2013-08-06 13:15:53.372900052 +0000
-+++ xorg-server/hw/xfree86/common/xf86Globals.c	2013-08-06 13:15:53.580196041 +0000
+--- xserver.orig/hw/xfree86/common/xf86Globals.c	2013-08-22 14:24:31.413804619 +1000
++++ xserver/hw/xfree86/common/xf86Globals.c	2013-08-22 14:24:31.405804618 +1000
 @@ -206,3 +206,6 @@
  #endif
  RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
@@ -102,10 +102,10 @@ Index: xorg-server/hw/xfree86/common/xf86Globals.c
 +Bool xorgMir = FALSE;
 +const char *mirID = NULL;
 +const char *mirSocket = NULL;
-Index: xorg-server/hw/xfree86/common/xf86Init.c
+Index: xserver/hw/xfree86/common/xf86Init.c
 ===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c	2013-08-06 13:15:53.470098171 +0000
-+++ xorg-server/hw/xfree86/common/xf86Init.c	2013-08-06 13:16:03.163310647 +0000
+--- xserver.orig/hw/xfree86/common/xf86Init.c	2013-08-22 14:24:31.413804619 +1000
++++ xserver/hw/xfree86/common/xf86Init.c	2013-08-22 14:24:31.405804618 +1000
 @@ -554,7 +554,7 @@
           * needed at this early stage.
           */
@@ -179,10 +179,10 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
      /* OS-specific usage */
      xf86UseMsg();
      ErrorF("\n");
-Index: xorg-server/hw/xfree86/common/xf86Priv.h
+Index: xserver/hw/xfree86/common/xf86Priv.h
 ===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Priv.h	2013-08-06 13:15:53.373400042 +0000
-+++ xorg-server/hw/xfree86/common/xf86Priv.h	2013-08-06 13:15:53.580696032 +0000
+--- xserver.orig/hw/xfree86/common/xf86Priv.h	2013-08-22 14:24:31.413804619 +1000
++++ xserver/hw/xfree86/common/xf86Priv.h	2013-08-22 14:24:31.405804618 +1000
 @@ -93,6 +93,9 @@
  extern _X_EXPORT const char *xf86VisualNames[];
  extern _X_EXPORT int xf86Verbose;       /* verbosity level */
@@ -193,10 +193,10 @@ Index: xorg-server/hw/xfree86/common/xf86Priv.h
  
  extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable;
  
-Index: xorg-server/hw/xfree86/xmir/Makefile.am
+Index: xserver/hw/xfree86/xmir/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/hw/xfree86/xmir/Makefile.am	2013-08-06 13:15:53.580796030 +0000
++++ xserver/hw/xfree86/xmir/Makefile.am	2013-08-22 14:24:31.405804618 +1000
 @@ -0,0 +1,26 @@
 +INCLUDES =					\
 +	$(XORG_INCS)                            \
@@ -224,10 +224,10 @@ Index: xorg-server/hw/xfree86/xmir/Makefile.am
 +	xmir-private.h
 +
 +sdk_HEADERS = xmir.h
-Index: xorg-server/hw/xfree86/xmir/xmir-output.c
+Index: xserver/hw/xfree86/xmir/xmir-output.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/hw/xfree86/xmir/xmir-output.c	2013-08-06 13:15:53.580996026 +0000
++++ xserver/hw/xfree86/xmir/xmir-output.c	2013-08-22 14:24:31.405804618 +1000
 @@ -0,0 +1,225 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -454,10 +454,10 @@ Index: xorg-server/hw/xfree86/xmir/xmir-output.c
 +  
 +    return TRUE;
 +}
-Index: xorg-server/hw/xfree86/xmir/xmir-private.h
+Index: xserver/hw/xfree86/xmir/xmir-private.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/hw/xfree86/xmir/xmir-private.h	2013-08-06 13:15:53.581096024 +0000
++++ xserver/hw/xfree86/xmir/xmir-private.h	2013-08-22 14:24:31.405804618 +1000
 @@ -0,0 +1,90 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -549,10 +549,10 @@ Index: xorg-server/hw/xfree86/xmir/xmir-private.h
 +xmir_process_from_eventloop(void);
 +
 + #endif /* _MIR_PRIVATE_H */
-Index: xorg-server/hw/xfree86/xmir/xmir-thread-proxy.c
+Index: xserver/hw/xfree86/xmir/xmir-thread-proxy.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/hw/xfree86/xmir/xmir-thread-proxy.c	2013-08-06 13:15:53.581196022 +0000
++++ xserver/hw/xfree86/xmir/xmir-thread-proxy.c	2013-08-22 14:24:31.405804618 +1000
 @@ -0,0 +1,117 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -671,11 +671,11 @@ Index: xorg-server/hw/xfree86/xmir/xmir-thread-proxy.c
 +	}
 +}
 +
-Index: xorg-server/hw/xfree86/xmir/xmir-window.c
+Index: xserver/hw/xfree86/xmir/xmir-window.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/hw/xfree86/xmir/xmir-window.c	2013-08-06 13:15:53.581496016 +0000
-@@ -0,0 +1,325 @@
++++ xserver/hw/xfree86/xmir/xmir-window.c	2013-08-22 14:26:10.329808020 +1000
+@@ -0,0 +1,326 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -937,6 +937,7 @@ Index: xorg-server/hw/xfree86/xmir/xmir-window.c
 +         */
 +        params.pixel_format = mir_pixel_format_xrgb_8888;
 +        params.buffer_usage = mir_buffer_usage_hardware;
++	params.output_id = mir_display_output_invalid;
 +
 +        mir_wait_for(mir_connection_create_surface(xmir_connection_get(),
 +                                                   &params,
@@ -1001,10 +1002,10 @@ Index: xorg-server/hw/xfree86/xmir/xmir-window.c
 +
 +    return TRUE;
 +}
-Index: xorg-server/hw/xfree86/xmir/xmir.c
+Index: xserver/hw/xfree86/xmir/xmir.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/hw/xfree86/xmir/xmir.c	2013-08-06 13:15:53.581696012 +0000
++++ xserver/hw/xfree86/xmir/xmir.c	2013-08-22 14:24:31.405804618 +1000
 @@ -0,0 +1,216 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -1222,10 +1223,10 @@ Index: xorg-server/hw/xfree86/xmir/xmir.c
 +xMirTeardown(pointer module)
 +{
 +}
-Index: xorg-server/hw/xfree86/xmir/xmir.h
+Index: xserver/hw/xfree86/xmir/xmir.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/hw/xfree86/xmir/xmir.h	2013-08-06 13:15:53.581796010 +0000
++++ xserver/hw/xfree86/xmir/xmir.h	2013-08-22 14:24:31.405804618 +1000
 @@ -0,0 +1,95 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -1322,10 +1323,10 @@ Index: xorg-server/hw/xfree86/xmir/xmir.h
 +xmir_screen_for_each_damaged_window(xmir_screen *xmir, xmir_handle_window_damage_proc callback);
 +
 +#endif /* _XMIR_H */
-Index: xorg-server/include/list.h
+Index: xserver/include/list.h
 ===================================================================
---- xorg-server.orig/include/list.h	2013-08-06 13:14:07.183506153 +0000
-+++ xorg-server/include/list.h	2013-08-06 13:15:53.581996006 +0000
+--- xserver.orig/include/list.h	2013-08-22 14:24:31.413804619 +1000
++++ xserver/include/list.h	2013-08-22 14:24:31.405804618 +1000
 @@ -184,6 +184,14 @@
      prev->next = next;
  }
@@ -1341,10 +1342,10 @@ Index: xorg-server/include/list.h
  /**
   * Remove the element from the list it is in. Using this function will reset
   * the pointers to/from this element so it is removed from the list. It does
-Index: xorg-server/include/xorg-server.h.in
+Index: xserver/include/xorg-server.h.in
 ===================================================================
---- xorg-server.orig/include/xorg-server.h.in	2013-08-06 13:14:07.191006013 +0000
-+++ xorg-server/include/xorg-server.h.in	2013-08-06 13:15:53.582096004 +0000
+--- xserver.orig/include/xorg-server.h.in	2013-08-22 14:24:31.413804619 +1000
++++ xserver/include/xorg-server.h.in	2013-08-22 14:24:31.409804619 +1000
 @@ -212,4 +212,7 @@
  #define _XSERVER64 1
  #endif
@@ -1353,10 +1354,10 @@ Index: xorg-server/include/xorg-server.h.in
 +#undef XMIR
 +
  #endif /* _XORG_SERVER_H_ */
-Index: xorg-server/miext/damage/damage.c
+Index: xserver/miext/damage/damage.c
 ===================================================================
---- xorg-server.orig/miext/damage/damage.c	2013-08-06 13:14:07.207005715 +0000
-+++ xorg-server/miext/damage/damage.c	2013-08-06 13:15:53.582495997 +0000
+--- xserver.orig/miext/damage/damage.c	2013-08-22 14:24:31.413804619 +1000
++++ xserver/miext/damage/damage.c	2013-08-22 14:24:31.409804619 +1000
 @@ -123,18 +123,14 @@
  damageReportDamagePostRendering(DamagePtr pDamage, RegionPtr pOldDamage,
                                  RegionPtr pDamageRegion)
@@ -1415,10 +1416,10 @@ Index: xorg-server/miext/damage/damage.c
  }
  
  #if DAMAGE_DEBUG_ENABLE
-Index: xorg-server/test/Makefile.am
+Index: xserver/test/Makefile.am
 ===================================================================
---- xorg-server.orig/test/Makefile.am	2013-08-06 13:14:07.219605480 +0000
-+++ xorg-server/test/Makefile.am	2013-08-06 13:15:53.582695993 +0000
+--- xserver.orig/test/Makefile.am	2013-08-22 14:24:31.413804619 +1000
++++ xserver/test/Makefile.am	2013-08-22 14:24:31.409804619 +1000
 @@ -6,7 +6,12 @@
  # For now, requires xf86 ddx, could be adjusted to use another
  SUBDIRS += xi2
@@ -1442,10 +1443,10 @@ Index: xorg-server/test/Makefile.am
  
  libxservertest_la_LIBADD = $(XSERVER_LIBS)
  if XORG
-Index: xorg-server/test/xmir-thread-proxy.c
+Index: xserver/test/xmir-thread-proxy.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server/test/xmir-thread-proxy.c	2013-08-06 13:15:53.582795991 +0000
++++ xserver/test/xmir-thread-proxy.c	2013-08-22 14:24:31.409804619 +1000
 @@ -0,0 +1,154 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -1601,10 +1602,10 @@ Index: xorg-server/test/xmir-thread-proxy.c
 +	xmir_test_many_threads_to_eventloop();
 +	xmir_test_refuses_to_marshall_too_large_msg();
 +}
-Index: xorg-server/hw/xfree86/common/xf86Helper.c
+Index: xserver/hw/xfree86/common/xf86Helper.c
 ===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Helper.c	2013-08-06 13:15:53.300101460 +0000
-+++ xorg-server/hw/xfree86/common/xf86Helper.c	2013-08-06 13:15:53.583195983 +0000
+--- xserver.orig/hw/xfree86/common/xf86Helper.c	2013-08-22 14:24:31.413804619 +1000
++++ xserver/hw/xfree86/common/xf86Helper.c	2013-08-22 14:24:31.409804619 +1000
 @@ -100,7 +100,14 @@
          if (xf86DriverList[drvIndex]->module)
              UnloadModule(xf86DriverList[drvIndex]->module);
Reply to:
Prev by Date: Bug#720100: A solution?
Next by Date: xorg-server: Changes to 'ubuntu'
Previous by thread: xorg-server: Changes to 'ubuntu'
Next by thread: xorg-server: Changes to 'ubuntu'
Index(es):
- Date
- Thread