xserver-xorg-video-freedreno: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 debian/changelog |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ffc000e60af0f2ef5f42778c44fedad939e7a73f
Author: Maarten Lankhorst 
Date:   Mon Feb 8 14:57:54 2016 +0100

release to unstable

diff --git a/debian/changelog b/debian/changelog
index f818ed0..5bedcc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
-xserver-xorg-video-freedreno (1.4.0-1) UNRELEASED; urgency=medium
+xserver-xorg-video-freedreno (1.4.0-1) unstable; urgency=medium
 
-   * Non-maintainer upload.
* New upstream release. (Closes: #812384)
* Build on arm64. (Closes: #812385)
 

xorg: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog|   23 +++
 debian/control  |8 ++---
 debian/local/xserver-wrapper.c  |   38 ++---
 debian/scripts/vars.amd64   |1 
 debian/scripts/vars.arm64   |1 
 debian/scripts/vars.armhf   |2 -
 debian/scripts/vars.i386|1 
 debian/scripts/vars.ppc64el |1 
 debian/x11-common.init  |2 +
 debian/xserver-xorg.postinst.in |   60 
 debian/xserver-xorg.preinst.in  |   32 -
 debian/xserver-xorg.prerm.in|   33 --
 12 files changed, 50 insertions(+), 152 deletions(-)

New commits:
commit 9a9063f58e9117ed3d72a909b57d5abdeaa281a7
Author: Maarten Lankhorst 
Date:   Thu Mar 12 13:27:51 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 1f518ef..da633b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+7ubuntu3) UNRELEASED; urgency=medium
+xorg (1:7.7+7ubuntu3) vivid; urgency=medium
 
   * Modesetting has been removed, remove from vars.
   * Do not require vesa on armhf, only fbdev is useful.
 
- -- Maarten Lankhorst   Mon, 09 Mar 2015 
11:46:22 +0100
+ -- Maarten Lankhorst   Mon, 09 Mar 2015 
11:51:24 +0100
 
 xorg (1:7.7+8) UNRELEASED; urgency=medium
 

commit 999f9dbce073dc385000d7ecdd723235654a4b74
Author: Maarten Lankhorst 
Date:   Mon Mar 9 11:48:25 2015 +0100

Remove modesetting driver from all archs, and only require fbdev on armhf.

Modesetting has been moved to xorg-server now.

diff --git a/debian/changelog b/debian/changelog
index 5ba80df..1f518ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+7ubuntu3) UNRELEASED; urgency=medium
+
+  * Modesetting has been removed, remove from vars.
+  * Do not require vesa on armhf, only fbdev is useful.
+
+ -- Maarten Lankhorst   Mon, 09 Mar 2015 
11:46:22 +0100
+
 xorg (1:7.7+8) UNRELEASED; urgency=medium
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index ca7cae8..88b3807 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Package: xserver-xorg
 Architecture: any
 Depends:
  xserver-xorg-core (>= 2:1.15.0.901),
- xserver-xorg-video-all | xorg-driver-video,
+ xserver-xorg-video-all | xserver-xorg-core (>= 2:1.17) | xorg-driver-video,
  xserver-xorg-input-all | xorg-driver-input,
  xserver-xorg-input-evdev [linux-any],
  ${shlibs:Depends},
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 1d86e89..f6c115c 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
-   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64
index 3a9a86e..8ce095a 100644
--- a/debian/scripts/vars.arm64
+++ b/debian/scripts/vars.arm64
@@ -1,6 +1,5 @@
 XSERVER_XORG_VIDEO_DEPENDS="\
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-modesetting, \
 "
 
 XSERVER_XORG_INPUT_DEPENDS="\
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index cb63601..e281045 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -5,8 +5,6 @@
 # debian/scripts (Bourne shell).
 XSERVER_XORG_VIDEO_DEPENDS="\
xserver-xorg-video-fbdev, \
-   xserver-xorg-video-modesetting, \
-   xserver-xorg-video-vesa, \
 "
 
 XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 922e152..3938700 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -9,7 +9,6 @@ XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
-   xserver-xorg-video-modesetting, \
xserver-xorg-video-neomagic, \
xserver-xorg-video-nouveau, \
xserver-xorg-video-openchrome, \
diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el
index 54348df..e963f06 100644
--- a/debian/scripts/vars.ppc64el
+++ b/debian/scripts/vars.ppc64el
@@ -1,6 +1,5 @@
 XSERVER_XORG_VIDEO_DEPENDS="\
 xserver-xorg-video-fbdev, \
-xserver-xorg-video-modesetting, \
 "
 
 XSERVER_XORG_INPUT_DEPENDS="\

commit 92e0aab7088619401247107911e2ecb4804a47d7
Author: Maarten Lankhorst 
Date:   Mon Feb 9 10:48:56 2015 +0100

Cope with /etc/X11/X not existing.

Default to /usr/bin/Xorg if no /etc/X11/X symlink is found.
Remove creation of /etc/X11/X symlink, but keep existing.
Do not chdir to /etc/X11 if the symlink has an absolute path.

diff --git a/debian/changelog b/debian/changelog
index b09fa77..8692a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
 xorg

xorg-server: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog   |6 +
 debian/patches/fix-int10.patch |   42 +
 debian/patches/series  |1 
 3 files changed, 49 insertions(+)

New commits:
commit 859326d78634517aa03e3a0427f5da2dc9fd3293
Author: Maarten Lankhorst 
Date:   Thu Mar 19 10:14:12 2015 +0100

Add a patch to fix vesa int10 failure. (LP: #1433198)

diff --git a/debian/changelog b/debian/changelog
index bfa06d9..66888c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.17.1-0ubuntu3) vivid; urgency=medium
+
+  * Add a patch to fix vesa int10 failure. (LP: #1433198)
+
+ -- Maarten Lankhorst   Thu, 19 Mar 2015 
10:13:08 +0100
+
 xorg-server (2:1.17.1-0ubuntu2) vivid; urgency=medium
 
   * Use conflicts/replaces on modesetting.
diff --git a/debian/patches/fix-int10.patch b/debian/patches/fix-int10.patch
new file mode 100644
index 000..5f7e5cd
--- /dev/null
+++ b/debian/patches/fix-int10.patch
@@ -0,0 +1,42 @@
+From: Jürg Billeter 
+To: xorg-de...@lists.x.org
+Subject: [PATCH xserver] int10: Fix error check for pci_device_map_legacy
+Date: Sat,  7 Feb 2015 18:13:21 +0100
+Message-Id: <1423329201-32163-1-git-send-emai...@bitron.ch>
+List-Id: "X.Org development list" 
+
+pci_device_map_legacy returns 0 on success.
+
+Signed-off-by: Jürg Billeter 
+---
+ hw/xfree86/int10/generic.c| 2 +-
+ hw/xfree86/os-support/linux/int10/linux.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
+index 012d194..8d5c4da 100644
+--- a/hw/xfree86/int10/generic.c
 b/hw/xfree86/int10/generic.c
+@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int 
len)
+ {
+ void *map;
+ 
+-if (!pci_device_map_legacy(dev, 0, len, 0, &map))
++if (pci_device_map_legacy(dev, 0, len, 0, &map))
+ return FALSE;
+ 
+ memcpy(buf, map, len);
+diff --git a/hw/xfree86/os-support/linux/int10/linux.c 
b/hw/xfree86/os-support/linux/int10/linux.c
+index 79b9a88..6ca118f 100644
+--- a/hw/xfree86/os-support/linux/int10/linux.c
 b/hw/xfree86/os-support/linux/int10/linux.c
+@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int 
base, int len)
+ {
+ void *map;
+ 
+-if (!pci_device_map_legacy(dev, base, len, 0, &map))
++if (pci_device_map_legacy(dev, base, len, 0, &map))
+ return FALSE;
+ 
+ memcpy(buf, map, len);
+-- 2.3.0
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 4b13dcc..771a1a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@ no-nv.patch
 #   Probably is just papering over issue; needs further analysis
 
 ## upstream patches
+fix-int10.patch
 
 # hybrid graphics fixes
 228_autobind_gpu.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yzzrl-0008ij...@moszumanska.debian.org

libdrm: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yzodo-0003w0...@moszumanska.debian.org

libdrm: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 .gitignore|4 
 Makefile.am   |   30 ++-
 configure.ac  |   36 ++-
 exynos/Makefile.am|3 
 exynos/exynos_drm.c   |   19 +
 exynos/exynos_drm.h   |   40 
 exynos/exynos_fimg2d.c|  253 +++--
 exynos/exynos_fimg2d.h|  328 +
 exynos/fimg2d.h   |  325 -
 exynos/fimg2d_reg.h   |2 
 freedreno/Android.mk  |3 
 include/drm/nouveau_drm.h |1 
 intel/Android.mk  |2 
 intel/intel_bufmgr_gem.c  |   71 +++
 intel/test_decode.c   |5 
 libdrm.h  |2 
 libkms/exynos.c   |7 
 nouveau/Android.mk|3 
 nouveau/abi16.c   |3 
 nouveau/bufctx.c  |6 
 nouveau/nouveau.c |  117 +--
 nouveau/nouveau.h |1 
 radeon/Android.mk |3 
 tests/Makefile.am |   54 ++---
 tests/auth.c  |1 
 tests/dristat.c   |7 
 tests/drmstat.c   |2 
 tests/exynos/Makefile.am  |1 
 tests/exynos/exynos_fimg2d_test.c |  187 ---
 tests/gem_basic.c |  102 --
 tests/gem_flink.c |  137 --
 tests/gem_mmap.c  |  136 -
 tests/gem_readwrite.c |  139 --
 tests/getclient.c |1 
 tests/getstats.c  |3 
 tests/kmstest/Makefile.am |1 
 tests/kmstest/main.c  |5 
 tests/lock.c  |1 
 tests/modeprint/Makefile.am   |1 
 tests/modeprint/modeprint.c   |   18 -
 tests/modetest/modetest.c |2 
 tests/name_from_fd.c  |4 
 tests/nouveau/.gitignore  |1 
 tests/nouveau/Makefile.am |   16 +
 tests/nouveau/threaded.c  |  156 +++
 tests/proptest/Makefile.am|1 
 tests/proptest/proptest.c |4 
 tests/radeon/Makefile.am  |1 
 tests/radeon/list.h   |   12 -
 tests/radeon/radeon_ttm.c |4 
 tests/setversion.c|1 
 tests/tegra/Makefile.am   |2 
 tests/updatedraw.c|3 
 tests/vbltest/Makefile.am |2 
 tests/vbltest/vbltest.c   |5 
 xf86atomic.h  |   19 +
 xf86drm.c |  371 --
 xf86drm.h |   16 +
 xf86drmMode.c |   59 +++---
 xf86drmRandom.c   |   12 -
 60 files changed, 1482 insertions(+), 1269 deletions(-)

New commits:
commit f744c07a31010f09b916eefb05d788d51490ccae
Author: Alexandre Courbot 
Date:   Fri Dec 5 14:55:35 2014 +0900

Add coherent BO attribute

diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
index b18cad0..87aefc5 100644
--- a/include/drm/nouveau_drm.h
+++ b/include/drm/nouveau_drm.h
@@ -96,6 +96,7 @@ struct drm_nouveau_setparam {
 #define NOUVEAU_GEM_DOMAIN_VRAM  (1 << 1)
 #define NOUVEAU_GEM_DOMAIN_GART  (1 << 2)
 #define NOUVEAU_GEM_DOMAIN_MAPPABLE  (1 << 3)
+#define NOUVEAU_GEM_DOMAIN_COHERENT  (1 << 4)
 
 #define NOUVEAU_GEM_TILE_LAYOUT_MASK 0xff00
 #define NOUVEAU_GEM_TILE_16BPP   0x0001
diff --git a/nouveau/abi16.c b/nouveau/abi16.c
index ae13821..d2d1d0d 100644
--- a/nouveau/abi16.c
+++ b/nouveau/abi16.c
@@ -195,6 +195,9 @@ abi16_bo_init(struct nouveau_bo *bo, uint32_t alignment,
if (bo->flags & NOUVEAU_BO_MAP)
info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE;
 
+   if (bo->flags & NOUVEAU_BO_COHERENT)
+   info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT;
+
if (!(bo->flags & NOUVEAU_BO_CONTIG))
info->tile_flags = NOUVEAU_GEM_TILE_NONCONTIG;
 
diff --git a/nouveau/nouveau.h b/nouveau/nouveau.h
index a55e2b0..4adda0e 100644
--- a/nouveau/nouveau.h
+++ b/nouveau/nouveau.h
@@ -127,6 +127,7 @@ union nouveau_bo_config {
 #define NOUVEAU_BO_MAP 0x8000
 #define NOUVEAU_BO_CONTIG  0x4000
 #define NOUVEAU_BO_NOSNOOP 0x2000
+#define NOUVEAU_BO_COHERENT 0x1000
 
 struct nouveau_bo {
struct nouveau_device *device;

commit 858b21f6af03c9658126fd6ec2aa35b4e5151ecb
Author: Tobias Jakobi 
Date:   Wed Mar 11 20:38:46 2015 +0100

exynos: fimg2d: follow-up fix for G2D_COEFF_MODE_GB_COLOR

Also add the register field formatting info provided by
Inki Dae .

Signed-off-by: Tobias Jakobi 
Suggested-by: Inki Dae 

diff --git a/exynos/exynos_fimg2d.h b/exynos/exynos_fimg2d.h
index f76f2a9..9db0c88 100644
--- a/exynos/exynos_fimg2d.h
+++ b/exynos/exynos_fimg2d.h
@@ -151,6 +151,12 @@ enum e_g2d_op {
G2D_OP_CONJOINT_

libdrm: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 debian/changelog  |6 ++
 debian/libdrm-exynos1.symbols |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 3d3021cf4c7e5861e5630079c9bcfa5ca133924d
Author: Maarten Lankhorst 
Date:   Sat Mar 21 19:13:57 2015 +0100

Fix ftbfs on armhf.

diff --git a/debian/changelog b/debian/changelog
index bf0f03a..d534449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.60-2) UNRELEASED; urgency=medium
+
+  * Fix ftbfs on armhf.
+
+ -- Maarten Lankhorst   Sat, 21 Mar 2015 
19:13:25 +0100
+
 libdrm (2.4.60-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/libdrm-exynos1.symbols b/debian/libdrm-exynos1.symbols
index 445f2b4..46b445b 100644
--- a/debian/libdrm-exynos1.symbols
+++ b/debian/libdrm-exynos1.symbols
@@ -17,4 +17,5 @@ libdrm_exynos.so.1 libdrm-exynos1 #MINVER#
  g2d_exec@Base 0
  g2d_fini@Base 0
  g2d_init@Base 0
+ g2d_scale_and_blend@Base 2.4.60
  g2d_solid_fill@Base 0


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yzoal-0004z5...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 debian/control   |4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 36e347779852ff821bb372d578ca02c09d2e5026
Author: Maarten Lankhorst 
Date:   Mon Mar 16 15:55:52 2015 +0100

Use conflicts/replaces on modesetting.

Irony, as of this writing I will have to add a new 
xserver-xorg-video-modesetting and undo this commit.

diff --git a/debian/changelog b/debian/changelog
index 071545d..bfa06d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.17.1-0ubuntu2) vivid; urgency=medium
+
+  * Use conflicts/replaces on modesetting.
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
16:56:38 +0100
+
 xorg-server (2:1.17.1-0ubuntu1) vivid; urgency=medium
 
   * Merge with 1.17 branch.
diff --git a/debian/control b/debian/control
index 908135f..1f23b0c 100644
--- a/debian/control
+++ b/debian/control
@@ -143,10 +143,10 @@ Breaks:
  xserver-xorg-video-vga (<= 1:4.1.0-8),
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
- xserver-xorg-video-modesetting (<< 0.10),
 Replaces:
- xserver-xorg-video-modesetting (<< 0.10),
+ xserver-xorg-video-modesetting,
 Conflicts:
+ xserver-xorg-video-modesetting,
  xserver-xorg-input-evtouch,
 Provides:
  ${videoabi},


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yxwrq-0004je...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 COPYING  |   24 
 ChangeLog| 8995 +--
 Xext/dpms.c  |   10 
 Xext/dpmsstubs.c |   10 
 Xext/panoramiX.c |2 
 Xext/panoramiX.h |2 
 Xext/panoramiXprocs.c|   16 
 Xext/saver.c |   16 
 Xext/security.c  |5 
 Xext/shm.c   |6 
 Xext/sync.c  |2 
 Xext/syncsrv.h   |8 
 Xext/xres.c  |   12 
 Xext/xvdisp.c|  106 
 Xext/xvdix.h |   45 
 Xext/xvmain.c|  164 
 Xi/exevents.c|5 
 composite/compalloc.c|8 
 composite/compext.c  |7 
 composite/compinit.c |   25 
 composite/compint.h  |3 
 composite/compoverlay.c  |4 
 composite/compwindow.c   |7 
 config/config.c  |  161 
 config/udev.c|   47 
 configure.ac |  117 
 dbe/dbe.c|   16 
 dbe/dbestruct.h  |   12 
 dbe/midbe.c  |   14 
 dbe/midbe.h  |8 
 debian/changelog |   35 
 debian/control   |   14 
 debian/patches/09_Xserver-man-iglx.diff  |   16 
 debian/patches/config-add-no-removal.patch   |   13 
 debian/patches/drm_device_keep_trying.patch  |   30 
 debian/patches/ppc64el-endian-fix.patch  |   34 
 debian/patches/series|4 
 debian/patches/xmir.patch|   63 
 debian/serverminver  |4 
 debian/xserver-xorg-core.install |2 
 devbook.am   |   10 
 dix/atom.c   |8 
 dix/colormap.c   |   34 
 dix/cursor.c |8 
 dix/devices.c|   61 
 dix/dispatch.c   |   74 
 dix/dispatch.h   |2 
 dix/dixfonts.c   |6 
 dix/dixutils.c   |   12 
 dix/extension.c  |   10 
 dix/gc.c |   25 
 dix/getevents.c  |   28 
 dix/globals.c|8 
 dix/glyphcurs.c  |8 
 dix/grabs.c  |   16 
 dix/inpututils.c |2 
 dix/main.c   |   10 
 dix/pixmap.c |   18 
 dix/property.c   |8 
 dix/protocol.txt |   30 
 dix/region.c |   22 
 dix/registry.c   |   94 
 dix/resource.c   |   18 
 dix/selection.c  |   10 
 dix/swaprep.c|8 
 dix/swapreq.c|8 
 dix/tables.c |8 
 dix/window.c |  111 
 doc/Makefile.am  |2 
 doc/Xserver-spec.xml |6 
 doc/filter-xmlto.sh  |   21 
 dri3/dri3.c  |   10 
 dri3/dri3.h  |2 
 exa/exa.c|2 
 exa/exa.h|8 
 exa/exa_accel.c  |   20 
 exa/exa_glyphs.c |8 
 exa/exa_priv.h   |   19 
 exa/exa_render.c |4 
 exa/exa_unaccel.c|   11 
 fb/Makefile.am   |2 
 fb/fb.h  |  342 
 fb/fb24_32.c |2 
 fb/fb24_32.h |2 
 fb/fbbits.c  |   12 
 fb/fbblt.c   

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

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b119ff956f2e6f8f27f14ac03d8fd43cb441493d
Author: Maarten Lankhorst 
Date:   Thu Mar 12 19:03:55 2015 +0100

rebuild bump

diff --git a/debian/changelog b/debian/changelog
index f547ff4..2b68855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.5.0-1ubuntu2) vivid; urgency=medium
+
+  * Bump build-depends to xorg 1.17.
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
19:00:15 +0100
+
 xserver-xorg-video-ati (1:7.5.0-1ubuntu1) vivid; urgency=medium
 
   * Merge with released debian-unstable. (LP: #1421601)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw7sm-0005a4...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f90a36b0cd531b43ce25522af84ecedb6ed3c23
Author: Maarten Lankhorst 
Date:   Thu Mar 12 13:29:00 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 73dd11c..f547ff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-ati (1:7.5.0-1ubuntu1) UNRELEASED; urgency=medium
+xserver-xorg-video-ati (1:7.5.0-1ubuntu1) vivid; urgency=medium
 
   * Merge with released debian-unstable. (LP: #1421601)
 
- -- Maarten Lankhorst   Mon, 09 Mar 2015 
10:44:44 +0100
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
13:28:50 +0100
 
 xserver-xorg-video-ati (1:7.5.0-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw2eb-0002w0...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4ffaa00df4f7a4356aa56f405352bceac747d946
Author: Maarten Lankhorst 
Date:   Mon Mar 9 11:34:07 2015 +0100

Set a version for replacing modesetting, fixing some lintian warnings.

diff --git a/debian/control b/debian/control
index 71b16cc..908135f 100644
--- a/debian/control
+++ b/debian/control
@@ -143,9 +143,9 @@ Breaks:
  xserver-xorg-video-vga (<= 1:4.1.0-8),
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
- xserver-xorg-video-modesetting,
+ xserver-xorg-video-modesetting (<< 0.10),
 Replaces:
- xserver-xorg-video-modesetting,
+ xserver-xorg-video-modesetting (<< 0.10),
 Conflicts:
  xserver-xorg-input-evtouch,
 Provides:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1gn-0006gf...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0be10fc8a0dcec2235c6275b83258675f70be373
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:23:06 2015 +0100

Kill off modesetting recommends too.

diff --git a/debian/control b/debian/control
index 738c9ee..6abd046 100644
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
-Recommends:
- xserver-xorg-video-modesetting,
 Provides:
  ${xviddriver:Provides}
 Suggests:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1d1-0004oj...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog   |6 ++
 debian/control |5 +-
 debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff |   21 
++
 3 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 7637bd1290a57765a84fba480b63ea1d8b5cca09
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:17:41 2015 +0100

refresh patch

diff --git a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff 
b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
index 588f513..75eddfb 100644
--- a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
+++ b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
@@ -1,6 +1,6 @@
 xserver-xorg-video-tdfx.orig/src/tdfx_driver.c
-+++ xserver-xorg-video-tdfx/src/tdfx_driver.c
-@@ -2689,8 +2689,16 @@
+--- a/src/tdfx_driver.c
 b/src/tdfx_driver.c
+@@ -2591,26 +2591,39 @@
TDFXPtr pTDFX;
  
TDFXTRACE("TDFXValidMode start\n");
@@ -16,16 +16,21 @@
 +return MODE_BAD;
 +  }
/* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
-   pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
-@@ -2704,13 +2712,19 @@
+   if (mode->Flags&V_INTERLACE) {
+ switch (pTDFX->ChipType) {
+-  case PCI_CHIP_BANSHEE:
+-return MODE_BAD;
+   case PCI_CHIP_VELOCITY:
+   case PCI_CHIP_VOODOO3:
+   case PCI_CHIP_VOODOO4:
+   case PCI_CHIP_VOODOO5:
  return MODE_OK;
- break;
++  case PCI_CHIP_BANSHEE:
default:
 +xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
-+ " interlace flag\n");
++   " interlace flag\n");
  return MODE_BAD;
- break;
  }
}
/* In clock doubled mode widths must be divisible by 16 instead of 8 */

commit c788f85d8a54a9595e59b4a64b8d3169447bf897
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:12:54 2015 +0100

Merge from unreleased debian-experimental to fix a ftbfs with 1.17.

diff --git a/debian/changelog b/debian/changelog
index 116b375..a1a1cf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tdfx (1:1.4.6-0ubuntu1) vivid; urgency=medium
+
+  * Merge from unreleased debian-experimental to fix a ftbfs with 1.17.
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
12:10:16 +0100
+
 xserver-xorg-video-tdfx (1:1.4.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0d58405..4728596 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: xserver-xorg-video-tdfx
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force 
+Maintainer: Ubuntu X-SWAT 
+XSBC-Orig-Maintainer: Debian X Strike Force 
 Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
  xutils-dev,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-gl-dev,
  x11proto-video-dev,
  x11proto-xf86dga-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1ae-wu...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog   |7 
 debian/control |2 -
 debian/patches/fix-ftbfs-1.17.diff |   53 +
 debian/patches/series  |1 
 4 files changed, 62 insertions(+), 1 deletion(-)

New commits:
commit db307af1abfa18a019066dbf85f00d6b020f9e48
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:48:56 2015 +0100

Rebuild against xserver 1.17.

fix-ftbfs-1.17.diff

diff --git a/debian/changelog b/debian/changelog
index 24158fb..d9dde83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.3.7-2ubuntu4) vivid; urgency=medium
+
+  * Rebuild against xserver 1.17.
+- fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:48:33 +0100
+
 xserver-xorg-video-savage (1:2.3.7-2ubuntu3) utopic; urgency=low
 
   * Rebuild for xorg 1.16 abi.
diff --git a/debian/control b/debian/control
index 9f98894..a7f4b53 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.99.901+git20110131),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-xext-dev,
  x11proto-gl-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff 
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 000..fed4834
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,53 @@
+diff --git a/src/savage_dri.c b/src/savage_dri.c
+index bdb78e4..0842821 100644
+--- a/src/savage_dri.c
 b/src/savage_dri.c
+@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
+psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
+pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
+ 
+-   pDRIInfo->wrap.ValidateTree = NULL;
+-   pDRIInfo->wrap.PostValidateTree = NULL;
+-
+pDRIInfo->createDummyCtx = TRUE;
+pDRIInfo->createDummyCtxPriv = FALSE;
+ 
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index bca2c60..e82794f 100644
+--- a/src/savage_driver.c
 b/src/savage_driver.c
+@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
+ return ((unsigned int) (tmp & 0x08));
+ }
+ 
++static void
++SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ static Bool
+ SavageDDC1(ScrnInfoPtr pScrn)
+ {
+@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
+ InI2CREG(byte,psav->I2CPort);
+ OutI2CREG(byte | 0x12,psav->I2CPort);
+ 
+-pMon = 
xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
++pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
++ SavageDDC1Read);
+ if (!pMon)
+ return FALSE;
+ 
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index ec4b1ea..de042af 100644
+--- a/src/savage_driver.h
 b/src/savage_driver.h
+@@ -54,6 +54,7 @@
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+ #endif
++#include "xf86Modes.h"
+ #include "xf86Pci.h"
+ #include "xf86_OSproc.h"
+ #include "xf86Cursor.h"
diff --git a/debian/patches/series b/debian/patches/series
index f420099..3ceb913 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 03_request_16bit_depth.diff
 100_bustype_pci_by_default.diff
 101-pointer.diff
+fix-ftbfs-1.17.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1a8-0007py...@moszumanska.debian.org

xserver-xorg-video-tdfx: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff |   21 
++
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 8859a01e9fb6730dbc559a0a60ab9584581ca4b2
Author: Maarten Lankhorst 
Date:   Thu Mar 12 12:17:41 2015 +0100

refresh patch

diff --git a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff 
b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
index 588f513..75eddfb 100644
--- a/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
+++ b/debian/patches/02_tdfx_improve_mode_rejection_diagnostics.diff
@@ -1,6 +1,6 @@
 xserver-xorg-video-tdfx.orig/src/tdfx_driver.c
-+++ xserver-xorg-video-tdfx/src/tdfx_driver.c
-@@ -2689,8 +2689,16 @@
+--- a/src/tdfx_driver.c
 b/src/tdfx_driver.c
+@@ -2591,26 +2591,39 @@
TDFXPtr pTDFX;
  
TDFXTRACE("TDFXValidMode start\n");
@@ -16,16 +16,21 @@
 +return MODE_BAD;
 +  }
/* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
-   pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
-@@ -2704,13 +2712,19 @@
+   if (mode->Flags&V_INTERLACE) {
+ switch (pTDFX->ChipType) {
+-  case PCI_CHIP_BANSHEE:
+-return MODE_BAD;
+   case PCI_CHIP_VELOCITY:
+   case PCI_CHIP_VOODOO3:
+   case PCI_CHIP_VOODOO4:
+   case PCI_CHIP_VOODOO5:
  return MODE_OK;
- break;
++  case PCI_CHIP_BANSHEE:
default:
 +xf86DrvMsg(pScrn->scrnIndex, X_INFO, "rejecting mode with unsupported"
-+ " interlace flag\n");
++   " interlace flag\n");
  return MODE_BAD;
- break;
  }
}
/* In clock doubled mode widths must be divisible by 16 instead of 8 */


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw1ae-vz...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog   |7 +++
 debian/control |6 +-
 debian/patches/fix-ftbfs-1.17.diff |   75 +
 debian/patches/series  |2 
 4 files changed, 87 insertions(+), 3 deletions(-)

New commits:
commit e76dfa6f7ef803f2d058534ec58c90fd0dc1984d
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:59:53 2015 +0100

Rebuild against 1.17.

fix-ftbfs-1.17.diff

diff --git a/debian/changelog b/debian/changelog
index 5b5afca..a6a585a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-siliconmotion (1:1.7.7-2ubuntu1) vivid; urgency=medium
+
+  * Rebuild against 1.17.
+- fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:53:23 +0100
+
 xserver-xorg-video-siliconmotion (1:1.7.7-2) unstable; urgency=low
 
   * Release to unstable.
diff --git a/debian/control b/debian/control
index fff5fe8..ad75033 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
 Source: xserver-xorg-video-siliconmotion
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force 
+Maintainer: Ubuntu X-SWAT 
+XSBC-Orig-Maintainer: Debian X Strike Force 
 Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
+ quilt,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-xext-dev,
  x11proto-core-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff 
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 000..5d1c210
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,75 @@
+diff --git a/src/smi.h b/src/smi.h
+index 956c14f..dce82e6 100644
+--- a/src/smi.h
 b/src/smi.h
+@@ -37,7 +37,6 @@ authorization from the XFree86 Project and Silicon Motion.
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+ #include "xf86Cursor.h"
+ #include "vgaHW.h"
+@@ -68,6 +67,15 @@ authorization from the XFree86 Project and Silicon Motion.
+ /*D E F I N I T I O N S */
+ 
/**/
+ 
++#define PCI_VENDOR_SMI0x126F
++#define PCI_CHIP_SMI910   0x0910
++#define PCI_CHIP_SMI810   0x0810
++#define PCI_CHIP_SMI820   0x0820
++#define PCI_CHIP_SMI710   0x0710
++#define PCI_CHIP_SMI712   0x0712
++#define PCI_CHIP_SMI720   0x0720
++#define PCI_CHIP_SMI731   0x0730
++
+ #ifndef SMI_DEBUG
+ #define SMI_DEBUG 0
+ #endif
+@@ -221,7 +229,7 @@ typedef struct
+ CARD8 *   DataPortBase;   /* Base of data port */
+ int   DataPortSize;   /* Size of data port */
+ CARD8 *   IOBase; /* Base of MMIO VGA ports */
+-IOADDRESS PIOBase;/* Base of I/O ports */
++unsigned int  PIOBase;/* Base of I/O ports */
+ unsigned char *   FBBase; /* Base of FB */
+ CARD32fbMapOffset;/* offset for fb mapping */
+ CARD32FBOffset;   /* Current visual FB starting
+diff --git a/src/smi_i2c.c b/src/smi_i2c.c
+index f38b514..ecf350e 100644
+--- a/src/smi_i2c.c
 b/src/smi_i2c.c
+@@ -35,7 +35,6 @@ authorization from the XFree86 Project and Silicon Motion.
+ #include "xf86_OSproc.h"
+ #include "compiler.h"
+ #include "xf86Pci.h"
+-#include "xf86PciInfo.h"
+ #include "vgaHW.h"
+ 
+ #include "smi.h"
+diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c
+index 9a10a31..b2ee8a5 100644
+--- a/src/smilynx_hw.c
 b/src/smilynx_hw.c
+@@ -572,6 +572,12 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
+ LEAVE(ret);
+ }
+ 
++static void
++SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
++{
++vgaHWddc1SetSpeed(pScrn, speed);
++}
++
+ xf86MonPtr
+ SMILynx_ddc1(ScrnInfoPtr pScrn)
+ {
+@@ -585,7 +591,7 @@ SMILynx_ddc1(ScrnInfoPtr pScrn)
+ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20);
+ 
+ pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),
+-   vgaHWddc1SetSpeedWeak(),
++   SMILynx_ddc1SetSpeed,
+SMILynx_ddc1Read));
+ VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..b2731a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+fix-ftbfs-1.17.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw19x-0007qv...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

New branch 'ubuntu' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw11m-00076o...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

New branch 'ubuntu' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw0jv-00073w...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog   |7 ++
 debian/control |5 ++--
 debian/patches/fix-ftbfs-1.17.diff |   38 +
 debian/patches/series  |3 +-
 4 files changed, 50 insertions(+), 3 deletions(-)

New commits:
commit 1fda50a5cf894399b8217da7a9c2f1fa461e1ac5
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:21:59 2015 +0100

Rebuild against 1.17.

fix-ftbfs-1.17.diff

diff --git a/debian/changelog b/debian/changelog
index 0ffed78..9ca7673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-neomagic (1:1.2.8-1ubuntu1) vivid; urgency=medium
+
+  * Rebuild against 1.17.
+- fix-ftbfs-1.17.diff
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:21:26 +0100
+
 xserver-xorg-video-neomagic (1:1.2.8-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index eb115e4..95634d7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: xserver-xorg-video-neomagic
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force 
+Maintainer: Ubuntu X-SWAT 
+XSBC-Orig-Maintainer: Debian X Strike Force 
 Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-xf86dga-dev,
  x11proto-core-dev,
diff --git a/debian/patches/fix-ftbfs-1.17.diff 
b/debian/patches/fix-ftbfs-1.17.diff
new file mode 100644
index 000..da1ac14
--- /dev/null
+++ b/debian/patches/fix-ftbfs-1.17.diff
@@ -0,0 +1,38 @@
+commit 6661bdd4551e4e63e983685464a277845aed3012
+Author: Dave Airlie 
+Date:   Sun Sep 21 09:51:37 2014 +1000
+
+neomagic: fix build against master X server.
+
+Signed-off-by: Dave Airlie 
+
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index 1b0da34..da01962 100644
+--- a/src/neo_driver.c
 b/src/neo_driver.c
+@@ -1994,10 +1994,12 @@ neoMapMem(ScrnInfoPtr pScrn)
+ }
+ #endif
+ } else
++#ifdef VIDMEM_MMIO
+ nPtr->NeoMMIOBase =
+ xf86MapVidMem(pScrn->scrnIndex,
+   VIDMEM_MMIO, nPtr->NeoMMIOAddr,
+   0x20L);
++#endif
+ if (nPtr->NeoMMIOBase == NULL)
+ return FALSE;
+ }
+@@ -2024,10 +2026,12 @@ neoMapMem(ScrnInfoPtr pScrn)
+ }
+ #endif
+ else
++#ifdef VIDMEM_FRAMEBUFFER
+ nPtr->NeoFbBase =
+ xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+   (unsigned long)nPtr->NeoLinearAddr,
+   nPtr->NeoFbMapSize);
++#endif
+ if (nPtr->NeoFbBase == NULL)
+ return FALSE;
+ return TRUE;
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..eccfa20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-# placeholder
+fix-ftbfs-1.17.diff
+


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw0gw-00056h...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

New branch 'ubuntu' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yw0dh-0004vr...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:
commit 32d2ff984b923966f63c3ad6b92918c7daff3f77
Author: Maarten Lankhorst 
Date:   Thu Mar 12 11:04:22 2015 +0100

Rebuild against 1.17.

- Add 11-pci-tag.diff to get rid of a build error.
- Get rid of modesetting recommends, part of xorg-server now.

diff --git a/debian/changelog b/debian/changelog
index 859f2d4..7bcfc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-cirrus (1:1.5.2-2ubuntu1) vivid; urgency=medium
+
+  * Rebuild against 1.17.
+- Add 11-pci-tag.diff to get rid of a build error.
+- Get rid of modesetting recommends, part of xorg-server now.
+
+ -- Maarten Lankhorst   Thu, 12 Mar 2015 
11:02:14 +0100
+
 xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
diff --git a/debian/control b/debian/control
index a732a03..97804fb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (>= 2:1.12),
+ xserver-xorg-dev (>= 2:1.16.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
  x11proto-fonts-dev,
@@ -25,8 +25,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
-Recommends:
- xserver-xorg-video-modesetting,
 Provides:
  ${xviddriver:Provides}
 Description: X.Org X server -- Cirrus display driver
diff --git a/debian/patches/11-pci-tag.diff b/debian/patches/11-pci-tag.diff
new file mode 100644
index 000..3d68f9f
--- /dev/null
+++ b/debian/patches/11-pci-tag.diff
@@ -0,0 +1,54 @@
+commit df389885adf71ed3b045c2fde9fd3ba4329e1a58
+Author: Dave Airlie 
+Date:   Sat Sep 20 18:51:17 2014 +1000
+
+cirrus: don't use pciTag
+
+Signed-off-by: Dave Airlie 
+
+diff --git a/src/alp_driver.c b/src/alp_driver.c
+index 36f2039..bd5e52f 100644
+--- a/src/alp_driver.c
 b/src/alp_driver.c
+@@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+   pCir->Chipset = pCir->pEnt->chipset;
+   /* Find the PCI info for this screen */
+   pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+   pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+ 
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ if (!xf86IsPc98())
+diff --git a/src/cir.h b/src/cir.h
+index 0a5d403..84f64b5 100644
+--- a/src/cir.h
 b/src/cir.h
+@@ -23,7 +23,9 @@ typedef struct {
+   ScrnInfoPtr pScrn;
+   CARD32  properties;
+   pciVideoPtr PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+   PCITAG  PciTag;
++#endif
+   unsigned long   PIOReg;
+ union {
+   struct lgRec*lg;
+diff --git a/src/lg_driver.c b/src/lg_driver.c
+index c20bbd0..589d14e 100644
+--- a/src/lg_driver.c
 b/src/lg_driver.c
+@@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+   /* Find the PCI info for this screen */
+   pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+   pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
++#endif
+ 
+   if (xf86LoadSubModule(pScrn, "int10")) {
+   xf86Int10InfoPtr int10InfoPtr;
diff --git a/debian/patches/series b/debian/patches/series
index 354eb33..fd80bac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10-qemu.diff
+11-pci-tag.diff

commit 6f621833abdc3c3acb4b92838f5ec03c90386100
Author: Julien Cristau 
Date:   Sun May 11 01:22:56 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e0f76f6..859f2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
+xserver-xorg-video-cirrus (1:1.5.2-2) unstable; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
   * Recommend xserver-xorg-video-modesetting, for kms on qemu.
 
- -- Julien Cristau   Sun, 11 May 2014 01:13:54 +0200
+ -- Julien Cristau   Sun, 11 May 2014 01:22:34 +0200
 
 xserver-xorg-video-cirrus (1:1.5.2-1) unstable; urgency=low
 

commit c2b3486837fa203ec92dda88cddcd29bb3022741
Author: Julien Cristau 
Date:   Sun May 11 01:14:59 2014 +0200

Recommend xserver-xorg-video-modesetting, for kms on qemu.

diff --git a/debian/changelog b/debian/changelog
index 390c837..e0f76f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-cirrus (1:1.5.2-2) UNRELEASED; urgency=medium
 
   * Remove Cyril Brulebois from Uploaders.
+  * Recommend xserver-xorg-video-modesetting, for kms on qemu.
 
  -- Julien Cristau   Sun, 11 May 2014 01:13:54 +0200
 
diff --git a/debian/control b/debian/control
index dd9a046..a732a03 100644
--- a/debian/control
+++ 

xserver-xorg-video-cirrus: Changes to 'ubuntu-quantal'

[Maarten Bernardus Lankhorst]

 debian/changelog |7 
 debian/patches/fix-oob-shadowfb.diff |  408 +++
 debian/patches/series|1 
 3 files changed, 416 insertions(+)

New commits:
commit 9240a7d9e981184fa14986a99cd09e667c25e376
Author: Maarten Lankhorst 
Date:   Mon Jan 14 12:12:16 2013 +0100

Add patch to fix out of bounds access in shadowfb (LP: #1043513)

* Add patch to fix out of bounds access in shadowfb (LP: #1043513)
  - fix-oob-shadowfb.diff

diff --git a/debian/changelog b/debian/changelog
index 02d9ea7..4b70474 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-cirrus (1:1.5.1-0ubuntu2.1) UNRELEASED; urgency=low
+
+  * Add patch to fix out of bounds access in shadowfb (LP: #1043513)
+- fix-oob-shadowfb.diff
+
+ -- Maarten Lankhorst   Mon, 14 Jan 2013 
11:21:57 +0100
+
 xserver-xorg-video-cirrus (1:1.5.1-0ubuntu2) quantal; urgency=low
 
   * Add fix-fallback.diff from upstream git, if a kernel driver is found
diff --git a/debian/patches/fix-oob-shadowfb.diff 
b/debian/patches/fix-oob-shadowfb.diff
new file mode 100644
index 000..42d605b
--- /dev/null
+++ b/debian/patches/fix-oob-shadowfb.diff
@@ -0,0 +1,408 @@
+commit bade70ce71ea26fae4f250f0bd1729dfb0d392df
+Author: Maarten Lankhorst 
+Date:   Tue Jan 8 11:00:33 2013 +0100
+
+cirrus: fix out of bounds access to shadowfb
+
+Perform the same bounds checking other drivers do. Thanks to Dave Gilbert 
for feedback on this patch.
+
+Signed-off-by: Maarten Lankhorst 
+
+diff --git a/src/cir_shadow.c b/src/cir_shadow.c
+index a9b425b..6bde0fd 100644
+--- a/src/cir_shadow.c
 b/src/cir_shadow.c
+@@ -15,30 +15,41 @@
+ #include "cir.h"
+ #include "alp.h"
+ 
++#define MIN(a, b) (((a) < (b)) ? (a) : (b))
++#define MAX(a, b) (((a) > (b)) ? (a) : (b))
++
+ _X_EXPORT void
+ cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+ {
+ CirPtr pCir = CIRPTR(pScrn);
+-int width, height, Bpp, FBPitch;
++int width, height, Bpp, FBPitch, x1, x2, y1, y2;
+ unsigned char *src, *dst;
+
+ Bpp = pScrn->bitsPerPixel >> 3;
+ FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel);
+ 
+ while(num--) {
+-  width = (pbox->x2 - pbox->x1) * Bpp;
+-  height = pbox->y2 - pbox->y1;
+-  src = pCir->ShadowPtr + (pbox->y1 * pCir->ShadowPitch) + 
+-  (pbox->x1 * Bpp);
+-  dst = pCir->FbBase + (pbox->y1 * FBPitch) + (pbox->x1 * Bpp);
+-
+-  while(height--) {
+-  memcpy(dst, src, width);
+-  dst += FBPitch;
+-  src += pCir->ShadowPitch;
+-  }
+-  
+-  pbox++;
++x1 = MAX(pbox->x1, 0);
++y1 = MAX(pbox->y1, 0);
++x2 = MIN(pbox->x2, pScrn->virtualX);
++y2 = MIN(pbox->y2, pScrn->virtualY);
++
++width = (x2 - x1) * Bpp;
++height = y2 - y1;
++
++if (width <= 0 || height <= 0)
++continue;
++
++src = pCir->ShadowPtr + (y1 * pCir->ShadowPitch) + (x1 * Bpp);
++dst = pCir->FbBase + (y1 * FBPitch) + (x1 * Bpp);
++
++while(height--) {
++memcpy(dst, src, width);
++dst += FBPitch;
++src += pCir->ShadowPitch;
++}
++
++pbox++;
+ }
+ } 
+ 
+@@ -64,7 +75,7 @@ _X_EXPORT void
+ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+ {
+ CirPtr pCir = CIRPTR(pScrn);
+-int count, width, height, y1, y2, dstPitch, srcPitch;
++int count, width, height, x1, x2, y1, y2, dstPitch, srcPitch;
+ CARD8 *dstPtr, *srcPtr, *src;
+ CARD32 *dst;
+ 
+@@ -72,36 +83,44 @@ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
+ srcPitch = -pCir->rotate * pCir->ShadowPitch;
+ 
+ while(num--) {
+-  width = pbox->x2 - pbox->x1;
+-  y1 = pbox->y1 & ~3;
+-  y2 = (pbox->y2 + 3) & ~3;
+-  height = (y2 - y1) >> 2;  /* in dwords */
+-
+-  if(pCir->rotate == 1) {
+-  dstPtr = pCir->FbBase + 
+-  (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
+-  srcPtr = pCir->ShadowPtr + ((1 - y2) * srcPitch) + pbox->x1;
+-  } else {
+-  dstPtr = pCir->FbBase + 
+-  ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
+-  srcPtr = pCir->ShadowPtr + (y1 * srcPitch) + pbox->x2 - 1;
+-  }
+-
+-  while(width--) {
+-  src = srcPtr;
+-  dst = (CARD32*)dstPtr;
+-  count = height;
+-  while(count--) {
+-  *(dst++) = src[0] | (src[srcPitch] << 8) | 
+-  (src[srcPitch * 2] << 16) | 
+-  (src[srcPitch * 3] << 24);
+-  src += srcPitch * 4;
+-  }
+-  srcPtr += pCir->rotate;
+-  dstPtr += dstPitch;
+-  }
+-
+-  pbox++;
++x1 = MAX(pbox->x1, 0);
++y1 = MAX(pbox->y1, 0);
++x2 = MIN(pbox->x2, pScrn->virtualX);
++y2 = MIN(pbox->y2, pScrn->virtua

mesa: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

 VERSION |2 
 docs/relnotes/10.5.0.html   |  147 +++-
 src/gallium/auxiliary/os/os_misc.c  |4 
 src/gallium/drivers/r600/sb/sb_sched.cpp|4 
 src/gallium/state_trackers/omx/vid_dec_h264.c   |5 
 src/gallium/targets/pipe-loader/Makefile.am |6 
 src/glsl/opt_algebraic.cpp  |   75 +++-
 src/glx/dri_common_query_renderer.c |   36 -
 src/mapi/Makefile.am|2 
 src/mesa/Android.gen.mk |2 
 src/mesa/Makefile.am|8 -
 src/mesa/Makefile.sources   |2 
 src/mesa/SConscript |2 
 src/mesa/drivers/common/meta_tex_subimage.c |   89 --
 src/mesa/drivers/dri/common/xmlpool/Makefile.am |2 
 src/mesa/drivers/dri/i965/gen8_depth_state.c|   12 +
 src/mesa/main/.gitignore|4 
 src/mesa/main/formats.c |2 
 18 files changed, 315 insertions(+), 89 deletions(-)

New commits:
commit 97357d475fc8cbb5dbe7bf17ca41f535827fb253
Author: Emil Velikov 
Date:   Fri Mar 6 22:55:59 2015 +

docs: Update 10.5.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/10.5.0.html b/docs/relnotes/10.5.0.html
index 578db4f..cde8f3d 100644
--- a/docs/relnotes/10.5.0.html
+++ b/docs/relnotes/10.5.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 10.5.0 Release Notes / TBD
+Mesa 10.5.0 Release Notes / March 06, 2015
 
 
 Mesa 10.5.0 is a new development release.
@@ -55,7 +55,150 @@ Note: some of the new features are only available with 
certain drivers.
 
 Bug fixes
 
-TBD.
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=10370";>Bug 10370 
- Incorrect pixels read back if draw bitmap texture through Display list
+
+https://bugs.freedesktop.org/show_bug.cgi?id=45348";>Bug 45348 
- [swrast] piglit fbo-drawbuffers-arbfp regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=60879";>Bug 60879 
- [radeonsi] X11 can't start with acceleration enabled
+
+https://bugs.freedesktop.org/show_bug.cgi?id=67672";>Bug 67672 
- [llvmpipe] lp_test_arit fails on old CPUs
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77544";>Bug 77544 
- i965: Try to use LINE instructions to perform MAD with immediate 
arguments
+
+https://bugs.freedesktop.org/show_bug.cgi?id=78770";>Bug 78770 
- [SNB bisected]Webglc conformance/textures/texture-size-limit.html fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=80568";>Bug 80568 
- [gen4] GPU Crash During Google Chrome Operation
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82477";>Bug 82477 
- [softpipe] piglit fp-long-alu regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82585";>Bug 82585 
- geometry shader with optional out variable segfaults
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82991";>Bug 82991 
- Inverted bumpmap in webgl applications
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83463";>Bug 83463 
- [swrast] piglit glsl-vs-clamp-1 regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83500";>Bug 83500 
- si_dma_copy_tile causes GPU hangs
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83510";>Bug 83510 
- Graphical glitches in Unreal Engine 4
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83908";>Bug 83908 
- [i965] Incorrect icon colors in Steam Big Picture
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84212";>Bug 84212 
- [BSW]ES3-CTS.shaders.loops.do_while_dynamic_iterations.vector_counter_vertex 
fails and causes GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84651";>Bug 84651 
- Distorted graphics or black window when running Battle.net app on Intel 
hardware via wine
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84777";>Bug 84777 
- [BSW]Piglit spec_glsl-1.50_execution_geometry-basic fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85367";>Bug 85367 
- [gen4] GPU hang in glmark-es2
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85467";>Bug 85467 
- [llvmpipe] piglit gl-1.0-dlist-beginend failure with llvm-3.6.0svn
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85529";>Bug 85529 
- Surfaces not drawn in Unvanquished
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85647";>Bug 85647 
- Random radeonsi crashes with mesa 10.3.x
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85696";>Bug 85696 
- r600g+nine: Bioshock shader failure after 
7b1c0cbc90d456384b0950ad21faa3c61a6b43ff
+
+https://bugs.freedesktop.org/show_bug.cgi?id=86089";>Bug 86089 
- [r600g][mesa 10.4.0-dev] shader failure - 
r600_sb::bc_finalizer::cf_peephole() when starting Second Life
+
+https://bugs.freedesktop.org/show_bug.cgi?id=86618";>Bug 86618 
- [NV96] neg modifiers not working in MIN and MAX operations
+
+https://bugs.freedesktop.org/show_bug.cgi?id=86760";>Bug 86760 
- mesa doesn't build: recipe for target 'r600_llvm.lo' failed
+
+https://bugs.freedesktop.org/s

mesa: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 VERSION |2 
 debian/changelog|2 
 docs/relnotes/10.5.0.html   |  147 +++-
 src/gallium/auxiliary/os/os_misc.c  |4 
 src/gallium/drivers/r600/sb/sb_sched.cpp|4 
 src/gallium/state_trackers/omx/vid_dec_h264.c   |5 
 src/gallium/targets/pipe-loader/Makefile.am |6 
 src/glsl/opt_algebraic.cpp  |   75 +++-
 src/glx/dri_common_query_renderer.c |   36 -
 src/mapi/Makefile.am|2 
 src/mesa/Android.gen.mk |2 
 src/mesa/Makefile.am|8 -
 src/mesa/Makefile.sources   |2 
 src/mesa/SConscript |2 
 src/mesa/drivers/common/meta_tex_subimage.c |   89 --
 src/mesa/drivers/dri/common/xmlpool/Makefile.am |2 
 src/mesa/drivers/dri/i965/gen8_depth_state.c|   12 +
 src/mesa/main/.gitignore|4 
 src/mesa/main/formats.c |2 
 19 files changed, 316 insertions(+), 90 deletions(-)

New commits:
commit 7b142029bf6af89fe647f2f127e4ede3e6fb0c86
Author: Maarten Lankhorst 
Date:   Mon Mar 9 13:56:10 2015 +0100

bump version

diff --git a/debian/changelog b/debian/changelog
index 29c297a..36d61ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.5.0~rc3-1) UNRELEASED; urgency=medium
+mesa (10.5.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update watch file.

commit 97357d475fc8cbb5dbe7bf17ca41f535827fb253
Author: Emil Velikov 
Date:   Fri Mar 6 22:55:59 2015 +

docs: Update 10.5.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/10.5.0.html b/docs/relnotes/10.5.0.html
index 578db4f..cde8f3d 100644
--- a/docs/relnotes/10.5.0.html
+++ b/docs/relnotes/10.5.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 10.5.0 Release Notes / TBD
+Mesa 10.5.0 Release Notes / March 06, 2015
 
 
 Mesa 10.5.0 is a new development release.
@@ -55,7 +55,150 @@ Note: some of the new features are only available with 
certain drivers.
 
 Bug fixes
 
-TBD.
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=10370";>Bug 10370 
- Incorrect pixels read back if draw bitmap texture through Display list
+
+https://bugs.freedesktop.org/show_bug.cgi?id=45348";>Bug 45348 
- [swrast] piglit fbo-drawbuffers-arbfp regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=60879";>Bug 60879 
- [radeonsi] X11 can't start with acceleration enabled
+
+https://bugs.freedesktop.org/show_bug.cgi?id=67672";>Bug 67672 
- [llvmpipe] lp_test_arit fails on old CPUs
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77544";>Bug 77544 
- i965: Try to use LINE instructions to perform MAD with immediate 
arguments
+
+https://bugs.freedesktop.org/show_bug.cgi?id=78770";>Bug 78770 
- [SNB bisected]Webglc conformance/textures/texture-size-limit.html fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=80568";>Bug 80568 
- [gen4] GPU Crash During Google Chrome Operation
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82477";>Bug 82477 
- [softpipe] piglit fp-long-alu regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82585";>Bug 82585 
- geometry shader with optional out variable segfaults
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82991";>Bug 82991 
- Inverted bumpmap in webgl applications
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83463";>Bug 83463 
- [swrast] piglit glsl-vs-clamp-1 regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83500";>Bug 83500 
- si_dma_copy_tile causes GPU hangs
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83510";>Bug 83510 
- Graphical glitches in Unreal Engine 4
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83908";>Bug 83908 
- [i965] Incorrect icon colors in Steam Big Picture
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84212";>Bug 84212 
- [BSW]ES3-CTS.shaders.loops.do_while_dynamic_iterations.vector_counter_vertex 
fails and causes GPU hang
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84651";>Bug 84651 
- Distorted graphics or black window when running Battle.net app on Intel 
hardware via wine
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84777";>Bug 84777 
- [BSW]Piglit spec_glsl-1.50_execution_geometry-basic fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85367";>Bug 85367 
- [gen4] GPU hang in glmark-es2
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85467";>Bug 85467 
- [llvmpipe] piglit gl-1.0-dlist-beginend failure with llvm-3.6.0svn
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85529";>Bug 85529 
- Surfaces not drawn in Unvanquished
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85647";>Bug 85647 
- Random radeonsi crashes with mesa 10.3.x
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85696";>Bug 85696 
- r600g+nine: Bioshock shader failure after 
7b1c0cbc90d456384b0950ad21faa3

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 VERSION   |2 
 debian/changelog  |   23 +-
 debian/patches/series |1 
 debian/patches/skl-implement-wadisable1ddepthstencil.diff |   38 ---
 docs/relnotes/10.5.0.html |  147 +-
 src/gallium/auxiliary/os/os_misc.c|4 
 src/gallium/drivers/r600/sb/sb_sched.cpp  |4 
 src/gallium/state_trackers/omx/vid_dec_h264.c |5 
 src/gallium/targets/pipe-loader/Makefile.am   |6 
 src/glsl/opt_algebraic.cpp|   75 ---
 src/glx/dri_common_query_renderer.c   |   36 ++-
 src/mapi/Makefile.am  |2 
 src/mesa/Android.gen.mk   |2 
 src/mesa/Makefile.am  |8 
 src/mesa/Makefile.sources |2 
 src/mesa/SConscript   |2 
 src/mesa/drivers/common/meta_tex_subimage.c   |   89 +---
 src/mesa/drivers/dri/common/xmlpool/Makefile.am   |2 
 src/mesa/drivers/dri/i965/gen8_depth_state.c  |   12 +
 src/mesa/main/.gitignore  |4 
 src/mesa/main/formats.c   |2 
 21 files changed, 333 insertions(+), 133 deletions(-)

New commits:
commit 56568ba9bc92a35f8c8f0a026c8300dc4fe68fc5
Author: Maarten Lankhorst 
Date:   Mon Mar 9 14:10:08 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 446711c..1c2453c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (10.5.0-0ubuntu1) UNRELEASED; urgency=medium
+mesa (10.5.0-0ubuntu1) vivid; urgency=medium
 
   * Merge with unreleased debian-experimental.
 
- -- Maarten Lankhorst   Mon, 16 Feb 2015 
09:35:43 +0100
+ -- Maarten Lankhorst   Mon, 09 Mar 2015 
14:10:00 +0100
 
 mesa (10.5.0-1) UNRELEASED; urgency=medium
 

commit 8cd55cbb089bea567a1ed81a5c5f265ba7da1233
Author: Maarten Lankhorst 
Date:   Mon Mar 9 13:56:52 2015 +0100

bump changelog

diff --git a/debian/changelog b/debian/changelog
index b051ca5..446711c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.5.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with unreleased debian-experimental.
+
+ -- Maarten Lankhorst   Mon, 16 Feb 2015 
09:35:43 +0100
+
 mesa (10.5.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.

commit 7b142029bf6af89fe647f2f127e4ede3e6fb0c86
Author: Maarten Lankhorst 
Date:   Mon Mar 9 13:56:10 2015 +0100

bump version

diff --git a/debian/changelog b/debian/changelog
index 29c297a..36d61ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.5.0~rc3-1) UNRELEASED; urgency=medium
+mesa (10.5.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update watch file.

commit 97357d475fc8cbb5dbe7bf17ca41f535827fb253
Author: Emil Velikov 
Date:   Fri Mar 6 22:55:59 2015 +

docs: Update 10.5.0 release notes

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/10.5.0.html b/docs/relnotes/10.5.0.html
index 578db4f..cde8f3d 100644
--- a/docs/relnotes/10.5.0.html
+++ b/docs/relnotes/10.5.0.html
@@ -14,7 +14,7 @@
 
 
 
-Mesa 10.5.0 Release Notes / TBD
+Mesa 10.5.0 Release Notes / March 06, 2015
 
 
 Mesa 10.5.0 is a new development release.
@@ -55,7 +55,150 @@ Note: some of the new features are only available with 
certain drivers.
 
 Bug fixes
 
-TBD.
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=10370";>Bug 10370 
- Incorrect pixels read back if draw bitmap texture through Display list
+
+https://bugs.freedesktop.org/show_bug.cgi?id=45348";>Bug 45348 
- [swrast] piglit fbo-drawbuffers-arbfp regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=60879";>Bug 60879 
- [radeonsi] X11 can't start with acceleration enabled
+
+https://bugs.freedesktop.org/show_bug.cgi?id=67672";>Bug 67672 
- [llvmpipe] lp_test_arit fails on old CPUs
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77544";>Bug 77544 
- i965: Try to use LINE instructions to perform MAD with immediate 
arguments
+
+https://bugs.freedesktop.org/show_bug.cgi?id=78770";>Bug 78770 
- [SNB bisected]Webglc conformance/textures/texture-size-limit.html fails
+
+https://bugs.freedesktop.org/show_bug.cgi?id=80568";>Bug 80568 
- [gen4] GPU Crash During Google Chrome Operation
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82477";>Bug 82477 
- [softpipe] piglit fp-long-alu regression
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82585";>Bug 82585 
- geometry shader with optional out variable segfaults
+
+https://bugs.freedesktop.org/show_bug.cgi?id=82991";>Bug 82991 
- Inverted bumpmap in webgl applications
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83463";>Bug 83463 
- [swrast] pigli

mesa: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 debian/control   |   13 +++--
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit c3ceacaa6d2e40a722885f0ef5eb703cc2f84a68
Author: Maarten Lankhorst 
Date:   Tue Mar 10 15:21:53 2015 +0100

Allow unrenamed -dev packages to work with the renamed stack. (LP: #1424466)

diff --git a/debian/changelog b/debian/changelog
index da7c98a..b36bf14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.3-0ubuntu0.4) trusty; urgency=medium
+
+  * Allow unrenamed -dev packages to work with the renamed stack. (LP: 
#1424466)
+
+ -- Maarten Lankhorst   Tue, 10 Mar 2015 
12:04:39 +0100
+
 mesa (10.1.3-0ubuntu0.3) trusty; urgency=medium
 
   * Backport Braswell support (LP: #1404217)
diff --git a/debian/control b/debian/control
index 8c9f685..d18bfcc 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Package: libxatracker-dev
 Section: libdevel
 Architecture: linux-any
 Depends:
- libxatracker2 (= ${binary:Version}),
+ libxatracker2 (= ${binary:Version}) | libxatracker2-lts-utopic | 
libxatracker2-lts-vivid,
  ${misc:Depends},
 Description: X acceleration library -- development files
  This package contains the XA (X acceleration) library.  It is used exclusively
@@ -182,8 +182,9 @@ Package: libegl1-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libegl1-mesa (= ${binary:Version}),
- libegl1-mesa-drivers (= ${binary:Version}) [!hurd-any],
+ libegl1-mesa (= ${binary:Version}) | libegl1-mesa-lts-utopic | 
libegl1-mesa-lts-vivid,
+# Vivid and higher only have libegl1-mesa-drivers as a transitional package.
+ libegl1-mesa-drivers (= ${binary:Version}) [!hurd-any] | 
libegl1-mesa-drivers-lts-utopic | libwayland-egl1-mesa-lts-vivid,
  libdrm-dev (>= 2.4.52) [!hurd-any],
  x11proto-dri2-dev (>= 2.6),
  x11proto-gl-dev (>= 1.4.14),
@@ -370,7 +371,7 @@ Package: libgles1-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libgles1-mesa (= ${binary:Version}),
+ libgles1-mesa (= ${binary:Version}) | libgles1-mesa-lts-utopic | 
libgles1-mesa-lts-vivid,
  libegl1-mesa-dev,
  ${misc:Depends},
 Description: free implementation of the OpenGL|ES 1.x API -- development files
@@ -428,7 +429,7 @@ Package: libgles2-mesa-dev
 Section: libdevel
 Architecture: any
 Depends:
- libgles2-mesa (= ${binary:Version}),
+ libgles2-mesa (= ${binary:Version}) | libgles2-mesa-lts-utopic | 
libgles2-mesa-lts-vivid,
  libegl1-mesa-dev,
  ${misc:Depends},
 Description: free implementation of the OpenGL|ES 2.x API -- development files
@@ -606,7 +607,7 @@ Section: libdevel
 Architecture: any
 Depends:
  mesa-common-dev (= ${binary:Version}),
- libgl1-mesa-glx (= ${binary:Version}),
+ libgl1-mesa-glx (= ${binary:Version}) | libgl1-mesa-glx-lts-utopic | 
libgl1-mesa-glx-lts-vivid,
  libdrm-dev (>= 2.4.52) [!hurd-any],
  libx11-dev,
  libx11-xcb-dev,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yvl2q-00077i...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/patches/xmir.patch |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit eff534ce056c4696849711192e8922e771fa0829
Author: Maarten Lankhorst 
Date:   Mon Mar 9 10:51:42 2015 +0100

refresh xmir patch

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index b3c3dfc..fe8489a 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,7 +8,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
 
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -1947,7 +1947,7 @@
+@@ -1958,7 +1958,7 @@
if (!miCreateDefColormap(pScreen))
return FALSE;
/* all radeons support 10 bit CLUTs */
@@ -167,7 +167,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  dri2_info.CreateBuffer2 = radeon_dri2_create_buffer2;
 --- a/src/radeon_exa.c
 +++ b/src/radeon_exa.c
-@@ -326,12 +326,12 @@
+@@ -325,12 +325,12 @@
  Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
  {
  struct radeon_exa_pixmap_priv *driver_priv = 
exaGetPixmapDriverPrivate(ppix);
@@ -301,7 +301,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  }
  
  static void
-@@ -616,6 +685,17 @@
+@@ -608,6 +677,17 @@
  dev->domain, dev->bus, dev->dev, dev->func);
  #endif
  
@@ -319,7 +319,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  fd = drmOpen(NULL, busid);
  if (fd == -1)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -646,6 +726,9 @@
+@@ -638,6 +718,9 @@
  if (info->dri2.drm_fd == -1)
return FALSE;
  
@@ -329,7 +329,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  /* Check that what we opened was a master or a master-capable FD,
   * by setting the version of the interface we'll use to talk to it.
   * (see DRIOpenDRMMaster() in DRI1)
-@@ -866,6 +949,14 @@
+@@ -854,6 +937,14 @@
  if (!RADEONPreInitChipType_KMS(pScrn))
  goto fail;
  
@@ -344,7 +344,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  if (radeon_open_drm_master(pScrn) == FALSE) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup 
failed\n");
goto fail;
-@@ -940,10 +1031,14 @@
+@@ -928,10 +1019,14 @@
  }
  
  info->swapBuffersWait = xf86ReturnOptValBool(info->Options,
@@ -360,7 +360,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  if (drmmode_pre_init(pScrn, &info->drmmode, pScrn->bitsPerPixel / 8) == 
FALSE) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup 
failed\n");
goto fail;
-@@ -953,7 +1048,10 @@
+@@ -941,7 +1036,10 @@
  pRADEONEnt->HasCRTC2 = FALSE;
  else
  pRADEONEnt->HasCRTC2 = TRUE;
@@ -372,16 +372,16 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  
  /* fix up cloning on rn50 cards
   * since they only have one crtc sometimes the xserver doesn't assign
-@@ -1131,7 +1229,7 @@
- {
- RADEONInfoPtr  info  = RADEONPTR(pScrn);
+@@ -1121,7 +1219,7 @@
+ #ifdef XF86_PDEV_SERVER_FD
  RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+ #endif
 -int err;
 +int err = 0;
  
  #ifdef XF86_PDEV_SERVER_FD
  if (pRADEONEnt->platform_dev &&
-@@ -1139,7 +1237,8 @@
+@@ -1129,7 +1227,8 @@
  return TRUE;
  #endif
  
@@ -391,7 +391,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  if (err)
  ErrorF("Unable to retrieve master\n");
  
-@@ -1157,6 +1256,11 @@
+@@ -1147,6 +1246,11 @@
  return;
  #endif
  
@@ -403,7 +403,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  drmDropMaster(info->dri2.drm_fd);
  }
  
-@@ -1214,6 +1318,21 @@
+@@ -1204,6 +1308,21 @@
  RADEONFreeRec(pScrn);
  }
  
@@ -425,7 +425,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
  {
  ScrnInfoPtrpScrn = xf86ScreenToScrn(pScreen);
-@@ -1246,7 +1365,8 @@
+@@ -1236,7 +1355,8 @@
   "failed to initialise GEM buffer manager");
return FALSE;
  }
@@ -435,7 +435,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  
  if (!info->csm)
  info->csm = radeon_cs_manager_gem_ctor(info->dri2.drm_fd);
-@@ -1370,7 +1490,10 @@
+@@ -1360,7 +1480,10 @@
  /* Cursor setup */
  miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
  
@@ -447,7 +447,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
if (RADEONCursorInit_KMS(pScreen)) {
}
  }
-@@ -1412,6 +1535,8 @@
+@@ -1402,6 +1525,8 @@
  info->CreateScreenResources = pScreen->CreateScreenResources;
  pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS;
  
@@ -456,7 +456,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  #ifdef RADEON_PIXMAP_SHARING
  pScreen->StartPixmapTracking = PixmapStartDirtyTracking;
  pScreen->StopPixmapTracking = PixmapStopDirtyTracking;
-@@ -1457,7 +1582,9 @@
+@@ -1447,7 +1572,9 @@
  
  pScrn->vtSema = TRUE;
  
@@ -467,7 +467,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
return FALSE;
  
  return TRUE;
-@@ -1598,6 +1725,7 @@
+@@ -1588,6 +1715,7 @@
}
info->front_surface = surface;
 

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

[Maarten Bernardus Lankhorst]

 .dir-locals.el|   12 
 ChangeLog |  209 
 configure.ac  |9 
 debian/changelog  |   18 
 debian/control|2 
 debian/rules  |4 
 debian/upstream/signing-key.asc   |   24 
 debian/watch  |1 
 man/radeon.man|3 
 src/Makefile.am   |1 
 src/ati_pciids_gen.h  |7 
 src/cayman_accel.c|1 
 src/drmmode_display.c |   17 
 src/evergreen_accel.c |1 
 src/pcidb/ati_pciids.csv  |9 
 src/r6xx_accel.c  |1 
 src/radeon.h  |2 
 src/radeon_chipinfo_gen.h |7 
 src/radeon_chipset_gen.h  |7 
 src/radeon_drm.h  |  920 --
 src/radeon_exa.c  |1 
 src/radeon_kms.c  |   34 -
 src/radeon_pci_chipset_gen.h  |7 
 src/radeon_pci_device_match_gen.h |7 
 src/radeon_vbo.c  |1 
 src/radeon_video.c|2 
 26 files changed, 347 insertions(+), 960 deletions(-)

New commits:
commit f37457d8585662b575bd83c6504e8869f968be79
Author: Maarten Lankhorst 
Date:   Mon Mar 9 10:45:24 2015 +0100

Merge with released debian-unstable. (LP: #1421601)

diff --git a/debian/changelog b/debian/changelog
index f28e423..73dd11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.5.0-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with released debian-unstable. (LP: #1421601)
+
+ -- Maarten Lankhorst   Mon, 09 Mar 2015 
10:44:44 +0100
+
 xserver-xorg-video-ati (1:7.5.0-1) unstable; urgency=medium
 
   [ Andreas Boll ]

commit f187ac6c9e6fcc0ba76d2bb51df5915b43fc93b2
Author: Julien Cristau 
Date:   Sun Oct 5 18:58:14 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8af5d3b..073b9bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
+xserver-xorg-video-ati (1:7.5.0-1) unstable; urgency=medium
 
   [ Andreas Boll ]
   * New upstream release.
@@ -8,7 +8,7 @@ xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
   * Let uscan verify tarball signatures.
   * Disable silent build rules.
 
- -- Andreas Boll   Thu, 02 Oct 2014 17:13:15 +0200
+ -- Julien Cristau   Sun, 05 Oct 2014 18:53:26 +0200
 
 xserver-xorg-video-ati (1:7.4.0-2) unstable; urgency=medium
 

commit 0ceed425a491e9e99457722ebb87e283e93dfc7e
Author: Julien Cristau 
Date:   Sun Oct 5 18:53:25 2014 +0200

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index 45ed2eb..8af5d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
 
   [ Julien Cristau ]
   * Let uscan verify tarball signatures.
+  * Disable silent build rules.
 
  -- Andreas Boll   Thu, 02 Oct 2014 17:13:15 +0200
 
diff --git a/debian/rules b/debian/rules
index 6d9d6a8..1d87401 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,9 @@
 XXV=xserver-xorg-video
 
 override_dh_auto_configure:
-   dh_auto_configure --builddirectory=build/ -- --libdir=/usr/lib
+   dh_auto_configure --builddirectory=build/ -- \
+   --libdir=/usr/lib \
+   --disable-silent-rules
 
 # Kill *.la files, and forget no-one:
 override_dh_install:

commit 2bcdc17274563005f41c09bde659faf5d79ee1ac
Author: Julien Cristau 
Date:   Sun Oct 5 18:38:38 2014 +0200

Let uscan verify tarball signatures.

diff --git a/debian/changelog b/debian/changelog
index 2ff542a..45ed2eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream release.
   * Bump libdrm-dev build-dep to 2.4.58.
 
+  [ Julien Cristau ]
+  * Let uscan verify tarball signatures.
+
  -- Andreas Boll   Thu, 02 Oct 2014 17:13:15 +0200
 
 xserver-xorg-video-ati (1:7.4.0-2) unstable; urgency=medium
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000..7c21240
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,24 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQGiBEUcmfwRBACcBCeMF28Q5hgM7wvaF2Tq7KYjU1RSg5KE4zqoaH5KH4H+Rtvh
+Wqyh4REAiGGcYowSDtRZN/22/gflf7PvHIRPz2NrrVJ9zTYupoSE/CR7khA9xgnj
+6DvntwZ9SBLR4ZlnyQxd650xTlntVfki8k+4rr2TyEczF7RmqLG5i9ddcwCgzMw9
+u1bbIYiMQ+zkFq6CmIVYB+0EAITS9XD84t37DxXdZyJIKNoOh7jH0iKwtXBz+jcP
+3TFcEKN58lfodTo++3Z3l6ZNrhP1kVQFrYUPYujBKVQ05omdZVDl6xHcxo7/KUws
+of4xZAGXkTsf6jPLIOydqZAuldzUcQCK/ulDswg907WfEVnth6Ad3gv5KqF3DkSp
+iyb1A/wI+Ph5/QqMkpFveYfgstu/5WqaUcn5o8skMhgxCBn7cnIR+Mhwt0cnU5P9
+ZdfDxRgIVzGTX728lHNdHf7dpT+0t2WuuY7rMZzfEiAwmfxs9Y/Qs+3dTgDx/f7K
+BYYOpe7eo0QSvYDn/Uh2FfjWXE0J9LoWcKglAk2BMop

mesa: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 debian/control |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 391a5500dd7b2f8e0e39ff9c337bf788118053cb
Author: Maarten Lankhorst 
Date:   Tue Feb 24 19:24:29 2015 +0100

add python-mako to build-depends

diff --git a/debian/control b/debian/control
index fa9ef9d..0ea493f 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Build-Depends:
  libxcb-sync-dev,
  libxshmfence-dev (>= 1.1),
  python,
+ python-mako,
  libudev-dev [linux-any],
  flex,
  bison,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yqkpt-0006eb...@moszumanska.debian.org

libdrm: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d868b29ce96722a7add7b1662576c6bc9a77b218
Author: Maarten Lankhorst 
Date:   Tue Feb 24 14:21:36 2015 +0100

Copy libdrm 2.4.59-1 from NEW queue to ubuntu.

diff --git a/debian/changelog b/debian/changelog
index d529a03..90733fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.59-0ubuntu1) vivid; urgency=medium
+
+  * Copy libdrm 2.4.59-1 from NEW queue to ubuntu.
+
+ -- Maarten Lankhorst   Tue, 24 Feb 2015 
14:20:55 +0100
+
 libdrm (2.4.59-1) experimental; urgency=medium
 
   * New upstream release.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yqfr8-0006kp...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e168391ccade5a938869654b069565739fc419cb
Author: Maarten Lankhorst 
Date:   Thu Feb 19 12:00:56 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index c8a78ef..f51097a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.5.0~rc1-0ubuntu1) UNRELEASED; urgency=medium
+mesa (10.5.0~rc1-0ubuntu1) vivid; urgency=medium
 
   [ Timo Aaltonen ]
   * Update Mir patch.
@@ -6,7 +6,7 @@ mesa (10.5.0~rc1-0ubuntu1) UNRELEASED; urgency=medium
   [ Maarten Lankhorst ]
   * Merge from unreleased debian-experimental.
 
- -- Timo Aaltonen   Tue, 13 Jan 2015 15:56:02 +0200
+ -- Maarten Lankhorst   Thu, 19 Feb 2015 
11:28:53 +0100
 
 mesa (10.5.0~rc1-1) UNRELEASED; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yooqp-00072k...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 .dir-locals.el |2 
 .gitignore |1 
 Makefile.am|  113 
 VERSION|2 
 bin/.cherry-ignore |2 
 configure.ac   |  257 
 debian/README.source   |2 
 debian/changelog   |   17 
 debian/control |1 
 debian/patches/egl-platform-mir.patch  |   80 
 debian/patches/i915-fix-gen4-hangs.patch   |   59 
 debian/patches/llvm-3.6-fixes.patch|  616 -
 debian/patches/series  |2 
 debian/rules   |2 
 debian/source/local-options|1 
 debian/watch   |2 
 docs/GL3.txt   |   15 
 docs/index.html|   44 
 docs/install.html  |6 
 docs/relnotes.html |8 
 docs/relnotes/10.3.4.html  |  106 
 docs/relnotes/10.3.5.html  |   88 
 docs/relnotes/10.3.6.html  |  124 
 docs/relnotes/10.3.7.html  |   93 
 docs/relnotes/10.4.2.html  |4 
 docs/relnotes/10.4.3.html  |  145 
 docs/relnotes/10.4.4.html  |  100 
 docs/relnotes/10.5.0.html  |   68 
 include/D3D9/d3d9.h|   10 
 include/D3D9/d3d9types.h   |   18 
 include/EGL/eglplatform.h  |   10 
 include/GL/glext.h |  266 
 include/GL/internal/dri_interface.h|1 
 include/c99/stdbool.h  |3 
 include/c99_compat.h   |6 
 include/pci_ids/i965_pci_ids.h |   15 
 install-lib-links.mk   |6 
 m4/ax_check_python_mako_module.m4  |   61 
 m4/ax_prog_flex.m4 |4 
 scons/gallium.py   |   12 
 scons/llvm.py  |   16 
 src/Makefile.am|   21 
 src/SConscript |5 
 src/egl/drivers/dri2/Makefile.am   |3 
 src/egl/drivers/dri2/SConscript|   40 
 src/egl/drivers/dri2/egl_dri2.c|   51 
 src/egl/drivers/dri2/egl_dri2.h|3 
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/drivers/dri2/platform_drm.c|2 
 src/egl/drivers/dri2/platform_wayland.c|   17 
 src/egl/drivers/dri2/platform_x11.c|   27 
 src/egl/drivers/haiku/SConscript   |   34 
 src/egl/drivers/haiku/egl_haiku.cpp|  436 
 src/egl/main/Makefile.am   |5 
 src/egl/main/SConscript|   16 
 src/egl/main/eglapi.c  |   19 
 src/egl/main/egldisplay.c  |7 
 src/egl/main/egldisplay.h  |2 
 src/egl/main/egldriver.c   |6 
 src/egl/main/eglglobals.c  |4 
 src/egl/main/eglglobals.h  |1 
 src/egl/main/eglmisc.c |1 
 src/egl/wayland/Makefile.am|1 
 src/egl/wayland/wayland-egl/Makefile.am|1 
 src/egl/wayland/wayland-egl/wayland-egl-priv.h |2 
 src/gallium/Automake.inc   |2 
 src/gallium/Makefile.am|9 
 src/gallium/SConscript |2 
 src/gallium/auxiliary/Android.mk   |4 
 src/gallium/auxiliary/Makefil

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 .dir-locals.el |2 
 .gitignore |1 
 Makefile.am|  113 
 VERSION|2 
 bin/.cherry-ignore |2 
 configure.ac   |  257 
 debian/README.source   |2 
 debian/changelog   |   17 
 debian/control |1 
 debian/patches/egl-platform-mir.patch  |   80 
 debian/patches/i915-fix-gen4-hangs.patch   |   59 
 debian/patches/llvm-3.6-fixes.patch|  616 -
 debian/patches/series  |2 
 debian/rules   |2 
 debian/source/local-options|1 
 debian/watch   |2 
 docs/GL3.txt   |   15 
 docs/index.html|   44 
 docs/install.html  |6 
 docs/relnotes.html |8 
 docs/relnotes/10.3.4.html  |  106 
 docs/relnotes/10.3.5.html  |   88 
 docs/relnotes/10.3.6.html  |  124 
 docs/relnotes/10.3.7.html  |   93 
 docs/relnotes/10.4.2.html  |4 
 docs/relnotes/10.4.3.html  |  145 
 docs/relnotes/10.4.4.html  |  100 
 docs/relnotes/10.5.0.html  |   68 
 include/D3D9/d3d9.h|   10 
 include/D3D9/d3d9types.h   |   18 
 include/EGL/eglplatform.h  |   10 
 include/GL/glext.h |  266 
 include/GL/internal/dri_interface.h|1 
 include/c99/stdbool.h  |3 
 include/c99_compat.h   |6 
 include/pci_ids/i965_pci_ids.h |   15 
 install-lib-links.mk   |6 
 m4/ax_check_python_mako_module.m4  |   61 
 m4/ax_prog_flex.m4 |4 
 scons/gallium.py   |   12 
 scons/llvm.py  |   16 
 src/Makefile.am|   21 
 src/SConscript |5 
 src/egl/drivers/dri2/Makefile.am   |3 
 src/egl/drivers/dri2/SConscript|   40 
 src/egl/drivers/dri2/egl_dri2.c|   51 
 src/egl/drivers/dri2/egl_dri2.h|3 
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/drivers/dri2/platform_drm.c|2 
 src/egl/drivers/dri2/platform_wayland.c|   17 
 src/egl/drivers/dri2/platform_x11.c|   27 
 src/egl/drivers/haiku/SConscript   |   34 
 src/egl/drivers/haiku/egl_haiku.cpp|  436 
 src/egl/main/Makefile.am   |5 
 src/egl/main/SConscript|   16 
 src/egl/main/eglapi.c  |   19 
 src/egl/main/egldisplay.c  |7 
 src/egl/main/egldisplay.h  |2 
 src/egl/main/egldriver.c   |6 
 src/egl/main/eglglobals.c  |4 
 src/egl/main/eglglobals.h  |1 
 src/egl/main/eglmisc.c |1 
 src/egl/wayland/Makefile.am|1 
 src/egl/wayland/wayland-egl/Makefile.am|1 
 src/egl/wayland/wayland-egl/wayland-egl-priv.h |2 
 src/gallium/Automake.inc   |2 
 src/gallium/Makefile.am|9 
 src/gallium/SConscript |2 
 src/gallium/auxiliary/Android.mk   |4 
 src/gallium/auxiliary/Makefil

libdrm: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

New branch 'debian-experimental' available with the following commits:
commit dc19569b312468c05c83f79ab2dadfe8bb82cf66
Author: Maarten Lankhorst 
Date:   Mon Feb 16 11:53:13 2015 +0100

suppress dpkg-source errors from building against a source with copies 
instead of symlinks

commit 442664a7f27581adb9bae16b5288a4285cbc0f60
Merge: efa46b3 d3ae9a1
Author: Maarten Lankhorst 
Date:   Wed Jan 21 13:30:39 2015 +0100

Merge correct debian-unstable into debian-experimental

Sorry about the mess.

commit d3ae9a1811ffd947d301ac73e63d76ec9b4df67c
Author: Maarten Lankhorst 
Date:   Wed Jan 21 13:24:34 2015 +0100

release to experimental

commit f326aeba862c98e48bc2d5db6b97e5c6afa4dbf9
Author: Maarten Lankhorst 
Date:   Wed Jan 21 13:11:38 2015 +0100

New upstream release.

Add libdrm-tegra0 on arm.
Update symbols for intel userptr support.
Update symbols for freedreno dma-buf support.

commit 9575b00185e283658a3ad392b088e999658628fb
Merge: 61c5e63 d2e0f55
Author: Maarten Lankhorst 
Date:   Wed Jan 21 12:28:43 2015 +0100

Merge branch 'upstream' into debian-experimental

commit d2e0f552467ca11162fe04dfed55de4590280f23
Author: Maarten Lankhorst 
Date:   Wed Jan 21 11:11:55 2015 +0100

configure.ac: bump version to 2.4.59 for release

commit d5bfbdc62ffc3eee4beabc84e78f47970eb9dbae
Author: Maarten Lankhorst 
Date:   Wed Jan 21 11:46:04 2015 +0100

only enable support for freedreno on arm automatically

Users can still override this by explicitly passing --enable-freedreno
to configure.

Signed-off-by: Maarten Lankhorst 

commit eca91cf163d50090db36d0b2abbffcff813a2adf
Author: Dave Airlie 
Date:   Fri Jan 9 13:34:41 2015 +1000

radeon: align r600/700 fmask to 128 X blocks.

After much searching and empricial testing, and reading of
things I've no justifcation for this fix, other than it really
appears this is what the hw is doing or close enough.

It makes sense that each entry in the FMASK corresponds to
an entry in the CMASKm and the CMASK is organised into 128x128
blocks, but I can't find anything in any of the docs/info from AMD.

But I've spent a lot of time on this, and this seems to be the
simplest fix, in that we don't over allocate things too much,
once this fix in place we can nuke the extra multiplier in mesa.

Reviewed-by: Alex Deucher 
Reviewed-by: Marek Olšák 
Signed-off-by: Dave Airlie 

commit a5003c6f859c90d6e7693ce085c1cb4dd7d95f26
Author: Rob Clark 
Date:   Tue Jan 13 11:00:09 2015 -0500

configure/freedreno: enable freedreno by default

Now that enabling freedreno doesn't automatically enable kgsl, lets
enable it by default.  The drm/msm driver has been upstream for a
while now, and it's ABI is locked.  So I don't think we need to keep
calling it experimental.

Signed-off-by: Rob Clark 

commit 28662b77ee0631af8ac659f1c9cba82f94182e0c
Author: Rob Clark 
Date:   Tue Jan 13 10:53:42 2015 -0500

configure/freedreno: make KGSL support optional

libdrm_freedreno currently supports two backends, 'msm' for the upstream
drm/msm driver, and 'kgsl' which supports (to some extent), the android/
downstream kgsl driver plus a sort of drm shim nonsense to get flink
names.

However, kgsl support is strictly on a best-effort basis.  Different
android devices with different versions of kgsl may have different
abi's.  And the existing kgsl interface (at least the parts of it that
we use) is completely broken for 64bit.  Lets disable it by default lest
anyone actually try to use it.

Signed-off-by: Rob Clark 

commit 13fcc697ee194060f949449bf37491d8abd7119b
Author: Zhenyu Wang 
Date:   Thu Jan 8 15:23:04 2015 +0800

intel: Fix GTT entry setup for aub dump

On recent emulator GTT entry setup for aub dump needs mem type as
GTT_ENTRY instead of NONLOCAL. NONLOCAL would write data in main
memory space which is wrong with new memory layout. GTT_ENTRY write
would setup GTT memory pool and other required internal buffers. With
this I can run aub dump on latest release without crash.

Signed-off-by: Zhenyu Wang 

commit d7c0a08bc576deb07df6c3f91f393ca8edd0c4bf
Author: Laurent Pinchart 
Date:   Tue Dec 9 22:00:58 2014 +0200

modetest: Allocate dumb buffers with the correct bpp

The modetest application uses libkms to allocate dumb buffers, leading
to overallocation due to the hardcoded 32 bpp value. This can even cause
failures in drivers when the resulting pitch is too large for the
hardware to handle and gets rejected by the driver when creating the
frame buffer.

Fix this by computing the required bpp value and allocating dumb buffers
directly without going through libkms.

Signed-off-by: Laurent Pinchart 

commit 566c3ce877a4be72697e15cdfc421ce965f7c37d
Author: Adam Cheney 
Date:   Tue Dec 16 12:22:38 2014 -0500

mesa: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:
commit b9518a41d4103fb19337d51971de0f14e267b954
Author: Emil Velikov 
Date:   Thu Feb 12 14:00:41 2015 +

Increment version to 10.5.0-rc1

Signed-off-by: Emil Velikov 

diff --git a/VERSION b/VERSION
index 093d8ba..49dab28 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.5.0-devel
+10.5.0-rc1

commit 550d7c26e773bdfb71f51c53ad160caca68420e2
Author: Emil Velikov 
Date:   Tue Feb 10 15:11:09 2015 +

auxiliary/vl: bring back the VL code for the dri targets

With commit c642e87d9f4(auxiliary/vl: rework the build of the VL code)
we split out the VL code into a separate static library that was meant
to be used by the VL targets alone - va, vdpau, xvmc.

The commit failed to consider the way we handle vdpau-gl interop and
broke it. Bring back the functionality by keeping the vl <> vl_stub
separation as requrested by Christian.

v2: Update the omx target as well. Update mesa-stable email address.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86837
Cc: "10.5" 
Signed-off-by: Emil Velikov 
Tested-by: Andy Furniss 

diff --git a/configure.ac b/configure.ac
index 155f496..351027b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1572,7 +1572,8 @@ if test -n "$with_gallium_drivers" -a 
"x$with_gallium_drivers" != xswrast; then
 fi
 fi
 
-if test "x$enable_xvmc" = xyes -o \
+if test "x$enable_dri" = xyes -o \
+"x$enable_xvmc" = xyes -o \
 "x$enable_vdpau" = xyes -o \
 "x$enable_omx" = xyes -o \
 "x$enable_va" = xyes; then
diff --git a/src/gallium/auxiliary/Makefile.am 
b/src/gallium/auxiliary/Makefile.am
index 1053ce4..453282a 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -53,9 +53,7 @@ libgalliumvl_stub_la_SOURCES = \
 
 if NEED_GALLIUM_VL
 
-noinst_LTLIBRARIES += libgalliumvl.la
-
-libgalliumvl_la_CFLAGS = \
+COMMON_VL_CFLAGS = \
$(AM_CFLAGS) \
$(VL_CFLAGS) \
$(LIBDRM_CFLAGS) \
@@ -63,14 +61,27 @@ libgalliumvl_la_CFLAGS = \
-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
 
 if HAVE_GALLIUM_STATIC_TARGETS
-libgalliumvl_la_CFLAGS += \
+COMMON_VL_CFLAGS += \
-DGALLIUM_STATIC_TARGETS=1
 
 endif # HAVE_GALLIUM_STATIC_TARGETS
 
+noinst_LTLIBRARIES += libgalliumvl.la
+
+libgalliumvl_la_CFLAGS = \
+   $(COMMON_VL_CFLAGS)
+
 libgalliumvl_la_SOURCES = \
$(VL_SOURCES)
 
+noinst_LTLIBRARIES += libgalliumvlwinsys.la
+
+libgalliumvlwinsys_la_CFLAGS = \
+   $(COMMON_VL_CFLAGS)
+
+libgalliumvlwinsys_la_SOURCES = \
+   $(VL_WINSYS_SOURCES)
+
 endif
 
 EXTRA_DIST = \
diff --git a/src/gallium/auxiliary/Makefile.sources 
b/src/gallium/auxiliary/Makefile.sources
index c45dd18..d330935 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -334,10 +334,13 @@ VL_SOURCES := \
vl/vl_video_buffer.h \
vl/vl_vlc.h \
vl/vl_winsys.h \
-   vl/vl_winsys_dri.c \
vl/vl_zscan.c \
vl/vl_zscan.h
 
+# XXX: Nuke this as our dri targets no longer depend on VL.
+VL_WINSYS_SOURCES := \
+   vl/vl_winsys_dri.c
+
 VL_STUB_SOURCES := \
vl/vl_stubs.c
 
diff --git a/src/gallium/targets/dri/Makefile.am 
b/src/gallium/targets/dri/Makefile.am
index 7f2ce6a..aaeb950 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -44,7 +44,7 @@ gallium_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
$(top_builddir)/src/gallium/state_trackers/dri/libdri.la \
-   $(top_builddir)/src/gallium/auxiliary/libgalliumvl_stub.la \
+   $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
$(top_builddir)/src/gallium/drivers/noop/libnoop.la \
diff --git a/src/gallium/targets/omx/Makefile.am 
b/src/gallium/targets/omx/Makefile.am
index 0ae7c55..f52e669 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -24,6 +24,7 @@ endif # HAVE_LD_VERSION_SCRIPT
 
 libomx_mesa_la_LIBADD = \
$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
+   $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/util/libmesautil.la \
diff --git a/src/gallium/targets/pipe-loader/Makefile.am 
b/src/gallium/targets/pipe-loader/Makefile.am
index 3d73a51..94658f8 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -40,6 +40,7 @@ PIPE_LIBS =
 
 if NEED_GALLIUM_VL
 PIPE_LIBS += \
+   $(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
$(top_builddi

mesa: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 .dir-locals.el |2 
 .gitignore |1 
 Makefile.am|  113 
 VERSION|2 
 bin/.cherry-ignore |2 
 configure.ac   |  257 
 debian/README.source   |2 
 debian/changelog   |   15 
 debian/control |2 
 debian/source/local-options|1 
 debian/watch   |2 
 docs/GL3.txt   |   15 
 docs/index.html|   44 
 docs/install.html  |6 
 docs/relnotes.html |8 
 docs/relnotes/10.3.4.html  |  106 
 docs/relnotes/10.3.5.html  |   88 
 docs/relnotes/10.3.6.html  |  124 
 docs/relnotes/10.3.7.html  |   93 
 docs/relnotes/10.4.2.html  |4 
 docs/relnotes/10.4.3.html  |  145 
 docs/relnotes/10.4.4.html  |  100 
 docs/relnotes/10.5.0.html  |   68 
 include/D3D9/d3d9.h|   10 
 include/D3D9/d3d9types.h   |   18 
 include/EGL/eglplatform.h  |   10 
 include/GL/glext.h |  266 
 include/GL/internal/dri_interface.h|1 
 include/c99/stdbool.h  |3 
 include/c99_compat.h   |6 
 include/pci_ids/i965_pci_ids.h |   15 
 install-lib-links.mk   |6 
 m4/ax_check_python_mako_module.m4  |   61 
 m4/ax_prog_flex.m4 |4 
 scons/gallium.py   |   12 
 scons/llvm.py  |   16 
 src/Makefile.am|   21 
 src/SConscript |5 
 src/egl/drivers/dri2/Makefile.am   |3 
 src/egl/drivers/dri2/SConscript|   40 
 src/egl/drivers/dri2/egl_dri2.c|   51 
 src/egl/drivers/dri2/egl_dri2.h|3 
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/drivers/dri2/platform_drm.c|2 
 src/egl/drivers/dri2/platform_wayland.c|   17 
 src/egl/drivers/dri2/platform_x11.c|   27 
 src/egl/drivers/haiku/SConscript   |   34 
 src/egl/drivers/haiku/egl_haiku.cpp|  436 
 src/egl/main/Makefile.am   |5 
 src/egl/main/SConscript|   16 
 src/egl/main/eglapi.c  |   19 
 src/egl/main/egldisplay.c  |7 
 src/egl/main/egldisplay.h  |2 
 src/egl/main/egldriver.c   |6 
 src/egl/main/eglglobals.c  |4 
 src/egl/main/eglglobals.h  |1 
 src/egl/main/eglmisc.c |1 
 src/egl/wayland/Makefile.am|1 
 src/egl/wayland/wayland-egl/Makefile.am|1 
 src/egl/wayland/wayland-egl/wayland-egl-priv.h |2 
 src/gallium/Automake.inc   |2 
 src/gallium/Makefile.am|9 
 src/gallium/SConscript |2 
 src/gallium/auxiliary/Android.mk   |4 
 src/gallium/auxiliary/Makefile.am  |   55 
 src/gallium/auxiliary/Makefile.sources |  338 
 src/gallium/auxiliary/SConscript   |2 
 src/gallium/auxiliary/cso_cache/cso_context.c  |   20 
 src/gallium/auxiliary/cso_cache/cso_context.h  |4 
 src/gallium/auxiliary/cso_cach

mesa: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 debian/changelog  |   18 +
 debian/control|2 -
 debian/patches/egl-platform-mir.patch |   45 +++---
 3 files changed, 56 insertions(+), 9 deletions(-)

New commits:
commit 443e9a1eda33596f6b6ae314a1e928ea4822aeef
Author: Maarten Lankhorst 
Date:   Wed Feb 11 09:22:34 2015 +0100

Fix ftbfs from no longer including libmirclient-dev.

diff --git a/debian/changelog b/debian/changelog
index 2517127..94916c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.4.2-2ubuntu5) vivid; urgency=medium
+
+  * Fix ftbfs from no longer including libmirclient-dev.
+
+ -- Maarten Lankhorst   Wed, 11 Feb 2015 
09:21:54 +0100
+
 mesa (10.4.2-2ubuntu4) vivid; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f56c7fc..6e1765b 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -104,12 +104,11 @@
free(dri2_dpy->driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
-@@ -64,6 +64,11 @@
+@@ -64,6 +64,10 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
  
 +#ifdef HAVE_MIR_PLATFORM
-+#include 
 +#include 
 +#endif
 +

commit ea665e5bd3aeb2ffe2d0c461688792d51065de24
Author: Maarten Lankhorst 
Date:   Tue Feb 10 16:28:54 2015 +0100

bump mir patch some more

diff --git a/debian/changelog b/debian/changelog
index 727b862..2517127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mesa (10.4.2-2ubuntu4) vivid; urgency=medium
+
+  * debian/control:
+- Change build-dep for mir to mir-client-platform-mesa-dev.
+  * debian/patches/egl-platform-mir.patch:
+- Fix potential double free (LP: #1414999).
+- Fix gbm_device leak (LP: #1419704).
+- Fix dri_buffers[front/back] leak (LP: #1419710).
+- Use mir-client-platform-mesa-dev to get Mir build flags.
+
+ -- Alexandros Frantzis   Mon, 09 Feb 2015 
12:35:56 +0200
+
 mesa (10.4.2-2ubuntu3) vivid; urgency=medium
 
   * egl-platform-mir.patch: Fix memory leak. (LP:#1418486)
diff --git a/debian/control b/debian/control
index 4c60ceb..46bad7a 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
  llvm-3.6-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f6ec7b6..f56c7fc 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -6,7 +6,7 @@
;;
 -
 +mir)
-+PKG_CHECK_MODULES([MIR], [mirclient])
++PKG_CHECK_MODULES([MIR], [mir-client-platform-mesa-dev])
 +;;
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
@@ -78,6 +78,30 @@
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
if (disp->Options.TestOnly)
+@@ -699,6 +705,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+   }
+   break;
+ #endif
++#ifdef HAVE_MIR_PLATFORM
++   case _EGL_PLATFORM_MIR:
++  if (dri2_dpy->own_device) {
++ gbm_device_destroy(&dri2_dpy->gbm_dri->base.base);
++  }
++  break;
++#endif
+ #ifdef HAVE_WAYLAND_PLATFORM
+case _EGL_PLATFORM_WAYLAND:
+   wl_drm_destroy(dri2_dpy->wl_drm);
+@@ -715,7 +728,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+ * the ones from the gbm device. As such the gbm itself is responsible
+ * for the cleanup.
+ */
+-   if (disp->Platform != _EGL_PLATFORM_DRM) {
++   if (disp->Platform != _EGL_PLATFORM_DRM &&
++   disp->Platform != _EGL_PLATFORM_MIR) {
+   for (i = 0; dri2_dpy->driver_configs[i]; i++)
+  free((__DRIconfig *) dri2_dpy->driver_configs[i]);
+   free(dri2_dpy->driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
 @@ -64,6 +64,11 @@
@@ -148,7 +172,7 @@
  #endif /* EGL_DRI2_INCLUDED */
 --- /dev/null
 +++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,613 @@
+@@ -0,0 +1,619 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -174,6 +198,7 @@
 + *
 + * Authors:
 + *Christopher James Halse Rogers 
++ *Alexandros Frantzis 
 + */
 +
 +#include 
@@ -567,10 +592,15 @@
 +   (*dri2_dpy->core->destroyDrawable)(dri2_surf->dri_drawable);
 +
 +   for (i = 0; i < __DRI_BUFFER_COUNT; ++i) {
-+  if (dri2_surf->dri_buffers[i] && !((i == __DRI_BUFFER_FRONT_LEFT) ||
-+ (i == __DRI_BUFFER_BACK_LEFT))) {
-+ dri2_dpy->dri2->releaseBuffer(dri2_dpy-

xorg-server: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:
commit 3b0d1ba2266d2780bfc111bab74885b90458eca4
Author: Keith Packard 
Date:   Tue Feb 10 14:43:34 2015 -0800

Release 1.17.1

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 2b46552..4e47bbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.17.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2015-02-02"
-RELEASE_NAME="Côte de veau"
+AC_INIT([xorg-server], 1.17.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2015-02-10"
+RELEASE_NAME="lambic"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit f160e722672dbb2b5215870b47bcc51461d96ff1
Author: Olivier Fourdan 
Date:   Fri Jan 16 08:44:45 2015 +0100

xkb: Check strings length against request size

Ensure that the given strings length in an XkbSetGeometry request remain
within the limits of the size of the request.

Signed-off-by: Olivier Fourdan 
Reviewed-by: Peter Hutterer 
Signed-off-by: Peter Hutterer 
(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index b9a3ac4..f3988f9 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -4957,25 +4957,29 @@ ProcXkbGetGeometry(ClientPtr client)
 
 /******/
 
-static char *
-_GetCountedString(char **wire_inout, Bool swap)
+static Status
+_GetCountedString(char **wire_inout, ClientPtr client, char **str)
 {
-char *wire, *str;
+char *wire, *next;
 CARD16 len;
 
 wire = *wire_inout;
 len = *(CARD16 *) wire;
-if (swap) {
+if (client->swapped) {
 swaps(&len);
 }
-str = malloc(len + 1);
-if (str) {
-memcpy(str, &wire[2], len);
-str[len] = '\0';
-}
-wire += XkbPaddedSize(len + 2);
-*wire_inout = wire;
-return str;
+next = wire + XkbPaddedSize(len + 2);
+/* Check we're still within the size of the request */
+if (client->req_len <
+bytes_to_int32(next - (char *) client->requestBuffer))
+return BadValue;
+*str = malloc(len + 1);
+if (!*str)
+return BadAlloc;
+memcpy(*str, &wire[2], len);
+*(*str + len) = '\0';
+*wire_inout = next;
+return Success;
 }
 
 static Status
@@ -4987,6 +4991,7 @@ _CheckSetDoodad(char **wire_inout,
 xkbAnyDoodadWireDesc any;
 xkbTextDoodadWireDesc text;
 XkbDoodadPtr doodad;
+Status status;
 
 dWire = (xkbDoodadWireDesc *) (*wire_inout);
 any = dWire->any;
@@ -5036,8 +5041,14 @@ _CheckSetDoodad(char **wire_inout,
 doodad->text.width = text.width;
 doodad->text.height = text.height;
 doodad->text.color_ndx = dWire->text.colorNdx;
-doodad->text.text = _GetCountedString(&wire, client->swapped);
-doodad->text.font = _GetCountedString(&wire, client->swapped);
+status = _GetCountedString(&wire, client, &doodad->text.text);
+if (status != Success)
+return status;
+status = _GetCountedString(&wire, client, &doodad->text.font);
+if (status != Success) {
+free (doodad->text.text);
+return status;
+}
 break;
 case XkbIndicatorDoodad:
 if (dWire->indicator.onColorNdx >= geom->num_colors) {
@@ -5072,7 +5083,9 @@ _CheckSetDoodad(char **wire_inout,
 }
 doodad->logo.color_ndx = dWire->logo.colorNdx;
 doodad->logo.shape_ndx = dWire->logo.shapeNdx;
-doodad->logo.logo_name = _GetCountedString(&wire, client->swapped);
+status = _GetCountedString(&wire, client, &doodad->logo.logo_name);
+if (status != Success)
+return status;
 break;
 default:
 client->errorValue = _XkbErrCode2(0x4F, dWire->any.type);
@@ -5304,18 +5317,20 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * 
req, ClientPtr client)
 char *wire;
 
 wire = (char *) &req[1];
-geom->label_font = _GetCountedString(&wire, client->swapped);
+status = _GetCountedString(&wire, client, &geom->label_font);
+if (status != Success)
+return status;
 
 for (i = 0; i < req->nProperties; i++) {
 char *name, *val;
 
-name = _GetCountedString(&wire, client->swapped);
-if (!name)
-return BadAlloc;
-val = _GetCountedString(&wire, client->swapped);
-if (!val) {
+status = _GetCountedString(&wire, client, &name);
+if (status != Success)
+return status;
+status = _GetCountedString(&wire, client, &val);
+if (status != Success) {
 free(name);
-return BadAlloc;
+return status;
 }
 if (XkbAddGeomProperty(geom, name, val) == NULL) {
 fre

xorg-server: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 ChangeLog| 2126 +++
 Xi/exevents.c|5 
 config/udev.c|   30 
 configure.ac |8 
 debian/changelog |   16 
 devbook.am   |   10 
 dix/dispatch.c   |2 
 dix/getevents.c  |6 
 doc/Makefile.am  |2 
 doc/filter-xmlto.sh  |   21 
 glamor/glamor.c  |   41 
 glamor/glamor.h  |2 
 glamor/glamor_egl.c  |   12 
 glamor/glamor_fbo.c  |4 
 glamor/glamor_priv.h |2 
 glamor/glamor_xv.c   |   26 
 glx/glxcmds.c|   71 
 hw/kdrive/ephyr/ephyr.c  |   10 
 hw/kdrive/ephyr/ephyr.h  |1 
 hw/kdrive/ephyr/hostx.c  |   11 
 hw/kdrive/ephyr/hostx.h  |2 
 hw/xfree86/Makefile.am   |2 
 hw/xfree86/Xorg.sh.in|4 
 hw/xfree86/common/xf86AutoConfig.c   |1 
 hw/xfree86/dri2/dri2.c   |9 
 hw/xfree86/drivers/modesetting/Makefile.am   |3 
 hw/xfree86/drivers/modesetting/dri2.c|2 
 hw/xfree86/drivers/modesetting/driver.c  |   94 -
 hw/xfree86/drivers/modesetting/driver.h  |   14 
 hw/xfree86/drivers/modesetting/drmmode_display.c |  491 +++--
 hw/xfree86/drivers/modesetting/drmmode_display.h |   32 
 hw/xfree86/drivers/modesetting/dumb_bo.c |  134 +
 hw/xfree86/drivers/modesetting/dumb_bo.h |   45 
 hw/xfree86/drivers/modesetting/present.c |  228 ++
 hw/xfree86/drivers/modesetting/vblank.c  |   37 
 hw/xfree86/man/Xorg.wrap.man |2 
 hw/xfree86/os-support/solaris/sun_init.c |   33 
 hw/xfree86/os-support/xf86_OSlib.h   |5 
 hw/xfree86/xorg-wrapper.c|   10 
 hw/xnest/Keyboard.c  |9 
 hw/xwayland/Makefile.am  |1 
 hw/xwayland/xwayland-glamor.c|3 
 hw/xwayland/xwayland-input.c |7 
 hw/xwayland/xwayland.c   |2 
 include/regionstr.h  |2 
 mi/mipointer.c   |4 
 os/WaitFor.c |   41 
 os/osinit.c  |6 
 os/xsha1.c   |   25 
 present/present.c|   15 
 randr/rroutput.c |7 
 randr/rrscreen.c |   22 
 randr/rrxinerama.c   |   12 
 xkb/xkb.c|  100 -
 54 files changed, 2260 insertions(+), 1550 deletions(-)

New commits:
commit 844389319f72ed964479b09c353b2f8f73a9dde8
Author: Maarten Lankhorst 
Date:   Wed Feb 11 11:17:51 2015 +0100

bump version to 1.17.1

diff --git a/ChangeLog b/ChangeLog
index e613918..3983221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,739 +1,1240 @@
-commit 27017380f96d7cec79ce8d618ea0ec389fa716a9
-Merge: 91651e7 9b037af
-Author: Maarten Lankhorst 
-Date:   Thu Dec 11 15:47:29 2014 +0100
+commit 3b0d1ba2266d2780bfc111bab74885b90458eca4
+Author: Keith Packard 
+Date:   Tue Feb 10 14:43:34 2015 -0800
 
-Merge branch 'upstream-unstable' into upstream-experimental
+Release 1.17.1
+
+Signed-off-by: Keith Packard 
 
-commit 91651e7c15892aa846fc406fbb13b37f094dd3f0
-Author: Michel Dänzer 
-Date:   Wed Dec 10 16:21:44 2014 +0900
+commit f160e722672dbb2b5215870b47bcc51461d96ff1
+Author: Olivier Fourdan 
+Date:   Fri Jan 16 08:44:45 2015 +0100
 
-glamor: Reinstate glamor_(egl_)destroy_textured_pixmap
+xkb: Check strings length against request size
 
-They are part of the ABI.
+Ensure that the given strings length in an XkbSetGeometry request remain
+within the limits of the size of the request.
 
-Signed-off-by: Michel Dänzer 
-Reviewed-by: Keith Packard 
-Signed-off-by: Keith Packard 
+Signed-off-by: Olivier Fourdan 
+Reviewed-by: Peter Hutterer 
+Signed-off-by: Peter Hutterer 
+(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43)
 
-commit c1455f76c6b1aa4ecaacb2221a687244285aa44b
-Author: Neil Roberts 
-Date:   Mon Dec 1 16:06:17 2014 -0500
+commit 29be310c303914090298ddda93a5bd5d00a94945
+Author: Olivier Fourdan 
+Date:   Fri Jan 16 20:08:59 2015 +0100
 
-glx: Add implementation of __GLXContext->loseCurrent for direct ctxts
+xkb: Don't

xorg-server: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 ChangeLog| 2126 +++
 Xi/exevents.c|5 
 config/udev.c|   30 
 configure.ac |8 
 debian/changelog |   18 
 devbook.am   |   10 
 dix/dispatch.c   |2 
 dix/getevents.c  |6 
 doc/Makefile.am  |2 
 doc/filter-xmlto.sh  |   21 
 glamor/glamor.c  |   41 
 glamor/glamor.h  |2 
 glamor/glamor_egl.c  |   12 
 glamor/glamor_fbo.c  |4 
 glamor/glamor_priv.h |2 
 glamor/glamor_xv.c   |   26 
 glx/glxcmds.c|   71 
 hw/kdrive/ephyr/ephyr.c  |   10 
 hw/kdrive/ephyr/ephyr.h  |1 
 hw/kdrive/ephyr/hostx.c  |   11 
 hw/kdrive/ephyr/hostx.h  |2 
 hw/xfree86/Makefile.am   |2 
 hw/xfree86/Xorg.sh.in|4 
 hw/xfree86/common/xf86AutoConfig.c   |1 
 hw/xfree86/dri2/dri2.c   |9 
 hw/xfree86/drivers/modesetting/Makefile.am   |3 
 hw/xfree86/drivers/modesetting/dri2.c|2 
 hw/xfree86/drivers/modesetting/driver.c  |   94 -
 hw/xfree86/drivers/modesetting/driver.h  |   14 
 hw/xfree86/drivers/modesetting/drmmode_display.c |  491 +++--
 hw/xfree86/drivers/modesetting/drmmode_display.h |   32 
 hw/xfree86/drivers/modesetting/dumb_bo.c |  134 +
 hw/xfree86/drivers/modesetting/dumb_bo.h |   45 
 hw/xfree86/drivers/modesetting/present.c |  228 ++
 hw/xfree86/drivers/modesetting/vblank.c  |   37 
 hw/xfree86/man/Xorg.wrap.man |2 
 hw/xfree86/os-support/solaris/sun_init.c |   33 
 hw/xfree86/os-support/xf86_OSlib.h   |5 
 hw/xfree86/xorg-wrapper.c|   10 
 hw/xnest/Keyboard.c  |9 
 hw/xwayland/Makefile.am  |1 
 hw/xwayland/xwayland-glamor.c|3 
 hw/xwayland/xwayland-input.c |7 
 hw/xwayland/xwayland.c   |2 
 include/regionstr.h  |2 
 mi/mipointer.c   |4 
 os/WaitFor.c |   41 
 os/osinit.c  |6 
 os/xsha1.c   |   25 
 present/present.c|   15 
 randr/rroutput.c |7 
 randr/rrscreen.c |   22 
 randr/rrxinerama.c   |   12 
 xkb/xkb.c|  100 -
 54 files changed, 2261 insertions(+), 1551 deletions(-)

New commits:
commit 844389319f72ed964479b09c353b2f8f73a9dde8
Author: Maarten Lankhorst 
Date:   Wed Feb 11 11:17:51 2015 +0100

bump version to 1.17.1

diff --git a/ChangeLog b/ChangeLog
index e613918..3983221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,739 +1,1240 @@
-commit 27017380f96d7cec79ce8d618ea0ec389fa716a9
-Merge: 91651e7 9b037af
-Author: Maarten Lankhorst 
-Date:   Thu Dec 11 15:47:29 2014 +0100
+commit 3b0d1ba2266d2780bfc111bab74885b90458eca4
+Author: Keith Packard 
+Date:   Tue Feb 10 14:43:34 2015 -0800
 
-Merge branch 'upstream-unstable' into upstream-experimental
+Release 1.17.1
+
+Signed-off-by: Keith Packard 
 
-commit 91651e7c15892aa846fc406fbb13b37f094dd3f0
-Author: Michel Dänzer 
-Date:   Wed Dec 10 16:21:44 2014 +0900
+commit f160e722672dbb2b5215870b47bcc51461d96ff1
+Author: Olivier Fourdan 
+Date:   Fri Jan 16 08:44:45 2015 +0100
 
-glamor: Reinstate glamor_(egl_)destroy_textured_pixmap
+xkb: Check strings length against request size
 
-They are part of the ABI.
+Ensure that the given strings length in an XkbSetGeometry request remain
+within the limits of the size of the request.
 
-Signed-off-by: Michel Dänzer 
-Reviewed-by: Keith Packard 
-Signed-off-by: Keith Packard 
+Signed-off-by: Olivier Fourdan 
+Reviewed-by: Peter Hutterer 
+Signed-off-by: Peter Hutterer 
+(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43)
 
-commit c1455f76c6b1aa4ecaacb2221a687244285aa44b
-Author: Neil Roberts 
-Date:   Mon Dec 1 16:06:17 2014 -0500
+commit 29be310c303914090298ddda93a5bd5d00a94945
+Author: Olivier Fourdan 
+Date:   Fri Jan 16 20:08:59 2015 +0100
 
-glx: Add implementation of __GLXContext->loseCurrent for direct ctxts
+xkb: Don't

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog  |6 ++
 debian/patches/egl-platform-mir.patch |3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 443e9a1eda33596f6b6ae314a1e928ea4822aeef
Author: Maarten Lankhorst 
Date:   Wed Feb 11 09:22:34 2015 +0100

Fix ftbfs from no longer including libmirclient-dev.

diff --git a/debian/changelog b/debian/changelog
index 2517127..94916c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.4.2-2ubuntu5) vivid; urgency=medium
+
+  * Fix ftbfs from no longer including libmirclient-dev.
+
+ -- Maarten Lankhorst   Wed, 11 Feb 2015 
09:21:54 +0100
+
 mesa (10.4.2-2ubuntu4) vivid; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f56c7fc..6e1765b 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -104,12 +104,11 @@
free(dri2_dpy->driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
-@@ -64,6 +64,11 @@
+@@ -64,6 +64,10 @@
  
  #endif /* HAVE_ANDROID_PLATFORM */
  
 +#ifdef HAVE_MIR_PLATFORM
-+#include 
 +#include 
 +#endif
 +


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ylssp-0007rr...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog  |   12 +
 debian/control|2 -
 debian/patches/egl-platform-mir.patch |   42 +-
 3 files changed, 49 insertions(+), 7 deletions(-)

New commits:
commit ea665e5bd3aeb2ffe2d0c461688792d51065de24
Author: Maarten Lankhorst 
Date:   Tue Feb 10 16:28:54 2015 +0100

bump mir patch some more

diff --git a/debian/changelog b/debian/changelog
index 727b862..2517127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mesa (10.4.2-2ubuntu4) vivid; urgency=medium
+
+  * debian/control:
+- Change build-dep for mir to mir-client-platform-mesa-dev.
+  * debian/patches/egl-platform-mir.patch:
+- Fix potential double free (LP: #1414999).
+- Fix gbm_device leak (LP: #1419704).
+- Fix dri_buffers[front/back] leak (LP: #1419710).
+- Use mir-client-platform-mesa-dev to get Mir build flags.
+
+ -- Alexandros Frantzis   Mon, 09 Feb 2015 
12:35:56 +0200
+
 mesa (10.4.2-2ubuntu3) vivid; urgency=medium
 
   * egl-platform-mir.patch: Fix memory leak. (LP:#1418486)
diff --git a/debian/control b/debian/control
index 4c60ceb..46bad7a 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
  llvm-3.6-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
- libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
+ mir-client-platform-mesa-dev [!arm64 !powerpc !ppc64 !ppc64el],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index f6ec7b6..f56c7fc 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -6,7 +6,7 @@
;;
 -
 +mir)
-+PKG_CHECK_MODULES([MIR], [mirclient])
++PKG_CHECK_MODULES([MIR], [mir-client-platform-mesa-dev])
 +;;
*)
AC_MSG_ERROR([EGL platform '$plat' does not exist])
@@ -78,6 +78,30 @@
  #ifdef HAVE_ANDROID_PLATFORM
 case _EGL_PLATFORM_ANDROID:
if (disp->Options.TestOnly)
+@@ -699,6 +705,13 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+   }
+   break;
+ #endif
++#ifdef HAVE_MIR_PLATFORM
++   case _EGL_PLATFORM_MIR:
++  if (dri2_dpy->own_device) {
++ gbm_device_destroy(&dri2_dpy->gbm_dri->base.base);
++  }
++  break;
++#endif
+ #ifdef HAVE_WAYLAND_PLATFORM
+case _EGL_PLATFORM_WAYLAND:
+   wl_drm_destroy(dri2_dpy->wl_drm);
+@@ -715,7 +728,8 @@ dri2_terminate(_EGLDriver *drv, _EGLDisp
+ * the ones from the gbm device. As such the gbm itself is responsible
+ * for the cleanup.
+ */
+-   if (disp->Platform != _EGL_PLATFORM_DRM) {
++   if (disp->Platform != _EGL_PLATFORM_DRM &&
++   disp->Platform != _EGL_PLATFORM_MIR) {
+   for (i = 0; dri2_dpy->driver_configs[i]; i++)
+  free((__DRIconfig *) dri2_dpy->driver_configs[i]);
+   free(dri2_dpy->driver_configs);
 --- a/src/egl/drivers/dri2/egl_dri2.h
 +++ b/src/egl/drivers/dri2/egl_dri2.h
 @@ -64,6 +64,11 @@
@@ -148,7 +172,7 @@
  #endif /* EGL_DRI2_INCLUDED */
 --- /dev/null
 +++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,613 @@
+@@ -0,0 +1,619 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -174,6 +198,7 @@
 + *
 + * Authors:
 + *Christopher James Halse Rogers 
++ *Alexandros Frantzis 
 + */
 +
 +#include 
@@ -567,10 +592,15 @@
 +   (*dri2_dpy->core->destroyDrawable)(dri2_surf->dri_drawable);
 +
 +   for (i = 0; i < __DRI_BUFFER_COUNT; ++i) {
-+  if (dri2_surf->dri_buffers[i] && !((i == __DRI_BUFFER_FRONT_LEFT) ||
-+ (i == __DRI_BUFFER_BACK_LEFT))) {
-+ dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen,
-+   dri2_surf->dri_buffers[i]);
++  if (dri2_surf->dri_buffers[i]) {
++ if ((i == __DRI_BUFFER_FRONT_LEFT) ||
++ (i == __DRI_BUFFER_BACK_LEFT)) {
++free(dri2_surf->dri_buffers[i]);
++ }
++ else {
++dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen,
++  dri2_surf->dri_buffers[i]);
++ }
 +  }
 +   }
 +


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ylcqm-0001ew...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 .dir-locals.el |2 
 debian/changelog   |   38 
 debian/control |   40 
 debian/mesa-opencl-icd.install.in  |3 
 debian/patches/egl-platform-mir.patch  |  250 +++--
 debian/rules   |   10 
 docs/GL3.txt   |   11 
 docs/index.html|8 
 docs/relnotes.html |1 
 docs/relnotes/10.4.4.html  |  100 ++
 docs/relnotes/10.5.0.html  |1 
 include/D3D9/d3d9types.h   |5 
 include/GL/glext.h |   57 -
 scons/llvm.py  |   16 
 src/egl/drivers/dri2/platform_x11.c|   24 
 src/gallium/auxiliary/Makefile.sources |1 
 src/gallium/auxiliary/draw/draw_llvm.c |2 
 src/gallium/auxiliary/draw/draw_llvm.h |2 
 src/gallium/auxiliary/gallivm/lp_bld_init.c|2 
 src/gallium/auxiliary/hud/font.c   |   24 
 src/gallium/auxiliary/hud/hud_context.c|1 
 src/gallium/auxiliary/postprocess/pp_mlaa.c|3 
 src/gallium/auxiliary/target-helpers/inline_debug_helper.h |4 
 src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h   |4 
 src/gallium/auxiliary/tgsi/tgsi_parse.c|   12 
 src/gallium/auxiliary/tgsi/tgsi_parse.h|2 
 src/gallium/auxiliary/tgsi/tgsi_ureg.c |   28 
 src/gallium/auxiliary/tgsi/tgsi_ureg.h |   25 
 src/gallium/auxiliary/util/u_cache.c   |2 
 src/gallium/auxiliary/util/u_math.h|   14 
 src/gallium/auxiliary/util/u_pstipple.c|   25 
 src/gallium/auxiliary/util/u_pstipple.h|3 
 src/gallium/auxiliary/util/u_simple_list.h |  199 
 src/gallium/auxiliary/util/u_simple_shaders.c  |   12 
 src/gallium/auxiliary/util/u_slab.c|2 
 src/gallium/auxiliary/util/u_tests.c   |  301 +-
 src/gallium/auxiliary/util/u_tests.h   |4 
 src/gallium/docs/source/screen.rst |5 
 src/gallium/docs/source/tgsi.rst   |   18 
 src/gallium/drivers/freedreno/.dir-locals.el   |2 
 src/gallium/drivers/freedreno/freedreno_screen.c   |2 
 src/gallium/drivers/i915/i915_screen.c |2 
 src/gallium/drivers/ilo/ilo_screen.c   |3 
 src/gallium/drivers/llvmpipe/lp_context.c  |2 
 src/gallium/drivers/llvmpipe/lp_scene.c|2 
 src/gallium/drivers/llvmpipe/lp_screen.c   |7 
 src/gallium/drivers/llvmpipe/lp_state_fs.c |2 
 src/gallium/drivers/llvmpipe/lp_state_setup.c  |2 
 src/gallium/drivers/llvmpipe/lp_texture.c  |2 
 src/gallium/drivers/nouveau/nv30/nv30_screen.c |2 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c |2 
 src/gallium/drivers/r300/r300_context.c|2 
 src/gallium/drivers/r300/r300_flush.c  |2 
 src/gallium/drivers/r300/r300_query.c  |2 
 src/gallium/drivers/r300/r300_reg.h|   22 
 src/gallium/drivers/r300/r300_screen.c |8 
 src/gallium/drivers/r300/r300_state.c  |1 
 src/gallium/drivers/r300/r300_state_inlines.h  |1 
 src/gallium/drivers/r600/.dir-locals.el|2 
 src/gallium/drivers/r600/r600_asm.c|6 
 src/gallium/drivers/r600/r600_pipe.c   |3 
 src/gallium/drivers/r600/r600_shader.c |   63 +
 src/gallium/drivers/r600/r700_asm.c|1 
 src/gallium/drivers/r600/sb/sb_expr.cpp|2 
 src/gallium/drivers/radeon/.dir-locals.el  |2 
 src/gallium/drivers/radeon/r600_pipe_common.c  |   11 
 src/gallium/drivers/radeon/r600_pipe_common.h  |1 
 src/gallium/drivers/radeon/r600_streamout.c|4 
 src/gallium/drivers/radeonsi/.dir-locals.el|2 
 src/gallium/drivers/radeonsi/si_compute.c  |  117 +-
 src/gallium/drivers/radeonsi/si_descriptors.c  |  111 +-
 src/gallium/drivers/radeonsi/si_hw_context.c   |1 
 src/gallium

xorg: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 debian/changelog|6 
 debian/local/xserver-wrapper.c  |   38 ++---
 debian/xserver-xorg.postinst.in |   60 
 debian/xserver-xorg.preinst.in  |   32 -
 debian/xserver-xorg.prerm.in|   33 --
 5 files changed, 27 insertions(+), 142 deletions(-)

New commits:
commit 92e0aab7088619401247107911e2ecb4804a47d7
Author: Maarten Lankhorst 
Date:   Mon Feb 9 10:48:56 2015 +0100

Cope with /etc/X11/X not existing.

Default to /usr/bin/Xorg if no /etc/X11/X symlink is found.
Remove creation of /etc/X11/X symlink, but keep existing.
Do not chdir to /etc/X11 if the symlink has an absolute path.

diff --git a/debian/changelog b/debian/changelog
index b09fa77..8692a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
 xorg (1:7.7+8) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * debian/x11-common.init: Add Short-Description field (Closes: #510087)
   * debian/x11-common.init: Call restorecon after creating the socket
 directories to ensure the SELinux context if properly set (Closes: #677831)
   * debian/control: Bump Standards-Version to 3.9.5 (no further changes)
   * debian/control: Use canonical Vcs-* URL
 
+  [ Maarten Lankhorst ]
+  * Default to /usr/bin/Xorg if no /etc/X11/X symlink is found.
+  * Remove creation of /etc/X11/X symlink, but keep existing.
+  * Do not chdir to /etc/X11 if the symlink has an absolute path.
+
  -- Laurent Bigonville   Wed, 24 Sep 2014 12:57:17 +0200
 
 xorg (1:7.7+7) unstable; urgency=medium
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index d4a6ab8..08e02e3 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -251,32 +251,36 @@ main(int argc, char **argv)
X_WRAPPER_CONFIG_FILE); */
   }
 
-  if (lstat(X_SERVER_SYMLINK, &statbuf)) {
+  i = lstat(X_SERVER_SYMLINK, &statbuf);
+  if (i < 0 && errno != ENOENT) {
 (void) fprintf(stderr, "X: cannot stat %s (%s), aborting.\n",
X_SERVER_SYMLINK, strerror(errno));
 exit(1);
   }
 
-  i = readlink(X_SERVER_SYMLINK, xserver, 1024);
-
   if (i < 0) {
-(void) fprintf(stderr, "X: cannot read %s symbolic link (%s), aborting.\n",
-   X_SERVER_SYMLINK, strerror(errno));
-exit(1);
-  }
+strcpy(xserver, "/usr/bin/Xorg");
+  } else {
+i = readlink(X_SERVER_SYMLINK, xserver, 1024);
 
-  xserver[i] = '\0'; /* readlink() does not null-terminate the string */
+if (i < 0) {
+  (void) fprintf(stderr, "X: cannot read %s symbolic link (%s), 
aborting.\n",
+ X_SERVER_SYMLINK, strerror(errno));
+  exit(1);
+}
+xserver[i] = '\0'; /* readlink() does not null-terminate the string */
 
-  if ((strcmp(xserver, "/usr/bin/X11/X") == 0) ||
-  (strcmp(xserver, "/usr/X11R6/bin/X") == 0) ||
-  (strcmp(xserver, "/usr/bin/X") == 0)) {
-(void) fprintf(stderr, "X: %s points back to X wrapper executable, "
-   "aborting.\n", X_SERVER_SYMLINK);
-exit(1);
+if ((strcmp(xserver, "/usr/bin/X11/X") == 0) ||
+(strcmp(xserver, "/usr/X11R6/bin/X") == 0) ||
+(strcmp(xserver, "/usr/bin/X") == 0)) {
+  (void) fprintf(stderr, "X: %s points back to X wrapper executable, "
+ "aborting.\n", X_SERVER_SYMLINK);
+  exit(1);
+}
   }
 
-  if (access(X_SERVER_SYMLINK, X_OK)) { /* access() uses real uid */
-(void) fprintf(stderr, "%s is not executable\n", X_SERVER_SYMLINK);
+  if (access(xserver, X_OK)) { /* access() uses real uid */
+(void) fprintf(stderr, "%s is not executable\n", val);
 exit(1);
   }
 
@@ -333,7 +337,7 @@ main(int argc, char **argv)
  * change to the directory where the X server symlink is so that a relative
  * symlink will work and execute the X server
  */
-if (chdir(X_SERVER_SYMLINK_DIR)) {
+if (xserver[0] != '/' && chdir(X_SERVER_SYMLINK_DIR)) {
   (void) fprintf(stderr, "X: cannot chdir() to %s (%s), aborting.\n",
  X_SERVER_SYMLINK_DIR, strerror(errno));
   exit(1);
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
deleted file mode 100644
index 3cc91c0..000
--- a/debian/xserver-xorg.postinst.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# Debian xserver-xorg package post-installation script
-# Copyright 1998-2004 Branden Robinson.
-# Copyright 2004-2005 Canonical Ltd.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or .
-# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-set -e
-
-THIS_PACKAGE=xserver-xorg
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ -e /etc/default/xorg ]; then
-  . /etc/default/xorg
-fi
-
-debug_echo () {
-  # Syntax: debug_echo message ...
-  if [ -n "$DEBUG_XORG_DEBCONF" ] || [ "$DEBCONF_DEBUG"

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 804523bd206f36913a2c4802904d210718c2b389
Author: Maarten Lankhorst 
Date:   Thu Jan 29 13:27:20 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index d5e6530..1b0497b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.4.2-2ubuntu2) UNRELEASED; urgency=medium
+mesa (10.4.2-2ubuntu2) vivid; urgency=medium
 
   * Flip the switch to llvm 3.6 with patches backported from upstream.
   * Add upstream workaround for hangs on gen4.
 
- -- Maarten Lankhorst   Wed, 28 Jan 2015 
14:08:49 +0100
+ -- Maarten Lankhorst   Thu, 29 Jan 2015 
13:27:10 +0100
 
 mesa (10.4.2-2ubuntu1) vivid; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ygpwa-0007ol...@moszumanska.debian.org

mesa: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 .gitignore   |1 
 configure.ac |  202 +
 docs/index.html  |6 
 docs/relnotes.html   |1 
 docs/relnotes/10.4.3.html|  145 +
 include/D3D9/d3d9.h  |   10 
 include/D3D9/d3d9types.h |   13 
 scons/gallium.py |3 
 src/Makefile.am  |   17 
 src/egl/drivers/dri2/platform_wayland.c  |2 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h|4 
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h|4 
 src/gallium/drivers/freedreno/a4xx/a4xx.xml.h|   31 
 src/gallium/drivers/freedreno/a4xx/fd4_gmem.c|   61 
 src/gallium/drivers/freedreno/adreno_common.xml.h|4 
 src/gallium/drivers/freedreno/adreno_pm4.xml.h   |   16 
 src/gallium/drivers/r600/evergreen_state.c   |5 
 src/gallium/drivers/r600/r600_hw_context.c   |2 
 src/gallium/drivers/r600/r600_shader.c   |   31 
 src/gallium/drivers/r600/r600_shader.h   |4 
 src/gallium/drivers/r600/r600_state.c|5 
 src/gallium/drivers/r600/r600_state_common.c |   12 
 src/gallium/drivers/radeon/r600_pipe_common.c|4 
 src/gallium/drivers/radeon/r600_pipe_common.h|8 
 src/gallium/drivers/radeon/radeon_elf_util.c |   65 
 src/gallium/drivers/radeon/radeon_elf_util.h |   15 
 src/gallium/drivers/radeon/radeon_llvm_emit.c|4 
 src/gallium/drivers/radeonsi/si_compute.c|   46 
 src/gallium/drivers/radeonsi/si_pipe.h   |1 
 src/gallium/drivers/radeonsi/si_shader.c |4 
 src/gallium/drivers/radeonsi/si_state_shaders.c  |   20 
 src/gallium/drivers/vc4/vc4_cl_dump.c|  151 +
 src/gallium/drivers/vc4/vc4_context.c|7 
 src/gallium/drivers/vc4/vc4_opt_cse.c|2 
 src/gallium/drivers/vc4/vc4_opt_small_immediates.c   |3 
 src/gallium/drivers/vc4/vc4_program.c|   29 
 src/gallium/drivers/vc4/vc4_qir.c|   22 
 src/gallium/drivers/vc4/vc4_qir.h|1 
 src/gallium/drivers/vc4/vc4_qpu.c|   83 
 src/gallium/drivers/vc4/vc4_register_allocate.c  |   22 
 src/gallium/state_trackers/clover/llvm/invocation.cpp|   51 
 src/gallium/state_trackers/nine/adapter9.c   |7 
 src/gallium/state_trackers/nine/basetexture9.c   |   66 
 src/gallium/state_trackers/nine/cubetexture9.c   |   16 
 src/gallium/state_trackers/nine/device9.c|  121 
 src/gallium/state_trackers/nine/device9.h|6 
 src/gallium/state_trackers/nine/nine_ff.c|   37 
 src/gallium/state_trackers/nine/nine_pipe.h  |5 
 src/gallium/state_trackers/nine/nine_shader.c|  667 +++-
 src/gallium/state_trackers/nine/nine_state.c |   94 
 src/gallium/state_trackers/nine/nine_state.h |3 
 src/gallium/state_trackers/nine/pixelshader9.c   |   10 
 src/gallium/state_trackers/nine/pixelshader9.h   |2 
 src/gallium/state_trackers/nine/query9.c |1 
 src/gallium/state_trackers/nine/stateblock9.c|4 
 src/gallium/state_trackers/nine/surface9.c   |   29 
 src/gallium/state_trackers/nine/swapchain9.c |2 
 src/gallium/state_trackers/nine/texture9.c   |9 
 src/gallium/state_trackers/nine/volumetexture9.c |   14 
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c|2 
 src/gbm/backends/dri/gbm_dri.c   |7 
 src/gbm/main/gbm.c   |1 
 src/glsl/Android.mk  |1 
 src/glsl/Makefile.am |   79 
 src/glsl/Makefile.sources|  302 +-
 src/glsl/ast_to_hir.cpp  |   16 
 src/glsl/blob.c  |  323 ++
 src/glsl/blob.h  |  289 ++
 src/glsl/glcpp/glcpp-parse.y |4 
 src/glsl/glsl_parser_extras.cpp  |2 
 src/glsl/glsl_parser_extras.h|4 
 src/glsl/glsl_types.cpp  |  111 
 src/glsl/glsl_types.h|9 
 src/glsl/ir_function_can_inline.cpp  |9 
 src/glsl/list.h  |   25 
 src/glsl/nir/.gitignore

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |7 
 debian/control   |2 
 debian/patches/i915-fix-gen4-hangs.patch |   59 ++
 debian/patches/llvm-3.6-fixes.patch  |  616 +++
 debian/patches/series|2 
 debian/rules |2 
 6 files changed, 686 insertions(+), 2 deletions(-)

New commits:
commit 710c202ec80cae4bb9fb49ab506739586aba0ca7
Author: Maarten Lankhorst 
Date:   Wed Jan 28 16:50:29 2015 +0100

Add upstream workaround for hangs on gen4.

diff --git a/debian/changelog b/debian/changelog
index da98ae7..d5e6530 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (10.4.2-2ubuntu2) UNRELEASED; urgency=medium
 
   * Flip the switch to llvm 3.6 with patches backported from upstream.
+  * Add upstream workaround for hangs on gen4.
 
  -- Maarten Lankhorst   Wed, 28 Jan 2015 
14:08:49 +0100
 
diff --git a/debian/patches/i915-fix-gen4-hangs.patch 
b/debian/patches/i915-fix-gen4-hangs.patch
new file mode 100644
index 000..34e8a5c
--- /dev/null
+++ b/debian/patches/i915-fix-gen4-hangs.patch
@@ -0,0 +1,59 @@
+commit 882f702441c6601589bdef805a9157cb113b91dd
+Author: Kenneth Graunke 
+Date:   Sat Jan 17 23:21:15 2015 -0800
+
+i965: Work around mysterious Gen4 GPU hangs with minimal state changes.
+
+Gen4 hardware appears to GPU hang frequently when using Chromium, and
+also when running 'glmark2 -b ideas'.  Most of the error states contain
+3DPRIMITIVE commands in quick succession, with very few state packets
+between them - usually VERTEX_BUFFERS/ELEMENTS and CONSTANT_BUFFER.
+
+I trimmed an apitrace of the glmark2 hang down to two draw calls with a
+glUniformMatrix4fv call between the two.  Either draw by itself works
+fine, but together, they hang the GPU.  Removing the glUniform call
+makes the hangs disappear.  In the hardware state, this translates to
+removing the CONSTANT_BUFFER packet between the two 3DPRIMITIVE packets.
+
+Flushing before emitting CONSTANT_BUFFER packets also appears to make
+the hangs disappear.  I observed a slowdown in glxgears by doing it all
+the time, so I've chosen to only do it when BRW_NEW_BATCH and
+BRW_NEW_PSP are unset (i.e. we haven't done a CS_URB_STATE change or
+already flushed the whole pipeline).
+
+I'd much rather understand the problem, but at this point, I don't see
+how we'd ever be able to track it down further.  We have no real tools,
+and the hardware people moved on years ago.  I've analyzed 20+ error
+states and read every scrap of documentation I could find.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80568
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85367
+Signed-off-by: Kenneth Graunke 
+Acked-by: Matt Turner 
+Cc: "10.4 10.3" 
+(cherry picked from commit c4fd0c9052dd391d6f2e9bb8e6da209dfc7ef35b)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c 
b/src/mesa/drivers/dri/i965/brw_curbe.c
+index 1a828ed..718d87c 100644
+--- a/src/mesa/drivers/dri/i965/brw_curbe.c
 b/src/mesa/drivers/dri/i965/brw_curbe.c
+@@ -280,6 +280,19 @@ brw_upload_constant_buffer(struct brw_context *brw)
+ */
+ 
+ emit:
++   /* Work around mysterious 965 hangs that appear to happen if you do
++* two 3DPRIMITIVEs with only a CONSTANT_BUFFER inbetween.  If we
++* haven't already flushed for some other reason, explicitly do so.
++*
++* We've found no documented reason why this should be necessary.
++*/
++   if (brw->gen == 4 && !brw->is_g4x &&
++   (brw->state.dirty.brw & (BRW_NEW_BATCH | BRW_NEW_PSP)) == 0) {
++  BEGIN_BATCH(1);
++  OUT_BATCH(MI_FLUSH);
++  ADVANCE_BATCH();
++   }
++
+/* BRW_NEW_URB_FENCE: From the gen4 PRM, volume 1, section 3.9.8
+ * (CONSTANT_BUFFER (CURBE Load)):
+ *
diff --git a/debian/patches/series b/debian/patches/series
index 494cdfb..0d106a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@
 # Ubuntu patches.
 egl-platform-mir.patch
 i915-dont-default-to-2.1.patch
-llvm-3.6-fixes.patch
+i915-fix-gen4-hangs.patch
+llvm-3.6-fixes.patch
\ No newline at end of file

commit f09055c78217196cfa377038a99fb7516add34ce
Author: Maarten Lankhorst 
Date:   Wed Jan 28 16:48:55 2015 +0100

Flip the switch to llvm 3.6 with patches backported from upstream.

diff --git a/debian/changelog b/debian/changelog
index 7e1102c..da98ae7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.4.2-2ubuntu2) UNRELEASED; urgency=medium
+
+  * Flip the switch to llvm 3.6 with patches backported from upstream.
+
+ -- Maarten Lankhorst   Wed, 28 Jan 2015 
14:08:49 +0100
+
 mesa (10.4.2-2ubuntu1) vivid; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 144382e..4c60ceb 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends:
  libudev-dev [

libdrm: Changes to 'refs/tags/libdrm-2.4.59-1'

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ydwou-0003ti...@moszumanska.debian.org

libdrm: Changes to 'refs/tags/libdrm-2.4.59-1'

[Maarten Bernardus Lankhorst]

Tag 'libdrm-2.4.59-1' created by Maarten Lankhorst 
 at 2015-01-21 12:28 +

libdrm Debian release 2.4.59-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUv5teAAoJEP5VjHKmcBPDAYsP/iw7CUkIqSmyGi1WobMs4U4h
hMcRsj3lhDYJYjDEH2N1J/bJJqshh7JnimK/+mdGlHDjvePJ5kKgRfCuNhzWOBsS
MtYTcw1jCMyaEp5WzV/j2pv2KEhOrNgsu+aksLPSic6rX6PwEELVgwJlx6Dfv+f0
bDzo2obJEVCt5TYwZjD0SyuGVv326KPKuQVhB4dNJgZ4wZJauh/6DT5PqRTIljMF
RHiQJbYnMWdPK1s69zMAAS/ybAOmEVW+lenk8aZstVQiiq8iVzjA6AoBP2qrBC4U
w750RC+OE9/ZrGWdJepOGYcb0OuF2hauOp4ihy4UT3l/S4y/HiIsvULTRIxUlZrH
UGehZ2B2sdcd0dTlgW0Rk+5yktorjbdvWauURf/E/b25miqDY3ZJl5FeaKEcJlxB
pRlLeFPjEmpoDiFuxSwHAXf4WhU4Y6uEkZKR+NsIwMHh+ZgLuvBsal4KAixtHu9/
1qT13T6ulW4e226ZCou+RKIoctFYW51ZkwP6mXayYcS1N0Mo4bbp7UeikadoXQ3v
IoWMBZmhAue0JbI/IkFYbKIHxPwlXs27mm4Z79tLKhtiLR02NlvS+Qa0Nw6qAoYl
XbbTIF9/16woeQnlQindR0pRxRWjaP5ODnKlGEcOYUD97e5P8sLPSt0tFdJ+jpHJ
ukxioZN0jb3d9GcTs2Q4
=wbpa
-END PGP SIGNATURE-

Changes since libdrm-2.4.56-1:
Adam Cheney (1):
  Add new DRM_MODE_CONNECTOR and _ENCODER defines

Alex Deucher (2):
  radeon: add new CIK pci ids
  radeon: add new SI pci ids

Benjamin Gaignard (1):
  modetest: Add support of STI driver

Chris Wilson (1):
  intel: Avoid overcounting fences when emitting self-referential relocs

Damien Lespiau (4):
  intel: Don't leak the test page in an has_userptr() error path
  intel/skl: Add SKL PCI ids
  intel/skl: Add gen9 to the buffer manager init
  intel/skl: add gen9 to the CS decoding init

Dave Airlie (1):
  radeon: align r600/700 fmask to 128 X blocks.

Emil Velikov (27):
  all: include config.h only when available and use its defines
  libkms: remove explicit define _FILE_OFFSET_BITS 64
  libdrm, freedreno, intel, nouveau, radeon: add Makefile.sources
  libdrm,intel: Add Android build
  libdrm,intel: rework android header handling
  radeon: add Android build support
  nouveau: add Android build support
  freedreno: add Android build support
  android: add CleanSpec.mk
  freedreno: fd_bo_from_handle() remove duplicate declaration
  automake: remove obsolete makefiles
  Remove i810_drm.h and i830_drm.h from the distribution tarball
  automake: fix 'make commit-headers'
  configure: unconditionally check for atomic ops/primitives
  libkms: build the intel backend only when needed
  libkms: move sources lists to makefile.sources
  libkms: add Android build
  modetest: move sources lists to makefiles.sources
  modetest: add Android build
  automake: pick up all files for distribution.
  Add private mmap/munmap wrappers
  drm: use drm_mmap/drm_munmap wrappers
  libkms: use drm_mmap/drm_munmap wrappers
  nouveau: use drm_mmap/drm_munmap wrappers
  radeon: use drm_mmap/drm_munmap wrappers
  freedreno: use drm_mmap/drm_munmap wrappers
  intel: use drm_mmap/drm_munmap wrappers

François Tigeot (1):
  drm: Implement drmCheckModesettingSupported() for DragonFly

Jasper St. Pierre (1):
  modetest: Use threads for cursors instead of SIGALRM

Laurent Pinchart (1):
  modetest: Allocate dumb buffers with the correct bpp

Lionel Landwerlin (4):
  atomic: add atomic_add_unless()
  intel: make bufmgr_gem shareable from different API
  intel: make bo_unreference() thread safe
  intel: make drm_intel_gem_bo_get_reloc_count() thread safe

Maarten Lankhorst (11):
  nouveau: Only export public functions.
  radeon: Use symbol visibility.
  intel: Use symbol visibility.
  omap: Use symbol visibility.
  freedreno: Use symbol visibility.
  exynos: Use symbol visibility.
  only enable support for freedreno on arm automatically
  configure.ac: bump version to 2.4.59 for release
  Merge branch 'upstream' into debian-experimental
  New upstream release.
  release to experimental

Maks Naumov (1):
  radeon: Fix surf->bankh init by default value when surf->tile_split == 0

Michel Dänzer (1):
  radeon: Always multiply pitch_bytes by nsamples, not by slice_pt

Paulo Zanoni (1):
  tests: add proptest

Rafal Sapala (1):
  intel: Adding locks for drm objects synchronization.

Rob Clark (11):
  freedreno: add dmabuf import/export helpers
  configure.ac: bump version to 2.4.57 for release
  fix compile error on 32bit systems
  more compile fix
  configure.ac: bump version to 2.4.58 for release
  freedreno: do handle lookup on handle and dmabuf import
  modetest: universal plane support
  modetest: alpha buffers
  update signed/object prop types
  configure/freedreno: make KGSL support optional
  configure/freedreno: enable freedreno by default

Thierry Reding (7):
  configure: Support symbol visibility when available
  libdrm: Add NVIDIA Tegra support
  tegra: Add simple test for drm_tegra_open()
  tegra: Add GET/SET_TILING IOCTLs
  tegra: Add SET/GET_FLAGS IOCTLs
  tegra: Implement drm_te

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

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 65123fa358090683a6de49b27f9e8db05f051e17
Author: Maarten Lankhorst 
Date:   Tue Jan 20 13:14:42 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 809df10..f8d3210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) UNRELEASED; urgency=medium
+xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) vivid; urgency=medium
 
   * Merge from unreleased debian.
 
- -- Maarten Lankhorst   Tue, 20 Jan 2015 
11:21:26 +0100
+ -- Maarten Lankhorst   Tue, 20 Jan 2015 
13:14:27 +0100
 
 xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ydxjn-iw...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 ChangeLog   |  381 
 configure.ac|2 
 debian/changelog|   13 +
 debian/control  |2 
 saa/saa.c   |2 
 saa/saa_unaccel.c   |   56 ---
 src/vmware.c|5 
 src/vmware_bootstrap.c  |7 
 src/vmwarevideo.c   |9 -
 vmwgfx/vmwgfx_crtc.c|9 +
 vmwgfx/vmwgfx_driver.c  |2 
 vmwgfx/vmwgfx_overlay.c |1 
 vmwgfx/vmwgfx_saa.c |3 
 13 files changed, 460 insertions(+), 32 deletions(-)

New commits:
commit 2a72feff87289063e3e23519e438d9bec8bdf495
Author: Maarten Lankhorst 
Date:   Tue Jan 20 12:49:14 2015 +0100

Merge from unreleased debian.

diff --git a/debian/changelog b/debian/changelog
index c6d2ea6..809df10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from unreleased debian.
+
+ -- Maarten Lankhorst   Tue, 20 Jan 2015 
11:21:26 +0100
+
 xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.

commit 6e7d85c60f8182af995a4aa554fdbafddd698f90
Author: Maarten Lankhorst 
Date:   Tue Jan 20 12:48:07 2015 +0100

New upstream release.

Bump Standards-Version to 3.9.6 (no changes needed).

diff --git a/ChangeLog b/ChangeLog
index f19a6ea..8bfe3ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,384 @@
+commit 891ee48e4c1baa2643eda048b4207f8263a37dca
+Author: Thomas Hellstrom 
+Date:   Mon Jan 19 11:23:50 2015 +0100
+
+vmware: Bump version number for release
+
+Signed-off-by: Thomas Hellstrom 
+
+commit 79289b0ffc553ded902eea7b8b9803b098f340e3
+Author: Adam Jackson 
+Date:   Thu Dec 4 10:35:04 2014 -0500
+
+saa: Adapt to GC client clip changes in xserver 1.17
+
+1.17 always stores the client clip as a region, so there's no longer a
+clientClipType member to look at.  Change the code to just inspect
+whether the clientClip is non-null, since that works both before and
+after 1.17.
+
+Signed-off-by: Adam Jackson 
+Reviewed-by: Thomas Hellstrom 
+
+commit 4664412d7a5266d2b392957406b34abc5db95e48
+Author: Stefan Dirsch 
+Date:   Tue Oct 7 11:29:32 2014 +0200
+
+xf86xv.h cannot be included without first including xorg-server.h.
+
+Without this the build fails on systems with the latest glibc,
+throwing this error:
+
+In file included from /usr/include/string.h:634:0,
+ from /usr/include/xorg/os.h:53,
+ from /usr/include/xorg/misc.h:115,
+ from /usr/include/xorg/screenint.h:50,
+ from /usr/include/xorg/scrnintstr.h:50,
+ from /usr/include/xorg/xvdix.h:55,
+ from /usr/include/xorg/xf86xv.h:32,
+ from vmwgfx_overlay.c:38:
+/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before 
'__extension__'
+strndup(const char *str, size_t n);
+
+This is caused by HAVE_STRNDUP not being set (it is set from 
xorg-server.h),
+causing os.h to redefine it.
+
+Signed-off-by: Stefan Dirsch 
+Reviewed-by: Daniel Stone 
+Acked-by: Thomas Hellstrom 
+
+commit 8e1c4e5bd521ec2d4f1a21da432f110c606b3fde
+Author: Thomas Hellstrom 
+Date:   Mon Sep 22 12:09:13 2014 +0200
+
+vmware/saa: Fix saa_check_poly_fill_rect_noreadback v2
+
+We were not clipping the dirty region correctly, Fix this.
+Also actually do what the comment in the function says: If there are more 
than
+an ad-hoc number of rectangles to read back, then revert to the default
+saa_check_poly_fill_rect function that reads back the whole damage region.
+
+v2: Fix commit log message.
+
+Signed-off-by: Thomas Hellstrom 
+Reviewed-by: Brian Paul 
+Reviewed-by: Sinclair Yeh 
+Reviewed-by: Jakob Bornecrantz 
+
+commit c23fd33d8ce8491891255d93c04e053bf333bd4e
+Author: Thomas Hellstrom 
+Date:   Mon Sep 22 11:43:02 2014 +0200
+
+vmware/saa: Fix saa_check_copy_window dirty region v3
+
+The saa_check_copy_window could dirty regions that were never touched, 
since
+we were using the X server provided damage region rather than the more
+detailed region actually copied. This would have been OK if we had first 
done
+a read-back of the region to be dirtied, but since we want to avoid that,
+instead compute the detailed destination region and use that for dirtying.
+
+This fixes rendering glitches seen with motif applications.
+
+v2: Fix whitespace error.
+v3: Move dirty region computation.
+
+Signed-off-by: Thomas Hellstrom 
+Reviewed-by: Brian Paul 
+Reviewed-by: Sinclair Yeh 
+Reviewed-by: Jakob Bornecrantz 
+
+commit f86434ac69bd288c7fba65d178c22a91a0f4f6c2
+Author: Thomas Hellstrom 
+Date:   Mon Sep 15 15:13:53 2014 +0200
+
+Revert "vmware/saa: Disable the noreadback polyfillrect optimization"
+

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

[Maarten Bernardus Lankhorst]

 debian/changelog |   14 +++
 debian/rules |7 +++--
 saa/saa_unaccel.c|   12 -
 src/vmware.c |3 --
 src/vmware_bootstrap.c   |   59 ---
 src/vmwarevideo.c|7 -
 vmwgfx/vmwgfx_crtc.c |   13 +-
 vmwgfx/vmwgfx_driver.c   |   35 +++
 vmwgfx/vmwgfx_driver.h   |2 +
 vmwgfx/vmwgfx_overlay.c  |   28 ++
 vmwgfx/vmwgfx_saa.c  |3 +-
 vmwgfx/vmwgfx_xmir.c |6 
 vmwgfx/vmwgfx_xwayland.c |2 -
 13 files changed, 162 insertions(+), 29 deletions(-)

New commits:
commit 3249f38d2f91207266d9e5e6113106bbf9db2eab
Author: Maarten Lankhorst 
Date:   Wed Sep 10 16:33:11 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 8c088e2..6f1cc69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-vmware (1:13.0.2-3ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-vmware (1:13.0.2-3ubuntu1) utopic; urgency=medium
 
   * Merge from released debian-unstable.
   * Cherry pick some more fixes from master.
 
- -- Maarten Lankhorst   Wed, 06 Aug 2014 
15:50:06 +0200
+ -- Maarten Lankhorst   Wed, 10 Sep 2014 
16:32:01 +0200
 
 xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
 

commit 378d7adf092513ef8fcd3851bc4f512e51ea2437
Author: Maarten Lankhorst 
Date:   Wed Aug 6 15:50:51 2014 +0200

Add changelog entries.

diff --git a/debian/changelog b/debian/changelog
index 431efbf..8c088e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-vmware (1:13.0.2-3ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from released debian-unstable.
+  * Cherry pick some more fixes from master.
+
+ -- Maarten Lankhorst   Wed, 06 Aug 2014 
15:50:06 +0200
+
 xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
 
   * rules: avoid mixing implicit and normal rules; make 4 doesn't like that

commit 0a596fd0c92fdcf73071869a59029263a2596018
Author: Thomas Hellstrom 
Date:   Wed Jul 2 14:21:45 2014 +0200

vmware/vmwgfx: Fix an error path segfault

Part of freedesktop.org bugzilla bug #80645
If taking a scanout reference on a pixmap fails, the
struct vmwgfx_screen_entry::pixmap pointer must be set to NULL, otherwise
the driver will incorrectly attempt to remove the scanout reference in the
error path, causing a segfault.

This problem is seen in the above-mentioned bug, but it is not the root
cause of the problem. With this patch applied, the server will terminate
cleanly instead of segfaulting.

Signed-off-by: Thomas Hellstrom 
Reviewed-by: Jakob Bornecrantz 

diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
index 5fce5f7..4f9cdda 100644
--- a/vmwgfx/vmwgfx_crtc.c
+++ b/vmwgfx/vmwgfx_crtc.c
@@ -193,6 +193,7 @@ crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtcp->entry.pixmap = pixmap;
crtcp->scanout_id = vmwgfx_scanout_ref(&crtcp->entry);
if (crtcp->scanout_id == -1) {
+   crtcp->entry.pixmap = NULL;
LogMessage(X_ERROR, "Failed to convert pixmap to scanout.\n");
return FALSE;
}

commit e2d4e0cb5870f51e8a27cedc74565efb124b75e9
Author: Julien Cristau 
Date:   Mon Jun 2 22:29:16 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 5cf4dd4..62a7de6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-vmware (1:13.0.2-3) UNRELEASED; urgency=medium
+xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
 
-  * rules: avoid mixing implicit and normal rules; make 4 doesn't like that.
+  * rules: avoid mixing implicit and normal rules; make 4 doesn't like that
+(closes: #750265)
 
- -- Julien Cristau   Tue, 29 Apr 2014 18:34:12 +0200
+ -- Julien Cristau   Mon, 02 Jun 2014 22:28:59 +0200
 
 xserver-xorg-video-vmware (1:13.0.2-2) unstable; urgency=medium
 

commit 4e378a730d2d2deffc915af2a3d013d2a994a1b0
Author: Jakob Bornecrantz 
Date:   Wed May 21 11:52:29 2014 +0200

vmware/legacy: Apply same fix to auto colorkey fill

Signed-off-by: Jakob Bornecrantz 
Reviewed-by: Thomas Hellström 

diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
index 745c71f..a82110d 100644
--- a/src/vmwarevideo.c
+++ b/src/vmwarevideo.c
@@ -687,7 +687,12 @@ vmwareVideoInitStream(ScrnInfoPtr pScrn, VMWAREVideoPtr 
pVid,
int nBoxes = REGION_NUM_RECTS(&pVid->clipBoxes);
 
 #if HAVE_FILLKEYHELPERDRAWABLE
-   xf86XVFillKeyHelperDrawable(draw, pVid->colorKey, clipBoxes);
+   if (draw->type == DRAWABLE_WINDOW) {
+   xf86XVFillKeyHelperDrawable(draw, pVid->colorKey, clipBoxes);
+   DamageDamageRegion(draw, clipBoxes);
+   } else {
+   xf86XVFillKeyHelper(pScrn->pScreen, pVid->colorKey, clipBoxes);
+}
 #else
 xf86XVFillKeyHelper(pScrn->pScreen, pVid->colorKey, clipBoxes);
 #

xserver-xorg-video-vmware: Changes to 'upstream-unstable'

[Maarten Bernardus Lankhorst]

 configure.ac   |4 +-
 saa/saa.c  |2 -
 saa/saa_unaccel.c  |   44 +++
 src/vmware.c   |8 ++---
 src/vmware_bootstrap.c |   62 ++---
 src/vmwarevideo.c  |   16 +--
 vmwgfx/vmwgfx_crtc.c   |   22 +++
 vmwgfx/vmwgfx_driver.c |   37 ++
 vmwgfx/vmwgfx_driver.h |2 +
 vmwgfx/vmwgfx_overlay.c|   29 +
 vmwgfx/vmwgfx_saa.c|   17 +++-
 vmwgfx/vmwgfx_saa_priv.h   |   11 +++
 vmwgfx/vmwgfx_xa_surface.c |   61 +++-
 vmwgfx/vmwgfx_xmir.c   |6 
 vmwgfx/vmwgfx_xwayland.c   |2 -
 15 files changed, 267 insertions(+), 56 deletions(-)

New commits:
commit 891ee48e4c1baa2643eda048b4207f8263a37dca
Author: Thomas Hellstrom 
Date:   Mon Jan 19 11:23:50 2015 +0100

vmware: Bump version number for release

Signed-off-by: Thomas Hellstrom 

diff --git a/configure.ac b/configure.ac
index be40ed7..97f2f85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-vmware],
-[13.0.2],
+[13.1.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-vmware])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 79289b0ffc553ded902eea7b8b9803b098f340e3
Author: Adam Jackson 
Date:   Thu Dec 4 10:35:04 2014 -0500

saa: Adapt to GC client clip changes in xserver 1.17

1.17 always stores the client clip as a region, so there's no longer a
clientClipType member to look at.  Change the code to just inspect
whether the clientClip is non-null, since that works both before and
after 1.17.

Signed-off-by: Adam Jackson 
Reviewed-by: Thomas Hellstrom 

diff --git a/saa/saa.c b/saa/saa.c
index f2d68e9..be9520e 100644
--- a/saa/saa.c
+++ b/saa/saa.c
@@ -349,7 +349,7 @@ saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC)
 {
 return ((pGC->alu != GXcopy && pGC->alu != GXclear && pGC->alu != GXset &&
 pGC->alu != GXcopyInverted) || pGC->fillStyle == FillStippled ||
-   pGC->clientClipType != CT_NONE ||
+   pGC->clientClip != NULL ||
!SAA_PM_IS_SOLID(pDrawable, pGC->planemask));
 }
 

commit 4664412d7a5266d2b392957406b34abc5db95e48
Author: Stefan Dirsch 
Date:   Tue Oct 7 11:29:32 2014 +0200

xf86xv.h cannot be included without first including xorg-server.h.

Without this the build fails on systems with the latest glibc,
throwing this error:

In file included from /usr/include/string.h:634:0,
 from /usr/include/xorg/os.h:53,
 from /usr/include/xorg/misc.h:115,
 from /usr/include/xorg/screenint.h:50,
 from /usr/include/xorg/scrnintstr.h:50,
 from /usr/include/xorg/xvdix.h:55,
 from /usr/include/xorg/xf86xv.h:32,
 from vmwgfx_overlay.c:38:
/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before 
'__extension__'
strndup(const char *str, size_t n);

This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
causing os.h to redefine it.

Signed-off-by: Stefan Dirsch 
Reviewed-by: Daniel Stone 
Acked-by: Thomas Hellstrom 

diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
index ef1d541..2b05b0e 100644
--- a/vmwgfx/vmwgfx_overlay.c
+++ b/vmwgfx/vmwgfx_overlay.c
@@ -35,6 +35,7 @@
  */
 
 
+#include "xorg-server.h"
 #include "xf86xv.h"
 #include "fourcc.h"
 #define debug_printf(...)

commit 8e1c4e5bd521ec2d4f1a21da432f110c606b3fde
Author: Thomas Hellstrom 
Date:   Mon Sep 22 12:09:13 2014 +0200

vmware/saa: Fix saa_check_poly_fill_rect_noreadback v2

We were not clipping the dirty region correctly, Fix this.
Also actually do what the comment in the function says: If there are more 
than
an ad-hoc number of rectangles to read back, then revert to the default
saa_check_poly_fill_rect function that reads back the whole damage region.

v2: Fix commit log message.

Signed-off-by: Thomas Hellstrom 
Reviewed-by: Brian Paul 
Reviewed-by: Sinclair Yeh 
Reviewed-by: Jakob Bornecrantz 

diff --git a/saa/saa_unaccel.c b/saa/saa_unaccel.c
index 08a64b0..cff0587 100644
--- a/saa/saa_unaccel.c
+++ b/saa/saa_unaccel.c
@@ -421,17 +421,20 @@ saa_check_poly_fill_rect_noreadback(DrawablePtr 
pDrawable, GCPtr pGC,
 if (!region)
goto out_no_region;
 
-REGION_TRANSLATE(pGC->pScreen, region, xoff + pDrawable->x,
-yoff + pDrawable->y);
-
+REGION_TRANSLATE(pGC->pScreen, region, pDrawable->x, pDrawable->y);
+REGION_INTERSECT(pGC->pScreen, region, fbGetCompositeClip(pGC), region);
+REGION_TRANSLATE(pGC->pScreen, region, xoff, yoff);
 
 access = SAA_ACCESS_

xserver-xorg-video-vmware: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 ChangeLog  |  381 +
 configure.ac   |2 
 debian/changelog   |7 
 debian/control |2 
 saa/saa.c  |2 
 saa/saa_unaccel.c  |   44 +++--
 src/vmware.c   |8 
 src/vmware_bootstrap.c |   62 ++-
 src/vmwarevideo.c  |   16 +
 vmwgfx/vmwgfx_crtc.c   |   22 ++
 vmwgfx/vmwgfx_driver.c |   37 +++-
 vmwgfx/vmwgfx_driver.h |2 
 vmwgfx/vmwgfx_overlay.c|   29 ++-
 vmwgfx/vmwgfx_saa.c|   17 +-
 vmwgfx/vmwgfx_saa_priv.h   |   11 +
 vmwgfx/vmwgfx_xa_surface.c |   61 ++-
 vmwgfx/vmwgfx_xmir.c   |6 
 vmwgfx/vmwgfx_xwayland.c   |2 
 18 files changed, 655 insertions(+), 56 deletions(-)

New commits:
commit 6e7d85c60f8182af995a4aa554fdbafddd698f90
Author: Maarten Lankhorst 
Date:   Tue Jan 20 12:48:07 2015 +0100

New upstream release.

Bump Standards-Version to 3.9.6 (no changes needed).

diff --git a/ChangeLog b/ChangeLog
index f19a6ea..8bfe3ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,384 @@
+commit 891ee48e4c1baa2643eda048b4207f8263a37dca
+Author: Thomas Hellstrom 
+Date:   Mon Jan 19 11:23:50 2015 +0100
+
+vmware: Bump version number for release
+
+Signed-off-by: Thomas Hellstrom 
+
+commit 79289b0ffc553ded902eea7b8b9803b098f340e3
+Author: Adam Jackson 
+Date:   Thu Dec 4 10:35:04 2014 -0500
+
+saa: Adapt to GC client clip changes in xserver 1.17
+
+1.17 always stores the client clip as a region, so there's no longer a
+clientClipType member to look at.  Change the code to just inspect
+whether the clientClip is non-null, since that works both before and
+after 1.17.
+
+Signed-off-by: Adam Jackson 
+Reviewed-by: Thomas Hellstrom 
+
+commit 4664412d7a5266d2b392957406b34abc5db95e48
+Author: Stefan Dirsch 
+Date:   Tue Oct 7 11:29:32 2014 +0200
+
+xf86xv.h cannot be included without first including xorg-server.h.
+
+Without this the build fails on systems with the latest glibc,
+throwing this error:
+
+In file included from /usr/include/string.h:634:0,
+ from /usr/include/xorg/os.h:53,
+ from /usr/include/xorg/misc.h:115,
+ from /usr/include/xorg/screenint.h:50,
+ from /usr/include/xorg/scrnintstr.h:50,
+ from /usr/include/xorg/xvdix.h:55,
+ from /usr/include/xorg/xf86xv.h:32,
+ from vmwgfx_overlay.c:38:
+/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before 
'__extension__'
+strndup(const char *str, size_t n);
+
+This is caused by HAVE_STRNDUP not being set (it is set from 
xorg-server.h),
+causing os.h to redefine it.
+
+Signed-off-by: Stefan Dirsch 
+Reviewed-by: Daniel Stone 
+Acked-by: Thomas Hellstrom 
+
+commit 8e1c4e5bd521ec2d4f1a21da432f110c606b3fde
+Author: Thomas Hellstrom 
+Date:   Mon Sep 22 12:09:13 2014 +0200
+
+vmware/saa: Fix saa_check_poly_fill_rect_noreadback v2
+
+We were not clipping the dirty region correctly, Fix this.
+Also actually do what the comment in the function says: If there are more 
than
+an ad-hoc number of rectangles to read back, then revert to the default
+saa_check_poly_fill_rect function that reads back the whole damage region.
+
+v2: Fix commit log message.
+
+Signed-off-by: Thomas Hellstrom 
+Reviewed-by: Brian Paul 
+Reviewed-by: Sinclair Yeh 
+Reviewed-by: Jakob Bornecrantz 
+
+commit c23fd33d8ce8491891255d93c04e053bf333bd4e
+Author: Thomas Hellstrom 
+Date:   Mon Sep 22 11:43:02 2014 +0200
+
+vmware/saa: Fix saa_check_copy_window dirty region v3
+
+The saa_check_copy_window could dirty regions that were never touched, 
since
+we were using the X server provided damage region rather than the more
+detailed region actually copied. This would have been OK if we had first 
done
+a read-back of the region to be dirtied, but since we want to avoid that,
+instead compute the detailed destination region and use that for dirtying.
+
+This fixes rendering glitches seen with motif applications.
+
+v2: Fix whitespace error.
+v3: Move dirty region computation.
+
+Signed-off-by: Thomas Hellstrom 
+Reviewed-by: Brian Paul 
+Reviewed-by: Sinclair Yeh 
+Reviewed-by: Jakob Bornecrantz 
+
+commit f86434ac69bd288c7fba65d178c22a91a0f4f6c2
+Author: Thomas Hellstrom 
+Date:   Mon Sep 15 15:13:53 2014 +0200
+
+Revert "vmware/saa: Disable the noreadback polyfillrect optimization"
+
+This reverts commit 88c487cb19aaf2882d582f7f887a52935ef8d92e.
+
+While the commit made the rendering artefacts less frequent, they didn't
+disappear completely and are likely caused by something else, so revert 
this
+commit.
+
+Signed-off-by: Thomas Hellstrom 
+Acked-by: Sinclair Yeh 
+
+

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f1650f1e55adb8a48009d8f6159d33771d6d6379
Author: Maarten Lankhorst 
Date:   Tue Jan 20 10:30:50 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index fff7fe2..7e1102c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.4.2-2ubuntu1) UNRELEASED; urgency=medium
+mesa (10.4.2-2ubuntu1) vivid; urgency=medium
 
   [ Timo Aaltonen ]
   * Merge from Debian experimental.
@@ -6,7 +6,7 @@ mesa (10.4.2-2ubuntu1) UNRELEASED; urgency=medium
   [ Maarten Lankhorst ]
   * Disable opencl after it was re-enabled accidentally in the merge.
 
- -- Timo Aaltonen   Tue, 13 Jan 2015 15:33:54 +0200
+ -- Maarten Lankhorst   Tue, 20 Jan 2015 
10:30:20 +0100
 
 mesa (10.4.2-2) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ydv9e-0008uj...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog  |   12 ++--
 debian/control|   38 ++
 debian/mesa-opencl-icd.install.in |3 ---
 debian/rules  |7 ---
 4 files changed, 12 insertions(+), 48 deletions(-)

New commits:
commit ecb805fea6f6241258cb1ef1bc3cb5d96c81346d
Author: Maarten Lankhorst 
Date:   Mon Jan 19 14:30:36 2015 +0100

Disable opencl after it was re-enabled accidentally in the merge.

diff --git a/debian/changelog b/debian/changelog
index c70fc64..ff832e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 mesa (10.4.2-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * Merge from Debian experimental.
 
+  [ Maarten Lankhorst ]
+  * Disable opencl after it was re-enabled accidentally in the merge.
+
  -- Timo Aaltonen   Tue, 13 Jan 2015 15:33:54 +0200
 
 mesa (10.4.2-2) UNRELEASED; urgency=medium

commit 6cc22fa459ff47661c7a3f6ee5397b1fd93c0699
Author: Maarten Lankhorst 
Date:   Mon Jan 19 14:29:30 2015 +0100

disable opencl again for now

diff --git a/debian/control b/debian/control
index bb4fc90..adfab80 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,6 @@ Build-Depends:
  llvm-3.5-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.5-dev (>= 1:3.5-1) [amd64 i386 armhf],
- libclc-dev [amd64 i386 armhf],
  libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
@@ -644,38 +642,4 @@ Description: Debugging symbols for the Mesa VDPAU video 
acceleration drivers
  .
  This package contains the debugging symbols for the VDPAU drivers.
 
-Package: mesa-opencl-icd
-Section: libs
-Architecture: amd64 i386 armhf
-Depends:
- libclc-r600,
- ocl-icd-libopencl1 | libopencl1,
- ${shlibs:Depends},
- ${misc:Depends},
-Replaces:
- libgl1-mesa-dri (<< 10.3.0-1),
-Breaks:
- libgl1-mesa-dri (<< 10.3.0-1),
-Provides: opencl-icd
-Description: free implementation of the OpenCL API -- ICD runtime
- This package contains the mesa implementation of the OpenCL (Open Compute
- Language) library, which is intended for use with an ICD loader. OpenCL
- provides a standardized interface for computational analysis on graphical
- processing units.
-
-Package: mesa-opencl-icd-dbg
-Section: debug
-Priority: extra
-Architecture: amd64 i386 armhf
-Depends:
- mesa-opencl-icd (= ${binary:Version}),
- ${misc:Depends},
-Description: free implementation of the OpenCL API -- debugging symbols
- This package contains the mesa implementation of the OpenCL (Open Compute
- Language) library, which is intended for use with an ICD loader. OpenCL
- provides a standardized interface for computational analysis on graphical
- processing units.
- .
- This package contains the debugging symbols for the mesa OpenCL ICD library.
-
 # vim: tw=0
diff --git a/debian/mesa-opencl-icd.install.in 
b/debian/mesa-opencl-icd.install.in
deleted file mode 100644
index f8e8aef..000
--- a/debian/mesa-opencl-icd.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-dri/etc/OpenCL/vendors/mesa.icd etc/OpenCL/vendors
-dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so 
usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libMesaOpenCL* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/rules b/debian/rules
index 633adeb..6d89ebe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,13 +104,6 @@ else
 DRI_DRIVERS += r200 radeon
 GALLIUM_DRIVERS += r600 r300
   endif
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf))
-   # opencl needs gallium-pipe-loader which needs udev,
-   # so no opencl on kfreebsd.
-   # opencl needs LLVM and Clang, so only build it on the subset
-   # of arches where we have LLVM enabled.
-   confflags_GALLIUM += --enable-opencl --enable-opencl-icd
-  endif
 
   # LLVM is required for r300g, radeonsi and llvmpipe:
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
armhf))

commit b0de79a9aa08642397f27655f4f240b0f8181caf
Author: Timo Aaltonen 
Date:   Thu Jan 15 15:29:06 2015 +0200

releasing package mesa version 10.4.2-2

diff --git a/debian/changelog b/debian/changelog
index b909256..3866e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.4.2-2) UNRELEASED; urgency=medium
+mesa (10.4.2-2) unstable; urgency=medium
 
   * rules: Drop dh_makeshlibs exception on gbm_gallium_drm.so as it's
 gone now.
@@ -7,7 +7,7 @@ mesa (10.4.2-2) UNRELEASED; urgency=medium
   * control: Mark libegl1-mesa-drivers M-A: same again. (Closes:
 #775370)
 
- -- Timo Aaltonen   Wed, 14 Jan 2015 15:12:07 +0200
+ -- Timo Aaltonen   Thu, 15 Jan 2015 15:28:40 +0200
 
 mesa (10.4.2-1) experimental; urgency=medium
 

commit 44fbb19b001aed8e20174761301d088b5541b07a
Author: Timo Aaltonen 
Date:  

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b5ec5aebd5152bfb4c77a054123e60f149617e3f
Author: Maarten Lankhorst 
Date:   Tue Jan 13 17:17:04 2015 +0100

release to utopic

diff --git a/debian/changelog b/debian/changelog
index d16c845..680ee24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) utopic-proposed; 
urgency=medium
 
   [ Timo Aaltonen ]
   * Added patches:
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) 
UNRELEASED; urgency=medium
   * Fix rotating external display with optimus results in corruption.
 - fix-sna-external-slave-rotation.patch (LP: #1410238)
 
- -- Timo Aaltonen   Fri, 12 Dec 2014 10:53:54 +0200
+ -- Maarten Lankhorst   Tue, 13 Jan 2015 
17:16:49 +0100
 
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.1) utopic-proposed; 
urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yb4c6-0006ab...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ef9ee9f70358ad04fca52c7ca7240d6ab1645f7
Author: Maarten Lankhorst 
Date:   Tue Jan 13 17:14:25 2015 +0100

release to trusty-proposed

diff --git a/debian/changelog b/debian/changelog
index a9b61ff..8a25ddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed; 
urgency=medium
 
   [ Timo Aaltonen ]
   * sna-fix-gen8-blt.diff
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; 
urgency=medium
   * Fix rotating external display with optimus results in corruption.
 - fix-sna-external-slave-rotation.patch (LP: #1410238)
 
- -- Timo Aaltonen   Fri, 12 Dec 2014 11:06:26 +0200
+ -- Maarten Lankhorst   Tue, 13 Jan 2015 
17:14:19 +0100
 
 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed; 
urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yb47i-0004fq...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-utopic'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 +
 debian/patches/fix-sna-external-slave-rotation.patch |   69 +++
 debian/patches/series|1 
 3 files changed, 74 insertions(+)

New commits:
commit c827f7f67632de3958fd22a517197b80acc5dd3f
Author: Maarten Lankhorst 
Date:   Tue Jan 13 14:32:52 2015 +0100

Fix rotating external display with optimus results in corruption.

fix-sna-external-slave-rotation.patch (LP: #1410238)

Conflicts:
debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index f82989f..d16c845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4.2) UNRELEASED; 
urgency=medium
 
+  [ Timo Aaltonen ]
   * Added patches:
 - disable-dri3.diff: Disable DRI3. (LP: #1401784)
 - sna-fix-gen8-blt.diff,
   sna-add-more-checks-and-asserts-for-blt.diff,
   sna-tweak-alignment-constraints-on-gen8.diff:
   Fix GEN8 BLT with 4bit address. (LP: #1401788)
+  [ Maarten Lankhorst ]
+  * Fix rotating external display with optimus results in corruption.
+- fix-sna-external-slave-rotation.patch (LP: #1410238)
 
  -- Timo Aaltonen   Fri, 12 Dec 2014 10:53:54 +0200
 
diff --git a/debian/patches/fix-sna-external-slave-rotation.patch 
b/debian/patches/fix-sna-external-slave-rotation.patch
new file mode 100644
index 000..80b79f3
--- /dev/null
+++ b/debian/patches/fix-sna-external-slave-rotation.patch
@@ -0,0 +1,69 @@
+commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9
+Author: Chris Wilson 
+Date:   Tue Jan 13 10:50:36 2015 +
+
+sna: Combine slave CRTC offsets with rotation
+
+When applying both a slave offset and an output rotation, order is
+important. To get the order right, we need to combine the two into a
+single transformation.
+
+Reported-by: Maarten Lankhorst 
+Signed-off-by: Chris Wilson 
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 569c585..0657c47 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -6696,6 +6696,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr 
region, struct kgem_bo
+   ScreenPtr screen = sna->scrn->pScreen;
+   DrawablePtr draw = crtc_source(crtc, &sx, &sy);
+   PictFormatPtr format;
++  PictTransform T;
+   PicturePtr src, dst;
+   PixmapPtr pixmap;
+   int depth, error;
+@@ -6735,9 +6736,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   if (!src)
+   goto free_pixmap;
+ 
+-  error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
+-  if (error)
+-  goto free_src;
++  pixman_transform_init_translate(&T, sx << 16, sy << 16);
++  pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
++  if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
++  error = SetPictureTransform(src, &T);
++  if (error)
++  goto free_src;
++  sx = sy = 0;
++  }
+ 
+   if (crtc->filter && crtc->transform_in_use)
+   SetPicturePictFilter(src, crtc->filter,
+@@ -6789,6 +6795,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   DrawablePtr draw = crtc_source(crtc, &sx, &sy);
+   struct sna_composite_op tmp;
+   PictFormatPtr format;
++  PictTransform T;
+   PicturePtr src, dst;
+   PixmapPtr pixmap;
+   const BoxRec *b;
+@@ -6829,9 +6836,14 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   if (!src)
+   goto free_pixmap;
+ 
+-  error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
+-  if (error)
+-  goto free_src;
++  pixman_transform_init_translate(&T, sx << 16, sy << 16);
++  pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
++  if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
++  error = SetPictureTransform(src, &T);
++  if (error)
++  goto free_src;
++  sx = sy = 0;
++  }
+ 
+   if (crtc->filter && crtc->transform_in_use)
+   SetPicturePictFilter(src, crtc->filter,
diff --git a/debian/patches/series b/debian/patches/series
index 02ff016..30cfcba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ disable-dri3.diff
 sna-fix-gen8-blt.diff
 sna-tweak-alignment-constraints-on-gen8.diff
 sna-add-more-checks-and-asserts-for-blt.diff
+fix-sna-external-slave-rotation.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yb2qi-000589...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog |7 +
 debian/patches/fix-sna-external-slave-rotation.patch |   69 +++
 debian/patches/series|2 
 3 files changed, 78 insertions(+)

New commits:
commit 36fa1a6f15b2f2675a375c5a2d1a2f22f061d7f5
Author: Maarten Lankhorst 
Date:   Tue Jan 13 15:16:15 2015 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index 1a095f7..a41fdf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) vivid; urgency=medium
 
   * Fix rotating external display with optimus results in corruption.
 - fix-sna-external-slave-rotation.patch (LP: #1410238)
 
- -- Maarten Lankhorst   Tue, 13 Jan 2015 
13:57:51 +0100
+ -- Maarten Lankhorst   Tue, 13 Jan 2015 
15:16:03 +0100
 
 xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; urgency=medium
 

commit 502cb697638ff25f12e413efc47296c7250cd187
Author: Maarten Lankhorst 
Date:   Tue Jan 13 14:32:52 2015 +0100

Fix rotating external display with optimus results in corruption.

fix-sna-external-slave-rotation.patch (LP: #1410238)

diff --git a/debian/changelog b/debian/changelog
index ff83a1b..1a095f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix rotating external display with optimus results in corruption.
+- fix-sna-external-slave-rotation.patch (LP: #1410238)
+
+ -- Maarten Lankhorst   Tue, 13 Jan 2015 
13:57:51 +0100
+
 xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; urgency=medium
 
   * Merge from Debian experimental.
diff --git a/debian/patches/fix-sna-external-slave-rotation.patch 
b/debian/patches/fix-sna-external-slave-rotation.patch
new file mode 100644
index 000..80b79f3
--- /dev/null
+++ b/debian/patches/fix-sna-external-slave-rotation.patch
@@ -0,0 +1,69 @@
+commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9
+Author: Chris Wilson 
+Date:   Tue Jan 13 10:50:36 2015 +
+
+sna: Combine slave CRTC offsets with rotation
+
+When applying both a slave offset and an output rotation, order is
+important. To get the order right, we need to combine the two into a
+single transformation.
+
+Reported-by: Maarten Lankhorst 
+Signed-off-by: Chris Wilson 
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 569c585..0657c47 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -6696,6 +6696,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr 
region, struct kgem_bo
+   ScreenPtr screen = sna->scrn->pScreen;
+   DrawablePtr draw = crtc_source(crtc, &sx, &sy);
+   PictFormatPtr format;
++  PictTransform T;
+   PicturePtr src, dst;
+   PixmapPtr pixmap;
+   int depth, error;
+@@ -6735,9 +6736,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   if (!src)
+   goto free_pixmap;
+ 
+-  error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
+-  if (error)
+-  goto free_src;
++  pixman_transform_init_translate(&T, sx << 16, sy << 16);
++  pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
++  if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
++  error = SetPictureTransform(src, &T);
++  if (error)
++  goto free_src;
++  sx = sy = 0;
++  }
+ 
+   if (crtc->filter && crtc->transform_in_use)
+   SetPicturePictFilter(src, crtc->filter,
+@@ -6789,6 +6795,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   DrawablePtr draw = crtc_source(crtc, &sx, &sy);
+   struct sna_composite_op tmp;
+   PictFormatPtr format;
++  PictTransform T;
+   PicturePtr src, dst;
+   PixmapPtr pixmap;
+   const BoxRec *b;
+@@ -6829,9 +6836,14 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   if (!src)
+   goto free_pixmap;
+ 
+-  error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
+-  if (error)
+-  goto free_src;
++  pixman_transform_init_translate(&T, sx << 16, sy << 16);
++  pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
++  if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
++  error = SetPictureTransform(src, &T);
++  if (error)
++  goto free_src;
++  sx = sy = 0;
++  }
+ 
+   if (crtc->filter && crtc->transform_in_use)
+   SetPicturePictFilter(src, crtc->filter,
diff --git a/debian/patches/series b/debian/patches/series
index 99afa45..6229fcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
+fix-sna-external-slave-rota

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |2 
 debian/patches/fix-sna-external-slave-rotation.patch |   69 +++
 debian/patches/series|1 
 3 files changed, 72 insertions(+)

New commits:
commit 39d471fc14d92696f6eb9cfe414010fa36cb90ae
Author: Maarten Lankhorst 
Date:   Tue Jan 13 14:32:52 2015 +0100

Fix rotating external display with optimus results in corruption.

fix-sna-external-slave-rotation.patch (LP: #1410238)

diff --git a/debian/changelog b/debian/changelog
index 62cab64..a9b61ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) UNRELEASED; 
urgency=medium
 
   [ Maarten Lankhorst ]
   * Fix regression with external displays on sna. (LP: #1405325)
+  * Fix rotating external display with optimus results in corruption.
+- fix-sna-external-slave-rotation.patch (LP: #1410238)
 
  -- Timo Aaltonen   Fri, 12 Dec 2014 11:06:26 +0200
 
diff --git a/debian/patches/fix-sna-external-slave-rotation.patch 
b/debian/patches/fix-sna-external-slave-rotation.patch
new file mode 100644
index 000..80b79f3
--- /dev/null
+++ b/debian/patches/fix-sna-external-slave-rotation.patch
@@ -0,0 +1,69 @@
+commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9
+Author: Chris Wilson 
+Date:   Tue Jan 13 10:50:36 2015 +
+
+sna: Combine slave CRTC offsets with rotation
+
+When applying both a slave offset and an output rotation, order is
+important. To get the order right, we need to combine the two into a
+single transformation.
+
+Reported-by: Maarten Lankhorst 
+Signed-off-by: Chris Wilson 
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 569c585..0657c47 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -6696,6 +6696,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr 
region, struct kgem_bo
+   ScreenPtr screen = sna->scrn->pScreen;
+   DrawablePtr draw = crtc_source(crtc, &sx, &sy);
+   PictFormatPtr format;
++  PictTransform T;
+   PicturePtr src, dst;
+   PixmapPtr pixmap;
+   int depth, error;
+@@ -6735,9 +6736,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   if (!src)
+   goto free_pixmap;
+ 
+-  error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
+-  if (error)
+-  goto free_src;
++  pixman_transform_init_translate(&T, sx << 16, sy << 16);
++  pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
++  if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
++  error = SetPictureTransform(src, &T);
++  if (error)
++  goto free_src;
++  sx = sy = 0;
++  }
+ 
+   if (crtc->filter && crtc->transform_in_use)
+   SetPicturePictFilter(src, crtc->filter,
+@@ -6789,6 +6795,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   DrawablePtr draw = crtc_source(crtc, &sx, &sy);
+   struct sna_composite_op tmp;
+   PictFormatPtr format;
++  PictTransform T;
+   PicturePtr src, dst;
+   PixmapPtr pixmap;
+   const BoxRec *b;
+@@ -6829,9 +6836,14 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, 
RegionPtr region, struct kgem_bo
+   if (!src)
+   goto free_pixmap;
+ 
+-  error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
+-  if (error)
+-  goto free_src;
++  pixman_transform_init_translate(&T, sx << 16, sy << 16);
++  pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
++  if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
++  error = SetPictureTransform(src, &T);
++  if (error)
++  goto free_src;
++  sx = sy = 0;
++  }
+ 
+   if (crtc->filter && crtc->transform_in_use)
+   SetPicturePictFilter(src, crtc->filter,
diff --git a/debian/patches/series b/debian/patches/series
index e232f4e..6552b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ sna-use-vmask-in-3dstate-ps.diff
 sna-fix-gen8-blt.diff
 sna-tweak-alignment-constraints-on-gen8.diff
 sna-add-more-checks-and-asserts-for-blt.diff
+fix-sna-external-slave-rotation.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yb2qi-00057o...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 debian/patches/10-handle-rotated-slaves.diff |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e1103d1723905589e0ab13aa3ccf54fafd177c9b
Author: Maarten Lankhorst 
Date:   Tue Jan 13 11:22:57 2015 +0100

Fix regression with external displays on sna. (LP: #1405325)

diff --git a/debian/changelog b/debian/changelog
index 5121f03..83ee4ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.5) trusty-proposed; 
urgency=medium
+
+  * Fix regression with external displays on sna. (LP: #1405325)
+
+ -- Maarten Lankhorst   Tue, 13 Jan 2015 
11:20:44 +0100
+
 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.4) trusty-proposed; 
urgency=medium
 
   * sna-fix-gen8-blt.diff: Fix GEN8 BLT with 4bit address. (LP: #1401788)
diff --git a/debian/patches/10-handle-rotated-slaves.diff 
b/debian/patches/10-handle-rotated-slaves.diff
index 9ddafb3..aa3b6e1 100644
--- a/debian/patches/10-handle-rotated-slaves.diff
+++ b/debian/patches/10-handle-rotated-slaves.diff
@@ -372,7 +372,7 @@ Date:   Thu Jul 17 14:40:51 2014 +0100
  
if (sna->render.copy_boxes(sna, GXcopy,
 - sna->front, priv->gpu_bo, 0, 0,
-+ container_of(draw, PixmapRec, 
drawable), priv->gpu_bo, 0, 0,
++ container_of(draw, PixmapRec, 
drawable), priv->gpu_bo, sx, sy,
   &tmp, sna_crtc->bo, -tx, -ty,
   REGION_RECTS(region), 
REGION_NUM_RECTS(region), 0))
return;


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yaycq-0008cc...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 debian/changelog  |6 ++
 debian/patches/xmir.patch |   11 ---
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 489dc081ec8b76fd29d288a4b5527224b44ee1a9
Author: Maarten Lankhorst 
Date:   Mon Dec 15 16:45:00 2014 +0100

Fix FTBFS caused by the previous patch.

diff --git a/debian/changelog b/debian/changelog
index 908b4a9..e6615e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.2.901-1ubuntu3) vivid; urgency=medium
+
+  * Fix FTBFS caused by the previous patch.
+
+ -- Maarten Lankhorst   Mon, 15 Dec 2014 
16:11:00 +0100
+
 xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium
 
   * Fix FTBFS with the bool redefinition by undef'ing it after including mir.
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 23a620a..538c58b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -980,7 +980,7 @@
 +}
 --- /dev/null
 +++ b/hw/xfree86/xmir/xmir-private.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,105 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -1016,7 +1016,6 @@
 +#ifndef _XMIR_PRIVATE_H
 +#define _XMIR_PRIVATE_H
 +
-+#include 
 +#include "xmir.h"
 +#include "xf86str.h"
 +#include "list.h"
@@ -1828,7 +1827,7 @@
 +}
 --- /dev/null
 +++ b/hw/xfree86/xmir/xmir.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,104 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -1865,15 +1864,13 @@
 +#define _XMIR_H
 +
 +#include 
-+#include 
-+
-+/* Fix because the library defines one of its members as having the name bool 
*/
-+#undef bool
 +
 +#include "xf86str.h"
 +#include "scrnintstr.h"
 +#include "window.h"
 +
++#include 
++
 +typedef struct xmir_screen xmir_screen;
 +typedef struct xmir_window xmir_window;
 +


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1y0xpt-8t...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog  |6 ++
 debian/patches/xmir.patch |   11 ---
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 489dc081ec8b76fd29d288a4b5527224b44ee1a9
Author: Maarten Lankhorst 
Date:   Mon Dec 15 16:45:00 2014 +0100

Fix FTBFS caused by the previous patch.

diff --git a/debian/changelog b/debian/changelog
index 908b4a9..e6615e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.2.901-1ubuntu3) vivid; urgency=medium
+
+  * Fix FTBFS caused by the previous patch.
+
+ -- Maarten Lankhorst   Mon, 15 Dec 2014 
16:11:00 +0100
+
 xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium
 
   * Fix FTBFS with the bool redefinition by undef'ing it after including mir.
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 23a620a..538c58b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -980,7 +980,7 @@
 +}
 --- /dev/null
 +++ b/hw/xfree86/xmir/xmir-private.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,105 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -1016,7 +1016,6 @@
 +#ifndef _XMIR_PRIVATE_H
 +#define _XMIR_PRIVATE_H
 +
-+#include 
 +#include "xmir.h"
 +#include "xf86str.h"
 +#include "list.h"
@@ -1828,7 +1827,7 @@
 +}
 --- /dev/null
 +++ b/hw/xfree86/xmir/xmir.h
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,104 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -1865,15 +1864,13 @@
 +#define _XMIR_H
 +
 +#include 
-+#include 
-+
-+/* Fix because the library defines one of its members as having the name bool 
*/
-+#undef bool
 +
 +#include "xf86str.h"
 +#include "scrnintstr.h"
 +#include "window.h"
 +
++#include 
++
 +typedef struct xmir_screen xmir_screen;
 +typedef struct xmir_window xmir_window;
 +


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1y0xpy-0008uo...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 debian/changelog  |6 ++
 debian/patches/xmir.patch |7 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit cd25c81aad4ea3532ecbe0ae78730d5235616fad
Author: Maarten Lankhorst 
Date:   Mon Dec 15 12:40:23 2014 +0100

refresh ftbfs in xmir patch

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index a45c76a..652fb51 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -78,7 +78,7 @@
 +
  if (xf86configptr->conf_modules) {
  /* Walk the disable list and let people know what we've parsed to
-  * not be loaded 
+  * not be loaded
 --- a/hw/xfree86/common/xf86Events.c
 +++ b/hw/xfree86/common/xf86Events.c
 @@ -613,6 +613,10 @@
@@ -1819,7 +1819,7 @@
 +}
 --- /dev/null
 +++ b/hw/xfree86/xmir/xmir.h
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,106 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -1858,6 +1858,9 @@
 +#include 
 +#include 
 +
++/* Fix because the library defines one of its members as having the name bool 
*/
++#undef bool
++
 +#include "xf86str.h"
 +#include "scrnintstr.h"
 +#include "window.h"

commit 7e83b9b581d0b84479c1954f2defd380279d4d1f
Author: Maarten Lankhorst 
Date:   Sat Dec 13 14:18:05 2014 +0100

Fix FTBFS with the bool redefinition by undef'ing it after including mir.

diff --git a/debian/changelog b/debian/changelog
index 5287cff..908b4a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.2.901-1ubuntu2) vivid; urgency=medium
+
+  * Fix FTBFS with the bool redefinition by undef'ing it after including mir.
+
+ -- Maarten Lankhorst   Sat, 13 Dec 2014 
14:13:17 +0100
+
 xorg-server (2:1.16.2.901-1ubuntu1) vivid; urgency=medium
 
   * Merge from released debian-unstable.
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index f60216f..23a620a 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,8 +1,6 @@
-diff --git a/configure.ac b/configure.ac
-index e5387bf..ec171d9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -627,6 +627,7 @@ AC_ARG_ENABLE(linux_acpi, 
AS_HELP_STRING([--disable-linux-acpi], [Disable buildi
+@@ -632,6 +632,7 @@
  AC_ARG_ENABLE(linux_apm, AS_HELP_STRING([--disable-linux-apm], [Disable 
building APM support on Linux (if available).]), [enable_linux_apm=$enableval], 
[enable_linux_apm=yes])
  AC_ARG_ENABLE(systemd-logind, AS_HELP_STRING([--enable-systemd-logind], 
[Build systemd-logind support (default: auto)]), [SYSTEMD_LOGIND=$enableval], 
[SYSTEMD_LOGIND=auto])
  AC_ARG_ENABLE(suid-wrapper, AS_HELP_STRING([--enable-suid-wrapper], [Build 
suid-root wrapper for legacy driver support on rootless xserver systems 
(default: no)]), [SUID_WRAPPER=$enableval], [SUID_WRAPPER=no])
@@ -10,7 +8,7 @@ index e5387bf..ec171d9 100644
  
  dnl DDXes.
  AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build 
Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -1348,6 +1349,15 @@ if test "x$XINERAMA" = xyes; then
+@@ -1368,6 +1369,15 @@
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"
  fi
  
@@ -20,13 +18,13 @@ index e5387bf..ec171d9 100644
 +AC_SUBST([XMIR_CFLAGS])
 +AC_DEFINE(XMIR, 1, [Support wayland mode])
 +  SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES mirclient"
-+fi  
++fi
 +AM_CONDITIONAL(XMIR, [test "x$XMIR" = xyes])
 +
  AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])
  if test "x$XACE" = xyes; then
AC_DEFINE(XACE, 1, [Build X-ACE extension])
-@@ -2573,6 +2583,7 @@ hw/xfree86/utils/Makefile
+@@ -2598,6 +2608,7 @@
  hw/xfree86/utils/man/Makefile
  hw/xfree86/utils/cvt/Makefile
  hw/xfree86/utils/gtf/Makefile
@@ -34,11 +32,9 @@ index e5387bf..ec171d9 100644
  hw/dmx/config/Makefile
  hw/dmx/config/man/Makefile
  hw/dmx/doc/Makefile
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index c5992c3..c9a077f 100644
 --- a/hw/xfree86/Makefile.am
 +++ b/hw/xfree86/Makefile.am
-@@ -34,16 +34,20 @@ if INT10MODULE
+@@ -34,16 +34,20 @@
  INT10_SUBDIR = int10
  endif
  
@@ -61,11 +57,9 @@ index c5992c3..c9a077f 100644
  
  bin_PROGRAMS = Xorg
  nodist_Xorg_SOURCES = sdksyms.c
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2adef44..f8c3a7e 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -118,6 +118,7 @@ static ModuleDefault ModuleDefaults[] = {
+@@ -118,6 +118,7 @@
  {.name = "fb",.toLoad = TRUE,.load_opt = NULL},
  {.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
  #endif
@@ -73,7 +67,7 @@ index 2adef44..f8c3a7e 100644
  {.name = NULL,.toLoad = FALSE,.load_opt = NULL}
  };
  
-@@ -272,6 +273,17 @@ xf86ModulelistFromConfig(void ***optlist)
+@@ -272,6 +273,17 @@
  return NULL;
  }
  
@@ -91,11 +85,9 @@ index 2adef44..f8c3a7e 100644
  if (xf86configptr->conf_modules) {
  /* Walk the disable list and let people know what we've parsed to
   * not be loaded 
-diff --git a/hw/xfree86/c

xorg-server: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 ChangeLog  | 8599 -
 Xext/dpms.c|   10 
 Xext/dpmsstubs.c   |   10 
 Xext/panoramiX.c   |2 
 Xext/panoramiX.h   |2 
 Xext/panoramiXprocs.c  |4 
 Xext/security.c|4 
 Xext/shm.c |6 
 Xext/sync.c|2 
 Xext/syncsrv.h |8 
 Xext/xcmisc.c  |1 
 Xext/xres.c|   12 
 Xext/xvdisp.c  |   28 
 Xext/xvdix.h   |   14 
 Xext/xvmain.c  |   18 
 Xi/chgdctl.c   |8 
 Xi/chgfctl.c   |2 
 Xi/sendexev.c  |3 
 Xi/xiallowev.c |2 
 Xi/xichangecursor.c|2 
 Xi/xichangehierarchy.c |   35 
 Xi/xigetclientpointer.c|1 
 Xi/xigrabdev.c |9 
 Xi/xipassivegrab.c |   12 
 Xi/xiproperty.c|   14 
 Xi/xiquerydevice.c |1 
 Xi/xiquerypointer.c|2 
 Xi/xiselectev.c|8 
 Xi/xisetclientpointer.c|3 
 Xi/xisetdevfocus.c |4 
 Xi/xiwarppointer.c |2 
 composite/compalloc.c  |8 
 composite/compext.c|4 
 composite/compinit.c   |2 
 composite/compint.h|2 
 composite/compoverlay.c|4 
 config/udev.c  |7 
 configure.ac   |1 
 dbe/dbe.c  |   33 
 dbe/dbestruct.h|   12 
 dbe/midbe.c|   14 
 dbe/midbe.h|8 
 debian/changelog   |   61 
 debian/control |8 
 debian/patches/disable-rotation-transform-gpuscreens.patch |   35 
 debian/serverminver|2 
 dix/atom.c |8 
 dix/colormap.c |   34 
 dix/cursor.c   |8 
 dix/devices.c  |2 
 dix/dispatch.c |   19 
 dix/dispatch.h |2 
 dix/dixfonts.c |6 
 dix/dixutils.c |   12 
 dix/extension.c|8 
 dix/gc.c   |   22 
 dix/globals.c  |8 
 dix/glyphcurs.c|8 
 dix/grabs.c|   16 
 dix/inpututils.c   |2 
 dix/main.c |8 
 dix/property.c |8 
 dix/region.c   |   42 
 dix/resource.c |   16 
 dix/selection.c|   10 
 dix/swaprep.c  |8 
 dix/swapreq.c  |8 
 dix/tables.c   |8 
 dix/window.c   |   38 
 dri3/dri3_request.c|6 
 exa/exa.c  |2 
 exa/exa.h  |8 
 exa/exa_glyphs.c   |8 
 exa/exa_render.c 

xorg-server: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 ChangeLog   |  
781 ++
 Xext/xcmisc.c   |  
  1 
 Xext/xvdisp.c   |  
 20 
 Xi/chgdctl.c|  
  8 
 Xi/chgfctl.c|  
  2 
 Xi/sendexev.c   |  
  3 
 Xi/xiallowev.c  |  
  2 
 Xi/xichangecursor.c |  
  2 
 Xi/xichangehierarchy.c  |  
 35 
 Xi/xigetclientpointer.c |  
  1 
 Xi/xigrabdev.c  |  
  9 
 Xi/xipassivegrab.c  |  
 12 
 Xi/xiproperty.c |  
 14 
 Xi/xiquerydevice.c  |  
  1 
 Xi/xiquerypointer.c |  
  2 
 Xi/xiselectev.c |  
  8 
 Xi/xisetclientpointer.c |  
  3 
 Xi/xisetdevfocus.c  |  
  4 
 Xi/xiwarppointer.c  |  
  2 
 configure.ac|  
  5 
 dbe/dbe.c   |  
 17 
 debian/changelog|  
 32 
 debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff |  
 68 
 debian/patches/09_Xserver-man-iglx.diff |  
 16 
 debian/patches/series   |  
  2 
 debian/patches/xmir.patch   |  
136 -
 dix/dispatch.c  |  
  3 
 dix/region.c|  
 20 
 dri3/dri3_request.c |  
  6 
 fb/fbseg.c  |  
 20 
 glx/clientinfo.c|  
 20 
 glx/glxcmds.c   |  
 85 -
 glx/glxcmdsswap.c   |  
  4 
 glx/glxserver.h |  
 43 
 glx/indirect_dispatch.c |  
 25 
 glx/indirect_dispatch_swap.c|  
 26 
 glx/indirect_program.c  |  
  2 
 glx/indirect_reqsize.c  |  
142 -
 glx/indirect_reqsize.h  |  
181 +-
 glx/indirect_texture_compression.c  |  
  4 
 glx/indirect_util.c |  
  9 
 glx/rensize.c   |  
114 -
 glx/single2.c   |  
 23 
 glx/single2swap.c   |  
 19 
 glx/singlepix.c |  
 60 
 glx/singlepixswap.c |  
 50 
 glx/swap_interval.c |  
  2 
 glx/unpack.h|  
  3 
 hw/xfree86/dri2/dri2ext.c   |  
  3 
 include/dix.h   |  
  7 
 include/regionstr.h |  
 10 
 man/Xserver.man |  
 10 
 os/access.c |  
  6 
 os/rpcauth.c|  
  4 
 present/present.c   |  
 18 
 present/present_request.c   |  
  6 
 randr/rrsdispatch.c |  
  4 
 render/render.c |  

xorg-server: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

 COPYING  |   24 
 Xext/dpms.c  |   10 
 Xext/dpmsstubs.c |   10 
 Xext/panoramiX.c |2 
 Xext/panoramiX.h |2 
 Xext/panoramiXprocs.c|   16 
 Xext/saver.c |   16 
 Xext/security.c  |5 
 Xext/shm.c   |   21 
 Xext/sync.c  |2 
 Xext/syncsrv.h   |8 
 Xext/xcmisc.c|1 
 Xext/xres.c  |   12 
 Xext/xvdisp.c|  126 -
 Xext/xvdix.h |   45 
 Xext/xvmain.c|  164 +-
 Xi/chgdctl.c |8 
 Xi/chgfctl.c |2 
 Xi/sendexev.c|3 
 Xi/xiallowev.c   |2 
 Xi/xichangecursor.c  |2 
 Xi/xichangehierarchy.c   |   35 
 Xi/xigetclientpointer.c  |1 
 Xi/xigrabdev.c   |9 
 Xi/xipassivegrab.c   |   12 
 Xi/xiproperty.c  |   14 
 Xi/xiquerydevice.c   |1 
 Xi/xiquerypointer.c  |2 
 Xi/xiselectev.c  |8 
 Xi/xisetclientpointer.c  |3 
 Xi/xisetdevfocus.c   |4 
 Xi/xiwarppointer.c   |2 
 composite/compalloc.c|8 
 composite/compext.c  |7 
 composite/compinit.c |   25 
 composite/compint.h  |3 
 composite/compoverlay.c  |4 
 composite/compwindow.c   |7 
 config/config.c  |  129 -
 config/udev.c|   17 
 configure.ac |  124 -
 dbe/dbe.c|   33 
 dbe/dbestruct.h  |   12 
 dbe/midbe.c  |   14 
 dbe/midbe.h  |8 
 dix/atom.c   |8 
 dix/colormap.c   |   34 
 dix/cursor.c |8 
 dix/devices.c|   63 
 dix/dispatch.c   |   75 -
 dix/dispatch.h   |2 
 dix/dixfonts.c   |6 
 dix/dixutils.c   |   12 
 dix/extension.c  |   10 
 dix/gc.c |   25 
 dix/getevents.c  |   22 
 dix/globals.c|8 
 dix/glyphcurs.c  |8 
 dix/grabs.c  |   16 
 dix/inpututils.c |2 
 dix/main.c   |   10 
 dix/pixmap.c |   18 
 dix/property.c   |8 
 dix/protocol.txt |   30 
 dix/region.c |   42 
 dix/registry.c   |   94 -
 dix/resource.c   |   18 
 dix/selection.c  |   10 
 dix/swaprep.c|8 
 dix/swapreq.c|8 
 dix/tables.c |8 
 dix/window.c |  111 -
 doc/Xserver-spec.xml |6 
 dri3/dri3.c  |   10 
 dri3/dri3.h  |2 
 dri3/dri3_request.c  |6 
 exa/exa.c|2 
 exa/exa.h|8 
 exa/exa_accel.c  |   20 
 exa/exa_glyphs.c |8 
 exa/exa_priv.h   |   19 
 exa/exa_render.c |4 
 exa/exa_unaccel.c|   13 
 fb/Makefile.am   |2 
 fb/fb.h  |  342 
 fb/fb24_32.c |2 

xorg-server: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 COPYING |  
 24 
 ChangeLog   | 
9268 ++
 Xext/dpms.c |  
 10 
 Xext/dpmsstubs.c|  
 10 
 Xext/panoramiX.c|  
  2 
 Xext/panoramiX.h|  
  2 
 Xext/panoramiXprocs.c   |  
 16 
 Xext/saver.c|  
 16 
 Xext/security.c |  
  5 
 Xext/shm.c  |  
 21 
 Xext/sync.c |  
  2 
 Xext/syncsrv.h  |  
  8 
 Xext/xcmisc.c   |  
  1 
 Xext/xres.c |  
 12 
 Xext/xvdisp.c   |  
126 
 Xext/xvdix.h|  
 45 
 Xext/xvmain.c   |  
164 
 Xi/chgdctl.c|  
  8 
 Xi/chgfctl.c|  
  2 
 Xi/sendexev.c   |  
  3 
 Xi/xiallowev.c  |  
  2 
 Xi/xichangecursor.c |  
  2 
 Xi/xichangehierarchy.c  |  
 35 
 Xi/xigetclientpointer.c |  
  1 
 Xi/xigrabdev.c  |  
  9 
 Xi/xipassivegrab.c  |  
 12 
 Xi/xiproperty.c |  
 14 
 Xi/xiquerydevice.c  |  
  1 
 Xi/xiquerypointer.c |  
  2 
 Xi/xiselectev.c |  
  8 
 Xi/xisetclientpointer.c |  
  3 
 Xi/xisetdevfocus.c  |  
  4 
 Xi/xiwarppointer.c  |  
  2 
 composite/compalloc.c   |  
  8 
 composite/compext.c |  
  7 
 composite/compinit.c|  
 25 
 composite/compint.h |  
  3 
 composite/compoverlay.c |  
  4 
 composite/compwindow.c  |  
  7 
 config/config.c |  
129 
 config/udev.c   |  
 17 
 configure.ac|  
124 
 dbe/dbe.c   |  
 33 
 dbe/dbestruct.h |  
 12 
 dbe/midbe.c |  
 14 
 dbe/midbe.h |  
  8 
 debian/changelog|  
 83 
 debian/control  |  
  6 
 debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff |  
 68 
 debian/patches/series   |  
  3 
 debian/rules|  
  5 
 debian/serverminver |  
  4 
 debian/upstream/signing-key.asc |  
281 
 debian/watch|  
  1 
 dix/atom.c  |  
  8 
 dix/colormap.c  |  
 34 
 dix/cursor.c|  
  8 
 dix/devices.c   |  
 63 
 

xorg-server: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |   30 +-
 1 file changed, 9 insertions(+), 21 deletions(-)

New commits:
commit a8fc994e6404adcff27743a0277c8098c253f9af
Author: Maarten Lankhorst 
Date:   Wed Dec 10 10:43:43 2014 +0100

merge security update that superceeded the version in -proposed

diff --git a/debian/changelog b/debian/changelog
index 1c184d2..2d85b47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,4 @@
-xorg-server (2:1.15.1-0ubuntu2.3) trusty-proposed; urgency=medium
-
-  * Actually fix the cirrus VGA corruption in gnome-terminal.
-- fb-24-depth.patch (LP: #1318119)
-
- -- Maarten Lankhorst   Wed, 05 Nov 2014 
15:24:09 +0100
-
-xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; urgency=medium
+xorg-server (2:1.15.1-0ubuntu2.6) trusty-proposed; urgency=medium
 
   [ Laércio de Sousa ]
   * Backport support for logind-based multiseat back to trusty. (LP: #1209008)
@@ -14,9 +7,42 @@ xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; 
urgency=medium
   * Re-enable support for rotation and transforms on gpu-screens with support.
 - Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620)
   * Fix black screen when using qemu with cirrus vga.
+- fb-24-depth.patch (LP: #1318119)
 
  -- Maarten Lankhorst   Mon, 03 Nov 2014 
12:36:32 +0100
 
+xorg-server (2:1.15.1-0ubuntu2.5) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Dec 2014 security issues - additional fixes
+- debian/patches/CVE-2014-8xxx/003[4567]*.patch: add additional
+  fixes not included in original pre-advisory bundle.
+
+ -- Marc Deslauriers   Tue, 09 Dec 2014 17:12:42 
-0500
+
+xorg-server (2:1.15.1-0ubuntu2.4) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Dec 2014 protocol handling security issues
+- debian/patches/CVE-2014-8xxx/*.patch: patches from upstream to fix
+  a multitude of security issues, including a couple of pre-requisite
+  fixes from git.
+- CVE-2014-8091
+- CVE-2014-8092
+- CVE-2014-8093
+- CVE-2014-8094
+- CVE-2014-8095
+- CVE-2014-8096
+- CVE-2014-8097
+- CVE-2014-8098
+- CVE-2014-8099
+- CVE-2014-8100
+- CVE-2014-8101
+- CVE-2014-8102
+- CVE-2014-8103
+  * This package does _not_ contain the changes from 2:1.15.1-0ubuntu2.3
+in trusty-proposed.
+
+ -- Marc Deslauriers   Mon, 08 Dec 2014 15:42:08 
-0500
+
 xorg-server (2:1.15.1-0ubuntu2.1) trusty-proposed; urgency=medium
 
   * Copy utopic package back to trusty.
diff --git a/debian/patches/CVE-2014-8xxx/-glx-check-return.patch 
b/debian/patches/CVE-2014-8xxx/-glx-check-return.patch
new file mode 100644
index 000..a652174
--- /dev/null
+++ b/debian/patches/CVE-2014-8xxx/-glx-check-return.patch
@@ -0,0 +1,184 @@
+From 61a292adf45405641de1c522a04c148e0a152acd Mon Sep 17 00:00:00 2001
+From: Keith Packard 
+Date: Thu, 9 Oct 2014 15:17:17 +0200
+Subject: glx: check return from __glXGetAnswerBuffer
+
+This function can return NULL; make sure every caller tests for that.
+
+Reviewed-by: Adam Jackson 
+Signed-off-by: Keith Packard 
+
+diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
+index 329b2e6..f6cabef 100644
+--- a/glx/indirect_dispatch.c
 b/glx/indirect_dispatch.c
+@@ -2464,6 +2464,9 @@ __glXDisp_AreTexturesResident(__GLXclientState * cl, 
GLbyte * pc)
+ GLboolean answerBuffer[200];
+ GLboolean *residences =
+ __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 
1);
++
++if (residences == NULL)
++return BadAlloc;
+ retval =
+ glAreTexturesResident(n, (const GLuint *) (pc + 4), residences);
+ __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
+@@ -2488,6 +2491,9 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, 
GLbyte * pc)
+ GLboolean answerBuffer[200];
+ GLboolean *residences =
+ __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 
1);
++
++if (residences == NULL)
++return BadAlloc;
+ retval =
+ glAreTexturesResident(n, (const GLuint *) (pc + 4), residences);
+ __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
+@@ -2593,6 +2599,9 @@ __glXDisp_GenTextures(__GLXclientState * cl, GLbyte * pc)
+ GLuint *textures =
+ __glXGetAnswerBuffer(cl, n * 4, answerBuffer, 
sizeof(answerBuffer),
+  4);
++
++if (textures == NULL)
++return BadAlloc;
+ glGenTextures(n, textures);
+ __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
+ error = Success;
+@@ -2616,6 +2625,9 @@ __glXDisp_GenTexturesEXT(__GLXclientState * cl, GLbyte * 
pc)
+ GLuint *textures =
+ __glXGetAnswerBuffer(cl, n * 4, answerBuffer, 
sizeof(answerBuffer),
+  4);
++
++if (textures == NULL)
++return BadAlloc;
+ glGenTextures(n, textures);
+ __glXSe

xorg-server: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog   |6 ++
 debian/patches/disable-rotation-transform-gpuscreens.patch |   35 -
 2 files changed, 19 insertions(+), 22 deletions(-)

New commits:
commit 1d9ce2ec7aa829ba3d262a326f4c60bd998d35cf
Author: Maarten Lankhorst 
Date:   Thu Nov 6 12:20:14 2014 +0100

Re-enable rotation in optimus mode with SNA. (LP: #1386620)

diff --git a/debian/changelog b/debian/changelog
index b254535..f089574 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.1.901-1ubuntu2) vivid; urgency=medium
+
+  * Re-enable rotation in optimus mode with SNA. (LP: #1386620)
+
+ -- Maarten Lankhorst   Thu, 06 Nov 2014 
12:19:07 +0100
+
 xorg-server (2:1.16.1.901-1ubuntu1) vivid; urgency=medium
 
   * Merge from released debian-unstable.
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch 
b/debian/patches/disable-rotation-transform-gpuscreens.patch
index 9da6c65..9f95572 100644
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ b/debian/patches/disable-rotation-transform-gpuscreens.patch
@@ -1,22 +1,13 @@
 a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -932,6 +932,9 @@
- if (xf86RandR12Key == NULL)
- return;
- 
-+if (pScreen->isGPU)
-+rotations = RR_Rotate_0;
-+
- randrp = XF86RANDRINFO(pScreen);
- #if RANDR_12_INTERFACE
- for (c = 0; c < config->num_crtc; c++) {
-@@ -954,6 +957,9 @@
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- #endif
- 
-+if (pScreen->isGPU)
-+transforms = FALSE;
-+
- if (xf86RandR12Key == NULL)
- return;
- 
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index a441fd1..9147a26 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
 b/hw/xfree86/modes/xf86Crtc.c
+@@ -778,7 +778,7 @@ xf86CrtcScreenInit(ScreenPtr screen)
+ if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
+ break;
+ }
+-if (c == config->num_crtc) {
++if (c == config->num_crtc && !screen->isGPU) {
+ xf86RandR12SetRotations(screen, RR_Rotate_0 | RR_Rotate_90 |
+ RR_Rotate_180 | RR_Rotate_270 |
+ RR_Reflect_X | RR_Reflect_Y);


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xyzar-0004r5...@moszumanska.debian.org

mesa: Changes to 'ubuntu-utopic'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 281d945f2ff474e4f2718a5f91f450b716c30358
Author: Maarten Lankhorst 
Date:   Thu Nov 20 09:33:41 2014 +0100

copy back to utopic

diff --git a/debian/changelog b/debian/changelog
index f55b0be..082bc1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.3.2-0ubuntu0.1) utopic-proposed; urgency=medium
+
+  * Copy back to utopic. (LP: #1384289)
+
+ -- Maarten Lankhorst   Tue, 28 Oct 2014 
09:59:15 +0100
+
 mesa (10.3.2-0ubuntu1) vivid; urgency=medium
 
   * Merge from unreleased debian-unstable.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xrncp-0007ue...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 2e8e3c9e86807352719826d85df098191704d518
Author: Maarten Lankhorst 
Date:   Thu Nov 20 09:33:02 2014 +0100

release to vivid

diff --git a/debian/changelog b/debian/changelog
index f3c296c..f55b0be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.3.2-0ubuntu1) vivid; urgency=medium
+
+  * Merge from unreleased debian-unstable.
+
+ -- Maarten Lankhorst   Mon, 27 Oct 2014 
08:43:19 +0100
+
 mesa (10.3.2-1) UNRELEASED; urgency=medium
 
   * New upstream stable release.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xrncp-0007sg...@moszumanska.debian.org

mesa: Changes to 'ubuntu-utopic'

[Maarten Bernardus Lankhorst]

New branch 'ubuntu-utopic' available with the following commits:
commit 2e8e3c9e86807352719826d85df098191704d518
Author: Maarten Lankhorst 
Date:   Thu Nov 20 09:33:02 2014 +0100

release to vivid


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xrnb8-0005yg...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 VERSION|2 
 debian/changelog   |7 
 docs/relnotes/10.3.1.html  |4 
 docs/relnotes/10.3.2.html  |  113 +
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gm107.cpp |2 
 src/gallium/drivers/r600/r600_state_common.c   |9 -
 src/gallium/drivers/radeon/r600_buffer_common.c|4 
 src/gallium/drivers/radeonsi/si_descriptors.c  |5 
 src/gallium/state_trackers/gbm/gbm_drm.c   |2 
 src/gallium/state_trackers/wgl/stw_ext_context.c   |4 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |   15 -
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c  |   46 ++---
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.h  |8 
 src/glsl/ast_to_hir.cpp|   10 -
 src/glx/xfont.c|5 
 src/mesa/drivers/dri/i965/brw_defines.h|   10 -
 src/mesa/drivers/dri/i965/gen8_surface_state.c |2 
 src/mesa/drivers/dri/i965/intel_extensions.c   |2 
 src/mesa/drivers/dri/nouveau/nouveau_context.c |3 
 src/mesa/main/context.c|   36 
 src/mesa/main/texgetimage.c|9 -
 src/mesa/state_tracker/st_cb_eglimage.c|3 
 src/mesa/state_tracker/st_cb_texture.c |   13 -
 src/mesa/state_tracker/st_gen_mipmap.c |2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |   14 +
 src/mesa/state_tracker/st_texture.c|6 
 src/mesa/state_tracker/st_texture.h|3 
 src/mesa/state_tracker/st_vdpau.c  |4 
 29 files changed, 273 insertions(+), 74 deletions(-)

New commits:
commit aad35283edff3f7a7ea9c341e60607f78dd20211
Author: Sven Joachim 
Date:   Sun Oct 26 20:05:45 2014 +0100

Close bug #766058

Commit 724f71ef3905289eee7b45955243fdc7dc5f1251 fixes the
corresponding freedesktop.org bug.

diff --git a/debian/changelog b/debian/changelog
index e979ed3..f3a9a85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mesa (10.3.2-1) UNRELEASED; urgency=medium
 
   * New upstream stable release.
+- Fixes crashes in vdpau with the r600g driver (Closes: #766058).
 
  -- Sven Joachim   Sun, 26 Oct 2014 08:25:29 +0100
 

commit ce2310b5f549556fbeabfdfbb2c08787b0ae42db
Author: Sven Joachim 
Date:   Sun Oct 26 08:25:45 2014 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 802de92..e979ed3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.3.2-1) UNRELEASED; urgency=medium
+
+  * New upstream stable release.
+
+ -- Sven Joachim   Sun, 26 Oct 2014 08:25:29 +0100
+
 mesa (10.3.1-1) unstable; urgency=medium
 
   * Build libgbm on kfreebsd (fixes FTBFS).

commit 3b6a4758fa8958db4b76e6d7efccc93b12b1da06
Author: Emil Velikov 
Date:   Sat Oct 25 00:33:38 2014 +

Add release notes for the 10.3.2 release

Signed-off-by: Emil Velikov 

diff --git a/docs/relnotes/10.3.2.html b/docs/relnotes/10.3.2.html
new file mode 100644
index 000..657c0ac
--- /dev/null
+++ b/docs/relnotes/10.3.2.html
@@ -0,0 +1,113 @@
+http://www.w3.org/TR/html4/loose.dtd";>
+
+
+  
+  Mesa Release Notes
+  
+
+
+
+
+  The Mesa 3D Graphics Library
+
+
+
+
+
+Mesa 10.3.2 Release Notes / October 24, 2014
+
+
+Mesa 10.3.2 is a bug fix release which fixes bugs found since the 10.3 release.
+
+
+Mesa 10.3.2 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3.  OpenGL
+3.3 is only available if requested at context creation
+because compatibility contexts are not supported.
+
+
+SHA256 checksums
+
+TBD
+
+
+New features
+None
+
+Bug fixes
+
+This list is likely incomplete.
+
+
+
+https://bugs.freedesktop.org/show_bug.cgi?id=54372";>Bug 54372 
- GLX_INTEL_swap_event crashes driver when swapping window buffers
+
+https://bugs.freedesktop.org/show_bug.cgi?id=81680";>Bug 81680 
- [r600g] Firefox crashes with hardware acceleration turned on
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84140";>Bug 84140 
- mplayer crashes playing some files using vdpau output
+
+https://bugs.freedesktop.org/show_bug.cgi?id=84662";>Bug 84662 
- Long pauses with Unreal demo Elemental on R9270X since : Always flush the HDP 
cache before submitting a CS to the GPU
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85267";>Bug 85267 
- vlc crashes with vdpau (Radeon 3850HD) [r600]
+
+
+
+Changes
+
+B

xserver-xorg-input-synaptics: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch |   18 
--
 debian/patches/series|1 
 2 files changed, 19 deletions(-)

New commits:
commit 980038f9408216f9d7b1b6dbb59b5bd330c60a49
Author: Maarten Lankhorst 
Date:   Thu Nov 6 11:05:48 2014 +0100

remove disabled patch

diff --git a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch 
b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
deleted file mode 100644
index 750cc25..000
--- a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Do not grab the synaptics device if not running on the current VT.
-This helps when switching user or more in general when running more than one
-instance of Xorg.
-
-Index: xserver-xorg-input-synaptics/src/synaptics.c
-===
 xserver-xorg-input-synaptics.orig/src/synaptics.c  2009-11-19 
21:14:09.183725703 +0900
-+++ xserver-xorg-input-synaptics/src/synaptics.c   2009-11-19 
22:00:51.296245013 +0900
-@@ -747,6 +747,9 @@
- 
- DBG(3, ErrorF("Synaptics DeviceOn called\n"));
- 
-+if (xf86Screens[0]->vtSema == FALSE)
-+  return !Success;
-+
- SetDeviceAndProtocol(local);
- local->fd = xf86OpenSerial(local->options);
- if (local->fd == -1) {
diff --git a/debian/patches/series b/debian/patches/series
index cc28603..e3f1d64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-#01-synaptics-dont-grab-if-not-on-current-VT.patch
 02-do-not-use-synaptics-for-keyboards.patch
 03-bug-return-val.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xmjww-0004vz...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 debian/serverminver|2 +-
 hw/xfree86/common/xf86Module.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c45db25e326a98cc89b803a887bc2fbdca73b677
Author: Maarten Lankhorst 
Date:   Thu Nov 6 10:48:42 2014 +0100

unbump input

diff --git a/debian/serverminver b/debian/serverminver
index 66cac6b..02899bc 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
 2:1.16.99.903
 ABI_VIDEODRV_VERSION:19.0
-ABI_XINPUT_VERSION:22.0
+ABI_XINPUT_VERSION:21.0
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 25a8869..e68fe9c 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -81,7 +81,7 @@ typedef enum {
  */
 #define ABI_ANSIC_VERSION  SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION   SET_ABI_VERSION(19, 0)
-#define ABI_XINPUT_VERSION SET_ABI_VERSION(22, 0)
+#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0)
 #define ABI_EXTENSION_VERSION  SET_ABI_VERSION(9, 0)
 #define ABI_FONT_VERSION   SET_ABI_VERSION(0, 6)
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xmjgn-0001jv...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4b43323dd32fb13709195b08d58a3874f1b9a377
Author: Maarten Lankhorst 
Date:   Tue Nov 4 10:15:10 2014 +0100

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 2525049..2b24a56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) trusty-proposed; 
urgency=medium
 
   * Prevent crash when using SNA with fglrx.
 - disable-outputs-when-slaved.patch
   * Backport support for rotation with SNA. (LP: #1386620)
 
- -- Maarten Lankhorst   Mon, 03 Nov 2014 
12:36:52 +0100
+ -- Maarten Lankhorst   Tue, 04 Nov 2014 
10:14:54 +0100
 
 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; 
urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xmilc-0004wh...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |9 -
 debian/patches/fb-24-depth.patch |   35 +++
 debian/patches/series|1 +
 3 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit a8f92746c78660408d6860a07bd6279d7b6fe3ad
Author: Maarten Lankhorst 
Date:   Wed Nov 5 15:25:01 2014 +0100

Actually fix the cirrus VGA corruption in gnome-terminal.

fb-24-depth.patch (LP: #1318119)

diff --git a/debian/changelog b/debian/changelog
index fcfb9be..1c184d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.15.1-0ubuntu2.3) trusty-proposed; urgency=medium
+
+  * Actually fix the cirrus VGA corruption in gnome-terminal.
+- fb-24-depth.patch (LP: #1318119)
+
+ -- Maarten Lankhorst   Wed, 05 Nov 2014 
15:24:09 +0100
+
 xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; urgency=medium
 
   [ Laércio de Sousa ]
@@ -6,7 +13,7 @@ xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; 
urgency=medium
   [ Maarten Lankhorst ]
   * Re-enable support for rotation and transforms on gpu-screens with support.
 - Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620)
-  * Fix black screen when using qemu with cirrus vga. (LP: #1386620)
+  * Fix black screen when using qemu with cirrus vga.
 
  -- Maarten Lankhorst   Mon, 03 Nov 2014 
12:36:32 +0100
 
diff --git a/debian/patches/fb-24-depth.patch b/debian/patches/fb-24-depth.patch
new file mode 100644
index 000..bdbd4c7
--- /dev/null
+++ b/debian/patches/fb-24-depth.patch
@@ -0,0 +1,35 @@
+commit fe5018e0564118a7a8198fa286186fdb9ed818c7
+Author: Takashi Iwai 
+Date:   Tue Aug 19 15:57:22 2014 -0500
+
+fb: Fix invalid bpp for 24bit depth window
+
+We have a hack in fb layer for a 24bpp screen to use 32bpp images, and
+fbCreateWindow() replaces its drawable.bitsPerPixel field
+appropriately.  But, the problem is that it always replaces when 32bpp
+is passed.  If the depth is 32, this results in bpp < depth, which is
+actually invalid.
+
+Meanwhile, fbCreatePixmap() has a more check and it creates with 24bpp
+only when the passed depth <= 24 for avoiding such a problem.
+
+This oneliner patch just adds the similar check in fbCreateWindow().
+This (hopefully) fixes the long-standing broken graphics mess of
+cirrus KMS with 24bpp.
+
+Signed-off-by: Takashi Iwai 
+Reviewed-by: Keith Packard 
+
+diff --git a/fb/fbwindow.c b/fb/fbwindow.c
+index 368c4b8..c90175f 100644
+--- a/fb/fbwindow.c
 b/fb/fbwindow.c
+@@ -33,7 +33,7 @@ fbCreateWindow(WindowPtr pWin)
+ {
+ dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin),
+   fbGetScreenPixmap(pWin->drawable.pScreen));
+-if (pWin->drawable.bitsPerPixel == 32)
++if (pWin->drawable.bitsPerPixel == 32 && pWin->drawable.depth <= 24)
+ pWin->drawable.bitsPerPixel =
+ fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp;
+ return TRUE;
diff --git a/debian/patches/series b/debian/patches/series
index a378325..7041da3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,3 +61,4 @@ xfree86_keep_non_seat0_from_touching_vts.patch
 xfree86_add_matchseat_key_to_xorg_conf.patch
 xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
 rotation-slaved-crtc-bounds.patch
+fb-24-depth.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xm1gr-0001ol...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

[Maarten Bernardus Lankhorst]

 COPYING |  
 24 
 ChangeLog   |  
270 +
 Xext/panoramiXprocs.c   |  
 12 
 Xext/saver.c|  
 16 
 Xext/security.c |  
  1 
 Xext/shm.c  |  
 15 
 Xext/xvdisp.c   |  
 98 
 Xext/xvdix.h|  
 31 
 Xext/xvmain.c   |  
146 
 composite/compext.c |  
  3 
 composite/compinit.c|  
 23 
 composite/compint.h |  
  1 
 composite/compwindow.c  |  
  7 
 config/config.c |  
161 
 config/udev.c   |  
 10 
 configure.ac|  
115 
 debian/changelog|  
 56 
 debian/control  |  
 17 
 debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff |  
 68 
 debian/patches/111_armel-drv-fallbacks.patch|  
 27 
 debian/patches/228_autobind_gpu.patch   |  
 29 
 debian/patches/config-add-no-removal.patch  |  
 13 
 debian/patches/drm_device_keep_trying.patch |  
 30 
 debian/patches/ppc64el-endian-fix.patch |  
 34 
 debian/patches/series   |  
  5 
 debian/patches/xf86-fixup-detection.patch   |  
 79 
 debian/patches/xmir.patch   |  
162 
 debian/rules|  
 14 
 debian/serverminver |  
  6 
 debian/upstream/signing-key.asc |  
 64 
 debian/xserver-xorg-core.install|  
  2 
 dix/devices.c   |  
 61 
 dix/dispatch.c  |  
 56 
 dix/extension.c |  
  2 
 dix/gc.c|  
  3 
 dix/getevents.c |  
 22 
 dix/main.c  |  
  2 
 dix/pixmap.c|  
 18 
 dix/protocol.txt|  
 30 
 dix/registry.c  |  
 94 
 dix/resource.c  |  
  2 
 dix/window.c|  
 73 
 doc/Xserver-spec.xml|  
  6 
 dri3/dri3.c |  
 10 
 dri3/dri3.h |  
  2 
 exa/exa_accel.c |  
 20 
 exa/exa_priv.h  |  
 19 
 exa/exa_unaccel.c   |  
 11 
 fb/Makefile.am  |  
  2 
 fb/fb.h |  
342 -
 fb/fbbits.c |  
 12 
 fb/fbblt.c  |  
271 -
 fb/fbbltone.c   |  
314 -
 fb/fbcopy.c |  
  2 
 fb/fbfill.c |  
 84 
 fb/fbgc.c   |  
 83 
 fb/fbglyph.c|  
  8 
 fb/fbline.c |  
  4 
 fb/fbo

xtrans: Changes to 'refs/tags/xtrans-1.3.5-1'

[Maarten Bernardus Lankhorst]

Tag 'xtrans-1.3.5-1' created by Maarten Lankhorst 
 at 2014-11-04 13:55 +

xtrans Debian release 1.3.5-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUWNrOAAoJEP5VjHKmcBPDqPEP/R8Fw7MssbMTkyvmNJek4eS0
c/lhcdpwDgaMWEcizuLBDwkzRtZBttvzvly+A33xFl7SugPp4npIIuTJKMDryU3M
KSVrwYohqAtVoIX3ejHkedWZQNOeDb/KBhqFH3OxYnbWuC9QzmlSB5dXUykq5w18
7FFFjH2FtXAn3XMug/pUpJok+Yo4lxnfJgAM26Ru/q3bfyQ59UfFSUDQwClM2vhw
6z6nn4eQZ/szeGqesti2nbgwnf1tDi745N99gcRRaN3i0FEA04+CGqppkUcvNQ9l
+pDwdNrfaJfBPPoM1LFD0PsRPTO3PeSLoI3S8sRPY8EOyJiwJT49SOFklFhfMvIA
u6F9gKLVYxVgQEHE8GJ5rCtUUOKI5Few+2RKAQ7TuT9Fpz2BPDDTvX3OSWQyms6e
FTUSDEmejpaLhzeVdGMfgTCP9OTTJvgi3ET/efioq9FoKBmu7rjkxk/0dI06OB13
qTz++6PHWGdq2M2EqmPqS0/vWroVeJVrT10zbmXDDlhp3etg0zlt/RRXI/F42ZNt
fXCJ/F80LW5J06dD664v9bHVMUF1o/dF0Q+SGjQpngT1+QzkblzvfjN4D0jIQgxE
V+A3Q52WXyPd/j4K4u8A4wuPErHoH5opdCERbMjgRbqODEEU7ztLPyiC1JEtQ/KT
FSr94ZtiuY1sGeVf5Iz6
=e/87
-END PGP SIGNATURE-

Changes since xtrans-1.3.4-1:
Alan Coopersmith (7):
  Update docs to note that TransName is now const char *
  Add const qualifiers to TRANS(Open...) address args
  Add const qualifiers to TRANS(Reopen...) port args
  Add const qualifiers to TRANS(CreateListener) port args
  Add const qualifiers to TRANS(Connect) args
  Add const qualifiers to TRANS(MakeAll*ServerListeners) port args
  Add const qualifiers to TRANS(OpenC{L,O}TS{Server,Client}) args

Keith Packard (2):
  Add TRANS(Listen) function to re-enable specific listen sockets
  xtrans 1.3.5

Maarten Lankhorst (2):
  Merge tag 'xtrans-1.3.5' into debian-unstable
  New upstream release.

---
 ChangeLog|   89 +++
 Xtrans.c |   59 ++--
 Xtrans.h |   24 --
 Xtransint.h  |   34 ++---
 Xtranslcl.c  |   74 -
 Xtranssock.c |   35 +++--
 configure.ac |2 -
 debian/changelog |6 +++
 doc/xtrans.xml   |   88 +++---
 9 files changed, 273 insertions(+), 138 deletions(-)
---


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xleab-pt...@moszumanska.debian.org

xtrans: Changes to 'upstream-unstable'

[Maarten Bernardus Lankhorst]

 Xtrans.c   |   59 +++---
 Xtrans.h   |   24 +--
 Xtransint.h|   34 +++---
 Xtranslcl.c|   74 +--
 Xtranssock.c   |   35 --
 configure.ac   |2 -
 doc/xtrans.xml |   88 -
 7 files changed, 178 insertions(+), 138 deletions(-)

New commits:
commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
Author: Keith Packard 
Date:   Sat Sep 20 10:02:05 2014 -0700

xtrans 1.3.5

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index bb8a34c..b43f0f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xtrans], [1.3.4],
+AC_INIT([xtrans], [1.3.5],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans])
 AC_CONFIG_SRCDIR([Makefile.am])
 

commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96
Author: Keith Packard 
Date:   Fri Sep 12 11:27:39 2014 -0700

Add TRANS(Listen) function to re-enable specific listen sockets

This will allow a server to disable listeners by default and then
let later configuration re-enable them. In particular, this lets the X
server disable inet and unix listen sockets by default while still
providing a '-listen' command line option to re-enable them later on.

Signed-off-by: Keith Packard 
Reviewed-by: Hans de Goede 

diff --git a/Xtrans.c b/Xtrans.c
index 2880803..bfba1ad 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -804,6 +804,31 @@ TRANS(NoListen) (const char * protocol)
 }
 
 int
+TRANS(Listen) (const char * protocol)
+{
+   Xtransport *trans;
+   int i = 0, ret = 0;
+
+   if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
+   {
+   prmsg (1,"TransListen: unable to find transport: %s\n",
+  protocol);
+
+   return -1;
+   }
+   if (trans->flags & TRANS_ALIAS) {
+   if (trans->nolisten)
+  while (trans->nolisten[i]) {
+  ret |= TRANS(Listen)(trans->nolisten[i]);
+  i++;
+   }
+   }
+
+   trans->flags &= ~TRANS_NOLISTEN;
+   return ret;
+}
+
+int
 TRANS(IsListening) (const char * protocol)
 {
Xtransport *trans;
diff --git a/Xtrans.h b/Xtrans.h
index 6decc6b..026fbd7 100644
--- a/Xtrans.h
+++ b/Xtrans.h
@@ -311,6 +311,10 @@ int TRANS(NoListen) (
 const char* /* protocol*/
 );
 
+int TRANS(Listen) (
+const char* /* protocol*/
+);
+
 int TRANS(IsListening) (
 const char* /* protocol*/
 );

commit 17491de45c352c833442cccf17a9bd65909889db
Author: Alan Coopersmith 
Date:   Sat Aug 23 12:28:14 2014 -0700

Add const qualifiers to TRANS(OpenC{L,O}TS{Server,Client}) args

Signed-off-by: Alan Coopersmith 

diff --git a/Xtransint.h b/Xtransint.h
index f674e5b..5ff824d 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -163,9 +163,9 @@ typedef struct _Xtransport {
 
 XtransConnInfo (*OpenCOTSClient)(
struct _Xtransport *,   /* transport */
-   char *, /* protocol */
-   char *, /* host */
-   char *  /* port */
+   const char *,   /* protocol */
+   const char *,   /* host */
+   const char */* port */
 );
 
 #endif /* TRANS_CLIENT */
@@ -174,9 +174,9 @@ typedef struct _Xtransport {
 const char **  nolisten;
 XtransConnInfo (*OpenCOTSServer)(
struct _Xtransport *,   /* transport */
-   char *, /* protocol */
-   char *, /* host */
-   char *  /* port */
+   const char *,   /* protocol */
+   const char *,   /* host */
+   const char */* port */
 );
 
 #endif /* TRANS_SERVER */
@@ -185,9 +185,9 @@ typedef struct _Xtransport {
 
 XtransConnInfo (*OpenCLTSClient)(
struct _Xtransport *,   /* transport */
-   char *, /* protocol */
-   char *, /* host */
-   char *  /* port */
+   const char *,   /* protocol */
+   const char *,   /* host */
+   const char */* port */
 );
 
 #endif /* TRANS_CLIENT */
@@ -196,9 +196,9 @@ typedef struct _Xtransport {
 
 XtransConnInfo (*OpenCLTSServer)(
struct _Xtransport *,   /* transport */
-   char *, /* protocol */
-   char *, /* host */
-   char *  /* port */
+   const char *,   /* protocol */
+   const char *,   /* host */
+   const char */* port */
 );
 
 #endif /* TRANS_SERVER */
diff --git a/Xtranslcl.c b/Xtranslcl.c
index 4f04927..3217506 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -123,7 +123,7 @@ static int TRANS(LocalClose)(XtransConnInfo ciptr);
 /* Type Not Supported */
 
 static int
-TRANS(OpenFail)(XtransConnInfo ciptr _X_UNUSED, char *port _X_UNUSED)
+T

xtrans: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 ChangeLog|   89 +++
 Xtrans.c |   59 ++--
 Xtrans.h |   24 --
 Xtransint.h  |   34 ++---
 Xtranslcl.c  |   74 -
 Xtranssock.c |   35 +++--
 configure.ac |2 -
 debian/changelog |6 +++
 doc/xtrans.xml   |   88 +++---
 9 files changed, 273 insertions(+), 138 deletions(-)

New commits:
commit 4f50ff3f112eeb5024f5c9935040a8cc5ecd42c5
Author: Maarten Lankhorst 
Date:   Tue Nov 4 14:23:11 2014 +0100

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 99098f9..a82f3b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,92 @@
+commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
+Author: Keith Packard 
+Date:   Sat Sep 20 10:02:05 2014 -0700
+
+xtrans 1.3.5
+
+Signed-off-by: Keith Packard 
+
+commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96
+Author: Keith Packard 
+Date:   Fri Sep 12 11:27:39 2014 -0700
+
+Add TRANS(Listen) function to re-enable specific listen sockets
+
+This will allow a server to disable listeners by default and then
+let later configuration re-enable them. In particular, this lets the X
+server disable inet and unix listen sockets by default while still
+providing a '-listen' command line option to re-enable them later on.
+
+Signed-off-by: Keith Packard 
+Reviewed-by: Hans de Goede 
+
+commit 17491de45c352c833442cccf17a9bd65909889db
+Author: Alan Coopersmith 
+Date:   Sat Aug 23 12:28:14 2014 -0700
+
+Add const qualifiers to TRANS(OpenC{L,O}TS{Server,Client}) args
+
+Signed-off-by: Alan Coopersmith 
+
+commit 305d20f2ee888d1c890f902da978176b8ec58a8d
+Author: Alan Coopersmith 
+Date:   Sat Aug 23 12:10:48 2014 -0700
+
+Add const qualifiers to TRANS(MakeAll*ServerListeners) port args
+
+Required also changing receive_listening_fds to specify port as const,
+which we can do now that TRANS(ReopenCOTSServer) takes it as const.
+
+Signed-off-by: Alan Coopersmith 
+
+commit ba70d48951fb925fb3082d81afb08c330333aa51
+Author: Alan Coopersmith 
+Date:   Sat Aug 23 11:33:57 2014 -0700
+
+Add const qualifiers to TRANS(Connect) args
+
+Also required constifying UnixHostReallyLocal, since SocketUNIXConnect
+passes the host arg through to it.
+
+Signed-off-by: Alan Coopersmith 
+
+commit 63b65a20706def951dd25e531949b7bc556419eb
+Author: Alan Coopersmith 
+Date:   Sat Aug 23 10:17:57 2014 -0700
+
+Add const qualifiers to TRANS(CreateListener) port args
+
+Signed-off-by: Alan Coopersmith 
+
+commit fd90a4e00321b22c96565cfa354b8b0efa376979
+Author: Alan Coopersmith 
+Date:   Sat Aug 23 10:07:22 2014 -0700
+
+Add const qualifiers to TRANS(Reopen...) port args
+
+Signed-off-by: Alan Coopersmith 
+
+commit a56ec9d720a7964bada837790e9c1f6ceef97861
+Author: Alan Coopersmith 
+Date:   Sat Aug 23 09:58:05 2014 -0700
+
+Add const qualifiers to TRANS(Open...) address args
+
+Required also adding const to static TRANS(ParseAddress) function which
+they pass the address arg to for parsing.
+
+Signed-off-by: Alan Coopersmith 
+
+commit 30b3fd74a27c80993e81dfcb33e33520ae8684fb
+Author: Alan Coopersmith 
+Date:   Sat Aug 23 12:46:44 2014 -0700
+
+Update docs to note that TransName is now const char *
+
+Missed when the code was updated in commit eb9a8904fbef61a57ff0.
+
+Signed-off-by: Alan Coopersmith 
+
 commit a57a7f62242e1ea972b81414741729bf3dbae0a4
 Author: Hans de Goede 
 Date:   Mon Mar 31 12:37:43 2014 +0200
diff --git a/debian/changelog b/debian/changelog
index 8da2fd4..39ddc4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xtrans (1.3.5-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maarten Lankhorst   Tue, 04 Nov 2014 
14:22:28 +0100
+
 xtrans (1.3.4-1) unstable; urgency=medium
 
   * New upstream release.

commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
Author: Keith Packard 
Date:   Sat Sep 20 10:02:05 2014 -0700

xtrans 1.3.5

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index bb8a34c..b43f0f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xtrans], [1.3.4],
+AC_INIT([xtrans], [1.3.5],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans])
 AC_CONFIG_SRCDIR([Makefile.am])
 

commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96
Author: Keith Packard 
Date:   Fri Sep 12 11:27:39 2014 -0700

Add TRANS(Listen) function to re-enable specific listen sockets

This will allow a server to disable listeners by default and then
let later configuration re-enable them. In particular, this lets the X
server disable inet and unix listen sockets by default while still
providing a '-listen' command

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 0d367aa997a756a06573519b711fbead30a5690c
Author: Maarten Lankhorst 
Date:   Tue Nov 4 09:59:16 2014 +0100

fixup changelog

diff --git a/debian/changelog b/debian/changelog
index b520a4d..2525049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,22 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; 
urgency=medium
-
-  [ Timo Aaltonen ]
-  * fix-no-backlight.diff: Don't let backlight switch off when cycling
-through display modes. (LP: #1373776)
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.3) UNRELEASED; urgency=medium
 
-  [ Maarten Lankhorst ]
-  * Fix black screen with SNA. (LP: #1365695)
   * Prevent crash when using SNA with fglrx.
 - disable-outputs-when-slaved.patch
   * Backport support for rotation with SNA. (LP: #1386620)
 
  -- Maarten Lankhorst   Mon, 03 Nov 2014 
12:36:52 +0100
 
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; 
urgency=medium
+
+  [ Maarten Lankhorst ]
+  * Fix black screen with SNA. (LP: #1365695)
+
+  [ Timo Aaltonen ]
+  * fix-no-backlight.diff: Don't let backlight switch off when cycling
+through display modes. (LP: #1373776)
+
+ -- Maarten LankhorstMon, 20 Oct 2014 
09:54:57 +0200
+
 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium
 
   * Backport fixes from upstream driver for fglrx and broadwell. (LP: #1359105)

commit 7e7b89542e64dafaa23b5275bed64e8e3174f705
Author: Maarten Lankhorst 
Date:   Mon Nov 3 12:37:06 2014 +0100

release to trusty-proposed

diff --git a/debian/changelog b/debian/changelog
index 8530d3d..b520a4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) trusty-proposed; 
urgency=medium
 
   [ Timo Aaltonen ]
   * fix-no-backlight.diff: Don't let backlight switch off when cycling
@@ -10,7 +10,7 @@ xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; 
urgency=medium
 - disable-outputs-when-slaved.patch
   * Backport support for rotation with SNA. (LP: #1386620)
 
- -- Maarten Lankhorst   Mon, 22 Sep 2014 
11:26:22 +0200
+ -- Maarten Lankhorst   Mon, 03 Nov 2014 
12:36:52 +0100
 
 xserver-xorg-video-intel (2:2.99.910-0ubuntu1.1) trusty; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xlzxs-0006wb...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 79a129c67189fcefe4693fc1b6ae9654a07aac31
Author: Maarten Lankhorst 
Date:   Mon Nov 3 12:36:46 2014 +0100

release to trusty-proposed

diff --git a/debian/changelog b/debian/changelog
index a8f1ea6..fcfb9be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.15.1-0ubuntu2.2) UNRELEASED; urgency=medium
+xorg-server (2:1.15.1-0ubuntu2.2) trusty-proposed; urgency=medium
 
   [ Laércio de Sousa ]
   * Backport support for logind-based multiseat back to trusty. (LP: #1209008)
@@ -8,7 +8,7 @@ xorg-server (2:1.15.1-0ubuntu2.2) UNRELEASED; urgency=medium
 - Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620)
   * Fix black screen when using qemu with cirrus vga. (LP: #1386620)
 
- -- Maarten Lankhorst   Tue, 30 Sep 2014 
12:46:12 +0200
+ -- Maarten Lankhorst   Mon, 03 Nov 2014 
12:36:32 +0100
 
 xorg-server (2:1.15.1-0ubuntu2.1) trusty-proposed; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xljnw-0001im...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog   |7 
 debian/patches/disable-rotation-transform-gpuscreens.patch |   35 +--
 debian/patches/rotation-slaved-crtc-bounds.patch   |  122 +
 debian/patches/series  |1 
 4 files changed, 142 insertions(+), 23 deletions(-)

New commits:
commit f3d6ff4350e55b52a766687f776af20a5faf0ba5
Author: Maarten Lankhorst 
Date:   Mon Nov 3 12:24:01 2014 +0100

bump changelog

* Re-enable support for rotation and transforms on gpu-screens with support.
  - Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620)
* Fix black screen when using qemu with cirrus vga. (LP: #1386620)

diff --git a/debian/changelog b/debian/changelog
index 9e2495e..a8f1ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-xorg-server (2:1.15.1-0ubuntu2.2) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-0ubuntu2.2) UNRELEASED; urgency=medium
 
   [ Laércio de Sousa ]
   * Backport support for logind-based multiseat back to trusty. (LP: #1209008)
 
+  [ Maarten Lankhorst ]
+  * Re-enable support for rotation and transforms on gpu-screens with support.
+- Allows re-enabling intel SNA rotation after fixing it. (LP: #1386620)
+  * Fix black screen when using qemu with cirrus vga. (LP: #1386620)
+
  -- Maarten Lankhorst   Tue, 30 Sep 2014 
12:46:12 +0200
 
 xorg-server (2:1.15.1-0ubuntu2.1) trusty-proposed; urgency=medium
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch 
b/debian/patches/disable-rotation-transform-gpuscreens.patch
index 9da6c65..9f95572 100644
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ b/debian/patches/disable-rotation-transform-gpuscreens.patch
@@ -1,22 +1,13 @@
 a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -932,6 +932,9 @@
- if (xf86RandR12Key == NULL)
- return;
- 
-+if (pScreen->isGPU)
-+rotations = RR_Rotate_0;
-+
- randrp = XF86RANDRINFO(pScreen);
- #if RANDR_12_INTERFACE
- for (c = 0; c < config->num_crtc; c++) {
-@@ -954,6 +957,9 @@
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- #endif
- 
-+if (pScreen->isGPU)
-+transforms = FALSE;
-+
- if (xf86RandR12Key == NULL)
- return;
- 
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index a441fd1..9147a26 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
 b/hw/xfree86/modes/xf86Crtc.c
+@@ -778,7 +778,7 @@ xf86CrtcScreenInit(ScreenPtr screen)
+ if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
+ break;
+ }
+-if (c == config->num_crtc) {
++if (c == config->num_crtc && !screen->isGPU) {
+ xf86RandR12SetRotations(screen, RR_Rotate_0 | RR_Rotate_90 |
+ RR_Rotate_180 | RR_Rotate_270 |
+ RR_Reflect_X | RR_Reflect_Y);
diff --git a/debian/patches/rotation-slaved-crtc-bounds.patch 
b/debian/patches/rotation-slaved-crtc-bounds.patch
new file mode 100644
index 000..4c8345a
--- /dev/null
+++ b/debian/patches/rotation-slaved-crtc-bounds.patch
@@ -0,0 +1,122 @@
+From: Chris Wilson 
+To: xorg-de...@lists.x.org
+Subject: [PATCH 2/3] randr: Consider rotation of slaved crtcs when computing 
bounds
+Date: Wed, 23 Jul 2014 12:35:14 +0100
+
+When creating a pixmap to cover a rotated slaved CRTC, we need to
+consider its rotated size as that is the area that it occupies in the
+framebuffer. The slave is then responsible for mapping the copy of the
+framebuffer onto the rotated scanout - which can be the usual RandR
+shadow composite method.
+
+Signed-off-by: Chris Wilson 
+Cc: Dave Airlie 
+Cc: Maarten Lankhorst 
+---
+ randr/rrcrtc.c | 56 
+ 1 file changed, 36 insertions(+), 20 deletions(-)
+
+--- a/randr/rrcrtc.c
 b/randr/rrcrtc.c
+@@ -273,27 +273,43 @@
+ return FALSE;
+ }
+ 
+-static void
+-crtc_bounds(RRCrtcPtr crtc, int *left, int *right, int *top, int *bottom)
++static int mode_height(const RRModeRec *mode, Rotation rotation)
+ {
+-*left = crtc->x;
+-*top = crtc->y;
+-
+-switch (crtc->rotation) {
++switch (rotation & 0xf) {
+ case RR_Rotate_0:
+ case RR_Rotate_180:
++  return mode->mode.height;
++case RR_Rotate_90:
++case RR_Rotate_270:
++  return mode->mode.width;
+ default:
+-*right = crtc->x + crtc->mode->mode.width;
+-*bottom = crtc->y + crtc->mode->mode.height;
+-return;
++  return 0;
++}
++}
++
++static int mode_width(const RRModeRec *mode, Rotation rotation)
++{
++switch (rotation & 0xf) {
++case RR_Rotate_0:
++case RR_Rotate_180:
++  return mode->mode.width;
+ case RR_Rotate_90:
+ case RR_Rotate_270:
+-*right = crtc->x + crtc->mode->mode.height;
+-*bottom = crtc->y + crtc->mode->mode.width;
+-return;
++  return mode->mode.height;
++d

xserver-xorg-video-intel: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |   11 
 debian/patches/01-support-native-rotations.diff  |  269 
 debian/patches/02-extend-native-rotation-to-sprites.diff |  407 +++
 debian/patches/03-reorganise-native-rotation.diff|  245 
 debian/patches/04-inherit-native-rotation.diff   |   21 
 debian/patches/05-clear-transform-on-disable.diff|   33 
 debian/patches/06-set-color-key-once.diff|   79 +
 debian/patches/07-show-sprites-on-all-outputs.diff   |  730 
 debian/patches/08-rewrite-rotation-universal-planes.diff |  856 +++
 debian/patches/09-reduce-reflections-onto-rotations.diff |   90 +
 debian/patches/10-handle-rotated-slaves.diff |  410 +++
 debian/patches/series|   11 
 12 files changed, 3158 insertions(+), 4 deletions(-)

New commits:
commit dc762db1e2d7b45b080889131fb362aead003e87
Author: Maarten Lankhorst 
Date:   Wed Oct 29 16:14:32 2014 +0100

add patch series for rotation support

diff --git a/debian/changelog b/debian/changelog
index 7fa7a26..dfa91b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.910-0ubuntu1.2) UNRELEASED; urgency=medium
 
   * Fix black screen with SNA. (LP: #1365695)
+  * Prevent crash when using SNA with fglrx.
+- disable-outputs-when-slaved.patch
+  * Backport support for rotation with SNA. (LP: #1386620)
 
  -- Maarten Lankhorst   Mon, 22 Sep 2014 
11:26:22 +0200
 
diff --git a/debian/patches/01-support-native-rotations.diff 
b/debian/patches/01-support-native-rotations.diff
new file mode 100644
index 000..99b5144
--- /dev/null
+++ b/debian/patches/01-support-native-rotations.diff
@@ -0,0 +1,269 @@
+commit 607737cc47788e2a8896fddfece907a3cfb24f7f
+Author: Chris Wilson 
+Date:   Wed Feb 12 11:33:45 2014 +
+
+sna: Support native primary plane rotations
+
+Use the display hardware for simple rotations, when exported through the
+rotation property on the CRTC.
+
+As the kernel support is not yet merged upstream, the feature is hidden
+behind --enable-rotation.
+
+Signed-off-by: Chris Wilson 
+
+diff --git a/configure.ac b/configure.ac
+index ea7473e..4f73ba4 100644
+--- a/configure.ac
 b/configure.ac
+@@ -578,6 +578,17 @@ if test "x$CREATE2" = "xyes"; then
+   xp_msg="$xp_msg create2"
+ fi
+ 
++AC_ARG_ENABLE(rotation,
++AS_HELP_STRING([--enable-rotation],
++   [Enable use of native rotations (experimental) 
[default=no]]),
++[ROTATION="$enableval"],
++[ROTATION="no"])
++AM_CONDITIONAL(USE_ROTATION, test "x$ROTATION" = "xyes")
++if test "x$ROTATION" = "xyes"; then
++  AC_DEFINE(USE_ROTATION,1,[Assume "rotation" support])
++  xp_msg="$xp_msg rotation"
++fi
++
+ AC_ARG_ENABLE(userptr,
+ AS_HELP_STRING([--enable-userptr],
+[Enable use of userptr (experimental) 
[default=no]]),
+diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
+index a89d31a..c5ccaac 100644
+--- a/src/sna/gen5_render.c
 b/src/sna/gen5_render.c
+@@ -1537,6 +1537,25 @@ gen5_composite_picture(struct sna *sna,
+   return sna_render_picture_extract(sna, picture, channel,
+ x, y, w, h, dst_x, dst_y);
+ 
++  DBG(("%s: pixmap, repeat=%d, filter=%d, transform?=%d [affine? %d], 
format=%08x\n",
++   __FUNCTION__,
++   channel->repeat, channel->filter,
++   channel->transform != NULL, channel->is_affine,
++   channel->pict_format));
++  if (channel->transform) {
++  DBG(("%s: transform=[%f %f %f, %f %f %f, %f %f %f]\n",
++   __FUNCTION__,
++   channel->transform->matrix[0][0] / 65536.,
++   channel->transform->matrix[0][1] / 65536.,
++   channel->transform->matrix[0][2] / 65536.,
++   channel->transform->matrix[1][0] / 65536.,
++   channel->transform->matrix[1][1] / 65536.,
++   channel->transform->matrix[1][2] / 65536.,
++   channel->transform->matrix[2][0] / 65536.,
++   channel->transform->matrix[2][1] / 65536.,
++   channel->transform->matrix[2][2] / 65536.));
++  }
++
+   return sna_render_pixmap_bo(sna, channel, pixmap,
+   x, y, w, h, dst_x, dst_y);
+ }
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index a6e6f68..9b05f74 100644
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -105,6 +105,10 @@ struct sna_crtc {
+   uint8_t id;
+   uint8_t pipe;
+   uint8_t plane;
++
++  uint32_t rotation_id;
++  uint32_t supported_rotations;
++  uint32_t rotation, last_rotation;
+ };
+ 
+ struct sna_property {
+@@ 

mesa: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0053ec9cb7cf4179e6d987850060e7230cedb71a
Author: Maarten Lankhorst 
Date:   Thu Oct 23 15:05:34 2014 +0200

mention bug number

diff --git a/debian/changelog b/debian/changelog
index 1937b17..7dffd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 mesa (10.3.1-1ubuntu1) utopic; urgency=medium
 
   * Merge with released debian unstable, no changes in packaging.
-- New upstream release.
+- New upstream release. (LP: #1384289)
 
  -- Maarten Lankhorst   Thu, 23 Oct 2014 
12:50:53 +0200
 

commit 657e4eb19e432a2b0cddd792173a9f91612db567
Author: Maarten Lankhorst 
Date:   Thu Oct 23 12:52:22 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 2b9a0d4..1937b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.3.1-1ubuntu1) UNRELEASED; urgency=medium
+mesa (10.3.1-1ubuntu1) utopic; urgency=medium
 
   * Merge with released debian unstable, no changes in packaging.
 - New upstream release.
 
- -- Maarten Lankhorst   Thu, 23 Oct 2014 
12:02:16 +0200
+ -- Maarten Lankhorst   Thu, 23 Oct 2014 
12:50:53 +0200
 
 mesa (10.3.1-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xieul-0002q5...@moszumanska.debian.org

xserver-xorg-video-freedreno: Changes to 'refs/tags/xserver-xorg-video-freedreno-1.3.0-1'

[Maarten Bernardus Lankhorst]

Tag 'xserver-xorg-video-freedreno-1.3.0-1' created by Maarten Lankhorst 
 at 2014-10-23 08:47 +

xserver-xorg-video-freedreno Debian release 1.3.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUSMCTAAoJEP5VjHKmcBPDBXEP/i5+sC+d3IhexuepiHHr8CPJ
uxHCyXkefrzH1YH6MPNohhDMKykFAui8n/OJpQuOTFD0kQtDvM0ttZuTHTclYeix
J1aT9zGotopcUAtjglLrUMvIffwV1MK5clmRM4dhRm3+f5uF9QBlwLKQrkY1LPZq
NNZ1Yv99iF2OFNo+d4elufXnJdsK1mFm+C5JsAE98IXtikYZneHlylGtG6obdX1C
eWCkG9Hmu2iYTVIrVTzfet7Spngoql7FZdivttxY6y28w0lQTSfYnWdo2YBt6qkP
93LD/WY0hnSl3SHJlrzmpmTBEmrvWE1Tsb64WygTiM/BCm88nHJoJ6GwbAzlAyqY
3MB3VjByF1heaCq2BKUcNP/z6aZPkOxwkhBclHdqOWBTlfxCRVNXFWVpxTg7NZNQ
B8BObw+UF1QOyy+Fw0TBFSzGuEPxmnpewSp4WvQ92wwyVbJ7YFAuSLQ+aLqnLM2Z
bDg9kbgX0FPKkbKhnViS2SA3ZWu2nfD5GhCWCBjenOy3aZK5+X7wQuqjZiNhiGAP
cXi7sHrXA/I0zhDWYVY4U0WUOf+FMC/Pld4HTQjpFkH9AUYDDAW3AdDyizsaMKpx
XBUAzNY8tq44x/PZSNHVAHcc/mA4eRswz4Fc2imrFPi66UZctVvKtF2LBLQZBi2t
wTfq2GqYaTwSy17rwvN4
=6G6r
-END PGP SIGNATURE-

Changes since the dawn of time:
Andreas Färber (2):
  drmmode_display: Drop unused include
  fbmode_display: Clean up comment

Maarten Lankhorst (13):
  Initial release. (Closes: #756021)
  remove copyright file copied from modesetting
  the installed xorg.conf snippet requires 1.16 for OutputClass section.
  fix some harmless packaging warnings
  add a basic copyright file
  first upload to unstable
  rollback to debhelper 8, multiarched libdir is not a good idea
  the conf file only gets installed with xorg-server 1.16 it seems
  update copyright
  and update some more
  Merge tag 'xf86-video-freedreno-1.3.0' into debian-unstable
  New upstream release.
  release to unstable

Micah Richert (1):
  Fix xf86ScreenToScrn and xf86ScrnToScreen macros not being defined.

Rob Clark (70):
  Initial commit
  Fix handling for framebuffer bo
  accel: Add ringbuffer and initial context setup
  accel: add debug support to log dwords
  exa: Add solid fill
  exa: add solid copy
  exa: begin adding composite
  exa: more work on composite
  exa: composite
  exa: cleanups
  driver: hack to make sure backlight gets enabled
  accel: turn off dword logging by default
  driver: improve panning/backlight hack
  driver: fix issue w/ lightdm
  exa: move scissor x/y into out_dstpix()
  exa: begin cleaning up hard-coded constants
  convert to use libdrm_freedreno
  add batching
  update fd_ringbuffer_emit_reloc()
  add dri2
  update for compat-api
  exa: composite ops w/ mask and other cleanups
  update registers header
  add libdrm debugging/traces
  exa: use CreatePixmap2
  exa: add support for composite w/ repeat
  accel: reduce cmdstream buffer size
  dri2: allocate DRI2 buffers in SMI
  remove unneeded mibstore.h include
  remove miInitializeBackingStore() call
  remove some unused config file stuff
  pixmap: remove some more cruft
  use compat-api: xf86Screens[] -> xf86ScreenToScrn()
  split out fbdev parts to prepare for drm/kms
  drm/kms support
  dri2: page-flip support
  fbdev: fix 0x0 visual issue
  make-dist fixes
  NEWS: Bump version to 1.0.0
  Fix probe issues
  xa: add XA state tracker based EXA
  add NoAccel config file option
  add man page with .conf file options
  kms: copy old fb to new fb on modeset
  accel: split out z1xx 2d core bits
  kms: fix crash with NoAccel
  kms: fix crash on startup with no display
  kms: missing hunk from last patch
  kms/fb: fix load_cursor_argb for the new Xorg ABI
  kms/fb: fix again, now for load_cursor_argb_check
  fb: fix yet again, now for load_cursor_argb_check
  config: add missing udev check
  xa: add composite
  option to enable/disable individual EXA functions
  NEWS: Bump version to 1.1.0
  bump libdrm dependency
  cleanup better on exit
  add platform-probe support
  add support for server managed fd's
  add OutputClass conf
  NEWS: Bump version to 1.2.0
  kms: fix problem with multiple displays
  make sure scanout has a legit stride
  kms: remove some unneeded includes
  add COPYING license file
  server-fd fixes
  kms: remove fb on ScreenClose
  dri2: pDraw can be gone already... don't dixSetPrivate()
  xa: reject unsupported Solid ops
  NEWS: Bump version to 1.3.0

crondog (1):
  Add option to disable SW_REFRESHER (KGSL)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xhe3g-rq...@moszumanska.debian.org

xserver-xorg-video-freedreno: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b5d7161ec3ae614dfa15a8c7ff39ed4bfe286b1
Author: Maarten Lankhorst 
Date:   Thu Oct 23 10:34:56 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index a796f46..461c402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-freedreno (1.3.0-1) UNRELEASED; urgency=medium
+xserver-xorg-video-freedreno (1.3.0-1) unstable; urgency=medium
 
   * New upstream release.
   * Build on armhf and armel only. (Closes: #766445)
 
- -- Maarten Lankhorst   Wed, 22 Oct 2014 
09:56:59 +0200
+ -- Maarten Lankhorst   Thu, 23 Oct 2014 
10:34:44 +0200
 
 xserver-xorg-video-freedreno (1.2.0-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xhe2z-lr...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog|  
  7 
 debian/patches/series   |  
  4 
 debian/patches/xfree86_add_matchseat_key_description_to_xorg_conf_man.patch |  
 68 ++
 debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch |  
248 ++
 debian/patches/xfree86_allow_fallback_to_pci_bus_probe_for_non_seat0.patch  |  
 52 ++
 debian/patches/xfree86_keep_non_seat0_from_touching_vts.patch   |  
 50 ++
 6 files changed, 429 insertions(+)

New commits:
commit 3d5b3816d5c758ffc9367ec2c94b8c843b4a751a
Author: Maarten Lankhorst 
Date:   Tue Sep 30 12:48:54 2014 +0200

Backport support for logind-based multiseat back to trusty. (LP: #1209008)

diff --git a/debian/changelog b/debian/changelog
index 9351147..9e2495e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.15.1-0ubuntu2.2) UNRELEASED; urgency=low
+
+  [ Laércio de Sousa ]
+  * Backport support for logind-based multiseat back to trusty. (LP: #1209008)
+
+ -- Maarten Lankhorst   Tue, 30 Sep 2014 
12:46:12 +0200
+
 xorg-server (2:1.15.1-0ubuntu2.1) trusty-proposed; urgency=medium
 
   * Copy utopic package back to trusty.
diff --git a/debian/patches/series b/debian/patches/series
index 9fa55f1..5cc0272 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,3 +56,7 @@ xi2-resize-touch.patch
 xi-dont-copy-too-much.patch
 mi-dont-process-disabled.patch
 ppc64el-endian-fix.patch
+xfree86_allow_fallback_to_pci_bus_probe_for_non_seat0.patch
+xfree86_keep_non_seat0_from_touching_vts.patch
+xfree86_add_matchseat_key_to_xorg_conf.patch
+xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
diff --git 
a/debian/patches/xfree86_add_matchseat_key_description_to_xorg_conf_man.patch 
b/debian/patches/xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
new file mode 100644
index 000..c7f70cc
--- /dev/null
+++ 
b/debian/patches/xfree86_add_matchseat_key_description_to_xorg_conf_man.patch
@@ -0,0 +1,68 @@
+From a6f5ffd5879e7fb052d343592951cc476b699bb4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= 
+Date: Thu, 3 Apr 2014 11:19:15 -0300
+Subject: [PATCH] xfree86: add short description about MatchSeat key in
+ xorg.conf man page
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Laércio de Sousa 
+Reviewed-by: Dave Airlie 
+Signed-off-by: Peter Hutterer 
+---
+ hw/xfree86/man/xorg.conf.man | 24 
+ 1 file changed, 24 insertions(+)
+
+diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
+index 6d2652e..cadd87b 100644
+--- a/hw/xfree86/man/xorg.conf.man
 b/hw/xfree86/man/xorg.conf.man
+@@ -1378,6 +1378,14 @@ for the regular text mode.
+ The frequency is specified in MHz.
+ This is rarely used.
+ .TP 7
++.BI "MatchSeat  " "seat\-id"
++Only apply this
++.B Device
++section if X server was started with
++.B -seat
++.I seat\-id
++option.
++.TP 7
+ .BI "Option \*qModeDebug\*q \*q" boolean \*q
+ Enable printing of additional debugging information about modesetting to
+ the server log.
+@@ -1900,6 +1908,14 @@ The only case where there is even a choice in this 
value is for depth 24,
+ where some hardware supports both a packed 24 bit framebuffer layout and a
+ sparse 32 bit framebuffer layout.
+ .TP 7
++.BI "MatchSeat  " "seat\-id"
++Only apply this
++.B Screen
++section if X server was started with
++.B -seat
++.I seat\-id
++option.
++.TP 7
+ .B Options
+ Various
+ .B Option
+@@ -2295,6 +2311,14 @@ and the first two should normally be used to indicate 
the core pointer
+ and core keyboard devices respectively.
+ .RE
+ .TP 7
++.BI "MatchSeat  " "seat\-id"
++Only apply this
++.B ServerLayout
++section if X server was started with
++.B -seat
++.I seat\-id
++option.
++.TP 7
+ .B Options
+ In addition to the following, any option permitted in the
+ .B ServerFlags
+-- 
+2.0.4
+
diff --git a/debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch 
b/debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch
new file mode 100644
index 000..31ab950
--- /dev/null
+++ b/debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch
@@ -0,0 +1,248 @@
+From 7070ebeebaca1b51f8a2801989120784a1c374ae Mon Sep 17 00:00:00 2001
+From: Oleg Samarin 
+Date: Thu, 3 Apr 2014 11:19:14 -0300
+Subject: [PATCH] xfree86: add new key MatchSeat to xorg.conf sections
+ "Device", "Screen", and "ServerLayout"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch introduces a new key MatchSeat in xorg.conf (also applies to
+any .conf file in xorg.conf.d). It will allow targeting a given
+"Device", "Screen", and/or "ServerLayout" section to a particular
+seat only (specified by option "-seat" in X server command line),
+so that other seats won't be affected.
+
+Without this patch, one needs to write a separate xorg.conf.custom
+file 

xorg-server: Changes to 'ubuntu'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 debian/control   |   11 ---
 2 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit d5f29a902b4807ada5aee920332d6d95f7a1a87c
Author: Maarten Lankhorst 
Date:   Mon Oct 13 10:24:30 2014 +0200

Remove outdated breaks/replaces, only affects the lts.

diff --git a/debian/changelog b/debian/changelog
index 26cec40..49ca1d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.16.0-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Remove outdated breaks/replaces, only affects the lts.
+
+ -- Maarten Lankhorst   Mon, 13 Oct 2014 
10:24:16 +0200
+
 xorg-server (2:1.16.0-1ubuntu1) utopic; urgency=medium
 
   [ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index 446b815..5033113 100644
--- a/debian/control
+++ b/debian/control
@@ -364,17 +364,6 @@ Depends:
 Recommends:
  xfonts-base,
  xauth,
-Breaks:
- xserver-common-lts-quantal (<< 3:0),
- xserver-common-lts-raring (<< 3:0),
- xserver-common-lts-saucy (<< 3:0),
- xserver-common-lts-trusty (<< 3:0),
-Replaces:
- xserver-common-lts-quantal (<< 3:0),
- xserver-common-lts-raring (<< 3:0),
- xserver-common-lts-saucy (<< 3:0),
- xserver-common-lts-trusty (<< 3:0),
- xserver-xorg-core (<< 2:1.5.2)
 Description: common files used by various X servers
  This package provides files necessary for all X.Org based X servers.
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xgszy-0003ib...@moszumanska.debian.org

xserver-xorg-video-freedreno: Changes to 'debian-unstable'

[Maarten Bernardus Lankhorst]

 debian/copyright |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fa07fda638321423f3d3aa35741551490b1e4308
Author: Maarten Lankhorst 
Date:   Mon Oct 6 13:51:19 2014 +0200

and update some more

diff --git a/debian/copyright b/debian/copyright
index 7034126..0a87c61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: 
 Files: src/fbmode_display.c src/msm-driver.c src/msm-exa*.c src/msm-pixmap.c 
src/msm.h
 Copyright: Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
Copyright © 2013 Rob Clark 
-License:
+License: X11-ish
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  * Redistributions of source code must retain the above copyright
@@ -33,7 +33,7 @@ License:
 Files: system-includes/linux/msm_mdp.h
 Copyright: Copyright (C) 2007 Google Incorporated
Copyright (c) 2012 Code Aurora Forum. All rights reserved.
-License: GPL-2 with userspace exception
+License: /usr/share/common-licenses/GPL-2 with userspace exception
  This software is licensed under the terms of the GNU General Public
  License version 2, as published by the Free Software Foundation, and
  may be copied, distributed, and modified under those terms.
@@ -45,7 +45,7 @@ License: GPL-2 with userspace exception
 
 Files: configure.ac Makefile.am conf/Makefile.am
 Copyright: Copyright 2005 Adam Jackson.
-License: MIT with Adam Jackson mentioned
+License: MIT-ajax
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
  to deal in the Software without restriction, including without limitation


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xgqmg-0001yl...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog |7 +++
 debian/control   |6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit ae870f74fff47950a1175145eb7d8438631363fe
Author: Maarten Lankhorst 
Date:   Mon Oct 13 16:05:51 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index f2185d1..af2e52c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:7.4.0-2ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.4.0-2ubuntu2) utopic; urgency=low
 
   * Rebuild for xorg 1.16.
   * Remove glamor as depends, part of Xorg in 1.16.
 
- -- Maarten Lankhorst   Tue, 29 Jul 2014 
14:21:39 +0200
+ -- Maarten Lankhorst   Wed, 10 Sep 2014 
16:57:22 +0200
 
 xserver-xorg-video-ati (1:7.4.0-2ubuntu1) utopic; urgency=medium
 

commit bafd22d23e7a41488de46ad19ba4fa29a802a161
Author: Maarten Lankhorst 
Date:   Wed Sep 10 16:57:19 2014 +0200

Rebuild for xorg 1.16.

Remove glamor as depends, part of Xorg in 1.16.

diff --git a/debian/changelog b/debian/changelog
index d885ba4..f2185d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:7.4.0-2ubuntu2) UNRELEASED; urgency=low
+
+  * Rebuild for xorg 1.16.
+  * Remove glamor as depends, part of Xorg in 1.16.
+
+ -- Maarten Lankhorst   Tue, 29 Jul 2014 
14:21:39 +0200
+
 xserver-xorg-video-ati (1:7.4.0-2ubuntu1) utopic; urgency=medium
 
   * Merge with released debian unstable.
diff --git a/debian/control b/debian/control
index 81d7716..b0dba0f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
+ xserver-xorg-dev (>= 2:1.15.99.904~),
  x11proto-gl-dev,
  x11proto-xext-dev,
  x11proto-core-dev,
@@ -22,8 +22,9 @@ Build-Depends:
  x11proto-dri2-dev,
  x11proto-xf86dri-dev,
  libudev-dev [linux-any],
- libglamor-dev (>= 0.6.0-0ubuntu3),
  xutils-dev (>= 1:7.5+4)
+Build-Conflicts:
+ libglamor-dev,
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ati
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git
@@ -34,7 +35,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${xviddriver:Depends},
- xserver-xorg-video-glamoregl,
  xserver-xorg-video-r128,
  xserver-xorg-video-mach64,
  xserver-xorg-video-radeon


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xdgg1-0002d0...@moszumanska.debian.org

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

[Maarten Bernardus Lankhorst]

 debian/changelog   |7 
 debian/patches/fix-uxa-fglrx-stealing.diff |  646 +
 debian/patches/series  |1 
 3 files changed, 654 insertions(+)

New commits:
commit 5bc2799b0a69dde7bb7dbcddd9e021f9243de30b
Author: Maarten Lankhorst 
Date:   Thu Oct 9 09:39:41 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 084e18f..3450e89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4) utopic; urgency=medium
 
   * Fix a crash when fglrx steals the screen in DGPU or IGPU mode.
 - fix-uxa-fglrx-stealing.diff
 
- -- Maarten Lankhorst   Wed, 08 Oct 2014 
15:46:38 +0200
+ -- Maarten Lankhorst   Thu, 09 Oct 2014 
09:39:17 +0200
 
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu3) utopic; urgency=medium
 

commit 6d4c2abfe9783cfec19e9282d6420a541527a24d
Author: Maarten Lankhorst 
Date:   Wed Oct 8 15:48:20 2014 +0200

Fix a crash when fglrx steals the screen in DGPU or IGPU mode.

add fix-uxa-fglrx-stealing.diff

diff --git a/debian/changelog b/debian/changelog
index dc2fe67..084e18f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu4) UNRELEASED; urgency=medium
+
+  * Fix a crash when fglrx steals the screen in DGPU or IGPU mode.
+- fix-uxa-fglrx-stealing.diff
+
+ -- Maarten Lankhorst   Wed, 08 Oct 2014 
15:46:38 +0200
+
 xserver-xorg-video-intel (2:2.99.914-1~exp1ubuntu3) utopic; urgency=medium
 
   * Add patch to enable SNA with fglrx. (LP: #1359105)
diff --git a/debian/patches/fix-uxa-fglrx-stealing.diff 
b/debian/patches/fix-uxa-fglrx-stealing.diff
new file mode 100644
index 000..f67a1e4
--- /dev/null
+++ b/debian/patches/fix-uxa-fglrx-stealing.diff
@@ -0,0 +1,646 @@
+commit c139e2fb95f2db0b39aadcd58cc63b316a278951
+Author: Chris Wilson 
+Date:   Wed Oct 8 13:59:55 2014 +0100
+
+intel: Store pointer to struct intel_device
+
+Beware the barbarians at the gate, who invade and steal your ScrnInfoPtr
+and its Entity from underneath you. In some configurations, we lose
+access to the struct intel_device stored on the Entity after
+initialisation, causing havoc. Workaround this by storing the
+intel_device that we open in our driverPrivate.
+
+Signed-off-by: Chris Wilson 
+
+--- a/src/intel_device.c
 b/src/intel_device.c
+@@ -65,9 +65,11 @@
+ #include "fd.h"
+ 
+ struct intel_device {
++  int idx;
+   char *master_node;
+   char *render_node;
+   int fd;
++  int device_id;
+   int open_count;
+   int master_count;
+ };
+@@ -97,7 +99,7 @@
+   if (dev == NULL)
+   return 0;
+ 
+-  return __intel_get_device_id(dev->fd);
++  return dev->device_id;
+ }
+ 
+ static inline struct intel_device *intel_device(ScrnInfoPtr scrn)
+@@ -108,11 +110,6 @@
+   return xf86GetEntityPrivate(scrn->entityList[0], intel_device_key)->ptr;
+ }
+ 
+-static inline void intel_set_device(ScrnInfoPtr scrn, struct intel_device 
*dev)
+-{
+-  xf86GetEntityPrivate(scrn->entityList[0], intel_device_key)->ptr = dev;
+-}
+-
+ static int is_i915_device(int fd)
+ {
+   drm_version_t version;
+@@ -511,6 +508,12 @@
+   if (geteuid() && is_master(fd))
+   master_count++;
+ 
++  if (pci)
++  dev->device_id = pci->device_id;
++  else
++  dev->device_id = __intel_get_device_id(fd);
++
++  dev->idx = entity_num;
+   dev->fd = fd;
+   dev->open_count = master_count;
+   dev->master_count = master_count;
+@@ -541,13 +544,15 @@
+   return dev->fd;
+ }
+ 
+-int intel_get_device(ScrnInfoPtr scrn)
++struct intel_device *intel_get_device(ScrnInfoPtr scrn, int *fd)
+ {
+   struct intel_device *dev;
+   int ret;
+ 
+   dev = intel_device(scrn);
+-  assert(dev && dev->fd != -1);
++  if (dev == NULL)
++  return NULL;
++  assert(dev->fd != -1);
+ 
+   if (dev->open_count++ == 0) {
+   drmSetVersion sv;
+@@ -575,16 +580,16 @@
+  "[drm] failed to set drm interface version: 
%s [%d].\n",
+  strerror(errno), errno);
+   dev->open_count--;
+-  return -1;
++  return NULL;
+   }
+   }
+ 
+-  return dev->fd;
++  *fd = dev->fd;
++  return dev;
+ }
+ 
+-const char *intel_get_client_name(ScrnInfoPtr scrn)
++const char *intel_get_client_name(struct intel_device *dev)
+ {
+-  struct intel_device *dev = intel_device(scrn);
+   assert(dev && dev->render_node);
+   return dev->render_node;
+ }
+@@ -600,14 +605,11 @@
+   return drmGetMagic(fd, &magic) == 0 && drmAuthMagic(dev->fd, magic) == 
0;
+ }
+ 
+-int intel_get_client_fd(ScrnInfoPtr scrn)
++int intel

xorg: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

 debian/changelog |6 ++
 debian/control   |   18 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 3f3595e88120b0a1f4ca11152190df597c656766
Author: Maarten Lankhorst 
Date:   Thu Oct 9 11:54:59 2014 +0200

Fixup the xorg packages to work correctly with the renamed utopic stack.

diff --git a/debian/changelog b/debian/changelog
index d2198da..a77530f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.7+1ubuntu8.1) UNRELEASED; urgency=medium
+
+  * Fixup the xorg packages to work correctly with the renamed utopic stack.
+
+ -- Maarten Lankhorst   Thu, 09 Oct 2014 
11:46:23 +0200
+
 xorg (1:7.7+1ubuntu8) trusty; urgency=low
 
   [ Bryce Harrington ]
diff --git a/debian/control b/debian/control
index 272ab8e..d95bc6f 100644
--- a/debian/control
+++ b/debian/control
@@ -34,9 +34,9 @@ Package: xserver-xorg
 Architecture: any
 Depends:
  xserver-xorg-core (>= 2:1.11) | xserver-xorg-core-omap-revert [armhf],
- xserver-xorg-video-all  | xserver-xorg-video-omap-revert [armhf] | 
xorg-driver-video,
- xserver-xorg-input-all | xorg-driver-input,
- xserver-xorg-input-evdev [linux-any],
+ xserver-xorg-video-all (>= 0~) | xorg-driver-video,
+ xserver-xorg-input-all (>= 0~) | xorg-driver-input,
+ xserver-xorg-input-evdev (>= 0~) [linux-any],
  hal (>= 0.5.14-4~) [kfreebsd-any],
  ${shlibs:Depends},
  ${misc:Depends},
@@ -44,7 +44,15 @@ Depends:
  x11-xkb-utils
 Recommends:
  libgl1-mesa-dri,
-Provides: xserver
+Provides:
+ xserver-xorg-renamed,
+ xserver,
+Replaces:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
+Conflicts:
+ xserver-xorg-renamed,
+ xorg-renamed-package,
 Description: X.Org X server
  This package depends on the full suite of the server and drivers for the
  X.Org X server.  It does not provide the actual server itself.
@@ -78,7 +86,7 @@ Description: X.Org X server -- input driver metapackage
 Package: xorg
 Architecture: any
 Depends:
- xserver-xorg (>= ${binary:Version}),
+ xserver-xorg (>= ${binary:Version}) | xserver-xorg-renamed,
  libgl1-mesa-glx | libgl1 [!armhf],
  libgl1-mesa-dri [!armhf],
  libglu1-mesa [!armhf],


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xcaz2-0005lr...@moszumanska.debian.org

xorg: Changes to 'ubuntu-trusty'

[Maarten Bernardus Lankhorst]

New branch 'ubuntu-trusty' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xcadb-0002om...@moszumanska.debian.org

mesa: Changes to 'refs/tags/mesa-10.3.0-1'

[Maarten Bernardus Lankhorst]

Tag 'mesa-10.3.0-1' created by Maarten Lankhorst 
 at 2014-10-08 08:36 +

mesa Debian release 10.3.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUNPeUAAoJEP5VjHKmcBPDiZ0QALE7mbV3+8OU5AXeubglhaff
f7+glRu0rEF78xnq2byIUIoEsAZqxsGbCEe3mnZZlna+5DuBIpcPn1UN776sOkNW
e92/tX6FZs/MeHi70Ptp59cEmcgRsv7tWjptvAauM85sh35B0kNLqKaI3T0jzoUo
GlAdUmjrYlBz/Tnmw3FHTZiw3WVo1ztjtIKWygTzeNH6dIsVOQ+g/4DXdi6jnvv8
RJJN9V1lWttbmZqi3l+Xl5fz1DLmYdDh5mvE9pBM7QseqWv9ypvDrEOHHuedIbVX
F/vr1+2KYH5fgis4M32VekgmZVL0t9OPvvOfUOsuY3U/5PTw0HC2DQLzVXfvokmP
0SkE4VHDsM9JEYw/10Fvf9vw1tdoDihRsoJ0Toe1Ly7Bv47Hoo8IydHIUlWjuBXv
14bAelYEHKbFcaWndz+wag0ZH2hj/8nrVnVXwKlkV2Jl1gsb58Tn8ipWjXbS0KdJ
gLbAvk1F5c7eRJV6hWaLU8ZJzEMsvGNF9yOkaXI3AuoC6j66Fgua7pELxBkJtJ8z
ZcdC9/ohYgJut/pQuCmEY3UvbTztjnS+E+jNWBFnhNO7XRPd3bPZZZBrI1NwkUqc
O/iP17FLx2jGwFgX13P0tRZmrqEMqhr0KEwnGhASR5U/m6dy3ELg3KX2eANfyI0s
eHxMR0jwwoaOi8mkeitP
=EtRO
-END PGP SIGNATURE-

Changes since mesa-10.3.0-rc3-3:
Andreas Boll (4):
  gallium/util: add missing u_debug include
  Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils.
  Revert "Remove gallium-pipe, no longer built."
  Move gallium-pipe installation to opencl

Brian Paul (1):
  mesa: fix _mesa_free_pipeline_data() use-after-free bug

Christian König (1):
  mesa/st: don't advertise NV_vdpau_interop if it doesn't work.

Christoph Bumiller (2):
  nv50/ir/util: fix BitSet issues
  nvc0/ir: clarify recursion fix to finding first tex uses

Connor Abbott (1):
  r300g: set register classes before interferences

Emil Velikov (5):
  configure: bail out if building svga without libdrm
  configure: enable the gallium loader only when needed
  Bump version to 10.3 (final)
  docs: Update 10.3 release notes
  docs: Add 10.3 sha256 sums, news item and link release notes

Gwenole Beauchesne (1):
  i965: add support for RGBA dma_buf imports.

Iago Toral Quiroga (1):
  i965: Implement GL_PRIMITIVES_GENERATED with non-zero streams.

Ian Romanick (8):
  mesa: Document SYSTEM_VALUE_VERTEX_ID and SYSTEM_VALUE_INSTANCE_ID
  mesa: Add SYSTEM_VALUE_VERTEX_ID_ZERO_BASE
  mesa: Add SYSTEM_VALUE_BASE_VERTEX
  glsl/linker: Make get_main_function_signature public
  glsl: Add a lowering pass for gl_VertexID
  i965: Handle SYSTEM_VALUE_VERTEX_ID_ZERO_BASE
  i965: Request lowering gl_VertexID
  i965/vec4: Only examine virtual_grf_end for GRF sources

Ilia Mirkin (4):
  nv50/ir: avoid array overrun when checking for supported mods
  nouveau: only enable the depth test if there actually is a depth buffer
  nouveau: only enable stencil func if the visual has stencil bits
  nouveau: change internal variables to avoid conflicts with macro args

Jason Ekstrand (1):
  i965/blorp: Pass image formats seperately from the miptree

Jonathan Gray (1):
  configure.ac: strip _GNU_SOURCE from llvm-config output

Kenneth Graunke (15):
  i965: Handle ir_triop_csel in emit_if_gen6().
  i965: Handle ir_binop_ubo_load in boolean expression code.
  mesa: Replace string comparisons with SYSTEM_VALUE enum checks.
  mesa: Fix glGetActiveAttribute for gl_VertexID when lowered.
  i965: Calculate start/base_vertex_location after preparing vertices.
  i965: Make gl_BaseVertex available in a buffer object.
  i965: Refactor Gen4-7 VERTEX_BUFFER_STATE emission into a helper.
  i965: Expose gl_BaseVertex via a vertex attribute.
  i965: Fix reference counting in new basevertex upload code.
  i965: Separate gl_InstanceID and gl_VertexID uploading.
  i965: Disable guardband clipping in the smaller-than-viewport case.
  i965: Skip allocating UNIFORM file storage for uniforms of size 0.
  i965/vec4: Make type_size() return 0 for samplers.
  glsl: Speed up constant folding for swizzles.
  i965: Mark delta_x/y as BAD_FILE if remapped away completely.

Kristian Høgsberg (1):
  i965: Adjust fast-clear resolve rect for BDW

Maarten Lankhorst (10):
  nouveau: re-allocate bo's on overflow
  nouveau: fix MPEG4 hw decoding
  nouveau: rework reference frame handling
  nouveau: remove unneeded assert
  Merge branch 'upstream-experimental' into debian-experimental
  New upstream release.
  Remove upstreamed patch.
  Remove gallium-pipe, no longer built.
  Revert "Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils."
  release to experimental

Matt Turner (1):
  i965/vec4: Reswizzle sources when necessary.

Richard Sandiford (1):
  gallivm: Fix uses of 2^24

Ulrich Weigand (1):
  gallivm: Fix Altivec pack intrinsics for little-endian

---
 VERSION  |2 
 configure.ac |   30 -
 debian/changelog |   13 
 debian/libgl1-mesa-dri.install.linux.in  |2 
 debian/mesa-op

mesa: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ce407fb1360b311859e936ae9c3a352e86dc506
Author: Maarten Lankhorst 
Date:   Wed Oct 8 10:30:19 2014 +0200

release to experimental

diff --git a/debian/changelog b/debian/changelog
index 763643e..15328c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.3.0-1) UNRELEASED; urgency=medium
+mesa (10.3.0-1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
   * New upstream release.
@@ -9,7 +9,7 @@ mesa (10.3.0-1) UNRELEASED; urgency=medium
   * Move gallium-pipe installation from libgl1-mesa-dri.install.linux.in
 to mesa-opencl-icd.install.in, because it's only needed for opencl.
 
- -- Maarten Lankhorst   Mon, 22 Sep 2014 
11:31:45 +0200
+ -- Maarten Lankhorst   Wed, 08 Oct 2014 
10:30:05 +0200
 
 mesa (10.3.0~rc3-3) experimental; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xbmjj-0003nx...@moszumanska.debian.org

mesa: Changes to 'debian-experimental'

[Maarten Bernardus Lankhorst]

 debian/changelog |1 -
 debian/control   |4 ++--
 debian/rules |2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit d4476e9feb8334a27dafc3fd43a589af2395dacf
Author: Maarten Lankhorst 
Date:   Mon Oct 6 10:44:39 2014 +0200

Revert "Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils."

This reverts commit d48cc6d4db11e4e4c5b65211f458ab1b1539f305.

diff --git a/debian/changelog b/debian/changelog
index bbcf100..763643e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ mesa (10.3.0-1) UNRELEASED; urgency=medium
 - 01_gallium-util-add-missing-u_debug-include.patch
 
   [ Andreas Boll ]
-  * Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils.
   * Move gallium-pipe installation from libgl1-mesa-dri.install.linux.in
 to mesa-opencl-icd.install.in, because it's only needed for opencl.
 
diff --git a/debian/control b/debian/control
index 07bd699..857f2a5 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,10 @@ Build-Depends:
  libudev-dev [linux-any],
  flex,
  bison,
- llvm-3.4-dev (>= 1:3.4.1-3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.5-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.4-dev (>= 1:3.4.1-3) [amd64 i386 armhf],
+ libclang-3.5-dev (>= 1:3.5-1) [amd64 i386 armhf],
  libclc-dev [amd64 i386 armhf],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
diff --git a/debian/rules b/debian/rules
index 97a12bc..c6d154a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ else
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 
armhf))
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
-   confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.4
+   confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.5
   endif
 
confflags_DIRECT_RENDERING = --enable-driglx-direct


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xbtps-00011x...@moszumanska.debian.org