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 05:46:15 +0000
Message-id: <[🔎] E1VCNip-0007DC-PK@vasks.debian.org>
 debian/changelog          |    6 ++++
 debian/patches/xmir.patch |   62 +++++++++++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 31 deletions(-)

New commits:
commit 11f4fd0029e93f92723c8a883d822d917622cf86
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Thu Aug 22 15:19:56 2013 +1000

    Fix build by using the actual API, not the API the docs tell you to use

diff --git a/debian/changelog b/debian/changelog
index 6d7b809..79bdfde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.2.901-2ubuntu3) saucy; urgency=low
+
+  * xmir.patch: Use the API we have, not the API we've documented
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 22 Aug 2013 15:18:55 +1000
+
 xorg-server (2:1.14.2.901-2ubuntu2) saucy; urgency=low
 
   * xmir.patch: Update for new API
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index cb2c269..6e5dab8 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,7 +1,7 @@
 Index: xserver/configure.ac
 ===================================================================
---- xserver.orig/configure.ac	2013-08-22 14:24:31.413804619 +1000
-+++ xserver/configure.ac	2013-08-22 14:24:31.401804618 +1000
+--- xserver.orig/configure.ac	2013-08-22 15:18:34.437916132 +1000
++++ xserver/configure.ac	2013-08-22 15:18:34.425916132 +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])
@@ -36,8 +36,8 @@ Index: xserver/configure.ac
  hw/dmx/doc/Makefile
 Index: xserver/hw/xfree86/Makefile.am
 ===================================================================
---- 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
+--- xserver.orig/hw/xfree86/Makefile.am	2013-08-22 15:18:34.437916132 +1000
++++ xserver/hw/xfree86/Makefile.am	2013-08-22 15:18:34.425916132 +1000
 @@ -25,15 +25,20 @@
  INT10_SUBDIR = int10
  endif
@@ -63,8 +63,8 @@ Index: xserver/hw/xfree86/Makefile.am
  nodist_Xorg_SOURCES = sdksyms.c
 Index: xserver/hw/xfree86/common/xf86Config.c
 ===================================================================
---- 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
+--- xserver.orig/hw/xfree86/common/xf86Config.c	2013-08-22 15:18:34.437916132 +1000
++++ xserver/hw/xfree86/common/xf86Config.c	2013-08-22 15:18:34.429916132 +1000
 @@ -117,6 +117,7 @@
      {.name = "fb",.toLoad = TRUE,.load_opt = NULL},
      {.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
@@ -93,8 +93,8 @@ Index: xserver/hw/xfree86/common/xf86Config.c
           * not be loaded 
 Index: xserver/hw/xfree86/common/xf86Globals.c
 ===================================================================
---- 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
+--- xserver.orig/hw/xfree86/common/xf86Globals.c	2013-08-22 15:18:34.437916132 +1000
++++ xserver/hw/xfree86/common/xf86Globals.c	2013-08-22 15:18:34.429916132 +1000
 @@ -206,3 +206,6 @@
  #endif
  RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
@@ -104,8 +104,8 @@ Index: xserver/hw/xfree86/common/xf86Globals.c
 +const char *mirSocket = NULL;
 Index: xserver/hw/xfree86/common/xf86Init.c
 ===================================================================
---- 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
+--- xserver.orig/hw/xfree86/common/xf86Init.c	2013-08-22 15:18:34.437916132 +1000
++++ xserver/hw/xfree86/common/xf86Init.c	2013-08-22 15:18:34.429916132 +1000
 @@ -554,7 +554,7 @@
           * needed at this early stage.
           */
@@ -181,8 +181,8 @@ Index: xserver/hw/xfree86/common/xf86Init.c
      ErrorF("\n");
 Index: xserver/hw/xfree86/common/xf86Priv.h
 ===================================================================
---- 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
+--- xserver.orig/hw/xfree86/common/xf86Priv.h	2013-08-22 15:18:34.437916132 +1000
++++ xserver/hw/xfree86/common/xf86Priv.h	2013-08-22 15:18:34.429916132 +1000
 @@ -93,6 +93,9 @@
  extern _X_EXPORT const char *xf86VisualNames[];
  extern _X_EXPORT int xf86Verbose;       /* verbosity level */
@@ -196,7 +196,7 @@ Index: xserver/hw/xfree86/common/xf86Priv.h
 Index: xserver/hw/xfree86/xmir/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/xfree86/xmir/Makefile.am	2013-08-22 14:24:31.405804618 +1000
++++ xserver/hw/xfree86/xmir/Makefile.am	2013-08-22 15:18:34.429916132 +1000
 @@ -0,0 +1,26 @@
 +INCLUDES =					\
 +	$(XORG_INCS)                            \
@@ -227,7 +227,7 @@ Index: xserver/hw/xfree86/xmir/Makefile.am
 Index: xserver/hw/xfree86/xmir/xmir-output.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/xfree86/xmir/xmir-output.c	2013-08-22 14:24:31.405804618 +1000
++++ xserver/hw/xfree86/xmir/xmir-output.c	2013-08-22 15:18:34.429916132 +1000
 @@ -0,0 +1,225 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -457,7 +457,7 @@ Index: xserver/hw/xfree86/xmir/xmir-output.c
 Index: xserver/hw/xfree86/xmir/xmir-private.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/xfree86/xmir/xmir-private.h	2013-08-22 14:24:31.405804618 +1000
++++ xserver/hw/xfree86/xmir/xmir-private.h	2013-08-22 15:18:34.429916132 +1000
 @@ -0,0 +1,90 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -552,7 +552,7 @@ Index: xserver/hw/xfree86/xmir/xmir-private.h
 Index: xserver/hw/xfree86/xmir/xmir-thread-proxy.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/xfree86/xmir/xmir-thread-proxy.c	2013-08-22 14:24:31.405804618 +1000
++++ xserver/hw/xfree86/xmir/xmir-thread-proxy.c	2013-08-22 15:18:34.433916132 +1000
 @@ -0,0 +1,117 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -674,7 +674,7 @@ Index: xserver/hw/xfree86/xmir/xmir-thread-proxy.c
 Index: xserver/hw/xfree86/xmir/xmir-window.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/xfree86/xmir/xmir-window.c	2013-08-22 14:26:10.329808020 +1000
++++ xserver/hw/xfree86/xmir/xmir-window.c	2013-08-22 15:19:20.877917729 +1000
 @@ -0,0 +1,326 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -937,7 +937,7 @@ Index: xserver/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;
++	params.output_id = mir_display_output_id_invalid;
 +
 +        mir_wait_for(mir_connection_create_surface(xmir_connection_get(),
 +                                                   &params,
@@ -1005,7 +1005,7 @@ Index: xserver/hw/xfree86/xmir/xmir-window.c
 Index: xserver/hw/xfree86/xmir/xmir.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/xfree86/xmir/xmir.c	2013-08-22 14:24:31.405804618 +1000
++++ xserver/hw/xfree86/xmir/xmir.c	2013-08-22 15:18:34.433916132 +1000
 @@ -0,0 +1,216 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -1226,7 +1226,7 @@ Index: xserver/hw/xfree86/xmir/xmir.c
 Index: xserver/hw/xfree86/xmir/xmir.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/hw/xfree86/xmir/xmir.h	2013-08-22 14:24:31.405804618 +1000
++++ xserver/hw/xfree86/xmir/xmir.h	2013-08-22 15:18:34.433916132 +1000
 @@ -0,0 +1,95 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -1325,8 +1325,8 @@ Index: xserver/hw/xfree86/xmir/xmir.h
 +#endif /* _XMIR_H */
 Index: xserver/include/list.h
 ===================================================================
---- 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
+--- xserver.orig/include/list.h	2013-08-22 15:18:34.437916132 +1000
++++ xserver/include/list.h	2013-08-22 15:18:34.433916132 +1000
 @@ -184,6 +184,14 @@
      prev->next = next;
  }
@@ -1344,8 +1344,8 @@ Index: xserver/include/list.h
   * the pointers to/from this element so it is removed from the list. It does
 Index: xserver/include/xorg-server.h.in
 ===================================================================
---- 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
+--- xserver.orig/include/xorg-server.h.in	2013-08-22 15:18:34.437916132 +1000
++++ xserver/include/xorg-server.h.in	2013-08-22 15:18:34.433916132 +1000
 @@ -212,4 +212,7 @@
  #define _XSERVER64 1
  #endif
@@ -1356,8 +1356,8 @@ Index: xserver/include/xorg-server.h.in
  #endif /* _XORG_SERVER_H_ */
 Index: xserver/miext/damage/damage.c
 ===================================================================
---- 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
+--- xserver.orig/miext/damage/damage.c	2013-08-22 15:18:34.437916132 +1000
++++ xserver/miext/damage/damage.c	2013-08-22 15:18:34.433916132 +1000
 @@ -123,18 +123,14 @@
  damageReportDamagePostRendering(DamagePtr pDamage, RegionPtr pOldDamage,
                                  RegionPtr pDamageRegion)
@@ -1418,8 +1418,8 @@ Index: xserver/miext/damage/damage.c
  #if DAMAGE_DEBUG_ENABLE
 Index: xserver/test/Makefile.am
 ===================================================================
---- 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
+--- xserver.orig/test/Makefile.am	2013-08-22 15:18:34.437916132 +1000
++++ xserver/test/Makefile.am	2013-08-22 15:18:34.437916132 +1000
 @@ -6,7 +6,12 @@
  # For now, requires xf86 ddx, could be adjusted to use another
  SUBDIRS += xi2
@@ -1446,7 +1446,7 @@ Index: xserver/test/Makefile.am
 Index: xserver/test/xmir-thread-proxy.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver/test/xmir-thread-proxy.c	2013-08-22 14:24:31.409804619 +1000
++++ xserver/test/xmir-thread-proxy.c	2013-08-22 15:18:34.437916132 +1000
 @@ -0,0 +1,154 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
@@ -1604,8 +1604,8 @@ Index: xserver/test/xmir-thread-proxy.c
 +}
 Index: xserver/hw/xfree86/common/xf86Helper.c
 ===================================================================
---- 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
+--- xserver.orig/hw/xfree86/common/xf86Helper.c	2013-08-22 15:18:34.437916132 +1000
++++ xserver/hw/xfree86/common/xf86Helper.c	2013-08-22 15:18:34.437916132 +1000
 @@ -100,7 +100,14 @@
          if (xf86DriverList[drvIndex]->module)
              UnloadModule(xf86DriverList[drvIndex]->module);
Reply to:
Prev by Date: xorg-server: Changes to 'ubuntu'
Next by Date: xserver-xorg-video-intel: Changes to 'ubuntu'
Previous by thread: xorg-server: Changes to 'ubuntu'
Next by thread: xorg-server: Changes to 'ubuntu'
Index(es):
- Date
- Thread