xserver-xorg-video-ati: Changes to 'ubuntu'

2013-08-08 Thread Christopher Halse Rogers 
 debian/changelog  |   19 ++
 debian/patches/xmir.patch |   47 +++---
 2 files changed, 43 insertions(+), 23 deletions(-)

New commits:
commit 387560cfad0b3e37c2768539c2a4c8f318b741f4
Author: Christopher James Halse Rogers 
Date:   Tue Aug 6 12:55:27 2013 +1000

Whoops. Uploaded a stale build. Urgh

diff --git a/debian/changelog b/debian/changelog
index cd29a37..e5a2713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.1.0+git20130801.g2ae6bb1-0ubuntu4) saucy; 
urgency=low
+
+  * Fix non-XMir-server-build harder
+
+ -- Christopher James Halse Rogers   Tue, 06 Aug 2013 
12:55:01 +1000
+
 xserver-xorg-video-ati (1:7.1.0+git20130801.g2ae6bb1-0ubuntu3) saucy; 
urgency=low
 
   * xmir.patch: Fix build against Xservers without XMir support

commit 32bd97b83483b1b52588f7aa6342d65c44cd66b8
Author: Christopher James Halse Rogers 
Date:   Tue Aug 6 10:16:31 2013 +1000

Fix build against servers without XMir support

diff --git a/debian/changelog b/debian/changelog
index 30fd8a2..cd29a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.1.0+git20130801.g2ae6bb1-0ubuntu3) saucy; 
urgency=low
+
+  * xmir.patch: Fix build against Xservers without XMir support
+
+ -- Christopher James Halse Rogers   Tue, 06 Aug 2013 
10:16:14 +1000
+
 xserver-xorg-video-ati (1:7.1.0+git20130801.g2ae6bb1-0ubuntu2) saucy; 
urgency=low
 
   * xmir.patch: Flush rendering before submitting to Mir. Fixes occasional 
missing
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 87b7956..30f7680 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,8 +8,8 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
 
 Index: xf86-video-ati/src/drmmode_display.c
 ===
 xf86-video-ati.orig/src/drmmode_display.c  2013-08-02 20:57:42.475265082 
+1000
-+++ xf86-video-ati/src/drmmode_display.c   2013-08-02 20:57:42.467265083 
+1000
+--- xf86-video-ati.orig/src/drmmode_display.c  2013-08-06 12:20:08.282997173 
+1000
 xf86-video-ati/src/drmmode_display.c   2013-08-06 12:20:08.270997173 
+1000
 @@ -1887,7 +1887,7 @@
  if (!miCreateDefColormap(pScreen))
  return FALSE;
@@ -21,9 +21,9 @@ Index: xf86-video-ati/src/drmmode_display.c
  #if 0 /* This option messes up text mode! (e...@suse.de) */
 Index: xf86-video-ati/src/radeon.h
 ===
 xf86-video-ati.orig/src/radeon.h   2013-08-02 20:57:42.475265082 +1000
-+++ xf86-video-ati/src/radeon.h2013-08-02 20:57:42.467265083 +1000
-@@ -87,6 +87,13 @@
+--- xf86-video-ati.orig/src/radeon.h   2013-08-06 12:20:08.282997173 +1000
 xf86-video-ati/src/radeon.h2013-08-06 12:20:08.270997173 +1000
+@@ -87,6 +87,14 @@
  #include "picturestr.h"
  #endif
  
@@ -31,13 +31,14 @@ Index: xf86-video-ati/src/radeon.h
 +#include "xmir.h"
 +#include "xf86Priv.h"
 +#else
++#define xorgMir 0
 +typedef struct xmir_screen xmir_screen;
 +#endif
 +
  #include "compat-api.h"
  
  #include "simple_list.h"
-@@ -480,9 +487,12 @@
+@@ -480,9 +488,12 @@
  /* Perform vsync'ed SwapBuffers? */
  Bool swapBuffersWait;
  
@@ -52,8 +53,8 @@ Index: xf86-video-ati/src/radeon.h
  /* radeon_accel.c */
 Index: xf86-video-ati/src/radeon_bo_helper.c
 ===
 xf86-video-ati.orig/src/radeon_bo_helper.c 2013-08-02 20:57:42.475265082 
+1000
-+++ xf86-video-ati/src/radeon_bo_helper.c  2013-08-02 20:57:42.467265083 
+1000
+--- xf86-video-ati.orig/src/radeon_bo_helper.c 2013-08-06 12:20:08.282997173 
+1000
 xf86-video-ati/src/radeon_bo_helper.c  2013-08-06 12:20:08.270997173 
+1000
 @@ -201,19 +201,25 @@
  }
  
@@ -113,8 +114,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.c
  
 Index: xf86-video-ati/src/radeon_bo_helper.h
 ===
 xf86-video-ati.orig/src/radeon_bo_helper.h 2013-08-02 20:57:42.475265082 
+1000
-+++ xf86-video-ati/src/radeon_bo_helper.h  2013-08-02 20:57:42.467265083 
+1000
+--- xf86-video-ati.orig/src/radeon_bo_helper.h 2013-08-06 12:20:08.282997173 
+1000
 xf86-video-ati/src/radeon_bo_helper.h  2013-08-06 12:20:08.270997173 
+1000
 @@ -33,6 +33,7 @@
  
  extern Bool
@@ -126,8 +127,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.h
  #endif /* RADEON_BO_HELPER_H */
 Index: xf86-video-ati/src/radeon_dri2.c
 ===
 xf86-video-ati.orig/src/radeon_dri2.c  2013-08-02 20:57:42.475265082 
+1000
-+++ xf86-video-ati/src/radeon_dri2.c   2013-08-02 20:57:42.471265083 +1000
+--- xf86-video-ati.orig/src/radeon_dri2.c  2013-08-06 12:20:08.282997173 
+1000
 xf86-video-ati/src/radeon_dri2.c   2013-08-06 12:20:08.270997173 +1000
 @@ -1535,6 +1535,18 @@
  
  #endif /* USE_DR

Bug#716783: weston: Create weston-launch group

2013-08-08 Thread Hector Oron 
Package: weston
Tags: patch
Followup-For: Bug #716783

Hello,

  Find attached patch for fixing the issue.

Regards

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (900, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.10-1-686-pae (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages weston depends on:
ii  libc6 2.17-7
ii  libcairo2 1.12.14-5
ii  libcolord11.0.1-1
ii  libdrm2   2.4.45-3
ii  libegl1-mesa  9.1.4-1
ii  libegl1-mesa-drivers  9.1.4-1
ii  libgbm1   9.1.4-1
ii  libgl1-mesa-glx [libgl1]  9.1.4-1
ii  libgles2-mesa 9.1.4-1
ii  libglib2.0-0  2.36.3-3
ii  libglu1-mesa [libglu1]9.0.0-1
ii  libjpeg8  8d-1
ii  liblcms2-22.2+git20110628-2.2
ii  libmtdev1 1.1.3-1
ii  libpam0g  1.1.3-9
ii  libpixman-1-0 0.26.0-4
ii  libpng12-01.2.49-4
ii  libsystemd-login0 200-0~0.1
ii  libudev1  200-0~0.1
ii  libwayland-client01.2.0-1
ii  libwayland-cursor01.2.0-1
ii  libwayland-server01.2.0-1
ii  libx11-6  2:1.6.0-1
ii  libx11-xcb1   2:1.6.0-1
ii  libxcb-render01.9.1-3
ii  libxcb-shape0 1.9.1-3
ii  libxcb-shm0   1.9.1-3
ii  libxcb-xfixes01.9.1-3
ii  libxcb1   1.9.1-3
ii  libxcursor1   1:1.1.14-1
ii  libxkbcommon0 0.3.1-1

Versions of packages weston recommends:
ii  libgl1-mesa-dri  9.1.4-1

weston suggests no packages.

-- no debconf information
>From 1145f7c1d4870befdc3f0007d472865af03bd3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= 
Date: Thu, 8 Aug 2013 20:04:34 +0200
Subject: [PATCH 1/1] Add weston-launch group
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  In order to run weston-launch, users should be part of
  weston-launch group.

Signed-off-by: Héctor Orón Martínez 
---
 debian/weston.postinst | 27 +++
 debian/weston.prerm|  8 
 2 files changed, 35 insertions(+)
 create mode 100644 debian/weston.postinst
 create mode 100644 debian/weston.prerm

diff --git a/debian/weston.postinst b/debian/weston.postinst
new file mode 100644
index 000..0212664
--- /dev/null
+++ b/debian/weston.postinst
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+configure)
+
+# create weston-launch group if not already present
+if ! getent group weston-launch > /dev/null; then
+addgroup --system --quiet weston-launch
+fi
+
+if [ -u `which weston-launch` ]; then
+chmod +s `which weston-launch`
+fi
+
+;;
+abort-upgrade|abort-remove|abort-deconfigure)
+;;
+
+*)
+echo "postinst called with unknown argument \`$1'" >&2
+exit 0
+;;
+esac
+
+#DEBHELPER#
diff --git a/debian/weston.prerm b/debian/weston.prerm
new file mode 100644
index 000..194337e
--- /dev/null
+++ b/debian/weston.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ]; then
+delgroup --system --quiet weston-launch
+fi
+
-- 
1.8.3.2

Bug#719143: weston: disable tests for now

2013-08-08 Thread Hector Oron 
Package: weston
Version: 1.2.0-1
Severity: wishlist
Tags: patch

Hello,

  When building weston, tests ask for user input. Maybe those should be 
disabled.
  Find attached patch to do so.

Regards,

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (900, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.10-1-686-pae (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages weston depends on:
ii  libc6 2.17-7
ii  libcairo2 1.12.14-5
ii  libcolord11.0.1-1
ii  libdrm2   2.4.45-3
ii  libegl1-mesa  9.1.4-1
ii  libegl1-mesa-drivers  9.1.4-1
ii  libgbm1   9.1.4-1
ii  libgl1-mesa-glx [libgl1]  9.1.4-1
ii  libgles2-mesa 9.1.4-1
ii  libglib2.0-0  2.36.3-3
ii  libglu1-mesa [libglu1]9.0.0-1
ii  libjpeg8  8d-1
ii  liblcms2-22.2+git20110628-2.2
ii  libmtdev1 1.1.3-1
ii  libpam0g  1.1.3-9
ii  libpixman-1-0 0.26.0-4
ii  libpng12-01.2.49-4
ii  libsystemd-login0 200-0~0.1
ii  libudev1  200-0~0.1
ii  libwayland-client01.2.0-1
ii  libwayland-cursor01.2.0-1
ii  libwayland-server01.2.0-1
ii  libx11-6  2:1.6.0-1
ii  libx11-xcb1   2:1.6.0-1
ii  libxcb-render01.9.1-3
ii  libxcb-shape0 1.9.1-3
ii  libxcb-shm0   1.9.1-3
ii  libxcb-xfixes01.9.1-3
ii  libxcb1   1.9.1-3
ii  libxcursor1   1:1.1.14-1
ii  libxkbcommon0 0.3.1-1

Versions of packages weston recommends:
ii  libgl1-mesa-dri  9.1.4-1

weston suggests no packages.

-- no debconf information
>From 4c89748f4944083c36fc419f2d3c28b95c5dab90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= 
Date: Fri, 2 Aug 2013 17:25:03 +0200
Subject: [PATCH 1/1] d/rules: disable running tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Héctor Orón Martínez 
---
 debian/changelog | 1 +
 debian/rules | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d7754fd..6b6d719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ weston (1.2.0-1) unstable; urgency=low
   * d/weston.install: add new files
 - usr/lib/*/weston/cms-colord.so
 - usr/lib/*/weston/cms-static.so
+  * d/rules: disable running tests for now, require user input.
 
  -- Hector Oron   Fri, 02 Aug 2013 15:32:49 +0200
 
diff --git a/debian/rules b/debian/rules
index a2043e2..fc44ed6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,9 @@ override_dh_auto_configure:
 
 override_dh_auto_test:
 	# the test suite does not 100% pass in headless mode
-	dh_auto_test || true
+	# some tests expect user input
+	# dh_auto_test || true
+	true
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp
-- 
1.8.3.2

xserver-xorg-video-nouveau: Changes to 'ubuntu'

2013-08-08 Thread Christopher Halse Rogers 
 debian/changelog  |6 ++
 debian/patches/xmir.patch |   22 --
 2 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 5aa069ec224fa232d9374b1476a32a383a9137d2
Author: Christopher James Halse Rogers 
Date:   Tue Aug 6 12:48:34 2013 +1000

Fix build against !XMir servers

diff --git a/debian/changelog b/debian/changelog
index 7e5adb6..a14fe33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu3) saucy; urgency=low
+
+  * Fix build against servers without XMir support
+
+ -- Christopher James Halse Rogers   Tue, 06 Aug 2013 
12:47:46 +1000
+
 xserver-xorg-video-nouveau (1:1.0.8-0ubuntu2) saucy; urgency=low
 
   * Add XMir support
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 94ce066..ae77249 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,8 +8,8 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
 
 Index: xf86-video-nouveau/src/nouveau_dri2.c
 ===
 xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-01 20:57:06.744921258 
+1000
-+++ xf86-video-nouveau/src/nouveau_dri2.c  2013-08-01 20:57:06.740921258 
+1000
+--- xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-06 12:40:27.802943906 
+1000
 xf86-video-nouveau/src/nouveau_dri2.c  2013-08-06 12:40:27.798943906 
+1000
 @@ -267,7 +267,7 @@
NVPtr pNv = NVPTR(scrn);
int i;
@@ -62,8 +62,8 @@ Index: xf86-video-nouveau/src/nouveau_dri2.c
dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
 Index: xf86-video-nouveau/src/nv_driver.c
 ===
 xf86-video-nouveau.orig/src/nv_driver.c2013-08-01 20:57:06.744921258 
+1000
-+++ xf86-video-nouveau/src/nv_driver.c 2013-08-01 20:57:40.208921211 +1000
+--- xf86-video-nouveau.orig/src/nv_driver.c2013-08-06 12:40:27.802943906 
+1000
 xf86-video-nouveau/src/nv_driver.c 2013-08-06 12:44:47.126932579 +1000
 @@ -226,6 +226,8 @@
case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data;
@@ -318,20 +318,22 @@ Index: xf86-video-nouveau/src/nv_driver.c
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
pNv->HWCursor ? "HW" : "SW");
  
-@@ -1062,7 +1196,11 @@
+@@ -1062,7 +1196,13 @@
xf86DrvMsg(pScrn->scrnIndex, from, "Swap limit set to %d [Max allowed 
%d]%s\n",
   pNv->swap_limit, pNv->max_swap_limit, reason);
  
 -  ret = drmmode_pre_init(pScrn, pNv->dev->fd, pScrn->bitsPerPixel >> 3);
++#ifdef XMIR
 +  if (xorgMir) {
 +  xmir_screen_pre_init(pScrn, pNv->xmir, &xmir_nouveau_driver);
 +  ret = TRUE;
 +  } else
++#endif
 +  ret = drmmode_pre_init(pScrn, pNv->dev->fd, pScrn->bitsPerPixel 
>> 3);
if (ret == FALSE)
NVPreInitFail("Kernel modesetting failed to initialize\n");
  
-@@ -1170,7 +1308,8 @@
+@@ -1170,7 +1310,8 @@
  {
NVPtr pNv = NVPTR(pScrn);
  
@@ -341,7 +343,7 @@ Index: xf86-video-nouveau/src/nv_driver.c
  
nouveau_bo_ref(NULL, &pNv->transfer);
nouveau_bo_ref(NULL, &pNv->scanout);
-@@ -1370,6 +1509,11 @@
+@@ -1370,6 +1511,11 @@
else
fbPictureInit (pScreen, 0, 0);
  
@@ -353,7 +355,7 @@ Index: xf86-video-nouveau/src/nv_driver.c
xf86SetBlackWhitePixels(pScreen);
  
if (!pNv->NoAccel && !nouveau_exa_init(pScreen))
-@@ -1443,19 +1587,19 @@
+@@ -1443,19 +1589,19 @@
 * Initialize colormap layer.
 * Must follow initialization of the default colormap 
 */
@@ -378,8 +380,8 @@ Index: xf86-video-nouveau/src/nv_driver.c
  
 Index: xf86-video-nouveau/src/nv_type.h
 ===
 xf86-video-nouveau.orig/src/nv_type.h  2013-08-01 20:57:06.744921258 
+1000
-+++ xf86-video-nouveau/src/nv_type.h   2013-08-01 20:57:06.740921258 +1000
+--- xf86-video-nouveau.orig/src/nv_type.h  2013-08-06 12:40:27.802943906 
+1000
 xf86-video-nouveau/src/nv_type.h   2013-08-06 12:40:27.798943906 +1000
 @@ -9,6 +9,14 @@
  #include 
  #include "xf86Crtc.h"


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v7ygn-0005tt...@vasks.debian.org

xorg-server: Changes to 'ubuntu'

2013-08-08 Thread Christopher Halse Rogers 
 debian/changelog |   12 ++
 debian/patches/xf86-detach-scanout.patch |   12 ++
 debian/patches/xmir.patch|  128 +++
 debian/rules |2 
 4 files changed, 91 insertions(+), 63 deletions(-)

New commits:
commit 862fbb4f27aa81446db9856fc67196c691bcf673
Author: Christopher James Halse Rogers 
Date:   Wed Aug 7 11:03:32 2013 +1000

Fold in Maarten's fixes; fixing the name of xserver-xorg-xmir along the way

diff --git a/debian/changelog b/debian/changelog
index 360d349..693597c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 xorg-server (2:1.14.2-0ubuntu9) saucy; urgency=low
 
-  * Fix damage reporting (LP: 1206744)?
+  [ Maarten Lankhorst ]
+  * Fix crash in RRCrtcDetachScanoutPixmap.
+  * Add xmir module to xserver-xorg-core-dbg.
+  * Fix xf86DeleteDriver infinite loop. (LP: 1208715)
+
+  [ Christopher James Halse Rogers ]
+  * Fix damage reporting (LP: 1206744)
 
  -- Christopher James Halse Rogers   Tue, 06 Aug 2013 
16:11:47 +1000
 
diff --git a/debian/patches/xf86-detach-scanout.patch 
b/debian/patches/xf86-detach-scanout.patch
index b994845..4c7f248 100644
--- a/debian/patches/xf86-detach-scanout.patch
+++ b/debian/patches/xf86-detach-scanout.patch
@@ -73,3 +73,15 @@ Dave, does this seem like a reasonable way to work around 
this particular crash?
  config->randr_provider->output_source = NULL;
  RRSetChanged(screen);
  detached = TRUE;
+--- a/randr/rrcrtc.c
 b/randr/rrcrtc.c
+@@ -367,6 +367,9 @@
+ PixmapPtr mscreenpix;
+ rrScrPriv(crtc->pScreen);
+ 
++   if (!crtc->scanout_pixmap)
++return;
++
+ mscreenpix = master->GetScreenPixmap(master);
+ 
+ ret = pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL);
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 795e147..58e5486 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,7 +1,7 @@
-Index: xserver/configure.ac
+Index: xorg-server/configure.ac
 ===
 xserver.orig/configure.ac  2013-08-06 16:04:22.795155912 +1000
-+++ xserver/configure.ac   2013-08-06 16:04:22.783155913 +1000
+--- xorg-server.orig/configure.ac  2013-08-06 13:15:53.451098539 +
 xorg-server/configure.ac   2013-08-06 13:15:53.579296059 +
 @@ -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: xserver/configure.ac
  hw/dmx/config/Makefile
  hw/dmx/config/man/Makefile
  hw/dmx/doc/Makefile
-Index: xserver/hw/xfree86/Makefile.am
+Index: xorg-server/hw/xfree86/Makefile.am
 ===
 xserver.orig/hw/xfree86/Makefile.am2013-08-06 16:04:22.795155912 
+1000
-+++ xserver/hw/xfree86/Makefile.am 2013-08-06 16:04:22.783155913 +1000
+--- xorg-server.orig/hw/xfree86/Makefile.am2013-08-06 13:14:07.176406286 
+
 xorg-server/hw/xfree86/Makefile.am 2013-08-06 13:15:53.579496055 +
 @@ -25,15 +25,20 @@
  INT10_SUBDIR = int10
  endif
@@ -61,10 +61,10 @@ Index: xserver/hw/xfree86/Makefile.am
  
  bin_PROGRAMS = Xorg
  nodist_Xorg_SOURCES = sdksyms.c
-Index: xserver/hw/xfree86/common/xf86Config.c
+Index: xorg-server/hw/xfree86/common/xf86Config.c
 ===
 xserver.orig/hw/xfree86/common/xf86Config.c2013-08-06 
16:04:22.795155912 +1000
-+++ xserver/hw/xfree86/common/xf86Config.c 2013-08-06 16:04:22.783155913 
+1000
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c2013-08-06 
13:15:53.364100222 +
 xorg-server/hw/xfree86/common/xf86Config.c 2013-08-06 13:15:53.579996045 
+
 @@ -117,6 +117,7 @@
  {.name = "fb",.toLoad = TRUE,.load_opt = NULL},
  {.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
@@ -91,10 +91,10 @@ Index: xserver/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: xserver/hw/xfree86/common/xf86Globals.c
+Index: xorg-server/hw/xfree86/common/xf86Globals.c
 ===
 xserver.orig/hw/xfree86/common/xf86Globals.c   2013-08-06 
16:04:22.795155912 +1000
-+++ xserver/hw/xfree86/common/xf86Globals.c2013-08-06 16:04:22.783155913 
+1000
+--- xorg-server.orig/hw/xfree86/common/xf86Globals.c   2013-08-06 
13:15:53.372900052 +
 xorg-server/hw/xfree86/common/xf86Globals.c2013-08-06 
13:15:53.580196041 +
 @@ -206,3 +206,6 @@
  #endif
  RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
@