from:"Maarten Lankhorst"

 debian/control |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 69c196490681aea46d339252af86d7a1c42af5c3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 10:41:48 2014 +0200

fix copy paste in description with some more copy paste

diff --git a/debian/control b/debian/control
index 5b99f21..67f2a2e 100644
--- a/debian/control
+++ b/debian/control
@@ -213,11 +213,11 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the omap-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
 
 Package: libdrm-freedreno1-dbg
 Section: debug
@@ -227,7 +227,7 @@ Depends:
  libdrm-freedreno1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
debugging symbols
+Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
@@ -243,11 +243,11 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the omap-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+Description: Userspace interface to exynos-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
 
 Package: libdrm-exynos1-dbg
 Section: debug
@@ -257,7 +257,7 @@ Depends:
  libdrm-exynos1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: Userspace interface to omap-specific kernel DRM services -- 
debugging symbols
+Description: Userspace interface to exynos-specific kernel DRM services -- 
debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on


-- 
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/e1xcpsd-000830...@moszumanska.debian.org

libdrm: Changes to 'upstream-unstable'

 configure.ac|2 +-
 include/drm/qxl_drm.h   |2 +-
 radeon/radeon_surface.c |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d6861609b2b887612d652bb2be7c39f199802937
Author: Marek Olšák marek.ol...@amd.com
Date:   Tue Jul 29 18:54:33 2014 +0200

configure.ac: bump version to 2.4.56 for release

diff --git a/configure.ac b/configure.ac
index a7be095..5e9cb6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.55],
+[2.4.56],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit 2169dce96c5503ef8f6e4bb008e989d0ef02ec8e
Author: Marek Olšák marek.ol...@amd.com
Date:   Sat Jul 26 20:07:33 2014 +0200

radeon: fix typo in sample split / fixes MSAA on Hawaii

Reviewed-by: Michel Dänzer michel.daen...@amd.com

diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index 9c3a192..8a1fe7d 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -1914,7 +1914,7 @@ static void cik_get_2d_params(struct 
radeon_surface_manager *surf_man,
 sample_split = 1;
 break;
 case CIK__SAMPLE_SPLIT__2:
-sample_split = 1;
+sample_split = 2;
 break;
 case CIK__SAMPLE_SPLIT__4:
 sample_split = 4;

commit 8bdb4cfa450b16f2c70729f923fa05d9553d7118
Author: Andreas Boll andreas.boll@gmail.com
Date:   Mon May 5 23:28:23 2014 +0200

libdrm: Fix drm.h include in qxl drm header file

Use drm.h instead of drm/drm.h as used in the other header files.
Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
file is installed in /usr/include/libdrm.

Fixes Debian bug #746807

Reported-by: Bastian Blank wa...@debian.org
Signed-off-by: Andreas Boll andreas.boll@gmail.com
Reviewed-by: Emil Velikov emil.l.veli...@gmail.com

diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
index 5d7de70..1e331a8 100644
--- a/include/drm/qxl_drm.h
+++ b/include/drm/qxl_drm.h
@@ -25,7 +25,7 @@
 #define QXL_DRM_H
 
 #include stddef.h
-#include drm/drm.h
+#include drm.h
 
 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.


-- 
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/e1xcqq9-00053n...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

 configure.ac   |2 
 debian/changelog   |4 -
 debian/libdrm-freedreno1.lintian-overrides |1 
 debian/libdrm-freedreno1.symbols   |4 -
 debian/libdrm-intel1.symbols   |6 -
 debian/libdrm-nouveau2.symbols |7 --
 debian/libdrm-radeon1.lintian-overrides|1 
 debian/libdrm-radeon1.symbols  |   19 -
 debian/patches/03_hide_symbols.diff|   98 +
 debian/patches/series  |1 
 include/drm/qxl_drm.h  |2 
 radeon/radeon_surface.c|2 
 12 files changed, 105 insertions(+), 42 deletions(-)

New commits:
commit abba37f34253ffe0ed2c6e5833f5e0f35f413fd3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 11:42:20 2014 +0200

bump version

diff --git a/debian/changelog b/debian/changelog
index 90e937b..3cb47be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.55-1) UNRELEASED; urgency=medium
+libdrm (2.4.56-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Enable building freedreno and exynos on arm. (Closes: #741509)

commit c8e6bc23d5baaa59739d33d0019a10097425ce59
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 11:40:02 2014 +0200

Add a patch to hide all private symbols.

03_hide_symbols.diff

diff --git a/debian/changelog b/debian/changelog
index f899150..90e937b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libdrm (2.4.55-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Enable building freedreno and exynos on arm. (Closes: #741509)
+  * Add a patch to hide all private symbols.
+- 03_hide_symbols.diff
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/libdrm-freedreno1.lintian-overrides 
b/debian/libdrm-freedreno1.lintian-overrides
deleted file mode 100644
index 2efb4e6..000
--- a/debian/libdrm-freedreno1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-freedreno1: symbols-declares-dependency-on-other-package 
libdrm-freedreno-private
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
index 751d8e4..4321a4f 100644
--- a/debian/libdrm-freedreno1.symbols
+++ b/debian/libdrm-freedreno1.symbols
@@ -1,8 +1,4 @@
 libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
-| libdrm-freedreno-private
- is_kgsl_pipe@Base 0 1
- (regex)^msm_.*@Base 0 1
- (regex)^kgsl_.*@Base 0 1
  fd_bo_cpu_fini@Base 0
  fd_bo_cpu_prep@Base 0
  fd_bo_del@Base 0
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index d5c48aa..c1d5e7c 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -67,9 +67,3 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
  drm_intel_get_pipe_from_crtc_id@Base 2.4.11
  drm_intel_get_reset_stats@Base 2.4.48
  drm_intel_reg_read@Base 2.4.38
- drm_mmAllocMem@Base 2.4.1
- drm_mmDestroy@Base 2.4.1
- drm_mmDumpMemInfo@Base 2.4.1
- drm_mmFindBlock@Base 2.4.1
- drm_mmFreeMem@Base 2.4.1
- drm_mmInit@Base 2.4.1
diff --git a/debian/libdrm-nouveau2.symbols b/debian/libdrm-nouveau2.symbols
index 278ee55..bd64f4b 100644
--- a/debian/libdrm-nouveau2.symbols
+++ b/debian/libdrm-nouveau2.symbols
@@ -1,12 +1,5 @@
 libdrm_nouveau.so.2 libdrm-nouveau2 #MINVER#
 | libdrm-nouveau-private
- abi16_bo_info@Base 0 1
- abi16_bo_init@Base 0 1
- abi16_chan_nv04@Base 0 1
- abi16_chan_nvc0@Base 0 1
- abi16_chan_nve0@Base 0 1
- abi16_engobj@Base 0 1
- abi16_ntfy@Base 0 1
  nouveau_bo_map@Base 2.4.34
  nouveau_bo_name_get@Base 2.4.34
  nouveau_bo_name_ref@Base 2.4.34
diff --git a/debian/libdrm-radeon1.lintian-overrides 
b/debian/libdrm-radeon1.lintian-overrides
deleted file mode 100644
index 0e452e0..000
--- a/debian/libdrm-radeon1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libdrm-radeon1: symbols-declares-dependency-on-other-package 
libdrm-radeon-private
diff --git a/debian/libdrm-radeon1.symbols b/debian/libdrm-radeon1.symbols
index e9578a6..5a763a4 100644
--- a/debian/libdrm-radeon1.symbols
+++ b/debian/libdrm-radeon1.symbols
@@ -1,23 +1,4 @@
 libdrm_radeon.so.1 libdrm-radeon1 #MINVER#
-| libdrm-radeon-private
- bof_array@Base 0 1
- bof_array_append@Base 0 1
- bof_array_get@Base 0 1
- bof_array_size@Base 0 1
- bof_blob@Base 0 1
- bof_blob_size@Base 0 1
- bof_blob_value@Base 0 1
- bof_decref@Base 0 1
- bof_dump_file@Base 0 1
- bof_incref@Base 0 1
- bof_int32@Base 0 1
- bof_int32_value@Base 0 1
- bof_load_file@Base 0 1
- bof_object@Base 0 1
- bof_object_get@Base 0 1
- bof_object_set@Base 0 1
- bof_print@Base 0 1
- bof_string@Base 0 1
  radeon_bo_debug@Base 2.4.17
  radeon_bo_get_handle@Base 2.4.17
  radeon_bo_get_src_domain@Base 2.4.17
diff --git a/debian/patches/03_hide_symbols.diff 
b/debian/patches/03_hide_symbols.diff
new file mode 100644
index 000..71a01f7
--- /dev/null
+++ b/debian/patches/03_hide_symbols.diff
@@ -0,0

Re: libdrm package

op 30-07-14 12:04, Pedretti Fabio schreef:
2014-07-29 15:24 GMT+02:00 Maarten Lankhorst
maarten.lankho...@canonical.com:
op 29-07-14 15:17, Pedretti Fabio schreef:
Hi, this two commits:
http://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git/commit/?id=99f0810d7b83a1a7eb07a1dfe61dd130a3e572f0
http://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git/commit/?id=e0ecbaa110adda9805f55482f67544d755720161

refers in the new exynos and freedreno packages to the
omap-specific, it looks missing an update after copy-paste from
another package.

Hey,

Thanks for catching it!

After latest commits there still is some inconsistencies, e.g., some
packages (freedreno, exynos) have this description for both the
library and -dbg version:

This library implements the userspace interface to the kernel DRM services.
DRM stands for Direct Rendering Manager, which is the kernelspace portion
of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
Linux to provide hardware-accelerated OpenGL drivers.

All others has a specific description, e.g. intel:

This library implements the userspace interface to the intel-specific kernel
DRM services. DRM stands for Direct Rendering Manager, which is the
kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI
is
currently used on Linux to provide hardware-accelerated OpenGL drivers.

while the -dbg package has a different, not specific description.

Not a big issue anyway...

Yeah on purpose, it's a bit unclear to me what freedreno requires, seems to be
a mix of KGSL and msm kernel services,
so I used the generic description from the -dbg package, and only have it
mentioned in the first description line.

~Maarten

--
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/53d8c40f.5020...@canonical.com

libdrm: Changes to 'debian-unstable'

 debian/control   |4 ++--
 debian/patches/02_fix_qxl_drm_h.diff |   33 -
 debian/patches/series|1 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 3d9b1e691680272bb49a445bbfc0713f05b67f62
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 12:09:10 2014 +0200

fix too long description for freedreno

diff --git a/debian/control b/debian/control
index 67f2a2e..7110c19 100644
--- a/debian/control
+++ b/debian/control
@@ -213,7 +213,7 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
runtime
+Description: Userspace interface to msm/kgsl kernel DRM services -- runtime
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
@@ -227,7 +227,7 @@ Depends:
  libdrm-freedreno1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: Userspace interface to msm/kgsl-specific kernel DRM services -- 
debugging symbols
+Description: Userspace interface to msm/kgsl kernel DRM services -- debugging 
symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for Direct Rendering Manager, which is the kernelspace portion
  of the Direct Rendering Infrastructure (DRI). The DRI is currently used on

commit 8004a0512617bc74f62b43d2fd599469ee4a4625
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 30 11:44:36 2014 +0200

drop upstreamed patch

diff --git a/debian/patches/02_fix_qxl_drm_h.diff 
b/debian/patches/02_fix_qxl_drm_h.diff
deleted file mode 100644
index 4018ca7..000
--- a/debian/patches/02_fix_qxl_drm_h.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1d048a8f2caec10eb0c9647f0554a60be619602d Mon Sep 17 00:00:00 2001
-From: Andreas Boll andreas.boll@gmail.com
-Date: Mon, 5 May 2014 23:28:23 +0200
-Subject: [PATCH libdrm] libdrm: Fix drm.h include in qxl drm header file
-
-Use drm.h instead of drm/drm.h as used in the other header files.
-Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
-file is installed in /usr/include/libdrm.
-
-Fixes Debian bug #746807
-
-Reported-by: Bastian Blank wa...@debian.org
-Signed-off-by: Andreas Boll andreas.boll@gmail.com

- include/drm/qxl_drm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
-index 5d7de70..1e331a8 100644
 a/include/drm/qxl_drm.h
-+++ b/include/drm/qxl_drm.h
-@@ -25,7 +25,7 @@
- #define QXL_DRM_H
- 
- #include stddef.h
--#include drm/drm.h
-+#include drm.h
- 
- /* Please note that modifications to all structs defined here are
-  * subject to backwards-compatibility constraints.
--- 
-1.9.2
-
diff --git a/debian/patches/series b/debian/patches/series
index eb3793b..c9175c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_default_perms.diff
-02_fix_qxl_drm_h.diff
 03_hide_symbols.diff
\ No newline at end of file


-- 
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/e1xcqow-0002c7...@moszumanska.debian.org

libdrm: Changes to 'debian-unstable'

 debian/control |  108 +++--
 1 file changed, 60 insertions(+), 48 deletions(-)

New commits:
commit cdc8731e6283274db1caf124312175a6c2d30f9d
Author: Fabio Pedretti fabio@libero.it
Date:   Wed Jul 30 15:43:21 2014 +0200

debian/control: consolidate packages description

diff --git a/debian/control b/debian/control
index 7110c19..6eb075f 100644
--- a/debian/control
+++ b/debian/control
@@ -96,10 +96,11 @@ Depends:
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Userspace interface to intel-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the intel-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
 
 Package: libdrm-intel1-dbg
 Section: debug
@@ -110,10 +111,11 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: Userspace interface to intel-specific kernel DRM services -- 
debugging symbols
- This library implements the userspace interface to the kernel DRM services.
- DRM stands for Direct Rendering Manager, which is the kernelspace portion
- of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
- Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
  .
  This package provides the debugging symbols for the libdrm-intel1 package.
 
@@ -125,10 +127,11 @@ Depends: ${shlibs:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Userspace interface to nouveau-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the nouveau-specific kernel
- DRM services. DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
 
 Package: libdrm-nouveau2-dbg
 Section: debug
@@ -138,10 +141,11 @@ Depends: libdrm-nouveau2 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
 Description: Userspace interface to nouveau-specific kernel DRM -- debugging 
symbols
- This library implements the userspace interface to the kernel DRM services.
- DRM stands for Direct Rendering Manager, which is the kernelspace portion
- of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
- Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
  .
  This package provides the debugging symbols for the libdrm-nouveau2 package.
 
@@ -154,10 +158,11 @@ Depends:
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Userspace interface to radeon-specific kernel DRM services -- 
runtime
- This library implements the userspace interface to the radeon-specific kernel
- DRM services.  DRM stands for Direct Rendering Manager, which is the
- kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
- currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ This library implements the userspace interface to the kernel DRM
+ services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI).
+ The DRI is currently used on Linux to provide hardware-accelerated
+ OpenGL drivers.
 
 Package: libdrm-radeon1-dbg
 Section: debug
@@ -168,10 +173,11 @@ Depends:
  ${misc:Depends},
 Multi-Arch: same
 Description: Userspace interface to radeon-specific kernel DRM services -- 
debugging symbols
- This library implements the userspace interface to the kernel DRM services.
- DRM stands for Direct Rendering Manager, which is the kernelspace portion
- of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
- Linux to provide

xserver-xorg-input-evdev: Changes to 'ubuntu'

2014-07-29 Thread Maarten Lankhorst

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

New commits:
commit 45819ebc1a051da67bf764b5097c45b0ec6ad993
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 29 13:41:54 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 86260cb..d06aaa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-evdev (1:2.9.0-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.9.0-1ubuntu1) utopic; urgency=medium
 
   * Merge from debian-experimental.
   * Build against 1.15 for now.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
13:17:16 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 29 Jul 2014 
13:41:47 +0200
 
 xserver-xorg-input-evdev (1:2.9.0-1) experimental; urgency=medium
 

commit 72fd45bbced97736fb9efe9701f5bb745f4dfdd2
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 29 13:38:42 2014 +0200

Build against 1.15 for now.

diff --git a/debian/changelog b/debian/changelog
index ed14f5a..86260cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-evdev (1:2.9.0-1ubuntu1) UNRELEASED; urgency=low
 
   * Merge from debian-experimental.
+  * Build against 1.15 for now.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
13:17:16 +0200
 
diff --git a/debian/control b/debian/control
index cf69d30..73b432a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.15.99),
+ xserver-xorg-dev (= 2:1.14.99),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev (= 2.1.99.3),


-- 
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/e1xc5n6-0005wc...@moszumanska.debian.org

Re: libdrm package

2014-07-29 Thread Maarten Lankhorst

op 29-07-14 15:17, Pedretti Fabio schreef:
 Hi, this two commits:
 http://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git/commit/?id=99f0810d7b83a1a7eb07a1dfe61dd130a3e572f0
 http://anonscm.debian.org/cgit/pkg-xorg/lib/libdrm.git/commit/?id=e0ecbaa110adda9805f55482f67544d755720161

 refers in the new exynos and freedreno packages to the
 omap-specific, it looks missing an update after copy-paste from
 another package.

Hey,

Thanks for catching it!

~Maarten


-- 
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/53d7a070.3070...@canonical.com

Bug#741509: libdrm: please include exynos and freedreno DRM

op 13-03-14 10:12, Fathi Boudra schreef:
 Source: libdrm
 Severity: wishlist

 Dear Maintainer,

 Exynos and freedreno DRM aren't enabled during libdrm build.
 Please could you enable Exynos and freedreno APIs?

 I packaged the X.Org driver side and only need libdrm support is missing
 now.

Do you have the packaged drivers somewhere? I should have a system to test 
freedreno soon, and I would be interested.

What about exynos, did you perform any testing on that? It should probably have 
a separate bug.

~Maarten


-- 
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/53d21acd.4090...@canonical.com

libdrm: Changes to 'debian-unstable'

 debian/changelog |7 +++
 debian/control   |   62 +++
 debian/libdrm-exynos1.symbols|   20 
 debian/libdrm-freedreno1.install |1 
 debian/libdrm-freedreno1.lintian-overrides   |1 
 debian/libdrm-freedreno1.symbols |   40 +
 debian/patches/03_fix_exynos_test_ftbfs.diff |   23 ++
 debian/patches/series|1 
 debian/rules |   18 +--
 9 files changed, 168 insertions(+), 5 deletions(-)

New commits:
commit 2ad898100e88fff8076133b5c791a364b4bc29e0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:43:50 2014 +0200

Add a patch to fix FTBFS with exynos.

diff --git a/debian/changelog b/debian/changelog
index abd3ac1..eac5e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdrm (2.4.54-2) UNRELEASED; urgency=medium
 
   * Enable building freedreno and exynos on arm. (Closes: #741509)
+  * Add a patch to fix FTBFS with exynos.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/patches/03_fix_exynos_test_ftbfs.diff 
b/debian/patches/03_fix_exynos_test_ftbfs.diff
new file mode 100644
index 000..b94545e
--- /dev/null
+++ b/debian/patches/03_fix_exynos_test_ftbfs.diff
@@ -0,0 +1,23 @@
+commit a328b02c1d0b2e19e3587221aa290f05e33baefe
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Fri Jul 25 11:22:24 2014 +0200
+
+exynos: do not build fimg2d_test when building without libkms support.
+
+This prevents a build failure.
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+
+--- a/tests/exynos/Makefile.am
 b/tests/exynos/Makefile.am
+@@ -4,8 +4,10 @@
+   -I $(top_srcdir)/exynos \
+   -I $(top_srcdir)
+ 
++if HAVE_LIBKMS
+ noinst_PROGRAMS = \
+   exynos_fimg2d_test
++endif
+ 
+ exynos_fimg2d_test_LDADD = \
+   $(top_builddir)/libdrm.la \
diff --git a/debian/patches/series b/debian/patches/series
index d2f7405..cc77303 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_default_perms.diff
 02_fix_qxl_drm_h.diff
+03_fix_exynos_test_ftbfs.diff

commit 99f0810d7b83a1a7eb07a1dfe61dd130a3e572f0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:16:43 2014 +0200

build exynos on arm too

diff --git a/debian/changelog b/debian/changelog
index f7c19e7..abd3ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 libdrm (2.4.54-2) UNRELEASED; urgency=medium
 
-  * Enable building freedreno on arm. (Closes: #741509)
+  * Enable building freedreno and exynos on arm. (Closes: #741509)
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/control b/debian/control
index 476be5a..5b99f21 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Depends:
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  libdrm-freedreno1 (= ${binary:Version}) [any-arm],
+ libdrm-exynos1 (= ${binary:Version}) [any-arm],
  ${misc:Depends},
 Multi-Arch: same
 Replaces:
@@ -233,3 +234,33 @@ Description: Userspace interface to omap-specific kernel 
DRM services -- debuggi
  Linux to provide hardware-accelerated OpenGL drivers.
  .
  This package provides the debugging symbols for the libdrm-freedreno1 package.
+
+Package: libdrm-exynos1
+Section: libs
+Architecture: any-arm
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- 
runtime
+ This library implements the userspace interface to the omap-specific kernel
+ DRM services.  DRM stands for Direct Rendering Manager, which is the
+ kernelspace portion of the Direct Rendering Infrastructure (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+
+Package: libdrm-exynos1-dbg
+Section: debug
+Priority: extra
+Architecture: any-arm
+Depends:
+ libdrm-exynos1 (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- 
debugging symbols
+ This library implements the userspace interface to the kernel DRM services.
+ DRM stands for Direct Rendering Manager, which is the kernelspace portion
+ of the Direct Rendering Infrastructure (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package provides the debugging symbols for the libdrm-exynos1 package.
diff --git a/debian/libdrm-exynos1.symbols b/debian/libdrm-exynos1.symbols
new file mode 100644
index 000..445f2b4
--- /dev/null
+++ b/debian/libdrm-exynos1.symbols
@@ -0,0 +1,20 @@
+libdrm_exynos.so.1 libdrm-exynos1 #MINVER#
+ exynos_bo_create@Base 0
+ exynos_bo_destroy@Base 0

libdrm: Changes to 'debian-unstable'

 debian/libdrm-exynos1.install |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e9ffcd2127923bfe159244daf86d6ecb89fd43e3
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:51:39 2014 +0200

add missing libdrm-exynos1.install

diff --git a/debian/libdrm-exynos1.install b/debian/libdrm-exynos1.install
new file mode 100644
index 000..ce2fbc9
--- /dev/null
+++ b/debian/libdrm-exynos1.install
@@ -0,0 +1 @@
+usr/lib/*/libdrm_exynos.so.1*


-- 
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/e1xacac-0002zu...@moszumanska.debian.org

libdrm: Changes to 'upstream-unstable'

 configure.ac  |2 -
 exynos/exynos_drm.c   |   52 --
 exynos/exynos_drmif.h |2 -
 exynos/exynos_fimg2d.c|8 ++---
 exynos/fimg2d.h   |2 -
 freedreno/freedreno_drmif.h   |1 
 freedreno/kgsl/kgsl_pipe.c|3 ++
 freedreno/msm/msm_drm.h   |   12 
 freedreno/msm/msm_pipe.c  |5 +++
 freedreno/msm/msm_priv.h  |1 
 include/drm/drm.h |8 +
 include/drm/i915_drm.h|   19 +
 radeon/radeon_surface.c   |   18 ++---
 tests/exynos/Makefile.am  |9 +-
 tests/exynos/exynos_fimg2d_test.c |2 -
 tests/radeon/radeon_ttm.c |2 +
 xf86drm.c |   13 -
 xf86drmMode.h |4 ++
 18 files changed, 89 insertions(+), 74 deletions(-)

New commits:
commit 6f15ca80815ae34d412c9fbdf526d69c45561a0f
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 15:08:23 2014 +0200

bump to version 2.4.55 for release

diff --git a/configure.ac b/configure.ac
index 1c78c45..a7be095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.54],
+[2.4.55],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit a328b02c1d0b2e19e3587221aa290f05e33baefe
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:22:24 2014 +0200

exynos: do not build fimg2d_test when building without libkms support.

This prevents a build failure.

Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com

diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am
index 518f00b..92de4e4 100644
--- a/tests/exynos/Makefile.am
+++ b/tests/exynos/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS = \
-I $(top_srcdir)/exynos \
-I $(top_srcdir)
 
+if HAVE_LIBKMS
 if HAVE_INSTALL_TESTS
 bin_PROGRAMS = \
exynos_fimg2d_test
@@ -11,6 +12,7 @@ else
 noinst_PROGRAMS = \
exynos_fimg2d_test
 endif
+endif
 
 exynos_fimg2d_test_LDADD = \
$(top_builddir)/libdrm.la \

commit c0b34dca2632a774249cfa3b969c3f7ce9df33e1
Author: Thomas Klausner w...@netbsd.org
Date:   Tue Jul 15 19:22:55 2014 +0200

radeon: Add missing header includes.

unistd.h for close() and xf86drm.h for drmOpen().

Signed-off-by: Thomas Klausner w...@netbsd.org

diff --git a/tests/radeon/radeon_ttm.c b/tests/radeon/radeon_ttm.c
index 246fd99..ac3297a 100644
--- a/tests/radeon/radeon_ttm.c
+++ b/tests/radeon/radeon_ttm.c
@@ -25,7 +25,9 @@
  */
 #include stdio.h
 #include stdlib.h
+#include unistd.h
 #include rbo.h
+#include xf86drm.h
 
 /* allocate as many single page bo to try to starve the kernel
  * memory zone (below highmem)

commit 72f84b85afbe762b86ea8c095fee01e7d406b131
Author: Thomas Klausner w...@netbsd.org
Date:   Tue Jul 15 19:22:52 2014 +0200

radeon: Remove superfluous parentheses.

Signed-off-by: Thomas Klausner w...@netbsd.org

diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index 109bd6b..9c3a192 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -282,7 +282,7 @@ static int r6_surface_init_linear(struct 
radeon_surface_manager *surf_man,
 surf_minify(surf, surf-level+i, surf-bpe, i, xalign, yalign, zalign, 
offset);
 /* level0 and first mipmap need to have alignment */
 offset = surf-bo_size;
-if ((i == 0)) {
+if (i == 0) {
 offset = ALIGN(offset, surf-bo_alignment);
 }
 }
@@ -310,7 +310,7 @@ static int r6_surface_init_linear_aligned(struct 
radeon_surface_manager *surf_ma
 surf_minify(surf, surf-level+i, surf-bpe, i, xalign, yalign, zalign, 
offset);
 /* level0 and first mipmap need to have alignment */
 offset = surf-bo_size;
-if ((i == 0)) {
+if (i == 0) {
 offset = ALIGN(offset, surf-bo_alignment);
 }
 }
@@ -343,7 +343,7 @@ static int r6_surface_init_1d(struct radeon_surface_manager 
*surf_man,
 surf_minify(surf, surf-level+i, surf-bpe, i, xalign, yalign, zalign, 
offset);
 /* level0 and first mipmap need to have alignment */
 offset = surf-bo_size;
-if ((i == 0)) {
+if (i == 0) {
 offset = ALIGN(offset, surf-bo_alignment);
 }
 }
@@ -384,7 +384,7 @@ static int r6_surface_init_2d(struct radeon_surface_manager 
*surf_man,
 }
 /* level0 and first mipmap need to have alignment */
 offset = surf-bo_size;
-if ((i == 0)) {
+if (i == 0) {
 offset = ALIGN(offset, surf-bo_alignment);
 }
 }
@@ -632,7 +632,7 @@ static int eg_surface_init_1d(struct radeon_surface_manager 
*surf_man,
 surf_minify(surf, level+i, bpe, i, xalign, yalign, zalign, offset

libdrm: Changes to 'debian-unstable'

 configure.ac |2 -
 debian/changelog |4 +-
 debian/patches/03_fix_exynos_test_ftbfs.diff |   23 ---
 debian/patches/series|1 
 exynos/exynos_drm.c  |   52 ++-
 exynos/exynos_drmif.h|2 -
 exynos/exynos_fimg2d.c   |8 ++--
 exynos/fimg2d.h  |2 -
 freedreno/freedreno_drmif.h  |1 
 freedreno/kgsl/kgsl_pipe.c   |3 +
 freedreno/msm/msm_drm.h  |   12 ++
 freedreno/msm/msm_pipe.c |5 ++
 freedreno/msm/msm_priv.h |1 
 include/drm/drm.h|8 
 include/drm/i915_drm.h   |   19 +
 radeon/radeon_surface.c  |   18 -
 tests/exynos/Makefile.am |9 +++-
 tests/exynos/exynos_fimg2d_test.c|2 -
 tests/radeon/radeon_ttm.c|2 +
 xf86drm.c|   13 --
 xf86drmMode.h|4 ++
 21 files changed, 91 insertions(+), 100 deletions(-)

New commits:
commit bca5f71beba691ce4036e41cfb73ae65161e4c94
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 15:27:29 2014 +0200

bump changelog, and remove ftbfs patch, upstream

diff --git a/debian/changelog b/debian/changelog
index eac5e3e..f899150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-libdrm (2.4.54-2) UNRELEASED; urgency=medium
+libdrm (2.4.55-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * Enable building freedreno and exynos on arm. (Closes: #741509)
-  * Add a patch to fix FTBFS with exynos.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 25 Jul 2014 
10:24:34 +0200
 
diff --git a/debian/patches/03_fix_exynos_test_ftbfs.diff 
b/debian/patches/03_fix_exynos_test_ftbfs.diff
deleted file mode 100644
index b94545e..000
--- a/debian/patches/03_fix_exynos_test_ftbfs.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit a328b02c1d0b2e19e3587221aa290f05e33baefe
-Author: Maarten Lankhorst maarten.lankho...@canonical.com
-Date:   Fri Jul 25 11:22:24 2014 +0200
-
-exynos: do not build fimg2d_test when building without libkms support.
-
-This prevents a build failure.
-
-Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
-
 a/tests/exynos/Makefile.am
-+++ b/tests/exynos/Makefile.am
-@@ -4,8 +4,10 @@
-   -I $(top_srcdir)/exynos \
-   -I $(top_srcdir)
- 
-+if HAVE_LIBKMS
- noinst_PROGRAMS = \
-   exynos_fimg2d_test
-+endif
- 
- exynos_fimg2d_test_LDADD = \
-   $(top_builddir)/libdrm.la \
diff --git a/debian/patches/series b/debian/patches/series
index cc77303..d2f7405 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_default_perms.diff
 02_fix_qxl_drm_h.diff
-03_fix_exynos_test_ftbfs.diff

commit 6f15ca80815ae34d412c9fbdf526d69c45561a0f
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 15:08:23 2014 +0200

bump to version 2.4.55 for release

diff --git a/configure.ac b/configure.ac
index 1c78c45..a7be095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.54],
+[2.4.55],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit a328b02c1d0b2e19e3587221aa290f05e33baefe
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 11:22:24 2014 +0200

exynos: do not build fimg2d_test when building without libkms support.

This prevents a build failure.

Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com

diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am
index 518f00b..92de4e4 100644
--- a/tests/exynos/Makefile.am
+++ b/tests/exynos/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS = \
-I $(top_srcdir)/exynos \
-I $(top_srcdir)
 
+if HAVE_LIBKMS
 if HAVE_INSTALL_TESTS
 bin_PROGRAMS = \
exynos_fimg2d_test
@@ -11,6 +12,7 @@ else
 noinst_PROGRAMS = \
exynos_fimg2d_test
 endif
+endif
 
 exynos_fimg2d_test_LDADD = \
$(top_builddir)/libdrm.la \

commit c0b34dca2632a774249cfa3b969c3f7ce9df33e1
Author: Thomas Klausner w...@netbsd.org
Date:   Tue Jul 15 19:22:55 2014 +0200

radeon: Add missing header includes.

unistd.h for close() and xf86drm.h for drmOpen().

Signed-off-by: Thomas Klausner w...@netbsd.org

diff --git a/tests/radeon/radeon_ttm.c b/tests/radeon/radeon_ttm.c
index 246fd99..ac3297a 100644
--- a/tests/radeon/radeon_ttm.c
+++ b/tests/radeon/radeon_ttm.c
@@ -25,7 +25,9 @@
  */
 #include stdio.h
 #include stdlib.h
+#include unistd.h
 #include rbo.h
+#include xf86drm.h
 
 /* allocate as many single page bo to try to starve the kernel

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

New branch 'upstream-unstable' 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/e1xagae-sa...@moszumanska.debian.org

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

 debian/copyright |   38 --
 1 file changed, 38 deletions(-)

New commits:
commit 2c7d5bcfe54ee149a6b138f9254cad7b4e881e1c
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 25 16:19:35 2014 +0200

remove copyright file copied from modesetting

Doesn't work correctly with freedreno, and the various files
contains different copyright statements.

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 971708d..000
--- a/debian/copyright
+++ /dev/null
@@ -1,38 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: xf86-video-modesetting
-Upstream-Contact: http://lists.freedesktop.org/mailman/listinfo/xorg
-Source: http://xorg.freedesktop.org/releases/individual/driver/
-
-Files: src/driver.h
-Copyright: 2008 Tungsten Graphics, Inc.
-License: MIT-X11
-
-Files: src/driver.c
-Copyright: 2008 Tungsten Graphics, Inc.
-  2011 Dave Airlie
-License: MIT-X11
-
-Files: src/drmmode_*
-Copyright: 2007 Red Hat, Inc.
-License: MIT-X11
-
-License: MIT-X11
- 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 the rights to use, copy, modify, merge, publish,
- distribute, sub license, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial portions
- of the Software.
- .
- THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file


-- 
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/e1xagng-0006u4...@moszumanska.debian.org

Bug#755673: xserver-xorg-video-intel: Screen flickering with Xorg 1.16

2014-07-22 Thread Maarten Lankhorst

op 22-07-14 11:16, Bernhard Schmidt schreef:
 Package: xserver-xorg-video-intel
 Version: 2:2.99.912+git20140719-1~exp1
 Severity: normal

 Dear Maintainer,

 I have been a happy user of the experimental intel drivers because they
 fix a couple of annoyances for me. However since the upgrade of
 xserver-xorg to 2:1.15.99.904-1 I experience heavy flickering (Windows
 seems to switch between two versions of the window content).

 The problem is especially noticable in RDP sessions (Remmina) and in
 Thunderbird/Icedove. In Icedove's message list it behaves like a messed
 up scroll wheel.

 The problem can be observed in 2:2.99.912+git20140705-1~exp1+b1 and
 2:2.99.912+git20140719-1~exp1, downgrading to 2:2.21.15-2+b2 fixes the
 problem. I have been running the experimental drivers for a couple of
 weeks before Xorg 1.16 and cannot remember that issue.

 Best Regards,
 Bernhard

Smells like https://bugs.freedesktop.org/show_bug.cgi?id=81551

Can you give the patch there a try?

~Maarten


-- 
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/53ce599a.7030...@canonical.com

libxi: Changes to 'refs/tags/libxi-2%1.7.4-1'

2014-07-21 Thread Maarten Lankhorst

Tag 'libxi-2%1.7.4-1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-07-21 08:11 +

Debian release 2:1.7.4-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTzMsxAAoJEP5VjHKmcBPDGLIP/RQ8l4fgsgakhCmtpfVnU6vC
wwyfb+mgI2xdrmSqeXF+r4ex3HUr9K9qs/7UtOl3kLOI3OyFOaPl6FbgxNQ2E7IS
X3HZgygYq4mx26ATZBl2Jv0+zIswIKNMMxa3GEQU18OWYjjVz6okoRipMTt16e58
j67lfHRgYDrSDrCyK04sVHzW15gHbJjae7DoJSBL9QjOKY3Ec0mhTZWlKrkkM1QC
RhJ95MWThwoBAzs9NiFcolI+Pq0lh/NwolsgJvxVv2pcHLHKAhj9h0BXVryiesde
TrZiVjpE8ZEmGD1qFfm3qT3M5ZfygRoYujtjJVV/DJrBkaVdkCVrCE/W/jZPwWHE
2xJDl2QWWO4DCMWc1GSRhCqUSLcFKq4gDjup3rLLG4zoz0yjKn6KLjU73Hkx3nx/
OzePsO9c8T+Y4xP7chGi+e+8sgTK0QvBeZSuUcqHjz50CBSQSQImbUgWSTd6Ocka
bJ2ixMPl0LOesYl/yFwBfWVysL7r8nDDwRq9hqXHkiEGrQ4K3LgrjWh8Wf2DrNDN
Qcjwllx2LPaUElmM8JMhKL8eHkREUzyiTepWfHtszWMnBaLyv1jyUPFwrHVSu1Ys
IREvfO2K2GPd8GyR4GFaI4ABsLujdR/WnCs2a3hCdR5MyzmsTcIf7gVaV10cJ3I5
z/e75uRb1nCQ8H98nTWG
=7B9y
-END PGP SIGNATURE-

Changes since libxi-2_1.7.2-1:
Jasper St. Pierre (2):
  XIPassiveGrab: Fix display locking inside _XIPassiveGrabDevice for error 
paths
  XIPassiveGrab: Fix completely broken locking in XIGrabTouchBegin

Keith Packard (1):
  man: Update XIQueryVersion docs to match new version compatibility 
semantics

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

Michael Joost (1):
  Remove fallback for _XEatDataWords, require libX11 1.6 for it

Owen W. Taylor (1):
  Fix locking bugs with XIAllowTouchEvents() and XIUngrabTouchBegin()

Peter Hutterer (2):
  libXi 1.7.3
  libXi 1.7.4

---
 ChangeLog  |   86 +
 configure.ac   |   10 +
 debian/changelog   |6 +++
 man/XIQueryVersion.txt |   20 +--
 src/XIAllowEvents.c|7 ---
 src/XIPassiveGrab.c|   20 ++-
 src/XIint.h|   13 ---
 7 files changed, 122 insertions(+), 40 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/e1x98ow-0002ip...@moszumanska.debian.org

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

 debian/patches/xmir.patch |   32 +++-
 1 file changed, 11 insertions(+), 21 deletions(-)

New commits:
commit 1195fe754edf459ca8c267aa7a946c39c20c9941
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 17 10:02:56 2014 +0200

refresh xmir patch a second time

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index c709253..b2c334c 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -373,11 +373,9 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 +}
 +
 +#endif
-diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
-index 1baaf2b..e053dcc 100644
 --- a/src/sna/sna_dri2.c
 +++ b/src/sna/sna_dri2.c
-@@ -791,6 +791,7 @@ static void sna_dri2_select_mode(struct sna *sna, struct 
kgem_bo *dst, struct kg
+@@ -791,6 +791,7 @@
if (busy.busy  (1  17))
mode = KGEM_BLT;
kgem_bo_mark_busy(busy.handle == src-handle ? src : dst, mode);
@@ -385,28 +383,20 @@ index 1baaf2b..e053dcc 100644
_kgem_set_mode(sna-kgem, mode);
  }
  
-@@ -1351,16 +1352,16 @@ can_flip(struct sna * sna,
-   if (draw-type == DRAWABLE_PIXMAP)
+@@ -1356,6 +1357,12 @@
return false;
+   }
  
--  if (!sna-scrn-vtSema) {
--  DBG((%s: no, not attached to VT\n, __FUNCTION__));
 +  if ((sna-flags  SNA_IS_HOSTED) == 0) {
 +  DBG((%s: no, not hosted\n, __FUNCTION__));
++  return false;
++  }
++
++
+   if ((sna-flags  (SNA_HAS_FLIP | SNA_HAS_ASYNC_FLIP)) == 0) {
+   DBG((%s: no, pageflips disabled\n, __FUNCTION__));
return false;
-   }
- 
--  if ((sna-flags  (SNA_HAS_FLIP | SNA_HAS_ASYNC_FLIP)) == 0) {
--  DBG((%s: no, pageflips disabled\n, __FUNCTION__));
-+  if (!sna-scrn-vtSema) {
-+  DBG((%s: no, not attached to VT\n, __FUNCTION__));
-   return false;
-   }
- 
-   if (front-format != back-format) {
-   DBG((%s: no, format mismatch, front = %d, back = %d\n,
-__FUNCTION__, front-format, back-format));
-@@ -2966,6 +2977,13 @@ static const char *dri_driver_name(struct sna *sna)
+@@ -2966,6 +2973,13 @@
return s;
  }
  
@@ -420,7 +410,7 @@ index 1baaf2b..e053dcc 100644
  bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
  {
DRI2InfoRec info;
-@@ -3027,6 +3045,13 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
+@@ -3027,6 +3041,13 @@
info.ReuseBufferNotify = sna_dri2_reuse_buffer;
  #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/e1x7geh-0006gv...@moszumanska.debian.org

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

 debian/patches/xmir.patch |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit a10095fc97234e859041c32f0351d21c648e2fcc
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 17 10:47:50 2014 +0200

and a third time, still broken with glxgears

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index b2c334c..5cd4c97 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -25,7 +25,7 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  
 --- a/src/intel_device.c
 +++ b/src/intel_device.c
-@@ -276,6 +276,27 @@
+@@ -276,6 +276,25 @@
  }
  #endif
  
@@ -35,17 +35,15 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 +#if XMIR
 +  char id[20];
 +
++  if (!xorgMir)
++  return -1;
++
 +  snprintf(id, sizeof(id),
 +   pci:%04x:%02x:%02x.%d,
 +   pci-domain, pci-bus, pci-dev, pci-func);
 +  fd = xmir_get_drm_fd(id);
 +  if (fd == -1)
 +  return -1;
-+
-+  if (*path == NULL) /* XXX Fix Xmir - it knows both the fd and path */
-+  *path = drmGetDeviceNameFromFd(fd);
-+  if (*path == NULL)
-+  fd = -1;
 +#endif
 +
 +  return fd;
@@ -53,7 +51,7 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  
  #if defined(ODEV_ATTRIB_FD)
  static int get_fd(struct xf86_platform_device *dev)
-@@ -328,7 +349,9 @@
+@@ -328,7 +347,9 @@
master_count = 1; /* DRM_MASTER is managed by Xserver */
fd = get_fd(platform);
if (fd == -1) {


-- 
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/e1x7hm9-0007na...@moszumanska.debian.org

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

 debian/patches/xmir.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f282d6d67cd8fff7529b4b1b9c08e89d9cbdb6cd
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 16 16:51:48 2014 +0200

fix ftbfs

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 983e5b7..fe22b35 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -235,7 +235,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
 +  NVPtr pNv = NVPTR(pScrn);
 +
 +  exaMoveInPixmap(ppix);
-+  if (!pNv-NoAccel)
++  if (pNv-AccelMethod == NONE)
 +  nouveau_bo_ref(nouveau_pixmap(ppix)-bo, pNv-scanout);
 +  ppix-drawable.pScreen-devPrivate = ppix;
 +}


-- 
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/e1x7ibq-0005p9...@moszumanska.debian.org

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

 debian/patches/xmir.patch |   34 ++
 1 file changed, 22 insertions(+), 12 deletions(-)

New commits:
commit fc194e416b4fef9fca892135be479e23b5ae6c38
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 17 14:05:16 2014 +0200

remove drmSetInterfaceVersion call when using xmir

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 2e6f6d2..b3c3dfc 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -319,7 +319,17 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  fd = drmOpen(NULL, busid);
  if (fd == -1)
xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
-@@ -866,6 +946,14 @@
+@@ -646,6 +726,9 @@
+ if (info-dri2.drm_fd == -1)
+   return FALSE;
+ 
++if (xorgMir)
++return TRUE;
++
+ /* 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 @@
  if (!RADEONPreInitChipType_KMS(pScrn))
  goto fail;
  
@@ -334,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 +1028,14 @@
+@@ -940,10 +1031,14 @@
  }
  
  info-swapBuffersWait = xf86ReturnOptValBool(info-Options,
@@ -350,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 +1045,10 @@
+@@ -953,7 +1048,10 @@
  pRADEONEnt-HasCRTC2 = FALSE;
  else
  pRADEONEnt-HasCRTC2 = TRUE;
@@ -362,7 +372,7 @@ 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 +1226,7 @@
+@@ -1131,7 +1229,7 @@
  {
  RADEONInfoPtr  info  = RADEONPTR(pScrn);
  RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
@@ -371,7 +381,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  
  #ifdef XF86_PDEV_SERVER_FD
  if (pRADEONEnt-platform_dev 
-@@ -1139,7 +1234,8 @@
+@@ -1139,7 +1237,8 @@
  return TRUE;
  #endif
  
@@ -381,7 +391,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  if (err)
  ErrorF(Unable to retrieve master\n);
  
-@@ -1157,6 +1253,11 @@
+@@ -1157,6 +1256,11 @@
  return;
  #endif
  
@@ -393,7 +403,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  drmDropMaster(info-dri2.drm_fd);
  }
  
-@@ -1214,6 +1315,21 @@
+@@ -1214,6 +1318,21 @@
  RADEONFreeRec(pScrn);
  }
  
@@ -415,7 +425,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
  {
  ScrnInfoPtrpScrn = xf86ScreenToScrn(pScreen);
-@@ -1246,7 +1362,8 @@
+@@ -1246,7 +1365,8 @@
   failed to initialise GEM buffer manager);
return FALSE;
  }
@@ -425,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 +1487,10 @@
+@@ -1370,7 +1490,10 @@
  /* Cursor setup */
  miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
  
@@ -437,7 +447,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
if (RADEONCursorInit_KMS(pScreen)) {
}
  }
-@@ -1412,6 +1532,8 @@
+@@ -1412,6 +1535,8 @@
  info-CreateScreenResources = pScreen-CreateScreenResources;
  pScreen-CreateScreenResources = RADEONCreateScreenResources_KMS;
  
@@ -446,7 +456,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  #ifdef RADEON_PIXMAP_SHARING
  pScreen-StartPixmapTracking = PixmapStartDirtyTracking;
  pScreen-StopPixmapTracking = PixmapStopDirtyTracking;
-@@ -1457,7 +1579,9 @@
+@@ -1457,7 +1582,9 @@
  
  pScrn-vtSema = TRUE;
  
@@ -457,7 +467,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
return FALSE;
  
  return TRUE;
-@@ -1598,6 +1722,7 @@
+@@ -1598,6 +1725,7 @@
}
info-front_surface = surface;
}


-- 
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/e1x7krq-0001oq...@moszumanska.debian.org

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

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

New commits:
commit de1ab9bea441d49cf34c8278567475bd425483fe
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 17 14:06:13 2014 +0200

remove libglamor-dev as dependency, part of core X now

diff --git a/debian/control b/debian/control
index b0e8539..2155e36 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/e1x7kur-00028w...@moszumanska.debian.org

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

 autogen.sh|4 
 configure.ac  |   15 +
 debian/patches/xmir.patch |  137 ++---
 man/nouveau.man   |   31 ++-
 src/Makefile.am   |   12 +
 src/drmmode_display.c |  300 ++---
 src/nouveau_copy.c|  129 
 src/nouveau_copy.h|   18 +
 src/nouveau_copy85b5.c|  104 ++
 src/nouveau_copy90b5.c|  100 +
 src/nouveau_copya0b5.c|   97 +
 src/nouveau_dri2.c|  463 --
 src/nouveau_exa.c |   54 ++---
 src/nouveau_glamor.c  |  246 
 src/nouveau_glamor.h  |   33 +++
 src/nouveau_present.c |  350 ++
 src/nouveau_present.h |   19 +
 src/nouveau_sync.c|  117 +++
 src/nouveau_sync.h|   34 +++
 src/nouveau_wfb.c |   12 -
 src/nouveau_xv.c  |   21 +-
 src/nv04_exa.c|2 
 src/nv50_accel.c  |   23 --
 src/nv50_exa.c|   59 -
 src/nv50_xv.c |2 
 src/nv_accel_common.c |  138 -
 src/nv_const.h|2 
 src/nv_dma.c  |  139 -
 src/nv_driver.c   |  245 
 src/nv_proto.h|   29 +-
 src/nv_type.h |   32 ++-
 src/nvc0_accel.c  |   27 --
 src/nvc0_accel.h  |2 
 src/nvc0_exa.c|  112 ---
 34 files changed, 2192 insertions(+), 916 deletions(-)

New commits:
commit 6b2de1e0e8ed425b6ae9e357295ef14a0ad84c1b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 16 16:15:18 2014 +0200

refresh xmir patch

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 45324eb..983e5b7 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,7 +8,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
 
 --- a/src/nouveau_dri2.c
 +++ b/src/nouveau_dri2.c
-@@ -267,7 +267,7 @@
+@@ -275,7 +275,7 @@
NVPtr pNv = NVPTR(scrn);
int i;
  
@@ -17,7 +17,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
return FALSE;
  
for (i = 0; i  xf86_config-num_crtc; i++) {
-@@ -290,7 +290,7 @@
+@@ -298,7 +298,7 @@
ScrnInfoPtr scrn = xf86ScreenToScrn(draw-pScreen);
NVPtr pNv = NVPTR(scrn);
  
@@ -26,8 +26,8 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
nv_window_belongs_to_crtc(scrn, draw-x, draw-y,
  draw-width, draw-height);
  }
-@@ -766,6 +766,19 @@
-   free(flip);
+@@ -951,6 +951,19 @@
+   return TRUE;
  }
  
 +#if DRI2INFOREC_VERSION = 8  defined(XMIR)
@@ -46,7 +46,7 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  Bool
  nouveau_dri2_init(ScreenPtr pScreen)
  {
-@@ -804,6 +817,11 @@
+@@ -992,6 +1005,11 @@
dri2.GetParam = NULL;
  #endif
  
@@ -60,16 +60,25 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
-@@ -226,6 +226,8 @@
+@@ -231,6 +231,8 @@
case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data;
(*flag) = 0;
 +  if (xorgMir)
 +  *flag |= HW_SKIP_CONSOLE;
return TRUE;
-   default:
-   return FALSE;
-@@ -333,6 +335,23 @@
+ #if XORG_VERSION_CURRENT  XORG_VERSION_NUMERIC(1,15,99,0,0)
+   case SUPPORTS_SERVER_FDS:
+@@ -309,6 +311,8 @@
+ #endif
+   if (fd != -1)
+   ret = nouveau_device_wrap(fd, 0, dev);
++  else if (xorgMir)
++  nouveau_device_wrap(xmir_get_drm_fd(busid), 0, dev);
+   else
+   ret = nouveau_device_open(busid, dev);
+   if (ret)
+@@ -372,6 +376,23 @@
  }
  
  static Bool
@@ -93,27 +102,28 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
   intptr_t match_data)
  {
-@@ -343,6 +362,9 @@
+@@ -382,6 +403,10 @@
};
ScrnInfoPtr pScrn = NULL;
  
++
 +  if (xorgMir  !NVHasMirSupport(pci_dev))
 +  return FALSE;
 +
-   if (!NVHasKMS(pci_dev))
+   if (!NVHasKMS(pci_dev, NULL))
return FALSE;
  
-@@ -367,6 +389,9 @@
+@@ -406,6 +431,9 @@
if (!dev-pdev)
return FALSE;
  
 +  if (xorgMir  !NVHasMirSupport(dev-pdev))
 +  return FALSE;
 +
-   if (!NVHasKMS(dev-pdev))
+   if (!NVHasKMS(dev-pdev, dev))
return FALSE;
  
-@@ -406,7 +431,8 @@
+@@ -445,7 +473,8 @@
  NVAdjustFrame(ADJUST_FRAME_ARGS_DECL)
  {
SCRN_INFO_PTR(arg);
@@ -123,24 +133,28 @@ Date:   Mon Jul 22 17:46:58 2013 +1000
  }
  
  /*
-@@ -424,9 +450,11 @@
+@@ -462,7 +491,7 @@
+ #ifdef XF86_PDEV_SERVER_FD
+   NVEntPtr pNVEnt = NVEntPriv(pScrn);
+ #endif
+-  int ret;
++  int ret = 0;
  
xf86DrvMsg(pScrn-scrnIndex, X_INFO, NVEnterVT is called.\n);
  
--  ret = drmSetMaster(pNv-dev-fd);
--  if (ret

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

 debian/patches/xmir.patch |  134 +-
 1 file changed, 51 insertions(+), 83 deletions(-)

New commits:
commit 0afc86288f798de708ccade66402b8c3b9ee6181
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 16 15:49:43 2014 +0200

refresh mir patch

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index fb7739d..2e6f6d2 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -184,7 +184,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  #endif
 --- a/src/radeon_glamor.c
 +++ b/src/radeon_glamor.c
-@@ -285,14 +285,15 @@
+@@ -297,14 +297,15 @@
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct radeon_surface surface;
struct radeon_pixmap *priv;
@@ -205,7 +205,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
xf86DrvMsg(scrn-scrnIndex, X_ERROR,
 --- a/src/radeon_kms.c
 +++ b/src/radeon_kms.c
-@@ -220,10 +220,15 @@
+@@ -230,10 +230,15 @@
return FALSE;
  pScreen-CreateScreenResources = RADEONCreateScreenResources_KMS;
  
@@ -223,7 +223,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  
  if (info-r600_shadow_fb) {
pixmap = pScreen-GetScreenPixmap(pScreen);
-@@ -285,6 +290,66 @@
+@@ -295,6 +300,66 @@
  }
  #endif
  
@@ -290,7 +290,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
  {
  SCREEN_PTR(arg);
-@@ -302,6 +367,10 @@
+@@ -312,6 +377,10 @@
  #ifdef RADEON_PIXMAP_SHARING
  radeon_dirty_update(pScreen);
  #endif
@@ -301,30 +301,25 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  }
  
  static void
-@@ -607,6 +676,22 @@
+@@ -616,6 +685,17 @@
  dev-domain, dev-bus, dev-dev, dev-func);
  #endif
  
 +if (xorgMir) {
-+  info-dri2.drm_fd = xmir_get_drm_fd(busid);
-+
-+  if (info-dri2.drm_fd  0) {
-+  xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
-+ [drm] Failed to retrieve DRM device %s from Mir\n,
-+ busid);
-+  free(busid);
-+  return FALSE;
-+  }
-+  free(busid);
-+  /* TODO: Work out what to do about the crazy multihead involved in
-+ pRADEONEnt-fd */
-+  goto out;
++fd = xmir_get_drm_fd(busid);
++
++if (fd == -1)
++xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
++   [drm] Failed to retrieve DRM device %s from Mir\n,
++   busid);
++free(busid);
++return fd;
 +}
 +
- info-dri2.drm_fd = drmOpen(NULL, busid);
- if (info-dri2.drm_fd == -1) {
- 
-@@ -839,6 +924,14 @@
+ fd = drmOpen(NULL, busid);
+ if (fd == -1)
+   xf86DrvMsg(pScrn-scrnIndex, X_ERROR,
+@@ -866,6 +946,14 @@
  if (!RADEONPreInitChipType_KMS(pScrn))
  goto fail;
  
@@ -339,7 +334,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;
-@@ -913,10 +1006,14 @@
+@@ -940,10 +1028,14 @@
  }
  
  info-swapBuffersWait = xf86ReturnOptValBool(info-Options,
@@ -355,7 +350,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;
-@@ -926,7 +1023,10 @@
+@@ -953,7 +1045,10 @@
  pRADEONEnt-HasCRTC2 = FALSE;
  else
  pRADEONEnt-HasCRTC2 = TRUE;
@@ -367,9 +362,28 @@ 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
-@@ -1126,6 +1226,11 @@
- if (info-accel_state-use_vbos)
- radeon_vbo_free_lists(pScrn);
+@@ -1131,7 +1226,7 @@
+ {
+ RADEONInfoPtr  info  = RADEONPTR(pScrn);
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+-int err;
++int err = 0;
+ 
+ #ifdef XF86_PDEV_SERVER_FD
+ if (pRADEONEnt-platform_dev 
+@@ -1139,7 +1234,8 @@
+ return TRUE;
+ #endif
+ 
+-err = drmSetMaster(info-dri2.drm_fd);
++if (!xorgMir)
++err = drmSetMaster(info-dri2.drm_fd);
+ if (err)
+ ErrorF(Unable to retrieve master\n);
+ 
+@@ -1157,6 +1253,11 @@
+ return;
+ #endif
  
 +#ifdef XMIR
 +if (info-xmir) {
@@ -377,9 +391,9 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
 +} else
 +#endif
  drmDropMaster(info-dri2.drm_fd);
+ }
  
- drmmode_fini(pScrn, info-drmmode);
-@@ -1154,6 +1259,21 @@
+@@ -1214,6 +1315,21 @@
  RADEONFreeRec(pScrn);
  }
  
@@ -401,26 +415,7 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
  Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
  {
  ScrnInfoPtrpScrn = xf86ScreenToScrn(pScreen);
-@@ -1161,7 +1281,7 @@
- intsubPixelOrder = SubPixelUnknown;
- char*  s;
- void *front_ptr;
--int ret;
-+int ret = 0;
- 
- pScrn-fbOffset = 0;
- 
-@@ -1172,7 +1292,8

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

/intel_driver.c  |  168 
 src/uxa/intel_glamor.c  |   10 
 src/uxa/intel_present.c |  401 
 src/uxa/intel_sync.c|  111 
 src/uxa/intel_uxa.c |   91 
 src/uxa/intel_video.c   |3 
 src/uxa/uxa-accel.c |2 
 src/uxa/uxa-priv.h  |   17 
 src/uxa/uxa-render.c|4 
 src/uxa/uxa.c   |2 
 test/.gitignore |2 
 test/Makefile.am|   15 
 test/dri2-test.c|   77 
 test/dri3-test.c| 1100 ++
 test/dri3.c |  133 
 test/dri3.h |   50 
 test/present-test.c |  726 +
 test/test.h |   14 
 tools/.gitignore|2 
 tools/Makefile.am   |   29 
 tools/backlight_helper.c|   36 
 tools/org.x.xf86-video-intel.backlight-helper.policy.in |   19 
 tools/virtual.c |  670 +
 99 files changed, 22351 insertions(+), 6603 deletions(-)

New commits:
commit 974d8035c75cca91f7df4d462b59522048a7379a
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 16 17:18:11 2014 +0200

refresh xmir patch, and remove the flip/exchange changes for now

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index c772429..c709253 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -15,7 +15,7 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -59,6 +59,7 @@ intel_drv_la_SOURCES = \
+@@ -67,6 +67,7 @@
intel_driver.h \
intel_options.c \
intel_module.c \
@@ -25,15 +25,15 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  
 --- a/src/intel_device.c
 +++ b/src/intel_device.c
-@@ -175,10 +175,34 @@ static int fd_set_nonblock(int fd)
-   return fd;
+@@ -276,6 +276,27 @@
  }
+ #endif
  
-+static int __intel_open_xmir(const struct pci_device *pci,
-+   char **path)
++static int __intel_open_xmir(const struct pci_device *pci)
 +{
++  int fd = -1;
++#if XMIR
 +  char id[20];
-+  int fd;
 +
 +  snprintf(id, sizeof(id),
 +   pci:%04x:%02x:%02x.%d,
@@ -46,20 +46,24 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 +  *path = drmGetDeviceNameFromFd(fd);
 +  if (*path == NULL)
 +  fd = -1;
++#endif
 +
 +  return fd;
 +}
-+
- static int __intel_open_device(const struct pci_device *pci, char **path)
- {
-   int fd;
  
-+  if (xorgMir)
-+  return __intel_open_xmir(pci, path);
-+
-   if (*path == NULL) {
-   char id[20];
-   int ret;
+ #if defined(ODEV_ATTRIB_FD)
+ static int get_fd(struct xf86_platform_device *dev)
+@@ -328,7 +349,9 @@
+   master_count = 1; /* DRM_MASTER is managed by Xserver */
+   fd = get_fd(platform);
+   if (fd == -1) {
+-  fd = __intel_open_device(pci, path);
++  fd = __intel_open_xmir(pci);
++  if (fd == -1)
++  fd = __intel_open_device(pci, path);
+   if (fd == -1)
+   goto err_path;
+ 
 --- a/src/intel_driver.h
 +++ b/src/intel_driver.h
 @@ -1,6 +1,8 @@
@@ -71,9 +75,9 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  struct xf86_platform_device;
  
  #define INTEL_VERSION 4000
-@@ -134,6 +136,6 @@ void intel_put_device(ScrnInfoPtr scrn);
- 
- void __intel_uxa_release_device(ScrnInfoPtr scrn);
+@@ -134,6 +136,6 @@
+ int intel_put_master(ScrnInfoPtr scrn);
+ void intel_put_device(ScrnInfoPtr scrn);
  
 -#define hosted() (0)
 +#define hosted() (xorgMir)
@@ -99,7 +103,7 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
 +#endif /* INTEL_XMIR_H */
 --- a/src/sna/Makefile.am
 +++ b/src/sna/Makefile.am
-@@ -81,6 +81,7 @@ libsna_la_SOURCES = \
+@@ -80,6 +80,7 @@
sna_video_overlay.c \
sna_video_sprite.c \
sna_video_textured.c \
@@ -109,7 +113,7 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
gen3_render.c \
 --- a/src/sna/sna.h
 +++ b/src/sna/sna.h
-@@ -289,6 +289,7 @@ struct sna {
+@@ -365,6 +365,7 @@
  
EntityInfoPtr pEnt;
const struct intel_device_info *info;
@@ -117,9 +121,9 @@ Date:   Wed Jul 24 01:44:30 2013 +0100
  
ScreenBlockHandlerProcPtr BlockHandler;
ScreenWakeupHandlerProcPtr WakeupHandler;
-@@ -987,4 +988,18 @@ static inline void sigtrap_put(void)
-   sigtrap_assert();
- }
+@@ -1215,4 +1216,18 @@
+ #define RR_Rotate_All (RR_Rotate_0

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

 AUTHORS |2 
 Makefile.am |2 
 NEWS|  420 
 README  |9 
 configure.ac|  764 +
 man/intel.man   |   69 
 src/Makefile.am |   18 
 src/backlight.c |  494 +
 src/backlight.h |   56 
 src/compat-api.h|   33 
 src/fd.c|   69 
 src/fd.h|   33 
 src/i915_pciids.h   |   55 
 src/intel_device.c  |  504 -
 src/intel_driver.h  |   19 
 src/intel_list.h|5 
 src/intel_module.c  |  151 
 src/intel_options.c |7 
 src/intel_options.h |6 
 src/legacy/Makefile.am  |2 
 src/legacy/i810/Makefile.am |3 
 src/legacy/i810/i810_accel.c|1 
 src/legacy/i810/i810_common.h   |4 
 src/legacy/i810/i810_cursor.c   |5 
 src/legacy/i810/i810_dga.c  |1 
 src/legacy/i810/i810_dri.c  |1 
 src/legacy/i810/i810_driver.c   |3 
 src/legacy/i810/i810_hwmc.c |1 
 src/legacy/i810/i810_memory.c   |3 
 src/legacy/i810/i810_ring.h |2 
 src/legacy/i810/i810_video.c|1 
 src/legacy/i810/i810_wmark.c|1 
 src/legacy/i810/i810_xaa.c  |1 
 src/legacy/i810/xvmc/Makefile.am|4 
 src/render_program/Makefile.am  |   23 
 src/render_program/exa_wm_src_affine.g8b|4 
 src/render_program/exa_wm_src_sample_argb.g8b   |3 
 src/render_program/exa_wm_src_sample_planar.g8b |5 
 src/render_program/exa_wm_write.g8b |   17 
 src/render_program/exa_wm_yuv_rgb.g8b   |   12 
 src/sna/Makefile.am |   45 
 src/sna/blt.c   |  184 
 src/sna/brw/Makefile.am |3 
 src/sna/brw/brw_eu_util.c   |  126 
 src/sna/brw/brw_wm.c|   16 
 src/sna/fb/fb.h |5 
 src/sna/fb/fbbitmap.c   |4 
 src/sna/fb/fbclip.c |2 
 src/sna/fb/fbgc.c   |1 
 src/sna/fb/fbline.c |   14 
 src/sna/fb/fblinebits.h |   23 
 src/sna/fb/fbpict.h |1 
 src/sna/fb/fbpoint.c|4 
 src/sna/fb/fbpointbits.h|   23 
 src/sna/fb/fbpush.c |2 
 src/sna/fb/fbseg.c  |1 
 src/sna/gen2_render.c   |  236 
 src/sna/gen3_render.c   |  322 
 src/sna/gen4_common.c   |   64 
 src/sna/gen4_common.h   |   49 
 src/sna/gen4_render.c   |  400 
 src/sna/gen4_render.h   |2 
 src/sna/gen4_vertex.c   |  237 
 src/sna/gen4_vertex.h   |1 
 src/sna/gen5_render.c   |  310 
 src/sna/gen6_common.c   |   71 
 src/sna/gen6_common.h   |  205 
 src/sna/gen6_render.c   |  515 -
 src/sna/gen7_render.c   |  623 -
 src/sna/gen8_eu.c   | 1379 ++
 src/sna/gen8_eu.h   |   19 
 src/sna/gen8_render.c   | 4008 
 src/sna/gen8_render.h   | 1132 ++
 src/sna/gen8_vertex.c   |  296 
 src/sna/gen8_vertex.h   |   14 
 src/sna/kgem.c  | 2408 +++-
 src/sna/kgem.h

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

2014-07-15 Thread Maarten Lankhorst

 debian/changelog |5 +
 debian/control   |2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1b6b87a376a31588497d0532a65ae93cca39dc6d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 15 14:59:49 2014 +0200

Drop libmtdev-dev, and add libxtst-dev dependency.

diff --git a/debian/changelog b/debian/changelog
index 97fb909..af9ee68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 xserver-xorg-input-synaptics (1.8.0-1~exp3) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Remove Cyril from Uploaders.
 
+  [ Maarten Lankhorst ]
+  * Drop libmtdev-dev, unused in 1.8.0.
+  * Add dependency on libxtst-dev again to enable support for XRecord.
+
  -- Julien Cristau jcris...@debian.org  Mon, 16 Jun 2014 20:19:21 +0200
 
 xserver-xorg-input-synaptics (1.8.0-1~exp2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 06289c8..bc38262 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  pkg-config,
  quilt,
  xutils-dev (= 1:7.5+4),
- libmtdev-dev [linux-any],
+ libxtst-dev,
 Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git


-- 
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/e1x736r-0002pd...@moszumanska.debian.org

xserver-xorg-input-synaptics: Changes to 'ubuntu'

2014-07-15 Thread Maarten Lankhorst

 debian/changelog |   13 +
 debian/control   |2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 27b2b516cad29ff2f7591613687028e028227cbf
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 15 15:07:29 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 11e2582..aeb1304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-synaptics (1.8.0-1~exp2ubuntu2) utopic; urgency=medium
+
+  * Remerge from debian-experimental to pick up libxtst-dev.
+- Fixes touchpad sometimes not disabling by allowing
+  'syndaemon -R' to use XRecord correctly. (LP: #1323006)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 15 Jul 2014 
15:07:15 +0200
+
 xserver-xorg-input-synaptics (1.8.0-1~exp2ubuntu1) utopic; urgency=medium
 
   * Merge from debian-experimental.

commit 1b6b87a376a31588497d0532a65ae93cca39dc6d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 15 14:59:49 2014 +0200

Drop libmtdev-dev, and add libxtst-dev dependency.

diff --git a/debian/changelog b/debian/changelog
index 97fb909..af9ee68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 xserver-xorg-input-synaptics (1.8.0-1~exp3) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Remove Cyril from Uploaders.
 
+  [ Maarten Lankhorst ]
+  * Drop libmtdev-dev, unused in 1.8.0.
+  * Add dependency on libxtst-dev again to enable support for XRecord.
+
  -- Julien Cristau jcris...@debian.org  Mon, 16 Jun 2014 20:19:21 +0200
 
 xserver-xorg-input-synaptics (1.8.0-1~exp2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 06289c8..bc38262 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  pkg-config,
  quilt,
  xutils-dev (= 1:7.5+4),
- libmtdev-dev [linux-any],
+ libxtst-dev,
 Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git


-- 
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/e1x736r-0002pm...@moszumanska.debian.org

xserver-xorg-input-synaptics: Changes to 'ubuntu-trusty'

2014-07-15 Thread Maarten Lankhorst

 configure.ac |2 +-
 debian/changelog |9 +
 debian/control   |1 -
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0e4f9588f2fb5969b20f2d8ea4f4ff79bd0ad62e
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 15 15:48:59 2014 +0200

Add dependency to libxtst-dev to make syndaemon -R work, and bump to 1.7.5.

diff --git a/debian/changelog b/debian/changelog
index 865ef63..0c7e27c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-input-synaptics (1.7.5-0ubuntu1) UNRELEASED; urgency=low
+
+  * Bump version to 1.7.5.
+- No changes except updating version in configure.ac,
+  we were using a git version.
+  * Add dependency to libxtst-dev to make syndaemon -R work. (LP: #1323006)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 15 Jul 2014 
15:25:17 +0200
+
 xserver-xorg-input-synaptics (1.7.4-0ubuntu1) trusty; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 766510d..f6506e1 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
  quilt,
  xutils-dev (= 1:7.5+4),
  libmtdev-dev [linux-any],
-Build-Conflicts:
  libxtst-dev
 Standards-Version: 3.9.5
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics

commit baca0fde5958d9dc17a9b13372cc8819170e2f74
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Apr 29 14:27:30 2014 +1000

synaptics 1.7.5

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index c41e6da..2cd7bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-synaptics],
-[1.7.4],
+[1.7.5],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-synaptics])
 AC_CONFIG_SRCDIR([Makefile.am])


-- 
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/e1x736r-0002qj...@moszumanska.debian.org

mesa: Changes to 'upstream-unstable'

 VERSION   |2 
 bin/.cherry-ignore|4 
 docs/relnotes/10.2.2.html |3 
 docs/relnotes/10.2.3.html |  127 +
 include/GL/glx.h  |2 
 include/pci_ids/i965_pci_ids.h|   36 +--
 src/gallium/auxiliary/draw/draw_private.h |2 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h |   21 +-
 src/gallium/drivers/freedreno/a2xx/fd2_blend.c|   25 ++
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h |   33 ++-
 src/gallium/drivers/freedreno/a3xx/fd3_blend.c|   25 ++
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c |   20 +-
 src/gallium/drivers/freedreno/a3xx/fd3_gmem.c |   40 ++--
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c  |4 
 src/gallium/drivers/freedreno/a3xx/fd3_util.c |  134 +++---
 src/gallium/drivers/freedreno/adreno_common.xml.h |   17 -
 src/gallium/drivers/freedreno/adreno_pm4.xml.h|8 
 src/gallium/drivers/freedreno/freedreno_resource.c|4 
 src/gallium/drivers/freedreno/freedreno_screen.c  |8 
 src/gallium/drivers/freedreno/freedreno_texture.c |4 
 src/gallium/drivers/freedreno/freedreno_util.c|   20 --
 src/gallium/drivers/freedreno/freedreno_util.h|1 
 src/gallium/drivers/llvmpipe/lp_texture.c |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h  |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   31 +++
 src/gallium/drivers/nouveau/nv50/nv50_context.c   |   29 ++-
 src/gallium/drivers/nouveau/nv50/nv50_context.h   |1 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c   |   29 ++-
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c   |   22 ++
 src/gallium/drivers/nouveau/nvc0/nvc0_context.h   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |   27 ++
 src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h|5 
 src/gallium/drivers/radeon/radeon_llvm_util.c |   10 -
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c   |4 
 src/gallium/state_trackers/xa/xa_composite.c  |3 
 src/gallium/state_trackers/xa/xa_tracker.c|7 
 src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c   |   19 +
 src/glx/glxext.c  |9 
 src/mesa/drivers/dri/i965/brw_shader.cpp  |9 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   14 -
 src/mesa/drivers/dri/i965/gen8_fs_generator.cpp   |2 
 42 files changed, 575 insertions(+), 196 deletions(-)

New commits:
commit 33cb9f9503cc57c341da8ecec6c16c33fd4f0ae5
Author: Carl Worth cwo...@cworth.org
Date:   Mon Jul 7 16:12:42 2014 -0700

docs: Add release notes for the 10.2.3 release.

Which is imminent.

diff --git a/VERSION b/VERSION
index 68e8fce..ea657e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.2
+10.2.3
diff --git a/docs/relnotes/10.2.3.html b/docs/relnotes/10.2.3.html
new file mode 100644
index 000..205b491
--- /dev/null
+++ b/docs/relnotes/10.2.3.html
@@ -0,0 +1,127 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.2.3 Release Notes / July 7, 2014/h1
+
+p
+Mesa 10.2.3 is a bug fix release which fixes bugs found since the 10.2.2 
release.
+/p
+p
+Mesa 10.2.3 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 strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2SHA256 checksums/h2
+pre
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=76223;Bug 76223/a 
- /li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=79823;Bug 79823/a 
- /li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=80015;Bug 80015/a 
- /li
+
+/ul
+
+h2Changes/h2
+
+pAaron Watry (1):/p
+ul
+  liradeon/llvm: Allocate space for kernel metadata operands/li
+/ul
+
+pCarl Worth (2):/p
+ul
+  lidocs: Add sha256 sums for the 10.2.2 release/li
+

mesa: Changes to 'ubuntu'

 VERSION   |2 
 bin/.cherry-ignore|4 
 debian/changelog  |6 
 docs/relnotes/10.2.2.html |3 
 docs/relnotes/10.2.3.html |  127 +
 include/pci_ids/i965_pci_ids.h|   36 +--
 src/gallium/auxiliary/draw/draw_private.h |2 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h |   21 +-
 src/gallium/drivers/freedreno/a2xx/fd2_blend.c|   25 ++
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h |   33 ++-
 src/gallium/drivers/freedreno/a3xx/fd3_blend.c|   25 ++
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c |   20 +-
 src/gallium/drivers/freedreno/a3xx/fd3_gmem.c |   40 ++--
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c  |4 
 src/gallium/drivers/freedreno/a3xx/fd3_util.c |  134 +++---
 src/gallium/drivers/freedreno/adreno_common.xml.h |   17 -
 src/gallium/drivers/freedreno/adreno_pm4.xml.h|8 
 src/gallium/drivers/freedreno/freedreno_resource.c|4 
 src/gallium/drivers/freedreno/freedreno_screen.c  |8 
 src/gallium/drivers/freedreno/freedreno_texture.c |4 
 src/gallium/drivers/freedreno/freedreno_util.c|   20 --
 src/gallium/drivers/freedreno/freedreno_util.h|1 
 src/gallium/drivers/llvmpipe/lp_texture.c |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h  |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   31 +++
 src/gallium/drivers/nouveau/nv50/nv50_context.c   |   29 ++-
 src/gallium/drivers/nouveau/nv50/nv50_context.h   |1 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c   |   29 ++-
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c   |   22 ++
 src/gallium/drivers/nouveau/nvc0/nvc0_context.h   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |   27 ++
 src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h|5 
 src/gallium/drivers/radeon/radeon_llvm_util.c |   10 -
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c   |4 
 src/gallium/state_trackers/xa/xa_composite.c  |3 
 src/gallium/state_trackers/xa/xa_tracker.c|7 
 src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c   |   19 +
 src/mesa/drivers/dri/i965/brw_shader.cpp  |9 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   14 -
 src/mesa/drivers/dri/i965/gen8_fs_generator.cpp   |2 
 41 files changed, 575 insertions(+), 191 deletions(-)

New commits:
commit 28be2582c3ab87a8150bfed30e830e411de31582
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 9 11:59:25 2014 +0200

bump changelog

diff --git a/debian/changelog b/debian/changelog
index 44cf9fd..7542bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 09 Jul 2014 
11:57:29 +0200
+
 mesa (10.2.2-1) unstable; urgency=medium
 
   [ Andreas Boll ]

commit 33cb9f9503cc57c341da8ecec6c16c33fd4f0ae5
Author: Carl Worth cwo...@cworth.org
Date:   Mon Jul 7 16:12:42 2014 -0700

docs: Add release notes for the 10.2.3 release.

Which is imminent.

diff --git a/VERSION b/VERSION
index 68e8fce..ea657e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.2
+10.2.3
diff --git a/docs/relnotes/10.2.3.html b/docs/relnotes/10.2.3.html
new file mode 100644
index 000..205b491
--- /dev/null
+++ b/docs/relnotes/10.2.3.html
@@ -0,0 +1,127 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.2.3 Release Notes / July 7, 2014/h1
+
+p
+Mesa 10.2.3 is a bug fix release which fixes bugs found since the 10.2.2 
release.
+/p
+p
+Mesa 10.2.3 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 strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2SHA256 checksums/h2
+pre
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p

mesa: Changes to 'debian-unstable'

 VERSION   |2 
 bin/.cherry-ignore|4 
 debian/changelog  |6 
 docs/relnotes/10.2.2.html |3 
 docs/relnotes/10.2.3.html |  127 +
 include/pci_ids/i965_pci_ids.h|   36 +--
 src/gallium/auxiliary/draw/draw_private.h |2 
 src/gallium/drivers/freedreno/a2xx/a2xx.xml.h |   21 +-
 src/gallium/drivers/freedreno/a2xx/fd2_blend.c|   25 ++
 src/gallium/drivers/freedreno/a3xx/a3xx.xml.h |   33 ++-
 src/gallium/drivers/freedreno/a3xx/fd3_blend.c|   25 ++
 src/gallium/drivers/freedreno/a3xx/fd3_emit.c |   20 +-
 src/gallium/drivers/freedreno/a3xx/fd3_gmem.c |   40 ++--
 src/gallium/drivers/freedreno/a3xx/fd3_texture.c  |4 
 src/gallium/drivers/freedreno/a3xx/fd3_util.c |  134 +++---
 src/gallium/drivers/freedreno/adreno_common.xml.h |   17 -
 src/gallium/drivers/freedreno/adreno_pm4.xml.h|8 
 src/gallium/drivers/freedreno/freedreno_resource.c|4 
 src/gallium/drivers/freedreno/freedreno_screen.c  |8 
 src/gallium/drivers/freedreno/freedreno_texture.c |4 
 src/gallium/drivers/freedreno/freedreno_util.c|   20 --
 src/gallium/drivers/freedreno/freedreno_util.h|1 
 src/gallium/drivers/llvmpipe/lp_texture.c |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h  |1 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |   31 +++
 src/gallium/drivers/nouveau/nv50/nv50_context.c   |   29 ++-
 src/gallium/drivers/nouveau/nv50/nv50_context.h   |1 
 src/gallium/drivers/nouveau/nv50/nv50_vbo.c   |   29 ++-
 src/gallium/drivers/nouveau/nvc0/nvc0_context.c   |   22 ++
 src/gallium/drivers/nouveau/nvc0/nvc0_context.h   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_state.c |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c   |   27 ++
 src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h|5 
 src/gallium/drivers/radeon/radeon_llvm_util.c |   10 -
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c   |4 
 src/gallium/state_trackers/xa/xa_composite.c  |3 
 src/gallium/state_trackers/xa/xa_tracker.c|7 
 src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c   |   19 +
 src/mesa/drivers/dri/i965/brw_shader.cpp  |9 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   14 -
 src/mesa/drivers/dri/i965/gen8_fs_generator.cpp   |2 
 41 files changed, 575 insertions(+), 191 deletions(-)

New commits:
commit 28be2582c3ab87a8150bfed30e830e411de31582
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 9 11:59:25 2014 +0200

bump changelog

diff --git a/debian/changelog b/debian/changelog
index 44cf9fd..7542bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 09 Jul 2014 
11:57:29 +0200
+
 mesa (10.2.2-1) unstable; urgency=medium
 
   [ Andreas Boll ]

commit 33cb9f9503cc57c341da8ecec6c16c33fd4f0ae5
Author: Carl Worth cwo...@cworth.org
Date:   Mon Jul 7 16:12:42 2014 -0700

docs: Add release notes for the 10.2.3 release.

Which is imminent.

diff --git a/VERSION b/VERSION
index 68e8fce..ea657e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.2
+10.2.3
diff --git a/docs/relnotes/10.2.3.html b/docs/relnotes/10.2.3.html
new file mode 100644
index 000..205b491
--- /dev/null
+++ b/docs/relnotes/10.2.3.html
@@ -0,0 +1,127 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.2.3 Release Notes / July 7, 2014/h1
+
+p
+Mesa 10.2.3 is a bug fix release which fixes bugs found since the 10.2.2 
release.
+/p
+p
+Mesa 10.2.3 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 strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2SHA256 checksums/h2
+pre
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p

mesa: Changes to 'ubuntu'

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

New commits:
commit 28b448aa15f1ba1941ecdefb0f145ab853645fed
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 9 16:06:44 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index a7e1308..edd8097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.3-0ubuntu1) utopic; urgency=low
+
+  * Merge from unreleased unstable to fix vmwgfx.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 09 Jul 2014 
11:57:29 +0200
+
 mesa (10.2.3-1) UNRELEASED; urgency=low
 
   * 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/e1x4swi-0004m9...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

2014-07-04 Thread Maarten Lankhorst

 debian/patches/xmir.patch |  129 +-
 1 file changed, 38 insertions(+), 91 deletions(-)

New commits:
commit 09b040ed973684451db9f686d3bda3575fee1b77
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jul 4 11:12:30 2014 +0200

quilt refresh --strip-trailing-whitespaces on xmir.patch

diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index f60216f..a91c52d 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
+@@ -2594,6 +2604,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/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
-index 35a673d..082e454 100644
 --- a/hw/xfree86/common/xf86Events.c
 +++ b/hw/xfree86/common/xf86Events.c
-@@ -614,6 +614,10 @@ xf86VTSwitch(void)
+@@ -614,6 +614,10 @@
  {
  DebugF(xf86VTSwitch()\n);
  
@@ -106,22 +98,18 @@ index 35a673d..082e454 100644
  #ifdef XFreeXDGA
  if (!DGAVTSwitch())
  return;
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index 984c39b..9b23d9a 100644
 --- a/hw/xfree86/common/xf86Globals.c
 +++ b/hw/xfree86/common/xf86Globals.c
-@@ -204,3 +204,6 @@ Bool xf86VidModeAllowNonLocal = FALSE;
+@@ -207,3 +207,6 @@
  #endif
  RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
  Bool xorgHWAccess = FALSE;
 +Bool xorgMir = FALSE;
 +const char *mirID = NULL;
 +const char *mirSocket = NULL;
-diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
-index e2b32a0..d942ffd 100644
 --- a/hw/xfree86/common/xf86Helper.c
 +++ b/hw/xfree86/common/xf86Helper.c
-@@ -100,7 +100,14 @@ xf86DeleteDriver(int drvIndex)
+@@ -100,7 +100,14 @@
  if (xf86DriverList[drvIndex]-module)
  UnloadModule(xf86DriverList[drvIndex]-module);
  free(xf86DriverList[drvIndex]);
@@ -137,11 +125,9 @@ index e2b32a0..d942ffd 100644
  }
  }
  
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 5a45004..931381d 100644
 --- a/hw/xfree86/common

xorg-server: Changes to 'ubuntu'

2014-07-04 Thread Maarten Lankhorst

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

New commits:
commit c1823e649111aa40bec07765ce57e3563e04d67e
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 3 10:51:56 2014 +0200

Import rebuild against Mir 0.4.0.

diff --git a/debian/changelog b/debian/changelog
index 37a86c9..4c8862a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.15.1-0ubuntu7) utopic; urgency=medium
+xorg-server (2:1.15.1-0ubuntu8) utopic; urgency=medium
 
   * debian/patches/xfree86-pci-bus-probe-non-seat0.patch
 - Upstream patch to fix No devices detected error for seats
@@ -6,6 +6,12 @@ xorg-server (2:1.15.1-0ubuntu7) utopic; urgency=medium
 
  -- Alberts Muktupāvels alberts.muktupav...@gmail.com  Tue, 01 Jul 2014 
17:12:51 +0300
 
+xorg-server (2:1.15.1-0ubuntu7) utopic; urgency=medium
+
+  * Rebuild against Mir 0.4.0.
+
+ -- Łukasz 'sil2100' Zemczak lukasz.zemc...@canonical.com  Wed, 02 Jul 2014 
12:33:10 +0200
+
 xorg-server (2:1.15.1-0ubuntu6) utopic; urgency=medium
 
   * ppc64el-endian-fix.patch: Fix PPC endian assumptions (LP: #1333422)
diff --git a/debian/control b/debian/control
index e0cb716..c9d4409 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,7 @@ Build-Depends:
 # getpeereid()
  libbsd-dev [kfreebsd-any],
 # XMir
- libmirclient-dev (= 0.1.5) [!arm64 !powerpc !ppc64el],
+ libmirclient-dev (= 0.4.0) [!arm64 !powerpc !ppc64el],
  libatomic-ops-dev,
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server


-- 
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/e1x2zy0-0004qh...@moszumanska.debian.org

mesa: Changes to 'debian-unstable'

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

New commits:
commit 1b3809aa2460d58a7ce7aa1161985a30790bae60
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 3 09:55:04 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 3020768..44cf9fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-mesa (10.2.2-1) UNRELEASED; urgency=medium
+mesa (10.2.2-1) unstable; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream release.
 - glx: Don't crash on swap event for a Window (non-GLXWindow)
   (Closes: #685328).
@@ -8,7 +9,7 @@ mesa (10.2.2-1) UNRELEASED; urgency=medium
   * Cherry-pick commit b4dcf87 (glxext: Send the Drawable's ID in the
 GLX_BufferSwapComplete event) from upstream, fixes intel + dri3.
 
- -- Andreas Boll andreas.boll@gmail.com  Wed, 02 Jul 2014 18:00:52 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 03 Jul 2014 
09:54:48 +0200
 
 mesa (10.2.1-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/e1x2cdv-0008af...@moszumanska.debian.org

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

Tag 'mesa-10.2.2-1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-07-03 08:09 +

Debian release 10.2.2-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTtQ+gAAoJEP5VjHKmcBPDn8sP/Ay+oLrPsXEU931/cIJuDnIt
wKsbe885s97bygLZ5iX1lKAjYo9tj5UeGQslFpOKmNrtlPvW3Qt2NhkSATEnS86D
zW1mPEmpdTdIEz4JHXp2cVvQLsF+NNuaSZXYS51giuteDLBW0jP/3Ka+SZSWdJym
jhSxaRjOYCYlMlC3s1eWZOR/DfyhdwEnLZ0Ov7RKxG1CtE06L/A1oiKd0v3s0HbU
mIve1nCjgKkTs+H/EfFcXBT5Zl0DTn9jmWI2ZrcTAStP8WA+9/XcKivhHW0mfixe
yQswPK0cz9TKeMlazB4dZempffgx1yKtvVaidGNZwtD7aRYkL99TMAF84QA28wwm
KvRj3k83swV01S1pxaoVkkM60l/5eA5KyOIMfA4mmKKmYcP2VBJJ5bATBcSOE8mj
MvkRckfw8fJSW2t1Am2WKK/5ryuUSXoWmrmSnHxDG/0j4+JpmHngatduTTlKmuUp
7HHYooPYaHNPnCmqywP9kUianyZfYYScHbnO6kdUA3Lm5odFE20hQALx931PRqni
SKTpbUFgR/+JtkCEb5y9p4KLeoVIsi5Ho9zvRNhpfJM4Adsbot4xdOsouOygFCwx
nYuLMbwvwkL+JvIILvHYwFO3kFYVtRzRVwgSHeCQZuT1g4pCE2AtEJua3gJDeuvS
tu9CQ7mXs49wqtCx+dZ1
=Rv9G
-END PGP SIGNATURE-

Changes since mesa-10.2.1-2:
Adrian Negreanu (8):
  add megadriver_stub_FILES
  android: adapt to the megadriver mechanism
  android: add libloader to libGLES_mesa and libmesa_egl_dri2
  android: add src/gallium/auxiliary as include path for libmesa_dricore
  android, egl: add correct drm include for libmesa_egl_dri2
  android, egl: typo dri2_fallback_pixmap_surface - 
dri2_fallback_create_pixmap_surface
  android, mesa_gen_matypes: pull in timespec POSIX definition
  android, dricore: undefined reference to _mesa_streaming_load_memcpy

Andreas Boll (5):
  Merge tag 'mesa-10.2.2' into debian-unstable
  New upstream release.
  Drop 01_targets-xa-limit-the-amount-of-exported-symbols.diff, upstream
  Close bug #685328
  Add changelog entry

Carl Worth (2):
  Update VERSION to 10.2.2
  docs: Add release notes for 10.2.2 release

Daniel Manjarres (1):
  glx: Don't crash on swap event for a Window (non-GLXWindow)

Emil Velikov (3):
  targets/xa: limit the amount of exported symbols
  configure: error out when building opencl without LLVM
  configure: correctly autodetect xvmc/vdpau/omx

Grigori Goronzy (1):
  radeon/uvd: disable VC-1 simple/main on UVD 2.x

Iago Toral Quiroga (1):
  mesa: Copy Geom.UsesEndPrimitive when cloning a geometry program.

Ian Romanick (3):
  docs: Add initial 10.2.1 release notes
  docs: Add MD5 checksum, etc. for 10.2.1 release
  meta: Respect the driver's maximum number of draw buffers

Ilia Mirkin (7):
  gk110/ir: emit saturate flag on fadd when needed
  gk110/ir: fix emitting constbuf file index
  gk110/ir: fix bfind emission
  nv50: make sure to mark first scissor dirty after blit
  nv30: plug some memory leaks on screen destroy and shader compile
  nv30: avoid dangling references to deleted contexts
  nv30: hack to avoid errors on unexpected color/zeta combinations

Jason Ekstrand (1):
  meta_blit: properly compute texture width for the CopyTexSubImage fallback

Jasper St. Pierre (1):
  glxext: Send the Drawable's ID in the GLX_BufferSwapComplete event

José Fonseca (1):
  mesa/main: Prevent sefgault on 
glGetIntegerv(GL_ATOMIC_COUNTER_BUFFER_BINDING).

Kenneth Graunke (9):
  i965: Don't use the head sentinel as an fs_inst in Gen4 workaround code.
  i965: Invalidate live intervals when inserting Gen4 SEND workarounds.
  i965/vec4: Fix dead code elimination for VGRFs of size  1.
  i965: Add missing MOCS setup for 3DSTATE_INDEX_BUFFER on Broadwell.
  i965: Drop Broadwell perf_debugs about missing MOCS that aren't missing.
  i965: Add missing newlines to a few perf_debug messages.
  i965/vec4: Use the sampler for pull constant loads on Broadwell.
  i965: Use 8x4 aligned rectangles for HiZ operations on Broadwell.
  i965: Save meta stencil blit programs in the context.

Kristian Høgsberg (1):
  mesa: Remove glClear optimization based on drawable size

Maarten Lankhorst (1):
  release to unstable

Michel Dänzer (1):
  configure: Only check for OpenCL without LLVM when the latter is certain

Neil Roberts (1):
  i965: Set the fast clear color value for texture surfaces

Tom Stellard (2):
  clover: Prevent Clang from printing number of errors and warnings to 
stderr.
  clover: Don't use llvm's global context

Ville Syrjälä (1):
  i915: Fix gen2 texblend setup

---
 VERSION|2 
 configure.ac   |6 
 debian/changelog   |   13 
 debian/patches/01_targets-xa-limit-the-amount-of-exported-symbols.diff |   85 

 debian/patches/series  |1 
 docs/index.html|7 
 docs/relnotes.html |2 
 docs/relnotes/10.2.1

xorg-server: Changes to 'ubuntu'

 debian/changelog |8 +++
 debian/patches/series|1 
 debian/patches/xfree86-pci-bus-probe-non-seat0.patch |   44 +++
 3 files changed, 53 insertions(+)

New commits:
commit 199ac5c8e3701320d4e4c865df825b161bb1e07c
Author: Alberts Muktupāvels alberts.muktupav...@gmail.com
Date:   Tue Jul 1 17:12:51 2014 +0300

Upstream patch to fix No devices detected error for seats other than 
seat0. (LP: #1209008)

diff --git a/debian/changelog b/debian/changelog
index d29c7a7..37a86c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.15.1-0ubuntu7) utopic; urgency=medium
+
+  * debian/patches/xfree86-pci-bus-probe-non-seat0.patch
+- Upstream patch to fix No devices detected error for seats
+  other than seat0. (LP: #1209008)
+
+ -- Alberts Muktupāvels alberts.muktupav...@gmail.com  Tue, 01 Jul 2014 
17:12:51 +0300
+
 xorg-server (2:1.15.1-0ubuntu6) utopic; urgency=medium
 
   * ppc64el-endian-fix.patch: Fix PPC endian assumptions (LP: #1333422)
diff --git a/debian/patches/series b/debian/patches/series
index 9fa55f1..0db02d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,3 +56,4 @@ xi2-resize-touch.patch
 xi-dont-copy-too-much.patch
 mi-dont-process-disabled.patch
 ppc64el-endian-fix.patch
+xfree86-pci-bus-probe-non-seat0.patch
diff --git a/debian/patches/xfree86-pci-bus-probe-non-seat0.patch 
b/debian/patches/xfree86-pci-bus-probe-non-seat0.patch
new file mode 100644
index 000..50718cb
--- /dev/null
+++ b/debian/patches/xfree86-pci-bus-probe-non-seat0.patch
@@ -0,0 +1,44 @@
+From 29b1484bb9555e45067669cbfe68a3c40596f4ff Mon Sep 17 00:00:00 2001
+From: Laércio de Sousa lbsous...@gmail.com
+Date: Thu, 03 Apr 2014 14:19:13 +
+Subject: xfree86: allow fallback to PCI bus probe for graphics devices on 
non-seat0 X servers (#66851)
+
+Currently non-seat0 X servers only probe platform bus for graphics devices,
+which is OK for most KMS-compliant drivers. However, for non-KMS drivers
+(like NVIDIA proprietary ones), graphics devices can't be reached
+by platform bus probe, resulting in a No devices detected error.
+
+This patch allows a fallback to PCI bus probe for non-seat0 X servers
+in case no platform bus graphics device is found.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66851
+
+Signed-off-by: Laércio de Sousa lbsous...@gmail.com
+Reviewed-by: Hans de Goede hdego...@redhat.com
+Reviewed-by: Dave Airlie airl...@redhat.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+---
+diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
+index 507c57d..b3b3f8c 100644
+--- a/hw/xfree86/common/xf86Bus.c
 b/hw/xfree86/common/xf86Bus.c
+@@ -81,7 +81,7 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
+ if (drv-platformProbe != NULL) {
+ foundScreen = xf86platformProbeDev(drv);
+ }
+-if (ServerIsNotSeat0())
++if (ServerIsNotSeat0()  foundScreen)
+ return foundScreen;
+ #endif
+ 
+@@ -201,7 +201,7 @@ xf86BusProbe(void)
+ {
+ #ifdef XSERVER_PLATFORM_BUS
+ xf86platformProbe();
+-if (ServerIsNotSeat0())
++if (ServerIsNotSeat0()  xf86_num_platform_devices  0)
+ return;
+ #endif
+ #ifdef XSERVER_LIBPCIACCESS
+--
+cgit v0.9.0.2-2-gbebe


-- 
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/e1x2cgk-000312...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

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

New commits:
commit 9067ac1520b5f74a86bef12e031e3f8c411df2ba
Author: Christopher James Halse Rogers r...@ubuntu.com
Date:   Thu Jul 3 11:52:41 2014 +1000

Fix segfault in Mir EGL platform on i965 (LP: #1336854)

diff --git a/debian/changelog b/debian/changelog
index 460c725..467ce81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.1-2ubuntu3) utopic; urgency=low
+
+  * Fix segfault in Mir EGL platform on i965 (LP: #1336854)
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Thu, 03 Jul 2014 
11:52:41 +1000
+
 mesa (10.2.1-2ubuntu2) utopic; urgency=medium
 
   * Fix FTBFS by fixing 117-static-gallium.patch
diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 991c766..a5ee791 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1045,6 +1045,15 @@
intel_update_dri2_buffers(brw, drawable);
  
 driUpdateFramebufferSize(brw-ctx, drawable);
+@@ -1271,7 +1269,7 @@
+   drm_intel_bo_flink(last_mt-bo, old_name);
+}
+ 
+-   if (old_name == buffer-name)
++   if ((old_name != 0)  (old_name == buffer-name))
+   return;
+ 
+if (unlikely(INTEL_DEBUG  DEBUG_DRI)) {
 @@ -1282,8 +1280,13 @@
 }
  


-- 
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/e1x2dyx-0006bu...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

 VERSION|2 
 configure.ac   |6 
 debian/changelog   |   20 +
 debian/patches/01_targets-xa-limit-the-amount-of-exported-symbols.diff |   85 

 debian/patches/series  |1 
 docs/index.html|7 
 docs/relnotes.html |2 
 docs/relnotes/10.2.1.html  |   61 
+++
 docs/relnotes/10.2.2.html  |  178 
++
 include/GL/glx.h   |2 
 src/egl/drivers/dri2/Android.mk|4 
 src/egl/drivers/dri2/platform_android.c|2 
 src/egl/main/Android.mk|5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp |8 
 src/gallium/drivers/nouveau/nv30/nv30_context.c|3 
 src/gallium/drivers/nouveau/nv30/nv30_screen.c |6 
 src/gallium/drivers/nouveau/nv30/nv30_state.c  |   17 
 src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c   |1 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c|1 
 src/gallium/drivers/radeon/radeon_video.c  |5 
 src/gallium/state_trackers/clover/llvm/invocation.cpp  |   20 -
 src/gallium/targets/xa/Makefile.am |3 
 src/gallium/targets/xa/xa.sym  |   38 
++
 src/glx/dri2.c |   12 
 src/glx/glxext.c   |9 
 src/mesa/Android.libmesa_dricore.mk|8 
 src/mesa/Android.libmesa_glsl_utils.mk |1 
 src/mesa/Android.mesa_gen_matypes.mk   |1 
 src/mesa/drivers/common/meta.c |4 
 src/mesa/drivers/common/meta_blit.c|2 
 src/mesa/drivers/dri/Android.mk|1 
 src/mesa/drivers/dri/common/Android.mk |   17 
 src/mesa/drivers/dri/common/Makefile.am|2 
 src/mesa/drivers/dri/common/Makefile.sources   |3 
 src/mesa/drivers/dri/i915/i830_texblend.c  |2 
 src/mesa/drivers/dri/i965/brw_context.h|3 
 src/mesa/drivers/dri/i965/brw_fs.cpp   |8 
 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c  |   18 -
 src/mesa/drivers/dri/i965/brw_vec4.cpp |3 
 src/mesa/drivers/dri/i965/gen6_clip_state.c|4 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c  |4 
 src/mesa/drivers/dri/i965/gen8_depth_state.c   |   20 -
 src/mesa/drivers/dri/i965/gen8_draw_upload.c   |6 
 src/mesa/drivers/dri/i965/gen8_misc_state.c|2 
 src/mesa/drivers/dri/i965/gen8_surface_state.c |4 
 src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp  |   16 
 src/mesa/main/clear.c  |5 
 src/mesa/main/get.c|6 
 src/mesa/program/program.c |1 
 49 files changed, 485 insertions(+), 154 deletions(-)

New commits:
commit e1536246ed9f1f0c66e8ad9bfd80a174784e49d8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 3 11:50:59 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 709bcf1..60df661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.2.2-1ubuntu1) utopic; urgency=medium
+
+  * Merge with released debian unstable.
+- New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 03 Jul 2014 
11:44:05 +0200
+
 mesa (10.2.2-1) unstable; urgency=medium
 
   [ Andreas Boll ]

commit 1b3809aa2460d58a7ce7aa1161985a30790bae60
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jul 3 09:55:04 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 3020768..44cf9fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-mesa (10.2.2-1) UNRELEASED; urgency=medium
+mesa (10.2.2-1) unstable; urgency=medium

xorg-server: Changes to 'ubuntu-trusty'

2014-07-02 Thread Maarten 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/e1x2hoi-0003n1...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu-trusty'

2014-07-02 Thread Maarten Lankhorst

 debian/changelog  |   45 ++
 debian/patches/drm_device_keep_trying.patch   |  172 ++
 debian/patches/mi-dont-process-disabled.patch |   62 +
 debian/patches/ppc64el-endian-fix.patch   |   34 +
 debian/patches/series |5 
 debian/patches/xi-dont-copy-too-much.patch|   67 ++
 debian/patches/xi2-resize-touch.patch |   34 +
 7 files changed, 419 insertions(+)

New commits:
commit 66ee7bc03428633f0f978f571cb3a91690ab2ef6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 2 12:43:15 2014 +0200

release copy of the utopic package back to trusty

diff --git a/debian/changelog b/debian/changelog
index d29c7a7..9351147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+xorg-server (2:1.15.1-0ubuntu2.1) trusty-proposed; urgency=medium
+
+  * Copy utopic package back to trusty.
+- Fix ppc64el byte order. (LP: #1333422)
+  + xi-dont-copy-too-much.patch
+- Fix valgrind issue with xi copying too much.
+  + xi-dont-copy-too-much.patch
+- Fix crash related to suspend/shutdown. (LP: #1208473)
+  + mi-dont-process-disabled.patch
+- Fix touch event history overflow.
+  + xi2-resize-touch.patch
+- Fix switching to guest sessions. (LP: #1322212)
+  + Revive drm_device_keep_trying.patch
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 02 Jul 2014 
12:37:25 +0200
+
 xorg-server (2:1.15.1-0ubuntu6) utopic; urgency=medium
 
   * ppc64el-endian-fix.patch: Fix PPC endian assumptions (LP: #1333422)

commit 201424bd607c84c106635d71dbef18d69c41454e
Author: Adam Conrad adcon...@ubuntu.com
Date:   Mon Jun 23 23:47:15 2014 -0600

Fix PPC endian assumptions (LP: #1333422)

diff --git a/debian/changelog b/debian/changelog
index 126f08d..d29c7a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.1-0ubuntu6) utopic; urgency=medium
+
+  * ppc64el-endian-fix.patch: Fix PPC endian assumptions (LP: #1333422)
+
+ -- Adam Conrad adcon...@ubuntu.com  Mon, 23 Jun 2014 23:47:15 -0600
+
 xorg-server (2:1.15.1-0ubuntu5) utopic; urgency=low
 
   * Add upstream patch to fix some valgrind issues.
diff --git a/debian/patches/ppc64el-endian-fix.patch 
b/debian/patches/ppc64el-endian-fix.patch
new file mode 100644
index 000..6950b27
--- /dev/null
+++ b/debian/patches/ppc64el-endian-fix.patch
@@ -0,0 +1,34 @@
+From adb7bc3386559dfee34b359dadcbb6796bc416e7 Mon Sep 17 00:00:00 2001
+From: Dinar Valeev dval...@suse.com
+Date: Mon, 24 Feb 2014 10:36:54 +
+Subject: arch: Fix image and bitmap byte order for ppc64le
+
+So far PPC was big endian for sure. For ppc64le this is no longer
+true.
+
+Signed-off-by: Egbert Eich e...@freedesktop.org
+Reviewed-by: Mark Kettenis kette...@openbsd.org
+Signed-off-by: Keith Packard kei...@keithp.com
+---
+diff --git a/include/servermd.h b/include/servermd.h
+index 081123b..e413314 100644
+--- a/include/servermd.h
 b/include/servermd.h
+@@ -114,8 +114,13 @@ SOFTWARE.
+ 
+ #if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)
+ 
+-#define IMAGE_BYTE_ORDERMSBFirst
+-#define BITMAP_BIT_ORDERMSBFirst
++#if defined(__LITTLE_ENDIAN__)
++#define IMAGE_BYTE_ORDER  LSBFirst
++#define BITMAP_BIT_ORDER  LSBFirst
++#else
++#define IMAGE_BYTE_ORDER  MSBFirst
++#define BITMAP_BIT_ORDER  MSBFirst
++#endif
+ #define GLYPHPADBYTES   4
+ 
+ #endif  /* PowerPC */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/series b/debian/patches/series
index 8266f07..9fa55f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,3 +55,4 @@ drm_device_keep_trying.patch
 xi2-resize-touch.patch
 xi-dont-copy-too-much.patch
 mi-dont-process-disabled.patch
+ppc64el-endian-fix.patch

commit a1b1ff9a27765697bc001a42f47dcef11f5e58da
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue May 20 11:32:49 2014 +0200

release to u

diff --git a/debian/changelog b/debian/changelog
index 4ea0d8c..126f08d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.15.1-0ubuntu5) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-0ubuntu5) utopic; urgency=low
 
   * Add upstream patch to fix some valgrind issues.
 - xi-dont-copy-too-much.patch
   * Fix crash related to suspend/shutdown. (LP: #1208473)
 - mi-dont-process-disabled.patch
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 20 May 2014 
10:49:07 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 20 May 2014 
11:32:41 +0200
 
 xorg-server (2:1.15.1-0ubuntu4) utopic; urgency=low
 

commit 2f75edaca4e4f532abf7882d34b8dbbee22eeb71
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue May 20 11:30:52 2014 +0200

Add upstream patches to fix some valgrind issues, and fix crash related to 
suspend/shutdown.

xi-dont-copy-too-much.patch
mi-dont-process

xserver-xorg-input-synaptics: Changes to 'ubuntu'

2014-07-02 Thread Maarten Lankhorst

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

New commits:
commit 8fa383ce7e5b76970604daa9f276b33d01a1d7b6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 13:35:37 2014 +0200

Annotate merge.

diff --git a/debian/changelog b/debian/changelog
index 9eda16a..10951bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.8.0-1~exp2ubuntu1) utopic; urgency=medium
+
+  * Merge from debian-experimental.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 02 Jul 2014 
16:36:40 +0200
+
 xserver-xorg-input-synaptics (1.8.0-1~exp3) UNRELEASED; urgency=medium
 
   * Remove Cyril from Uploaders.


-- 
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/e1x2ljt-0005j2...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

2014-06-30 Thread Maarten Lankhorst

 debian/changelog|   10 --
 debian/patches/117-static-gallium.patch |2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a2def0d7c6478cf4886e4a4eca7af247386f3c89
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 11:45:35 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 76d1892..460c725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (10.2.1-2ubuntu2) UNRELEASED; urgency=low
+mesa (10.2.1-2ubuntu2) utopic; urgency=medium
 
   * Fix FTBFS by fixing 117-static-gallium.patch
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
11:40:45 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
11:41:13 +0200
 
 mesa (10.2.1-2ubuntu1) utopic; urgency=medium
 

commit 20f7e5d8c5f27a50aec3b2992ea21626e4b958e4
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 11:41:10 2014 +0200

Fix FTBFS by fixing 117-static-gallium.patch

diff --git a/debian/changelog b/debian/changelog
index d999546..76d1892 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.2.1-2ubuntu2) UNRELEASED; urgency=low
+
+  * Fix FTBFS by fixing 117-static-gallium.patch
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
11:40:45 +0200
+
 mesa (10.2.1-2ubuntu1) utopic; urgency=medium
 
   * Merge with released debian unstable.
diff --git a/debian/patches/117-static-gallium.patch 
b/debian/patches/117-static-gallium.patch
index f74a01c..e3ab085 100644
--- a/debian/patches/117-static-gallium.patch
+++ b/debian/patches/117-static-gallium.patch
@@ -55,7 +55,7 @@ index f14279b..3cdec83 100644
  
  AM_CXXFLAGS += -fno-rtti
  
-+libgallium_la_LIBADD = $(LLVM_LIBS) $(PTHREAD_LIBS)
++libgallium_la_LIBADD = $(LLVM_LIBS) $(PTHREAD_LIBS) $(LLVM_LDFLAGS)
 +
  endif
  

commit 2e2be6d4710a66554ab0cf819a1926827a6e29a7
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 11:40:35 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index 6801479..d999546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mesa (10.2.1-2ubuntu1) UNRELEASED; urgency=medium
+mesa (10.2.1-2ubuntu1) utopic; urgency=medium
 
   * Merge with released debian unstable.
 - New upstream release.
 - Drop upstreamed patches.
 - Refresh mir patch.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 19 Mar 2014 
11:31:15 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 23 Jun 2014 
15:52:33 +0200
 
 mesa (10.2.1-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/e1x1clg-00029t...@moszumanska.debian.org

Re: xserver-xorg-video-ati_7.4.0-1+exp1_amd64.changes ACCEPTED into experimental

2014-06-30 Thread Maarten Lankhorst

Hey,

op 26-06-14 11:59, Debian FTP Masters schreef:

 Accepted:

 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1

 Format: 1.8
 Date: Wed, 25 Jun 2014 16:43:52 +0200
 Source: xserver-xorg-video-ati
 Binary: xserver-xorg-video-ati xserver-xorg-video-ati-dbg 
 xserver-xorg-video-radeon xserver-xorg-video-radeon-dbg
 Architecture: source amd64
 Version: 1:7.4.0-1+exp1
 Distribution: experimental
 Urgency: low
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Changed-By: Maarten Lankhorst maarten.lankho...@ubuntu.com
 Description:
  xserver-xorg-video-ati - X.Org X server -- AMD/ATI display driver wrapper
  xserver-xorg-video-ati-dbg - X.Org X server -- AMD/ATI display driver 
 wrapper (debugging symbo
  xserver-xorg-video-radeon - X.Org X server -- AMD/ATI Radeon display driver
  xserver-xorg-video-radeon-dbg - X.Org X server -- AMD/ATI Radeon display 
 driver (debugging symbol
 Changes:
  xserver-xorg-video-ati (1:7.4.0-1+exp1) experimental; urgency=low
  .
* Rebuild against xorg 1.16 rc.
 Checksums-Sha1:
  d31731b8c185a5c8b747acc48fe022efc95e4aa8 2623 
 xserver-xorg-video-ati_7.4.0-1+exp1.dsc
  7dc38ddf84d3f5e4ec54f7d2e72d27b50b60bfc0 14979 
 xserver-xorg-video-ati_7.4.0-1+exp1.diff.gz
  f059bb4f99484dcfe6767b6ca88943fa6fdd1724 300772 
 xserver-xorg-video-ati_7.4.0-1+exp1_amd64.deb
  2fa67df5d4606b6b12f7e4d38f31bd80eacdac0b 305488 
 xserver-xorg-video-ati-dbg_7.4.0-1+exp1_amd64.deb
  ab4f4166c3ddeaf0df69f91b300d3a85d365f363 414934 
 xserver-xorg-video-radeon_7.4.0-1+exp1_amd64.deb
  ce2e851e113cac813f7c9cb589e84b11e8b9556f 1123726 
 xserver-xorg-video-radeon-dbg_7.4.0-1+exp1_amd64.deb
 Checksums-Sha256:
  145ae36256cdae4f6e4fe6c9297c968bc3db103fee6cf2cc153d3f28bdcb22c9 2623 
 xserver-xorg-video-ati_7.4.0-1+exp1.dsc
  2295a450d6bf2a51bf271a7f4454d71573a6e96a430b31c8ade1f3b6d36de30e 14979 
 xserver-xorg-video-ati_7.4.0-1+exp1.diff.gz
  197d76b08ba8a037a5ed92fe8058d4340889296882be6fdfce7cfce733001930 300772 
 xserver-xorg-video-ati_7.4.0-1+exp1_amd64.deb
  eba25ed9552f4c8ce865374b09c5ac29d38fcfb32aadcc962c7e85881e88eea3 305488 
 xserver-xorg-video-ati-dbg_7.4.0-1+exp1_amd64.deb
  eb9193e07c2d24bad3bd260231e7d4550cf74ab8b82a9f0889cfce49ce8ed31a 414934 
 xserver-xorg-video-radeon_7.4.0-1+exp1_amd64.deb
  a18710e24450e3e9abf5523ef893259d6b70960d53f74b5830be731e92d75169 1123726 
 xserver-xorg-video-radeon-dbg_7.4.0-1+exp1_amd64.deb
 Files:
  cb9a558fd08f7338431dfa00223c4018 300772 x11 optional 
 xserver-xorg-video-ati_7.4.0-1+exp1_amd64.deb
  9e0934766a56a5f0de6b9641da800385 305488 debug extra 
 xserver-xorg-video-ati-dbg_7.4.0-1+exp1_amd64.deb
  ed51b36483028e11c774b29d89e3c988 414934 x11 optional 
 xserver-xorg-video-radeon_7.4.0-1+exp1_amd64.deb
  3ed172b479a18802bf580d70c31d2355 1123726 debug extra 
 xserver-xorg-video-radeon-dbg_7.4.0-1+exp1_amd64.deb
  64289ebf8c6da0a6054481599a87bf1e 2623 x11 optional 
 xserver-xorg-video-ati_7.4.0-1+exp1.dsc
  35e06edd2aaa1f16ed182cc6641f7090 14979 x11 optional 
 xserver-xorg-video-ati_7.4.0-1+exp1.diff.gz

Where did this package go? I don't see it in experimental, and 
http://packages.qa.debian.org/x/xserver-xorg-video-ati.html doesn't show it.

~Maarten


-- 
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/53b17c94.6040...@canonical.com

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

 configure.ac  |4 -
 debian/changelog  |6 ++
 src/driver.c  |  110 --
 src/driver.h  |2 
 src/drmmode_display.c |   40 ++
 5 files changed, 131 insertions(+), 31 deletions(-)

New commits:
commit 0a352bd93c4002af08b743e91bd140a6e3edacf6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jun 26 10:43:17 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 906d569..e7c6b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-modesetting (0.9.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.9.0-1) unstable; urgency=medium
 
   * New upstream release.
 

commit b424cf723797a0469af8a6d4ee6799ca172c4c28
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jun 26 10:42:30 2014 +0200

bump changelog

diff --git a/debian/changelog b/debian/changelog
index af9c12c..906d569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-modesetting (0.9.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 26 Jun 2014 
10:41:50 +0200
+
 xserver-xorg-video-modesetting (0.8.1-2) unstable; urgency=medium
 
   * Add modprobe config file to enable cirrus and mgag200 kms drivers.

commit 1e4cb922617990a3005ac23b0c90f89147c3564b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jun 26 10:37:19 2014 +0200

bump to 0.9.0

diff --git a/configure.ac b/configure.ac
index 0ec8e18..1c1a36d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.8.1],
+[0.9.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit d1c6e27759ea1d2c30cabc62ff2bc315bbbec5fc
Author: Adam Jackson a...@redhat.com
Date:   Wed May 21 10:16:39 2014 -0400

Use own thunk function instead of shadowUpdatePackedWeak

I plan to remove the Weak functions from a future server.

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/src/driver.c b/src/driver.c
index 21274a9..d99b027 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -810,6 +810,12 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 
offset, int mode,
 return ((uint8_t *)ms-drmmode.front_bo-ptr + row * stride + offset);
 }
 
+static void
+msUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
 static Bool
 CreateScreenResources(ScreenPtr pScreen)
 {
@@ -842,7 +848,7 @@ CreateScreenResources(ScreenPtr pScreen)
FatalError(Couldn't adjust screen pixmap\n);
 
 if (ms-drmmode.shadow_enable) {
-   if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(),
+   if (!shadowAdd(pScreen, rootPixmap, msUpdatePacked,
   msShadowWindow, 0, 0))
return FALSE;
 }

commit 07c5d9cb782fde2a073efdc437489d6c4b432d46
Author: Dave Airlie airl...@redhat.com
Date:   Fri May 2 13:16:05 2014 +1000

modesetting: fix build regression against older servers.

Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/src/driver.c b/src/driver.c
index b5fcdaf..21274a9 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -217,7 +217,7 @@ static Bool probe_hw(const char *dev, struct 
xf86_platform_device *platform_dev)
 {
 int fd;
 
-#if XSERVER_PLATFORM_BUS
+#if XF86_PDEV_SERVER_FD
 if (platform_dev  (platform_dev-flags  XF86_PDEV_SERVER_FD)) {
 fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD, 
-1);
 if (fd == -1)

commit 32fb5f2d821e5e13038eab7db35c5048ad807ccc
Author: Dave Airlie airl...@redhat.com
Date:   Fri May 2 13:14:30 2014 +1000

modesetting: fix use after free.

Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 28a4abb..c533324 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -778,11 +778,11 @@ drmmode_output_destroy(xf86OutputPtr output)
drmModeFreeProperty(drmmode_output-props[i].mode_prop);
free(drmmode_output-props[i].atoms);
}
+   free(drmmode_output-props);
for (i = 0; i  drmmode_output-mode_output-count_encoders; i++) {
drmModeFreeEncoder(drmmode_output-mode_encoders[i]);
-   free(drmmode_output-mode_encoders);
}
-   free(drmmode_output-props);
+   free(drmmode_output-mode_encoders);
drmModeFreeConnector(drmmode_output-mode_output);
free(drmmode_output);
output-driver_private = NULL;

commit 509dbe8cab339e44b02fed3728bbef7de5c60d05
Author: Hans de Goede hdego...@redhat.com
Date:   Tue Mar 18 15:48:22 2014 +0100

Add support for server managed fds

Signed-off-by: Hans de Goede hdego

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

 configure.ac  |4 -
 src/driver.c  |  110 --
 src/driver.h  |2 
 src/drmmode_display.c |   40 ++
 4 files changed, 125 insertions(+), 31 deletions(-)

New commits:
commit 1e4cb922617990a3005ac23b0c90f89147c3564b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Jun 26 10:37:19 2014 +0200

bump to 0.9.0

diff --git a/configure.ac b/configure.ac
index 0ec8e18..1c1a36d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-modesetting],
-[0.8.1],
+[0.9.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])

commit d1c6e27759ea1d2c30cabc62ff2bc315bbbec5fc
Author: Adam Jackson a...@redhat.com
Date:   Wed May 21 10:16:39 2014 -0400

Use own thunk function instead of shadowUpdatePackedWeak

I plan to remove the Weak functions from a future server.

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/src/driver.c b/src/driver.c
index 21274a9..d99b027 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -810,6 +810,12 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 
offset, int mode,
 return ((uint8_t *)ms-drmmode.front_bo-ptr + row * stride + offset);
 }
 
+static void
+msUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
 static Bool
 CreateScreenResources(ScreenPtr pScreen)
 {
@@ -842,7 +848,7 @@ CreateScreenResources(ScreenPtr pScreen)
FatalError(Couldn't adjust screen pixmap\n);
 
 if (ms-drmmode.shadow_enable) {
-   if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(),
+   if (!shadowAdd(pScreen, rootPixmap, msUpdatePacked,
   msShadowWindow, 0, 0))
return FALSE;
 }

commit 07c5d9cb782fde2a073efdc437489d6c4b432d46
Author: Dave Airlie airl...@redhat.com
Date:   Fri May 2 13:16:05 2014 +1000

modesetting: fix build regression against older servers.

Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/src/driver.c b/src/driver.c
index b5fcdaf..21274a9 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -217,7 +217,7 @@ static Bool probe_hw(const char *dev, struct 
xf86_platform_device *platform_dev)
 {
 int fd;
 
-#if XSERVER_PLATFORM_BUS
+#if XF86_PDEV_SERVER_FD
 if (platform_dev  (platform_dev-flags  XF86_PDEV_SERVER_FD)) {
 fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD, 
-1);
 if (fd == -1)

commit 32fb5f2d821e5e13038eab7db35c5048ad807ccc
Author: Dave Airlie airl...@redhat.com
Date:   Fri May 2 13:14:30 2014 +1000

modesetting: fix use after free.

Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 28a4abb..c533324 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -778,11 +778,11 @@ drmmode_output_destroy(xf86OutputPtr output)
drmModeFreeProperty(drmmode_output-props[i].mode_prop);
free(drmmode_output-props[i].atoms);
}
+   free(drmmode_output-props);
for (i = 0; i  drmmode_output-mode_output-count_encoders; i++) {
drmModeFreeEncoder(drmmode_output-mode_encoders[i]);
-   free(drmmode_output-mode_encoders);
}
-   free(drmmode_output-props);
+   free(drmmode_output-mode_encoders);
drmModeFreeConnector(drmmode_output-mode_output);
free(drmmode_output);
output-driver_private = NULL;

commit 509dbe8cab339e44b02fed3728bbef7de5c60d05
Author: Hans de Goede hdego...@redhat.com
Date:   Tue Mar 18 15:48:22 2014 +0100

Add support for server managed fds

Signed-off-by: Hans de Goede hdego...@redhat.com

diff --git a/src/driver.c b/src/driver.c
index 0f9190a..b5fcdaf 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -213,9 +213,20 @@ static int check_outputs(int fd)
 return ret;
 }
 
-static Bool probe_hw(const char *dev)
+static Bool probe_hw(const char *dev, struct xf86_platform_device 
*platform_dev)
 {
-int fd = open_hw(dev);
+int fd;
+
+#if XSERVER_PLATFORM_BUS
+if (platform_dev  (platform_dev-flags  XF86_PDEV_SERVER_FD)) {
+fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD, 
-1);
+if (fd == -1)
+return FALSE;
+return check_outputs(fd);
+}
+#endif
+
+fd = open_hw(dev);
 if (fd != -1) {
 int ret = check_outputs(fd);
 close(fd);
@@ -283,6 +294,10 @@ ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op, void 
*data)
flag = (CARD32 *)data;
(*flag) = 0;
return TRUE;
+#if XORG_VERSION_CURRENT = XORG_VERSION_NUMERIC(1,15,99,902,0)
+case SUPPORTS_SERVER_FDS:
+return TRUE;
+#endif
default:
return FALSE;
 }
@@ -341,7 +356,7 @@ ms_platform_probe

xserver-xorg-video-modesetting: Changes to 'refs/tags/xserver-xorg-video-modesetting-0.9.0-1'

Tag 'xserver-xorg-video-modesetting-0.9.0-1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-26 08:45 +

Debian release 0.9.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTq92ZAAoJEP5VjHKmcBPDGIIP/A6hkb5k7oDyBnoJ0xdE6jE9
3XwbryXvLHtoN/2OWkxl5PEeiGfXKHwuCK2EsHT+IG+myO1GYxZ8ANCVCY7HvK3P
0OT/TIDt0KkZQtGc5xQfB5L1JJcYRF/24ooXM6Cl/sCVwJMK9IH3RnwdFNDbgcTs
wqo1iemPNt3iDDWoZal2UlPhs3UuCmn5AbolVeInM9NrT7DjEpoPESysgd2sDrwe
TP0r3A9JdMqJE6RJzPVvZgPGm+oxPPyAL2EITYDpTrdyhS0ZDVbAkhWFPxMaq4iN
txs2beJNYQ6L7/suu8IITkx/wiECYFW3zC3sBHJBapkELUECfAQf3qFNP1dw0BSh
9E6S0hzpeBp8N16BX5Ly05HBLfoP5nq2G18HyYgudG6IbP/7YU71VRChBZru6A89
BsAxQbO/18d2EGcxqXn72oHt4skONpPexxYeBbypanDjZu/cUkIBCXaSlTdfI8Qh
udnGyNx6Vb8ECg6r5NoRVGCSGEdIAjT35k7hiUJS1w7bwk5lH9w2MWTDWxtreCjU
13Q2B+DDUy4WykrmyeaD0POPlc3qnbX1jwKEnZVv23VhjPOiw22zW44c6D6xyF5C
IlgxbwpY1Z6/vDJ9bPmDHRtM2CmjUG6AtA5VJkStjFNeh0jX+m2J2WwIc4mQ1y+F
R5nZewAyGEKjAAE9Il5g
=6J4E
-END PGP SIGNATURE-

Changes since xserver-xorg-video-modesetting-0.8.1-2:
Adam Jackson (2):
  modesetting: Don't (brokenly) double-track software cursor
  Use own thunk function instead of shadowUpdatePackedWeak

Alex Deucher (1):
  modesetting: query cursor size from the kernel

Dave Airlie (5):
  modesetting: move closing fd to after we check outputs
  modesetting: try and use hotspot cursor support
  modesetting: fix cursor rendering with hotspots.
  modesetting: fix use after free.
  modesetting: fix build regression against older servers.

Hans de Goede (1):
  Add support for server managed fds

Maarten Lankhorst (4):
  bump to 0.9.0
  Merge tag 'xf86-video-modesetting-0.9.0' into debian-unstable
  bump changelog
  release to unstable

---
 configure.ac  |4 -
 debian/changelog  |6 ++
 src/driver.c  |  110 --
 src/driver.h  |2 
 src/drmmode_display.c |   40 ++
 5 files changed, 131 insertions(+), 31 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/e1x05op-000187...@moszumanska.debian.org

xserver-xorg-video-modesetting: Changes to 'refs/tags/xserver-xorg-video-modesetting-0.9.0-1+exp1'

Tag 'xserver-xorg-video-modesetting-0.9.0-1+exp1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-26 08:54 +

Debian release 0.9.0-1+exp1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTq9/PAAoJEP5VjHKmcBPDQPMP/3dCq0WjJZ9oNgz+D8Ymghti
FHJlxLotRFJB5wfWOzMEWigFXgx85ycJN+/IovoHWLbQTH8qUzgRANEFlyJtD5Qv
f8QVBXpGkZAnt8rjJuDHbuiv0qU0XUhqdKG5UMB5vWKSPaA4f/k+I/8F0L6MNF3j
TIrzRPpkqOtCqqx+lp8QcgOvwNqm/17dxXWU8KtOi1tN5HOW1Psk1rpibzmwVmTi
dTlCAgrRgiOdOW+QoaM8ZYKH87KWb45/hkvf3No+rafXMZqAw2qbR4L6v58XgR0g
9efG1bLe2oF6diuRQEjW5hu39Pv8SpyYEqvQlNjaBy7qHiv3s7ppm3ID3t/Y71bS
H2FXdYJG2fxvwuTtU3KYDQMV+YhqeEAvy1pKqlZ8T4wVS9uZgFtyrdNYba0+ov7j
9bMLk/yrRd6fijWpp/ySbJgLhH5Y/4HDAYUi0iYu0cJHJZ5xjKwrE28IgTjHjGbh
MMmw5mkUkzLHZQq/kYkMOmgKo2jVD6dRjga2awv2aJKBdNj/s3jLeKgiMsczMY5O
MACV1Q7Ux3l8NVpLp0DehbaQUeA9FR2ybfc3uku6G/OjTYKN1LWK44gNmiOw+GO5
iSf0rVKz+vEuoDE+ZIb33bnwvM1/gHt2ywwZxxTleJZILnULU5BUyb3uC0tJXhCV
MKpWgXQEYuYOGMoUkPD/
=IVS7
-END PGP SIGNATURE-

Changes since xserver-xorg-video-modesetting-0.9.0-1:
Maarten Lankhorst (1):
  Rebuild against xorg 1.16 rc.

---
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
---


-- 
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/e1x05v2-0002tb...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

 debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch |  297 
++
 1 file changed, 182 insertions(+), 115 deletions(-)

New commits:
commit e0717810ebc36a86d90d0c975de40ce030ddfeb4
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 10:59:06 2014 +0200

refresh xkbcomp caching patch

diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch 
b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index c5a08bc..773be7d 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -1,10 +1,8 @@
 Last-Update: 2013-09-19
 
-Index: xorg-server-1.14.2.901/configure.ac
-===
 xorg-server-1.14.2.901.orig/configure.ac   2013-09-19 11:43:53.948797077 
-0400
-+++ xorg-server-1.14.2.901/configure.ac2013-09-19 11:43:53.944797077 
-0400
-@@ -517,9 +517,9 @@
+--- a/configure.ac
 b/configure.ac
+@@ -511,9 +511,9 @@
  AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to 
XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH=$withval ],
[ XKBPATH=${datadir}/X11/xkb ])
@@ -16,7 +14,7 @@ Index: xorg-server-1.14.2.901/configure.ac
  AC_ARG_WITH(default-xkb-rules, 
AS_HELP_STRING([--with-default-xkb-rules=RULES],
 [Keyboard ruleset (default: base/evdev)]),
  [ XKB_DFLT_RULES=$withval ],
-@@ -1225,7 +1225,7 @@
+@@ -1449,7 +1449,7 @@
  dnl Make sure XKM_OUTPUT_DIR is an absolute path
  XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
  if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
@@ -25,10 +23,8 @@ Index: xorg-server-1.14.2.901/configure.ac
  fi
  
  dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-Index: xorg-server-1.14.2.901/xkb/README.compiled
-===
 xorg-server-1.14.2.901.orig/xkb/README.compiled2013-09-19 
11:43:53.948797077 -0400
-+++ xorg-server-1.14.2.901/xkb/README.compiled 2013-09-19 11:43:53.944797077 
-0400
+--- a/xkb/README.compiled
 b/xkb/README.compiled
 @@ -4,10 +4,10 @@
  or some other tool might destroy or replace the files in this directory,
  so it is not a safe place to store compiled keymaps for long periods of
@@ -44,10 +40,8 @@ Index: xorg-server-1.14.2.901/xkb/README.compiled
  
  Unless the X server is modified, sharing this directory between servers on
  different hosts could cause problems.
-Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
-===
 xorg-server-1.14.2.901.orig/xkb/ddxLoad.c  2013-09-19 11:43:53.948797077 
-0400
-+++ xorg-server-1.14.2.901/xkb/ddxLoad.c   2013-09-19 11:51:04.744800715 
-0400
+--- a/xkb/ddxLoad.c
 b/xkb/ddxLoad.c
 @@ -30,6 +30,12 @@
  
  #include xkb-config.h
@@ -83,9 +77,13 @@ Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
  #define   PRE_ERROR_MSG \The XKEYBOARD keymap compiler (xkbcomp) 
reports:\
  #define   ERROR_PREFIX\ \
  #define   POST_ERROR_MSG1 \Errors from xkbcomp are not fatal to the X 
server\
-@@ -69,35 +64,87 @@
+@@ -69,28 +64,73 @@
  #endif
  
+ static unsigned
+-LoadXKM(unsigned want, unsigned need, const char *keymap, XkbDescPtr 
*xkbRtrn);
++LoadXKM(unsigned want, unsigned need, const char *keymap, XkbDescPtr 
*xkbRtrn, Bool is_private_directory);
+ 
  static void
 -OutputDirectory(char *outdir, size_t size)
 +OutputDirectory(char *outdir, size_t size, Bool *is_private_directory)
@@ -112,9 +110,9 @@ Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
  (void) strcpy(outdir, /tmp/);
 +if (is_private_directory)
 +*is_private_directory = FALSE;
- }
- }
- 
++}
++}
++
 +#ifndef SHA_DIGEST_LENGTH
 +#define SHA_DIGEST_LENGTH 20
 +#endif
@@ -149,20 +147,18 @@ Index: xorg-server-1.14.2.901/xkb/ddxLoad.c
 +/* convert sha1 to sha1_asc */
 +for (i = 0; i  SHA_DIGEST_LENGTH; ++i) {
 +sprintf(sha1Asc + i * 2, %02X, sha1[i]);
-+}
+ }
 +
 +return Success;
-+}
-+
-+/* call xkbcomp and compile XKB keymap, return xkm file name in
-+   nameRtrn */
- static Bool
- XkbDDXCompileKeymapByNames(XkbDescPtr xkb,
-XkbComponentNamesPtr names,
-unsigned want,
--   unsigned need, char *nameRtrn, int nameRtrnLen)
-+   unsigned need, char *nameRtrn, int nameRtrnLen,
-+   Bool *is_private_directory)
+ }
+ 
+ /**
+@@ -103,10 +143,13 @@
+  * return a strdup'd copy of the file name we've written to.
+  */
+ static char *
+-RunXkbComp(xkbcomp_buffer_callback callback, void *userdata)
++RunXkbComp(xkbcomp_buffer_callback callback, void *userdata, Bool 
*is_private_directory)
  {
  FILE *out

xorg-server: Changes to 'ubuntu+1'

 debian/patches/drm_device_keep_trying.patch |   10 --
 debian/patches/series   |2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 7c8629f9af0bd2db54d5fbc0c88a7239cba2c545
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 11:02:27 2014 +0200

disable xmir patch for now

diff --git a/debian/patches/series b/debian/patches/series
index 5e74491..f6b2b6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,7 +49,7 @@ disable-rotation-transform-gpuscreens.patch
 
 pixman-validate.patch
 fix-ftbfs-ppc64el.patch
-xmir.patch
+#xmir.patch
 drm_device_keep_trying.patch
 xi2-resize-touch.patch
 mi-dont-process-disabled.patch

commit 6010f051924cdaf3b2739831099593ce216cb578
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 11:02:00 2014 +0200

fixup drm_device_keep_trying.patch

diff --git a/debian/patches/drm_device_keep_trying.patch 
b/debian/patches/drm_device_keep_trying.patch
index ea36cf9..7f7c935 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -30,7 +30,7 @@ Signed-off-by: Bryce Harrington br...@canonical.com
  
  config_udev_odev_setup_attribs(path, syspath, major(devnum),
 minor(devnum), NewGPUDeviceRequest);
-@@ -456,6 +456,17 @@
+@@ -456,18 +456,55 @@
  
  #ifdef CONFIG_UDEV_KMS
  
@@ -48,7 +48,13 @@ Signed-off-by: Bryce Harrington br...@canonical.com
  static void
  config_udev_odev_setup_attribs(const char *path, const char *syspath,
 int major, int minor,
-@@ -468,6 +479,31 @@
+config_odev_probe_proc_ptr probe_callback)
+ {
+ struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
++const char *platform;
+ 
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path);
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath);
  config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major);
  config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor);
  


-- 
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/e1wzj6e-0007sw...@moszumanska.debian.org

xserver-xorg-input-evdev: Changes to 'ubuntu'

 ChangeLog   |  729 -
 autogen.sh  |4 
 configure.ac|4 
 debian/changelog|   58 +
 debian/control  |7 
 debian/patches/series   |2 
 debian/patches/use-sigsafe-logging.diff |   73 -
 debian/rules|3 
 include/evdev-properties.h  |4 
 man/evdev.man   |   21 
 src/Makefile.am |7 
 src/apple.c |3 
 src/axis_labels.h   |  198 
 src/emuMB.c |4 
 src/emuWheel.c  |   16 
 src/evdev.c | 1298 
 src/evdev.h |   31 
 17 files changed, 1648 insertions(+), 814 deletions(-)

New commits:
commit cecd2bf51162a97cc4095340c318e9f15856fc76
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 13:18:39 2014 +0200

Merge from debian-experimental.

diff --git a/debian/changelog b/debian/changelog
index cf6091f..ed14f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.9.0-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from debian-experimental.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
13:17:16 +0200
+
 xserver-xorg-input-evdev (1:2.9.0-1) experimental; urgency=medium
 
   * New upstream release

commit 5420644f18cc82d6210cdf900ec9fcb1dca1d4e7
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 13:15:22 2014 +0200

Rebuild for xorg 1.15 abi.

diff --git a/debian/changelog b/debian/changelog
index 177d927..f5f6e4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.8.2-1ubuntu2) trusty; urgency=medium
+
+  * Rebuild for xorg 1.15 abi.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
09:36:37 +
+
 xserver-xorg-input-evdev (1:2.8.2-1ubuntu1) trusty; urgency=low
 
   * Merge from unreleased debian git, remaining changes:

commit d9a5284b1afa79464c2c60458edcebd0042c0b88
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jun 6 09:16:34 2014 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 507cc7d..e51c6b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
+xserver-xorg-input-evdev (1:2.9.0-1) experimental; urgency=medium
 
   * New upstream release
 - smooth scrolling improvements (closes: #702739)
@@ -6,7 +6,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
   * Remove Cyril from Uploaders.
   * Build against xserver 1.16 RC.
 
- -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 06 Jun 2014 09:16:30 +0200
 
 xserver-xorg-input-evdev (1:2.8.2-1) unstable; urgency=low
 

commit a9fa37763847b741ac18c86f573a7879a95f4630
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jun 6 09:16:22 2014 +0200

Build against xserver 1.16 RC.

diff --git a/debian/changelog b/debian/changelog
index b53815e..507cc7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
 - smooth scrolling improvements (closes: #702739)
   * Add build-dep on libevdev-dev.
   * Remove Cyril from Uploaders.
+  * Build against xserver 1.16 RC.
 
  -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
 
diff --git a/debian/control b/debian/control
index 3bddcb7..8e25605 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  pkg-config,
  quilt,
- xserver-xorg-dev (= 2:1.11.99.901),
+ xserver-xorg-dev (= 2:1.15.99),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-input-dev (= 2.1.99.3),

commit f0fbd4743bac70ec674b01fee66d7542b923e72f
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 5 22:47:33 2014 +0200

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index d714cdb..b53815e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.9.0-1) UNRELEASED; urgency=medium
   * New upstream release
 - smooth scrolling improvements (closes: #702739)
   * Add build-dep on libevdev-dev.
+  * Remove Cyril from Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 22:17:26 +0200
 
diff --git a/debian/control b/debian/control
index c4964f4..3bddcb7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-evdev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
+Uploaders: Drew

xorg-server: Changes to 'ubuntu+1'

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

New commits:
commit f85c27dc6b158a92e26ee0be9e1576ded0e7f930
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 13:33:14 2014 +0200

annotate new release

diff --git a/debian/changelog b/debian/changelog
index d496f46..5bc9ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.15.99.903-3ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+- Refresh patches.
+- Disable xmir, for now.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
12:57:16 +0200
+
 xorg-server (2:1.15.99.903-3) experimental; urgency=medium
 
   * Set shared memory dir to /dev/shm (closes: #747894).


-- 
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/e1wzltz-00088j...@moszumanska.debian.org

xserver-xorg-input-synaptics: Changes to 'ubuntu'

 conf/11-x11-synaptics.fdi |9 --
 conf/50-synaptics.conf|   24 ++--
 configure.ac  |2 -
 debian/changelog  |   31 
 debian/control|4 +-
 man/synaptics.man |   31 
 src/eventcomm.c   |   68 +-
 src/properties.c  |3 ++
 src/synaptics.c   |   45 +++---
 src/synapticsstr.h|1 
 src/synproto.h|   10 +++---
 11 files changed, 144 insertions(+), 84 deletions(-)

New commits:
commit bdcb5efeb7804ba7050e190bc2ad685fcd0e3e65
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 16 20:19:32 2014 +0200

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index fb5be39..97fb909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.8.0-1~exp3) UNRELEASED; urgency=medium
+
+  * Remove Cyril from Uploaders.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 16 Jun 2014 20:19:21 +0200
+
 xserver-xorg-input-synaptics (1.8.0-1~exp2) experimental; urgency=medium
 
   * Mark libevdev-dev build dependency [linux-any]. (closes: #749286)
diff --git a/debian/control b/debian/control
index 965fbb2..06289c8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-synaptics
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Mattia Dongili malat...@debian.org, Cyril Brulebois 
k...@debian.org, maximilian attems m...@debian.org
+Uploaders: Mattia Dongili malat...@debian.org, maximilian attems 
m...@debian.org
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,

commit 0173190ae24f0fe85920a4d14eecc0fb49876602
Author: maximilian attems m...@debian.org
Date:   Wed May 28 05:47:00 2014 +0200

prepare to release 1.8.0-1~exp2

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 43d2b18..fb5be39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-synaptics (1.8.0-1~exp2) UNRELEASED; urgency=medium
+xserver-xorg-input-synaptics (1.8.0-1~exp2) experimental; urgency=medium
 
   * Mark libevdev-dev build dependency [linux-any]. (closes: #749286)
 Thanks to Pino Toscano p...@debian.org.
 
- -- maximilian attems m...@debian.org  Tue, 27 May 2014 14:12:32 +0200
+ -- maximilian attems m...@debian.org  Wed, 28 May 2014 05:46:25 +0200
 
 xserver-xorg-input-synaptics (1.8.0-1~exp1) experimental; urgency=medium
 

commit 7f1abd50d35c66f8b4f3a14ae8299f439cbc0d5c
Author: maximilian attems m...@debian.org
Date:   Tue May 27 14:14:38 2014 +0200

care about !linux ftbfs

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index dd1e671..43d2b18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.8.0-1~exp2) UNRELEASED; urgency=medium
+
+  * Mark libevdev-dev build dependency [linux-any]. (closes: #749286)
+Thanks to Pino Toscano p...@debian.org.
+
+ -- maximilian attems m...@debian.org  Tue, 27 May 2014 14:12:32 +0200
+
 xserver-xorg-input-synaptics (1.8.0-1~exp1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index 0da51a5..965fbb2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  libx11-dev,
  libxext-dev,
  libxi-dev (= 2:1.2.0),
- libevdev-dev,
+ libevdev-dev [linux-any],
  x11proto-core-dev,
  xserver-xorg-dev (= 2:1.12),
  pkg-config,

commit ca09f7ebb599b9fdaba55a3cfa4e78188a8b229d
Author: maximilian attems m...@debian.org
Date:   Fri May 23 18:27:47 2014 +0200

changelog prepare to upload 1.8.0 to experimental

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index d6bc073..dd1e671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.8.0-1~exp1) UNRELEASED; urgency=medium
+xserver-xorg-input-synaptics (1.8.0-1~exp1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
   * Drop libxtst-dev conflicts, add libevdev-dev.
@@ -9,7 +9,7 @@ xserver-xorg-input-synaptics (1.8.0-1~exp1) UNRELEASED; 
urgency=medium
 - support newer Thinkpads (closes: #705807)
   * add myself to Uploaders.
 
- -- maximilian attems m...@debian.org  Fri, 23 May 2014 00:09:40 +0200
+ -- maximilian attems m...@debian.org  Fri, 23 May 2014 18:27:28 +0200
 
 xserver-xorg-input-synaptics (1.7.3-1) unstable; urgency=medium
 

commit b72abe3763bf938820198b0a2d80c1f4156bde22
Author: maximilian attems m...@debian.org
Date:   Fri May 23 00:34:05 2014 +0200

add myself to uploaders

Signed-off-by: maximilian attems m...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 9ba86aa..d6bc073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7

xserver-xorg-video-ati: Changes to 'refs/tags/xserver-xorg-video-ati-1%7.4.0-1'

Tag 'xserver-xorg-video-ati-1%7.4.0-1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-25 14:36 +

Debian release 1:7.4.0-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTqt6DAAoJEP5VjHKmcBPDZh4P+wUNkUqGJcE3iMRItiP69EVT
/cvsapO7CUQqhAnDA8purgaoQq0oLrvWpLB9bDwtOxWtiZUHnFAaHmWrY2D7UGaZ
saii8FTD3COJGX10QSF9+RGhhBWbGwTbZUgWKMGCG5yLwkXMtKl1o1rPa/ZBImms
9a1YygRT60uylJHYHAb9NVz/FDVndOSpFWta0ghPGWpCp7HdeZLz1RMJA9Tp3jff
msc8v9w/BSFDW8bj7TYvtQt0YqgFpvErBNNBkt+bqXxN/lAeb9XK4c4vZNZcBma+
CvE5JKHEq/QfzkHYiR1c95tFman1jckQXCTfnKW6bgT7IkiC+OJGLrcamBklZYuM
K+L4/I/49WiNIGSV2TyNmRjHQblv0EHql+yDh4+2XvMb+801QTGYLIeZyS8TybJv
teEFfLGZi0EP70qSnR1bpUmS12YZ70EfARjAmIfYtULL7Zt/2oeYmNnX/yTE2XbX
jHFXD/vuLOsz9P01zpV/KPunD7WgKvZ4/WNnH/a7vToEM8g12PuZQQj56s+y7Ga7
kZWQRNdU0ov/pBO9NWapI54pvOGVOdJGF9M3M6/oCWMkXPJ78WNiEaQXbTFDO2Wl
hO1J3szyNLwCdbEmLQNQ0jTbPxkgpe4RCWqYKQFJTCyF02dD5VjQeuvAUPgND8T3
shGzKUp/Z0xdDPL1JRiJ
=9YQS
-END PGP SIGNATURE-

Changes since xserver-xorg-video-ati-1%7.3.0-1:
Adam Jackson (1):
  kms: Use own thunk function instead of shadowUpdatePackedWeak

Alex Deucher (7):
  bump version post release
  radeon: don't install colormap handling if there are no crtcs
  radeon: require libdrm 2.4.51
  radeon: enable tiling by default on CIK
  update man page to reflect tiling changes for CI parts
  radeon: require libdrm_radeon 2.4.54 for mullins support
  radeon: enable tiling for mullins

Dave Airlie (1):
  radeon: fix use-after-free in modesetting cleanup

Hans de Goede (4):
  radeon_open_drm_master get rid of unnecessary goto
  Add radeon_get_drm_master_fd helper function
  Add support for server managed fds
  Fix building on older servers without xf86platformBus.h

Jérôme Glisse (1):
  evergreen: fix shader constant upload on ppc

Maarten Lankhorst (6):
  release to unstable
  return immediately in preinit when called with PROBE_DETECT
  bump version for release
  Merge tag 'xf86-video-ati-7.4.0' into debian-unstable
  Bump libdrm-dev to 2.4.54 and add changelogs.
  release to unstable

Michel Dänzer (10):
  Only log debugging output about initializing colormaps when we're doing so
  Allow enabling glamor on R500 (and R300) class 3D engines as well.
  Build against glamor in the xserver tree if available
  dri2: Fix conflicting CreatePixmap usage flag definitions
  glamor: Fix test for creating shared pixmaps
  Adapt to load_cursor_argb signature change in xserver 1.15.99.902
  dri2: Handle PRIME for source buffer as well in radeon_dri2_copy_region2
  Revert Adapt to load_cursor_argb signature change in xserver 1.15.99.902
  Don't disable acceleration on = SI on attempts to force EXA
  Rename Option NoAccel to Accel

Samuel Li (2):
  radeon: add support for Mullins.
  radeon: add Mullins pci ids.

---
 ChangeLog |  626 ++
 configure.ac  |   24 +
 debian/changelog  |   11 
 debian/control|2 
 man/radeon.man|   25 -
 src/ati_pciids_gen.h  |   16 
 src/drmmode_display.c |   28 -
 src/evergreen_accel.c |2 
 src/pcidb/ati_pciids.csv  |   16 
 src/radeon.h  |   21 -
 src/radeon_chipinfo_gen.h |   16 
 src/radeon_chipset_gen.h  |   16 
 src/radeon_dri2.c |9 
 src/radeon_glamor.c   |   37 +-
 src/radeon_kms.c  |  127 +--
 src/radeon_pci_chipset_gen.h  |   16 
 src/radeon_pci_device_match_gen.h |   16 
 src/radeon_probe.c|5 
 src/radeon_probe.h|9 
 19 files changed, 936 insertions(+), 86 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/e1wzoos-0004pn...@moszumanska.debian.org

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

 ChangeLog |  626 ++
 configure.ac  |   24 +
 debian/changelog  |7 
 debian/control|2 
 man/radeon.man|   25 -
 src/ati_pciids_gen.h  |   16 
 src/drmmode_display.c |   28 -
 src/evergreen_accel.c |2 
 src/pcidb/ati_pciids.csv  |   16 
 src/radeon.h  |   21 -
 src/radeon_chipinfo_gen.h |   16 
 src/radeon_chipset_gen.h  |   16 
 src/radeon_dri2.c |9 
 src/radeon_glamor.c   |   37 +-
 src/radeon_kms.c  |  127 +--
 src/radeon_pci_chipset_gen.h  |   16 
 src/radeon_pci_device_match_gen.h |   16 
 src/radeon_probe.c|5 
 src/radeon_probe.h|9 
 19 files changed, 934 insertions(+), 84 deletions(-)

New commits:
commit 6dfb858c612e07da2a6075df9704b142157332ba
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:56 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index b13c8f4..b79f3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:7.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.4.0-1) unstable; urgency=low
 
   * New upstream release.
   * Bump libdrm-dev requirement to 2.4.54.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:29:57 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:35:44 +0200
 
 xserver-xorg-video-ati (1:7.3.0-1) unstable; urgency=low
 

commit 111448475cc073c1a46f2e9b62c3040dffad9ab8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:13 2014 +0200

Bump libdrm-dev to 2.4.54 and add changelogs.

diff --git a/ChangeLog b/ChangeLog
index 3413e10..32d2d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,629 @@
+commit 906a0ec9224146098bb4581486129d2934d36495
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Wed Jun 25 16:10:21 2014 +0200
+
+bump version for release
+
+commit cc615d06db0332fc6e673b55632bcc7bf957b44b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Wed Jun 4 16:58:53 2014 +0900
+
+Rename Option NoAccel to Accel
+
+Removes the need for a double negation when forcing acceleration on.
+
+Note that this change is backwards compatible, as the option parser
+automagically handles the 'No' prefix.
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 851b2cf8714618843725f6d067915375485ade9d
+Author: Adam Jackson a...@redhat.com
+Date:   Wed May 21 09:34:32 2014 -0400
+
+kms: Use own thunk function instead of shadowUpdatePackedWeak
+
+I plan to delete the Weak functions from a future server.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit b2dba2906f0b2284f17f53fd5251ba0f03d52a8b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Thu May 15 16:07:53 2014 +0900
+
+Don't disable acceleration on = SI on attempts to force EXA
+
+Also make this case clear in the log file:
+
+ (WW) RADEON(0): EXA not supported, using glamor
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit be1469cc23aba46daf3293b3d09c5f2e792e7f42
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:48:07 2014 -0400
+
+radeon: enable tiling for mullins
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 2ae8e4b8d12f5c9bab6655eb8cd3c5c1d5cfb10e
+Author: Samuel Li samuel...@amd.com
+Date:   Tue Nov 12 15:30:42 2013 -0500
+
+radeon: add Mullins pci ids.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit 5c86a3461597647224c33d5190b4531aeeb2655f
+Author: Samuel Li samuel...@amd.com
+Date:   Thu Apr 17 15:17:28 2014 -0400
+
+radeon: add support for Mullins.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit fdb90ffc50acbb7d5ba0598470f9feeac6ce55fc
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:45:45 2014 -0400
+
+radeon: require libdrm_radeon 2.4.54 for mullins support
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 06e3c8c53ef4bd159f5864eabf726438d008b49a
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Apr 23 13:39:42 2014 +1000
+
+radeon: fix use-after-free in modesetting cleanup
+
+noticed while looking at something else.
+
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit dbac18c361f9e514ecb40d0617f9d68b65a542e0
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Mon Apr 28 17:51:56 2014 +0900
+
+Revert Adapt

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

 configure.ac  |   24 +--
 man/radeon.man|   25 ---
 src/ati_pciids_gen.h  |   16 
 src/drmmode_display.c |   28 
 src/evergreen_accel.c |2 
 src/pcidb/ati_pciids.csv  |   16 
 src/radeon.h  |   21 --
 src/radeon_chipinfo_gen.h |   16 
 src/radeon_chipset_gen.h  |   16 
 src/radeon_dri2.c |9 ++
 src/radeon_glamor.c   |   37 +++
 src/radeon_kms.c  |  127 +++---
 src/radeon_pci_chipset_gen.h  |   16 
 src/radeon_pci_device_match_gen.h |   16 
 src/radeon_probe.c|5 +
 src/radeon_probe.h|9 ++
 16 files changed, 300 insertions(+), 83 deletions(-)

New commits:
commit 906a0ec9224146098bb4581486129d2934d36495
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:10:21 2014 +0200

bump version for release

diff --git a/configure.ac b/configure.ac
index dc2a656..2fed8c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-[7.3.99],
+[7.4.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-ati])
 

commit cc615d06db0332fc6e673b55632bcc7bf957b44b
Author: Michel Dänzer michel.daen...@amd.com
Date:   Wed Jun 4 16:58:53 2014 +0900

Rename Option NoAccel to Accel

Removes the need for a double negation when forcing acceleration on.

Note that this change is backwards compatible, as the option parser
automagically handles the 'No' prefix.

Reviewed-by: Alex Deucher alexander.deuc...@amd.com

diff --git a/man/radeon.man b/man/radeon.man
index 65b880c..802f6c2 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -225,12 +225,12 @@ are supported:
 Selects software cursor.  The default is
 .B off.
 .TP
-.BI Option \*qNoAccel\*q \*q boolean \*q
+.BI Option \*qAccel\*q \*q boolean \*q
 Enables or disables all hardware acceleration.
 .br
-The default is to
-.B enable
-hardware acceleration.
+The default is
+.B on
+except for HAWAII.
 .TP
 .BI Option \*qZaphodHeads\*q \*q string \*q
 Specify the RandR output(s) to use with zaphod mode for a particular driver
diff --git a/src/radeon.h b/src/radeon.h
index 136a430..eac6ed5 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -135,7 +135,7 @@
 #endif
 
 typedef enum {
-OPTION_NOACCEL,
+OPTION_ACCEL,
 OPTION_SW_CURSOR,
 OPTION_PAGE_FLIP,
 OPTION_EXA_PIXMAPS,
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index ceaf575..707d0c7 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -59,7 +59,7 @@ extern SymTabRec RADEONChipsets[];
 static Bool radeon_setup_kernel_mem(ScreenPtr pScreen);
 
 const OptionInfoRec RADEONOptions_KMS[] = {
-{ OPTION_NOACCEL,NoAccel,  OPTV_BOOLEAN, {0}, FALSE },
+{ OPTION_ACCEL,  Accel,OPTV_BOOLEAN, {0}, FALSE },
 { OPTION_SW_CURSOR,  SWcursor, OPTV_BOOLEAN, {0}, FALSE },
 { OPTION_PAGE_FLIP,  EnablePageFlip,   OPTV_BOOLEAN, {0}, FALSE },
 { OPTION_COLOR_TILING,   ColorTiling,  OPTV_BOOLEAN, {0}, FALSE },
@@ -499,8 +499,8 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
info-is_fast_fb = TRUE;
 }
 
-if (xf86ReturnOptValBool(info-Options, OPTION_NOACCEL,
-info-ChipFamily == CHIP_FAMILY_HAWAII) ||
+if (!xf86ReturnOptValBool(info-Options, OPTION_ACCEL,
+info-ChipFamily != CHIP_FAMILY_HAWAII) ||
(!RADEONIsAccelWorking(pScrn))) {
xf86DrvMsg(pScrn-scrnIndex, X_INFO,
   GPU accel disabled or not working, using shadowfb for 
KMS\n);

commit 851b2cf8714618843725f6d067915375485ade9d
Author: Adam Jackson a...@redhat.com
Date:   Wed May 21 09:34:32 2014 -0400

kms: Use own thunk function instead of shadowUpdatePackedWeak

I plan to delete the Weak functions from a future server.

Signed-off-by: Adam Jackson a...@redhat.com

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 5e052e4..ceaf575 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -212,6 +212,12 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 
offset, int mode,
 return ((uint8_t *)info-front_bo-ptr + row * stride + offset);
 }
 
+static void
+radeonUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
 static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen)
 {
 ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
@@ -232,7 +238,7 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr 
pScreen)
 if (info-r600_shadow_fb) {
pixmap = pScreen-GetScreenPixmap(pScreen);
 
-   if (!shadowAdd(pScreen, pixmap, shadowUpdatePackedWeak(),
+   if (!shadowAdd(pScreen, pixmap, radeonUpdatePacked

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

 ChangeLog|6 ++
 configure.ac |2 +-
 debian/changelog |   13 +
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 8ebb885d14a111b57548c7019cdd7d070e282194
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:45:35 2014 +0200

rebuild against experimental

diff --git a/debian/changelog b/debian/changelog
index d3e73e8..6929c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.4.0-1+exp1) experimental; urgency=low
+
+  * Rebuild against xorg 1.16 rc.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:43:52 +0200
+
 xserver-xorg-video-ati (1:7.4.0-1) unstable; urgency=low
 
   * New upstream release.

commit 6dfb858c612e07da2a6075df9704b142157332ba
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:56 2014 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index b13c8f4..b79f3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:7.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.4.0-1) unstable; urgency=low
 
   * New upstream release.
   * Bump libdrm-dev requirement to 2.4.54.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:29:57 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 25 Jun 2014 
16:35:44 +0200
 
 xserver-xorg-video-ati (1:7.3.0-1) unstable; urgency=low
 

commit 111448475cc073c1a46f2e9b62c3040dffad9ab8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:35:13 2014 +0200

Bump libdrm-dev to 2.4.54 and add changelogs.

diff --git a/ChangeLog b/ChangeLog
index 3413e10..32d2d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,629 @@
+commit 906a0ec9224146098bb4581486129d2934d36495
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Wed Jun 25 16:10:21 2014 +0200
+
+bump version for release
+
+commit cc615d06db0332fc6e673b55632bcc7bf957b44b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Wed Jun 4 16:58:53 2014 +0900
+
+Rename Option NoAccel to Accel
+
+Removes the need for a double negation when forcing acceleration on.
+
+Note that this change is backwards compatible, as the option parser
+automagically handles the 'No' prefix.
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 851b2cf8714618843725f6d067915375485ade9d
+Author: Adam Jackson a...@redhat.com
+Date:   Wed May 21 09:34:32 2014 -0400
+
+kms: Use own thunk function instead of shadowUpdatePackedWeak
+
+I plan to delete the Weak functions from a future server.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit b2dba2906f0b2284f17f53fd5251ba0f03d52a8b
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Thu May 15 16:07:53 2014 +0900
+
+Don't disable acceleration on = SI on attempts to force EXA
+
+Also make this case clear in the log file:
+
+ (WW) RADEON(0): EXA not supported, using glamor
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+commit be1469cc23aba46daf3293b3d09c5f2e792e7f42
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:48:07 2014 -0400
+
+radeon: enable tiling for mullins
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 2ae8e4b8d12f5c9bab6655eb8cd3c5c1d5cfb10e
+Author: Samuel Li samuel...@amd.com
+Date:   Tue Nov 12 15:30:42 2013 -0500
+
+radeon: add Mullins pci ids.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit 5c86a3461597647224c33d5190b4531aeeb2655f
+Author: Samuel Li samuel...@amd.com
+Date:   Thu Apr 17 15:17:28 2014 -0400
+
+radeon: add support for Mullins.
+
+Signed-off-by: Samuel Li samuel...@amd.com
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit fdb90ffc50acbb7d5ba0598470f9feeac6ce55fc
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri May 2 17:45:45 2014 -0400
+
+radeon: require libdrm_radeon 2.4.54 for mullins support
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+commit 06e3c8c53ef4bd159f5864eabf726438d008b49a
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Apr 23 13:39:42 2014 +1000
+
+radeon: fix use-after-free in modesetting cleanup
+
+noticed while looking at something else.
+
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit dbac18c361f9e514ecb40d0617f9d68b65a542e0
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Mon Apr 28 17:51:56 2014 +0900
+
+Revert Adapt to load_cursor_argb signature change in xserver 1.15.99.902
+
+This reverts commit 48d3dbc8a0d3bfde88f46e402e530438f9317715.
+
+xserver Git has been

xserver-xorg-video-ati: Changes to 'upstream-experimental'

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 906a0ec9224146098bb4581486129d2934d36495
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 25 16:10:21 2014 +0200

bump version for release

diff --git a/configure.ac b/configure.ac
index dc2a656..2fed8c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-[7.3.99],
+[7.4.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-ati])
 


-- 
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/e1wzoup-0005sx...@moszumanska.debian.org

xserver-xorg-video-ati: Changes to 'refs/tags/xserver-xorg-video-ati-1%7.4.0-1+exp1'

Tag 'xserver-xorg-video-ati-1%7.4.0-1+exp1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-25 14:47 +

Debian release 1:7.4.0-1+exp1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTquEOAAoJEP5VjHKmcBPDqi8P/iTPUBYP0hCA34k82jThn6UX
DxFXJFfWHivp5OhG7OzsSqDjl0/ORHm3ccg5/1X0oxL5ydUKh8d7P2w2UWKcI0VS
Q1dx5/XRCneW7nDG2c9+LfYnI4FE85ODPo188U+J/AJpI5Bxekqps3WVL1ogt6XE
TVeg0Hqi9ck1627WTwpcXjQOhAQhVAbLe19Sj7/aCmJduULCoKHc4NaZyBrq2c7M
iLmvPIFnKw/cNGYX8gkVGFlrqDmVQzYAmOm+zvIHvfR5Tn7nv3xOQpVasGQjV5n1
ZHefEZXOyhd4zqs32rTF+6aAu8jRAQ8buMjX4qOUv7aQeR3sUjve4UNvsJfI3X2d
LNHv7WF4bF4fcm3ajJaR1eoOojthsstDZb7CTjl9mwegbOmob6y2r5T0o+bXrDPX
shp6k1vD7X+YN6JgEA/GXKgSPtWwXuG/YbBER2vfaL41fHqsTrulLBZu7K6PtonE
eaCQBMoTREo8G6m93w6mWRi/TC7NJ1Y2XkDj2T8lccPZaF2IcHmnxG6ojj4eCIg+
P369S3d5y9x9hJA2uafINw01Uf9ablgjSofip/xOfA/QrFXgmvJov3rsiOkjRb/F
wczxIdcCBfBEDE4UyA/NE6gYPWoS3lNO+uXDrLxYuTCl+BcoBPhHNXQJQC2AOQNo
jUPJWlI6Zme6w/EM+9YO
=sfn5
-END PGP SIGNATURE-

Changes since xserver-xorg-video-ati-1_7.3.0-2:
Maarten Lankhorst (6):
  bump version for release
  Merge tag 'xf86-video-ati-7.4.0' into debian-unstable
  Bump libdrm-dev to 2.4.54 and add changelogs.
  release to unstable
  Merge branch 'debian-unstable' into debian-experimental
  rebuild against experimental

---
 ChangeLog|6 ++
 configure.ac |2 +-
 debian/changelog |   13 +
 3 files changed, 20 insertions(+), 1 deletion(-)
---


-- 
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/e1wzov1-0005uw...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

2014-06-24 Thread Maarten Lankhorst

 debian/changelog|6 +
 debian/patches/ppc64el-endian-fix.patch |   34 
 debian/patches/series   |1 
 3 files changed, 41 insertions(+)

New commits:
commit 201424bd607c84c106635d71dbef18d69c41454e
Author: Adam Conrad adcon...@ubuntu.com
Date:   Mon Jun 23 23:47:15 2014 -0600

Fix PPC endian assumptions (LP: #1333422)

diff --git a/debian/changelog b/debian/changelog
index 126f08d..d29c7a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.1-0ubuntu6) utopic; urgency=medium
+
+  * ppc64el-endian-fix.patch: Fix PPC endian assumptions (LP: #1333422)
+
+ -- Adam Conrad adcon...@ubuntu.com  Mon, 23 Jun 2014 23:47:15 -0600
+
 xorg-server (2:1.15.1-0ubuntu5) utopic; urgency=low
 
   * Add upstream patch to fix some valgrind issues.
diff --git a/debian/patches/ppc64el-endian-fix.patch 
b/debian/patches/ppc64el-endian-fix.patch
new file mode 100644
index 000..6950b27
--- /dev/null
+++ b/debian/patches/ppc64el-endian-fix.patch
@@ -0,0 +1,34 @@
+From adb7bc3386559dfee34b359dadcbb6796bc416e7 Mon Sep 17 00:00:00 2001
+From: Dinar Valeev dval...@suse.com
+Date: Mon, 24 Feb 2014 10:36:54 +
+Subject: arch: Fix image and bitmap byte order for ppc64le
+
+So far PPC was big endian for sure. For ppc64le this is no longer
+true.
+
+Signed-off-by: Egbert Eich e...@freedesktop.org
+Reviewed-by: Mark Kettenis kette...@openbsd.org
+Signed-off-by: Keith Packard kei...@keithp.com
+---
+diff --git a/include/servermd.h b/include/servermd.h
+index 081123b..e413314 100644
+--- a/include/servermd.h
 b/include/servermd.h
+@@ -114,8 +114,13 @@ SOFTWARE.
+ 
+ #if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__)
+ 
+-#define IMAGE_BYTE_ORDERMSBFirst
+-#define BITMAP_BIT_ORDERMSBFirst
++#if defined(__LITTLE_ENDIAN__)
++#define IMAGE_BYTE_ORDER  LSBFirst
++#define BITMAP_BIT_ORDER  LSBFirst
++#else
++#define IMAGE_BYTE_ORDER  MSBFirst
++#define BITMAP_BIT_ORDER  MSBFirst
++#endif
+ #define GLYPHPADBYTES   4
+ 
+ #endif  /* PowerPC */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/series b/debian/patches/series
index 8266f07..9fa55f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,3 +55,4 @@ drm_device_keep_trying.patch
 xi2-resize-touch.patch
 xi-dont-copy-too-much.patch
 mi-dont-process-disabled.patch
+ppc64el-endian-fix.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/e1wzqej-0007li...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu+1'

2014-06-24 Thread Maarten Lankhorst

 debian/changelog  |6 +
 debian/patches/drm_device_keep_trying.patch   |  132 ++
 debian/patches/ppc64el-endian-fix.patch   |   34 ++
 debian/patches/rrcrtc-brackets-are-hard.patch |   39 ---
 debian/patches/series |3 
 debian/patches/xi-dont-copy-too-much.patch|   67 -
 6 files changed, 92 insertions(+), 189 deletions(-)

New commits:
commit aae62b119a9a035c586110a5438f8dd492a7e71c
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jun 24 15:37:44 2014 +0200

refresh and drop patches for 1.16

Still need updating:
- xmir.patch (rewrite on top of glamor?)
- 190_cache-xkbcomp_output_for_fast_start_up.patch

diff --git a/debian/patches/drm_device_keep_trying.patch 
b/debian/patches/drm_device_keep_trying.patch
index 8a8f920..ea36cf9 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -21,19 +21,20 @@ Signed-off-by: Bryce Harrington br...@canonical.com
 
 --- a/config/udev.c
 +++ b/config/udev.c
-@@ -98,7 +98,7 @@
- if (strncmp(sysname, card, 4) != 0)
+@@ -116,7 +116,7 @@
+ if (xf86_find_platform_device_by_devnum(major(devnum), minor(devnum)))
  return;
  
 -LogMessage(X_INFO, config/udev: Adding drm device (%s)\n, path);
 +LogMessage(X_INFO, config/udev: Adding drm device (%s) %s %s\n, 
path, sysname, syspath);
  
- config_udev_odev_setup_attribs(path, syspath, NewGPUDeviceRequest);
- return;
-@@ -430,11 +430,23 @@
+ config_udev_odev_setup_attribs(path, syspath, major(devnum),
+minor(devnum), NewGPUDeviceRequest);
+@@ -456,6 +456,17 @@
+ 
  #ifdef CONFIG_UDEV_KMS
  
- static Bool
++static Bool
 +get_pci_busid(const char *in, char *pci_str)
 +{
 +int ret, domain, bus, dev, func;
@@ -44,27 +45,20 @@ Signed-off-by: Bryce Harrington br...@canonical.com
 +return TRUE;
 +}
 +
-+static Bool
+ static void
  config_udev_odev_setup_attribs(const char *path, const char *syspath,
-config_odev_probe_proc_ptr probe_callback)
- {
- struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
- int ret;
-+const char *platform;
- 
- if (!attribs)
- return FALSE;
-@@ -447,6 +459,33 @@
- if (ret == FALSE)
- goto fail;
+int major, int minor,
+@@ -468,6 +479,31 @@
+ config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major);
+ config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor);
  
 +if (strstr(syspath, /devices/pci)) {
 +char pci_str[17];
 +const char *end = strstr(syspath, /drm/card);
 +if (strstr(syspath, /usb))
-+ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, );
++config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, );
 +else if (get_pci_busid(end - 13, pci_str))
-+ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, 
pci_str);
++config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, pci_str);
 +} else if ((platform = strstr(syspath, /devices/platform/))) {
 +/* OMAP relies on this, modesetting doesn't use it */
 +const char *end;
@@ -72,40 +66,37 @@ Signed-off-by: Bryce Harrington br...@canonical.com
 +end = strchr(platform, '.');
 +if (end) {
 +char *busid;
++int ret;
++
 +ret = asprintf(busid, platform:%.*s:%02li,
 +   (int)(end - platform), platform, strtol(end + 1, 
NULL, 10));
 +if (ret = 0) {
-+ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, 
busid);
++config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, busid);
 +free(busid);
 +}
-+else
-+ret = TRUE;
 +}
 +}
-+if (ret == FALSE)
-+goto fail;
 +
  /* ownership of attribs is passed to probe layer */
  probe_callback(attribs);
- return TRUE;
+ }
 --- a/hw/xfree86/os-support/linux/lnx_platform.c
 +++ b/hw/xfree86/os-support/linux/lnx_platform.c
-@@ -19,44 +19,6 @@
- 
- #include hotplug.h
- 
--static Bool
--get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
--{
+@@ -23,10 +23,7 @@
+ static Bool
+ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
+ {
 -drmSetVersion sv;
 -char *buf;
--int fd;
+ int major, minor, fd;
 -int err = 0;
--
--fd = open(path, O_RDWR, O_CLOEXEC);
--if (fd == -1)
--return FALSE;
--
+ Bool paused, server_fd = FALSE;
+ 
+ major = config_odev_get_int_attribute(attribs, ODEV_ATTRIB_MAJOR, 0);
+@@ -50,17 +47,6 @@
+ if (fd == -1)
+ return FALSE;
+ 
 -sv.drm_di_major = 1;
 -sv.drm_di_minor = 4;
 -sv.drm_dd_major = -1;   /* Don't care

mesa: Changes to 'refs/tags/mesa-10.2.1-2'

Tag 'mesa-10.2.1-2' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-23 10:09 +

Debian release 10.2.1-2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTp/zFAAoJEP5VjHKmcBPDyhoP/2MxWohTLK1VKNqxYsrVgM9C
j7u3TC7homhB7kmdHwa2pUaf19LyQSt9ghbZ94bl//v7cwpI8lYp2oqUv5UU4KZx
p6fc8dgkNs6/ytRqmwktUc+TgVQXLFEptwrkbk9+oTe+FD6cw2bQkzG7LXQevRq+
3ZqdWzVssq5Fpl4TX9Lb13/h+msUv9RxsP/lkgHFHc4gcPYhPiYJX8cIDjiru2IU
Aad/V9wn4TJGjWR6PLfGsFvXO1w+bcYh4KgsydZl6kv1HJqBi1lPexK3EG48Q7Z6
D7LWagg2wm9RxKKIFHjDhBZQC67aHfxOloUk0J53QlaJnfAifBbDFa3kQ/dY4atq
5iK+9tCTw0Vgkc3RCa5ZwpVERBXovfkhYver8vHVWsyWp0HA52YojGsqdLTSYmm2
gvjQgPCcft0QNBQhBrcLSOqVy9xNvLhlaTqyjg8bq2UYhjDbpyQCycqdIOVcYWrt
EuT9wIyY/uoZtaia1WsZkAeBaez/+wkGWZiWKBu6bfPM9Vmxk465DZu1nxUqlG3Z
lyJkjnbDCTmc1wnRoYCoiICwjUIYIZl7MU/KgPwWBWJQu/cRQhoGL1Y2VUsiYnWj
99SGJuxuDPC8YeeDH4qdzgJ1Wy48VYQodTv0/h3G4vsRR5BrXcuNd+RISWqpda/6
Tlo+kaGIi6p2xtsWwVuT
=CjVD
-END PGP SIGNATURE-

Changes since mesa-10.2.1-1:
Aaron Watry (1):
  gallium/util: Fix memory leak

Alexander von Gluck IV (1):
  haiku: Fix build through scons corrections and viewport fixes

Ander Conselvan de Oliveira (2):
  gbm/dri: Fix out-of-memory error path in dri_device_create()
  egl: Protect use of gbm_dri with ifdef HAVE_DRM_PLATFORM

Andreas Boll (9):
  Merge tag 'mesa-10.1.1' into debian-unstable
  New upstream release.
  Relax ocl-icd-libopencl1 dependency to allow the generic virtual 
libopencl1 as a valid alternative
  Add missing separator between dependency items '${misc:Depends}' and 
'libglapi-mesa (= ${binary:Version})'.
  Merge tag 'mesa-10.1.2' into debian-unstable
  New upstream version.
  Merge tag 'mesa-10.1.4' into debian-unstable
  New upstream release.
  Bump llvm-3.4-dev and libclang-3.4-dev to 1:3.4.1-3

Anuj Phogat (29):
  mesa: Set initial internal format of a texture to GL_RGBA
  mesa: Allow GL_DEPTH_COMPONENT and GL_DEPTH_STENCIL combinations in 
glTexImage{123}D()
  mesa: Fix glGetVertexAttribi(GL_VERTEX_ATTRIB_ARRAY_SIZE)
  swrast: Add glBlitFramebuffer to commands affected by conditional 
rendering
  mesa: Fix error condition for multisample proxy texture targets
  i965: Put an assertion to check valid varying_to_slot[varying]
  i965: Fix component mask and varying_to_slot mapping for gl_Layer
  i965: Fix component mask and varying_to_slot mapping for gl_ViewportIndex
  mesa: Add helper function _mesa_is_format_integer()
  mesa: Add error condition for integer formats in glGetTexImage()
  mesa: Add an error condition in glGetFramebufferAttachmentParameteriv()
  mesa: Fix error code generation in glReadPixels()
  glsl: Allow overlapping locations for vertex input attributes
  mesa: Fix querying location of nth element of an array variable
  mesa: Use location VERT_ATTRIB_GENERIC0 for vertex attribute 0
  glsl: Compile error if fs defines conflicting qualifiers for gl_FragCoord
  glsl: Compile error if fs uses gl_FragCoord before first redeclaration
  mesa: Add entry for extension ARB_texture_stencil8
  mesa: Add error condition for format=STENCIL_INDEX in glGetTexImage()
  i965: Fix crash in do_blit_readpixels()
  mesa: Add missing types in _mesa_texstore_xx_xx() functions
  mesa: Allow srcFormat=GL_DEPTH_STENCIL in _mesa_texstore_xx_xx() functions
  mesa: Add new helper function _mesa_unpack_depth_stencil_row()
  mesa: Add support to unpack depth-stencil texture in to 
FLOAT_32_UNSIGNED_INT_24_8_REV
  mesa: Allow FLOAT_32_UNSIGNED_INT_24_8_REV in get_tex_depth_stencil()
  i965: Add glBlitFramebuffer to commands affected by conditional rendering
  glsl: Use switch to allow adding more shader types
  glsl: Link error if fs defines conflicting qualifiers for gl_FragCoord
  glsl: Apply the link error conditions to GL_ARB_fragment_coord_conventions

Benjamin Bellec (1):
  mesa: fix GetStringi error message with correct function name

Brian Paul (14):
  softpipe: use 64-bit arithmetic in softpipe_resource_layout()
  mesa: don't call ctx-Driver.ClearBufferSubData() if size==0
  st/osmesa: check buffer size when searching for buffers
  mesa: fix copy  paste bugs in pack_ubyte_SARGB8()
  mesa: fix copy  paste bugs in pack_ubyte_SRGB8()
  c11/threads: don't include assert.h if the assert macro is already defined
  mesa: fix unpack_Z32_FLOAT_X24S8() / unpack_Z32_FLOAT() mix-up
  st/mesa: add null pointer checking in query object functions
  mesa: fix glMultiDrawArrays inside a display list
  cso: fix sampler view count in cso_set_sampler_views()
  svga: replace sampler assertion with conditional
  svga: move LIST_INITHEAD(dirty_buffers) earlier in svga_context_create()
  swrast: allocate swrast_texture_image::ImageSlices array if needed
  mesa: fix double-freeing of dispatch tables inside glBegin/End.

Carl Worth (17

mesa: Changes to 'debian-experimental'

 0 files changed

New commits:
commit cc9b282f8a00c1d8e552a3776709ca84e1f4467d
Author: Carl Worth cwo...@cworth.org
Date:   Tue May 20 14:22:34 2014 -0700

docs: Add release notes for the 10.1.4 release.

diff --git a/docs/relnotes/10.1.4.html b/docs/relnotes/10.1.4.html
new file mode 100644
index 000..6c02f32
--- /dev/null
+++ b/docs/relnotes/10.1.4.html
@@ -0,0 +1,97 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.1.4 Release Notes / (May 20, 2014)/h1
+
+p
+Mesa 10.1.4 is a bug fix release which fixes bugs found since the 10.1.3 
release.
+/p
+
+p
+Mesa 10.1.4 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 strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2MD5 checksums/h2
+pre
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=78225;Bug 78225/a 
- Compile error due to undefined reference to `gbm_dri_backend', fix 
attached/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=78537;Bug 78537/a 
- no anisotropic filtering in a native Half-Life 2/li
+
+/ul
+
+h2Changes/h2
+
+pBrian Paul (1):/p
+ul
+  limesa: fix double-freeing of dispatch tables inside glBegin/End./li
+/ul
+
+pCarl Worth (3):/p
+ul
+  lidocs: Add MD5 sums for 10.1.3/li
+  licherry-ignore: Roland and Michel agreed to drop these patches./li
+  liVERSION: Update to 10.1.4/li
+/ul
+
+pEmil Velikov (1):/p
+ul
+  liconfigure: error out if building GBM without dri/li
+/ul
+
+pEric Anholt (1):/p
+ul
+  lii965/vs: Use samplers for UBOs in the VS like we do for non-UBO 
pulls./li
+/ul
+
+pIlia Mirkin (3):/p
+ul
+  linv50/ir: make sure to reverse cond codes on all the OP_SET variants/li
+  linv50: fix setting of texture ms info to be per-stage/li
+  linv50/ir: fix integer mul lowering for u32 x u32 -gt; high u32/li
+/ul
+
+pMichel Dänzer (1):/p
+ul
+  liradeonsi: Fix anisotropic filtering state setup/li
+/ul
+
+pTom Stellard (2):/p
+ul
+  liconfigure.ac: Add LLVM_VERSION_PATCH to DEFINES/li
+  liradeonsi: Enable geometry shaders with LLVM 3.4.1/li
+/ul
+
+/div
+/body
+/html

commit edab352b250ea687df6e61a553bb51d0093a0e14
Author: Carl Worth cwo...@cworth.org
Date:   Tue May 20 14:19:05 2014 -0700

VERSION: Update to 10.1.4

In preparation for the 10.1.4 release.

diff --git a/VERSION b/VERSION
index c8d7efc..655f923 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.3
+10.1.4

commit 2d6f733979dd3c3e3f32876bb1eb89c0693edf80
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Tue May 13 11:23:33 2014 -0400

nv50/ir: fix integer mul lowering for u32 x u32 - high u32

UNION appears to expect that all of its sources are conditionally
defined. Otherwise it inserts an unpredicated mov instruction which
overwrites the desired result. This fixes tests that use UMUL_HI, and
much less directly, unsigned integer division by a constant, which uses
this functionality in a peephole pass.

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu
Cc: 10.1 10.2 mesa-sta...@lists.freedesktop.org
Reviewed-by: Ben Skeggs bske...@redhat.com
(cherry picked from commit 5b8f1a0f7c5b1412577a913d374192a2329fa615)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
index 7030c21..c4ae6c4 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
@@ -75,16 +75,17 @@ expandIntegerMUL(BuildUtil *bld, Instruction *mul)
i[4] = bld-mkOp3(OP_MAD, fTy, t[3], a[0], b[0], t[2]);
 
if (highResult) {
-  Value *r[3];
+  Value *r[4];
   Value *imm = bld-loadImm(NULL, 1  (halfSize * 8));
   c[0] = bld-getSSA(1, FILE_FLAGS);
   c[1] = bld-getSSA(1, FILE_FLAGS);
-  for (int j = 0; j  3; ++j)
+  for (int j = 0; j  4; ++j)
  r[j] = bld-getSSA(fullSize);
 
   i[8] = bld-mkOp2(OP_SHR, fTy, r[0], t[1], bld-mkImm(halfSize * 8));
   i[6] = bld-mkOp2(OP_ADD, fTy, r[1], r[0], imm);
-  bld-mkOp2(OP_UNION, TYPE_U32, r[2], r[1], r[0]);
+  bld-mkMov(r[3], r[0])-setPredicate(CC_NC, c[0]);
+  bld-mkOp2(OP_UNION, TYPE_U32, r[2], r[1], r[3]);
   i[5] = bld-mkOp3(OP_MAD, fTy, mul-getDef(0), a[1], b[1], r[2]);
 
   // set carry defs /

mesa: Changes to 'upstream-unstable'

Rebased ref, commits from common ancestor:
commit 1b69ea1c6d4e66ade7ab4fa0b08d024efe9dae9c
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jun 6 22:13:36 2014 -0700

Bump version to 10.2.1

diff --git a/VERSION b/VERSION
index 2bd6f7e..26ee5b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.0
+10.2.1

commit c2fc9fb90786cae02d589ee7242d5f5fe99bdbec
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jun 6 22:07:34 2014 -0700

radeonsi: Fix build error introduced in 5ab9a9c

While resolving conflicts in cherry picking commit d226191, I
accidentally introduced some garbage.  Because radeonsi isn't built by
default, the problem went unnoticed by me.

Signed-off-by: Ian Romanick ian.d.roman...@intel.com
Reported-by: Laurent Carlier lordhea...@gmail.com
Tested-by: Laurent Carlier lordhea...@gmail.com

diff --git a/src/gallium/drivers/radeonsi/si_blit.c 
b/src/gallium/drivers/radeonsi/si_blit.c
index 892ee84..1dfff49 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -692,7 +692,6 @@ static bool do_hardware_msaa_resolve(struct pipe_context 
*ctx,
!(dst-surface.flags  RADEON_SURF_SCANOUT) 
(!dst-cmask.size || !dst-dirty_level_mask) /* dst cannot be 
fast-cleared */) {
si_blitter_begin(ctx, SI_COLOR_RESOLVE);
-t-cleared
util_blitter_custom_resolve_color(sctx-blitter,
  info-dst.resource, 
info-dst.level,
  info-dst.box.z,

commit 28d41e409d74aabe35f1031e759179e82cb760b4
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jun 6 21:17:02 2014 -0700

docs: Add MD5 checksum, etc. for 10.1 release

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/docs/index.html b/docs/index.html
index 186bda2..5bd9601 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,6 +16,13 @@
 
 h1News/h1
 
+h2June 6, 2014/h2
+p
+a href=relnotes/10.2.htmlMesa 10.2/a is released.  This is a new
+development release.  See the release notes for more information about
+the release.
+/p
+
 h2April 18, 2014/h2
 p
 a href=relnotes/10.1.1.htmlMesa 10.1.1/a is released.
diff --git a/docs/relnotes/10.2.html b/docs/relnotes/10.2.html
index af44ca1..f17bfcc 100644
--- a/docs/relnotes/10.2.html
+++ b/docs/relnotes/10.2.html
@@ -14,7 +14,7 @@
 iframe src=../contents.html/iframe
 div class=content
 
-h1Mesa 10.2 Release Notes / TBD/h1
+h1Mesa 10.2 Release Notes / June 6, 2014/h1
 
 p
 Mesa 10.2 is a new development release.
@@ -33,7 +33,9 @@ because compatibility contexts are not supported.
 
 h2MD5 checksums/h2
 pre
-TBD.
+c87bfb6dd5cbcf1fdef42e5ccd972581  MesaLib-10.2.0.tar.gz
+7aaba90bd7169a94ae2fe83febdec963  MesaLib-10.2.0.tar.bz2
+58b203aca15dadc25ab4d1126db1052b  MesaLib-10.2.0.zip
 /pre
 
 

commit f836ef63fdbb4abada29299e226eed735094736c
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri Jun 6 18:42:36 2014 -0700

Bump version to 10.2 (final)

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/VERSION b/VERSION
index 88242cc..2bd6f7e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.0-rc5
+10.2.0

commit 99b9a0973ad32882897f21bb087b7bd34a928b59
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Fri Jun 6 22:40:47 2014 -0400

gk110/ir: fix slct emission

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu
Cc: 10.2 mesa-sta...@lists.freedesktop.org
(cherry picked from commit 9fef8b3d811000146b989a101ad0e26ae6530fe4)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
index e1b5a74..6788750 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
@@ -952,7 +952,7 @@ CodeEmitterGK110::emitSLCT(const CmpInstruction *i)
   FTZ_(32);
   emitCondCode(cc, 0x33, 0xf);
} else {
-  emitForm_21(i, 0x1a4, 0xb20);
+  emitForm_21(i, 0x1a0, 0xb20);
   emitCondCode(cc, 0x34, 0x7);
}
 }

commit d36d53b564f5907e86ad5f5ffd837738988be4a2
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Fri Jun 6 20:33:06 2014 -0400

gk110/ir: fix interp mode emission

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu
Cc: 10.2 mesa-sta...@lists.freedesktop.org
(cherry picked from commit d588a4919b732246b7aa26685ef65545929a4f7b)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
index 9a8c4b9..e1b5a74 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
@@ -1326,7 +1326,8 @@ CodeEmitterGK110::emitOUT(const Instruction *i)
 void
 CodeEmitterGK110::emitInterpMode(const Instruction *i)
 {
-   code[1] |= i-ipa  21; // TODO: INTERP_SAMPLEID
+   code[1] |= (i-ipa  0x3)  21; //

mesa: Changes to 'ubuntu+1'

 0 files changed

New commits:
commit cc9b282f8a00c1d8e552a3776709ca84e1f4467d
Author: Carl Worth cwo...@cworth.org
Date:   Tue May 20 14:22:34 2014 -0700

docs: Add release notes for the 10.1.4 release.

diff --git a/docs/relnotes/10.1.4.html b/docs/relnotes/10.1.4.html
new file mode 100644
index 000..6c02f32
--- /dev/null
+++ b/docs/relnotes/10.1.4.html
@@ -0,0 +1,97 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.1.4 Release Notes / (May 20, 2014)/h1
+
+p
+Mesa 10.1.4 is a bug fix release which fixes bugs found since the 10.1.3 
release.
+/p
+
+p
+Mesa 10.1.4 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 strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2MD5 checksums/h2
+pre
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=78225;Bug 78225/a 
- Compile error due to undefined reference to `gbm_dri_backend', fix 
attached/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=78537;Bug 78537/a 
- no anisotropic filtering in a native Half-Life 2/li
+
+/ul
+
+h2Changes/h2
+
+pBrian Paul (1):/p
+ul
+  limesa: fix double-freeing of dispatch tables inside glBegin/End./li
+/ul
+
+pCarl Worth (3):/p
+ul
+  lidocs: Add MD5 sums for 10.1.3/li
+  licherry-ignore: Roland and Michel agreed to drop these patches./li
+  liVERSION: Update to 10.1.4/li
+/ul
+
+pEmil Velikov (1):/p
+ul
+  liconfigure: error out if building GBM without dri/li
+/ul
+
+pEric Anholt (1):/p
+ul
+  lii965/vs: Use samplers for UBOs in the VS like we do for non-UBO 
pulls./li
+/ul
+
+pIlia Mirkin (3):/p
+ul
+  linv50/ir: make sure to reverse cond codes on all the OP_SET variants/li
+  linv50: fix setting of texture ms info to be per-stage/li
+  linv50/ir: fix integer mul lowering for u32 x u32 -gt; high u32/li
+/ul
+
+pMichel Dänzer (1):/p
+ul
+  liradeonsi: Fix anisotropic filtering state setup/li
+/ul
+
+pTom Stellard (2):/p
+ul
+  liconfigure.ac: Add LLVM_VERSION_PATCH to DEFINES/li
+  liradeonsi: Enable geometry shaders with LLVM 3.4.1/li
+/ul
+
+/div
+/body
+/html

commit edab352b250ea687df6e61a553bb51d0093a0e14
Author: Carl Worth cwo...@cworth.org
Date:   Tue May 20 14:19:05 2014 -0700

VERSION: Update to 10.1.4

In preparation for the 10.1.4 release.

diff --git a/VERSION b/VERSION
index c8d7efc..655f923 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.3
+10.1.4

commit 2d6f733979dd3c3e3f32876bb1eb89c0693edf80
Author: Ilia Mirkin imir...@alum.mit.edu
Date:   Tue May 13 11:23:33 2014 -0400

nv50/ir: fix integer mul lowering for u32 x u32 - high u32

UNION appears to expect that all of its sources are conditionally
defined. Otherwise it inserts an unpredicated mov instruction which
overwrites the desired result. This fixes tests that use UMUL_HI, and
much less directly, unsigned integer division by a constant, which uses
this functionality in a peephole pass.

Signed-off-by: Ilia Mirkin imir...@alum.mit.edu
Cc: 10.1 10.2 mesa-sta...@lists.freedesktop.org
Reviewed-by: Ben Skeggs bske...@redhat.com
(cherry picked from commit 5b8f1a0f7c5b1412577a913d374192a2329fa615)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp 
b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
index 7030c21..c4ae6c4 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp
@@ -75,16 +75,17 @@ expandIntegerMUL(BuildUtil *bld, Instruction *mul)
i[4] = bld-mkOp3(OP_MAD, fTy, t[3], a[0], b[0], t[2]);
 
if (highResult) {
-  Value *r[3];
+  Value *r[4];
   Value *imm = bld-loadImm(NULL, 1  (halfSize * 8));
   c[0] = bld-getSSA(1, FILE_FLAGS);
   c[1] = bld-getSSA(1, FILE_FLAGS);
-  for (int j = 0; j  3; ++j)
+  for (int j = 0; j  4; ++j)
  r[j] = bld-getSSA(fullSize);
 
   i[8] = bld-mkOp2(OP_SHR, fTy, r[0], t[1], bld-mkImm(halfSize * 8));
   i[6] = bld-mkOp2(OP_ADD, fTy, r[1], r[0], imm);
-  bld-mkOp2(OP_UNION, TYPE_U32, r[2], r[1], r[0]);
+  bld-mkMov(r[3], r[0])-setPredicate(CC_NC, c[0]);
+  bld-mkOp2(OP_UNION, TYPE_U32, r[2], r[1], r[3]);
   i[5] = bld-mkOp3(OP_MAD, fTy, mul-getDef(0), a[1], b[1], r[2]);
 
   // set carry defs /

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

2014-06-16 Thread Maarten Lankhorst

Tag 'mesa-10.2.1-1' created by Maarten Lankhorst 
maarten.lankho...@canonical.com at 2014-06-16 13:49 +

Debian release 10.2.1-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABAgAGBQJTnvXvAAoJEP5VjHKmcBPDUaIP/2jd8LiyOkaYt88tgzcrDKTS
9wtqv8St7lIOunFfyv3wWimUTUbhCea5Twh5texx9Inf76+Fft93DjqSux0Gu+w4
QNhw9vQTBsRU2EyZBtDdEHKTxzkjHB0p0sPc9FHsJSSgFVqDx/ZNqCCY+Jp3v0n7
M3nePG8BoyvBT0O/CHPTnMN3t3lIMGhaoW9K4v2AhphDzmVHykExnj5E56ngiidu
4NRjGHrs4JY1Qh4H3Fyy17FVGdm9GA+JUYXChFmrzcaGH/eZcP9xDjblEad6QqPk
9WJkdb39ckDqILglv4l/xWXMe3owb4BLapRu5NeA7uxDh03GADQIKvEbbwHzTSRI
BJzEgIqazZ6HdJFxJXJNagk7dv6XfAjqt0W5Su40094LmM5L6TfyGluhIpvCeWcW
qf9Kr3KEVc2ifaN0CixvcTY9AggKCstP3PJnnewPy7ZT/0gI/2AQ6tDUjjtqLjs3
0T4PEzUEx8BmL68yuEaiXPXFjQEcRuYeqDjmZADcu4efwSCntH67QnB76rJZHhLF
hre+UcepBiyWNKcg9vOqoaMoewm7bSJGXve4mZs/iYdfciVZr1uOCF0NlKYbR3UX
KTNL/TMaxTDb+fKxVpHU2tZcdlwlphaXX9BxW5Y6Kk3WMBfdzMxA69hmlwguKRWk
ziv5rBHzTdDdMEaWEHbR
=r/dE
-END PGP SIGNATURE-

Changes since mesa-10.2.0-rc4-2:
Andreas Boll (4):
  Merge tag 'mesa-10.2.1' into debian-experimental
  New upstream release.
  Drop 01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff, 
upstream
  Add 01_targets-xa-limit-the-amount-of-exported-symbols.diff

Beren Minor (1):
  egl/main: Fix eglMakeCurrent when releasing context from current thread.

Brian Paul (1):
  glsl: fix use-after free bug/crash in ast_declarator_list::hir()

Christoph Bumiller (7):
  nv50,nvc0: always pull out bufctx on context destruction
  nv50: setup scissors on clear_render_target/depth_stencil
  nv50,nvc0: set constbufs dirty on pipe context switch
  nv50/ir/tgsi: TGSI_OPCODE_POW replicates its result
  nv50/ir/opt: fix constant folding with saturate modifier
  nv50/ir: fix lowering of predicated instructions (without defs)
  nv50/ir/tgsi: optimize KIL

Emil Velikov (1):
  glx: do not leak dri3Display

Ian Romanick (6):
  glapi: Duplicate GLES1 prototypes in glapi_dispatch.c
  Bump version to 10.2-rc5
  Bump version to 10.2 (final)
  docs: Add MD5 checksum, etc. for 10.1 release
  radeonsi: Fix build error introduced in 5ab9a9c
  Bump version to 10.2.1

Ilia Mirkin (9):
  mesa/st: fix color outputs in presence of sample mask output
  nvc0: revert mistaken logic to collapse color outputs to the beginning
  gk110/ir: emit texbar the same way that the blob does
  gk110/ir: fix quadon opcode emission
  gk110/ir: fix ISAD emission with register args
  gk110: add in forgotten code for gk110 isa
  nvc0: don't bother trying to set up compute for gk110+
  gk110/ir: fix interp mode emission
  gk110/ir: fix slct emission

Jerome Glisse (1):
  glx: load dri driver with RTLD_LOCAL so dlclose never fails to unload

José Fonseca (2):
  mesa/main: Make get_hash.c values constant.
  mesa: Make glGetIntegerv(GL_*_ARRAY_SIZE) return GL_BGRA.

Kenneth Graunke (4):
  i965: Fix repeated usage of rectangle texture coordinate scaling.
  i965: Fix copy and pasted values in Broadwell code.
  i965: Pass brw to translate_wrap_mode().
  i965: Support GL_CLAMP natively on Broadwell.

Lubomir Rintel (1):
  i915: add a missing NULL pointer check

Maarten Lankhorst (2):
  hopefully fix a ftbfs on hurd by removing a space from DRI_DRIVERS.
  release to experimental

Marek Olšák (3):
  Revert glx: load dri driver with RTLD_LOCAL so dlclose never fails to 
unload
  r600g,radeonsi: disable fast clear if render condition is on
  r600g,radeonsi: don't use hardware MSAA resolve if dst is fast-cleared

Matt Turner (6):
  Revert i965/vec4: Change vec4_visitor::emit_lrp to use MAC for gen6
  Revert i965/fs: Change fs_visitor::emit_lrp to use MAC for gen6
  Revert i965/fs: Reduce restrictions on interference in register 
coalescing.
  Revert i965/fs: Give up in interference check if we see a WHILE.
  Revert i965/fs: Simplify interference scan in register coalescing.
  Revert i965: Don't make instructions with a null dest a barrier to 
scheduling.

Pavel Popov (1):
  i965: Fix Line Stipple enable bit in 3DSTATE_SF for Haswell.

Rob Clark (1):
  configure: fix build error with XA

Roland Scheidegger (1):
  llvmpipe: fix crash when not all attachments are populated in a fb

Sinclair Yeh (1):
  egl: Check for NULL native_window in eglCreateWindowSurface

Tobias Klausmann (1):
  nv50/ir: clear subop when folding constant expressions

Topi Pohjolainen (3):
  meta/blit: Add stencil texturing mode save and restore
  i965/meta: Store stencil texturing mode
  meta/blit: Use gl_FragColor also in the msaa blit shader

---
 VERSION |  
  2 
 configure.ac|  
  1 
 debian/changelog|  
 13 +
 debian/patches/01_glapi

mesa: Changes to 'debian-experimental'

2014-06-16 Thread Maarten Lankhorst

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

New commits:
commit f13b402c747b399df64ca61702db6e34eb1f31b6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jun 16 15:42:54 2014 +0200

release to experimental

diff --git a/debian/changelog b/debian/changelog
index 1f2e96e..74b5bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
-mesa (10.2.1-1) UNRELEASED; urgency=medium
+mesa (10.2.1-1) experimental; urgency=medium
 
+  [ Andreas Boll ]
   * New upstream release.
 - 01_glapi-Duplicate-GLES1-prototypes-in-glapi_dispatch.c.diff
   dropped, upstream
   * Add 01_targets-xa-limit-the-amount-of-exported-symbols.diff, fixes
 FTBFS with gcc-4.9.
+  [ Maarten Lankhorst ]
+  * Attempt to fix a FTBFS on hurd.
 
- -- Andreas Boll andreas.boll@gmail.com  Fri, 13 Jun 2014 17:39:17 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 16 Jun 2014 
15:41:59 +0200
 
 mesa (10.2.0~rc4-2) experimental; urgency=medium
 

commit 575287933f97b078b7800e54495b58e9722699d5
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Jun 16 15:38:38 2014 +0200

hopefully fix a ftbfs on hurd by removing a space from DRI_DRIVERS.

diff --git a/debian/rules b/debian/rules
index 4c18419..c1d6cbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ confflags_DRI3 = --disable-dri3
 # hurd doesn't do direct rendering
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
confflags_DIRECT_RENDERING = --disable-driglx-direct
-   DRI_DRIVERS += swrast
+   DRI_DRIVERS = swrast
 else
   ifeq ($(DEB_HOST_ARCH_OS), linux)
confflags_DRI3 = --enable-dri3


-- 
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/e1wwxjb-00050v...@moszumanska.debian.org

libdrm: Changes to 'ubuntu-precise'

2014-06-04 Thread Maarten Lankhorst

, DRM_IOCTL_GEM_FLINK, req);
-   if (ret)
+   if (ret) {
+   *name = 0;
return ret;
-   nvbo-name = req.name;
+   }
+   nvbo-name = *name = req.name;
}
-   *name = nvbo-name;
return 0;
 }
 
@@ -466,19 +531,18 @@ nouveau_bo_prime_handle_ref(struct nouveau_device *dev, 
int prime_fd,
int ret;
unsigned int handle;
 
-   ret = drmPrimeFDToHandle(dev-fd, prime_fd, handle);
-   if (ret) {
-   nouveau_bo_ref(NULL, bo);
-   return ret;
-   }
+   nouveau_bo_ref(NULL, bo);
 
-   ret = nouveau_bo_wrap(dev, handle, bo);
-   if (ret) {
-   nouveau_bo_ref(NULL, bo);
-   return ret;
+   pthread_mutex_lock(nvdev-lock);
+   ret = drmPrimeFDToHandle(dev-fd, prime_fd, handle);
+   if (ret == 0) {
+   ret = nouveau_bo_wrap_locked(dev, handle, bo);
+   if (!bo-name)
+   // XXX: Force locked DRM_IOCTL_GEM_CLOSE to rule out 
race conditions
+   bo-name = ~0;
}
-
-   return 0;
+   pthread_mutex_unlock(nvdev-lock);
+   return ret;
 }
 
 int
@@ -490,6 +554,8 @@ nouveau_bo_set_prime(struct nouveau_bo *bo, int *prime_fd)
ret = drmPrimeHandleToFD(bo-device-fd, nvbo-base.handle, 
DRM_CLOEXEC, prime_fd);
if (ret)
return ret;
+   if (!nvbo-name)
+   nvbo-name = ~0;
return 0;
 }
 
diff --git a/nouveau/private.h b/nouveau/private.h
index 60714b8..4f337ad 100644
--- a/nouveau/private.h
+++ b/nouveau/private.h
@@ -3,6 +3,7 @@
 
 #include xf86drm.h
 #include xf86atomic.h
+#include pthread.h
 #include nouveau_drm.h
 
 #include nouveau.h
@@ -94,7 +95,7 @@ nouveau_bo(struct nouveau_bo *bo)
 struct nouveau_device_priv {
struct nouveau_device base;
int close;
-   atomic_t lock;
+   pthread_mutex_t lock;
struct nouveau_list bo_list;
uint32_t *client;
int nr_client;

commit 928d846a2dacc41d8aaf4a2c54f82b5df8e48fb7
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jan 24 13:42:11 2014 +0100

release to unstable

diff --git a/debian/changelog b/debian/changelog
index f1b5fa8..952fe3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.52-1) UNRELEASED; urgency=medium
+libdrm (2.4.52-1) unstable; urgency=medium
 
   [ Julien Cristau ]
   * Remove Cyril Brulebois from Uploaders.
@@ -6,7 +6,7 @@ libdrm (2.4.52-1) UNRELEASED; urgency=medium
   [ Maarten Lankhorst ]
   * New upstream release.
 
- -- Julien Cristau jcris...@debian.org  Mon, 20 Jan 2014 13:51:56 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Fri, 24 Jan 2014 
13:41:57 +0100
 
 libdrm (2.4.51-1) unstable; urgency=medium
 

commit c963bfdc76ce02aa20210b3314422b101bb12239
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Jan 24 13:40:35 2014 +0100

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 6b22b7f..f1b5fa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-libdrm (2.4.51-2) UNRELEASED; urgency=medium
+libdrm (2.4.52-1) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Remove Cyril Brulebois from Uploaders.
 
+  [ Maarten Lankhorst ]
+  * New upstream release.
+
  -- Julien Cristau jcris...@debian.org  Mon, 20 Jan 2014 13:51:56 +0100
 
 libdrm (2.4.51-1) unstable; urgency=medium

commit 46d451c9a9514df9de01df647a3f397c5b5d7d1a
Author: Kenneth Graunke kenn...@whitecape.org
Date:   Mon Jan 13 15:47:15 2014 -0800

Bump the version to 2.4.52

Signed-off-by: Kenneth Graunke kenn...@whitecape.org

diff --git a/configure.ac b/configure.ac
index d0d051a..969fb83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([libdrm],
-[2.4.51],
+[2.4.52],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
 [libdrm])
 

commit edf17dbdaa525fe3a9abbbfafa768c556cfd7af2
Author: Kenneth Graunke kenn...@whitecape.org
Date:   Mon Jan 13 14:14:36 2014 -0800

intel: Create a new drm_intel_bo offset64 field.

The existing 'offset' field is unfortunately typed as 'unsigned long',
which is unfortunately only 4 bytes with a 32-bit userspace.

Traditionally, the hardware has only supported 32-bit virtual addresses,
so even though the kernel uses a __u64, the value would always fit.

However, Broadwell supports 48-bit addressing.  So with a 64-bit kernel,
the card virtual address may be too large to fit in the 'offset' field.

Ideally, we would change the type of 'offset' to be a uint64_t---but
this would break the libdrm ABI.  Instead, we create a new 'offset64'
field to hold the full 64-bit value from the kernel, and store the
32-bit truncation in the existing 'offset' field, for compatibility.

Signed-off-by: Kenneth Graunke kenn

libdrm: Changes to 'ubuntu-precise'

2014-06-04 Thread Maarten Lankhorst

Rebased ref, commits from common ancestor:
commit 1f916a3fe5709f32ed194ee2f54e6825a381e044
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jun 4 12:26:10 2014 +0200

add changelog entry

diff --git a/debian/changelog b/debian/changelog
index fa5cd41..bdee38b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.52-1~precise1) precise-proposed; urgency=low
+
+  * Copy package back to precise, and build libdrm-nouveau1a again. (LP: 
#1318616)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 18 Feb 2014 
17:08:01 +0100
+
 libdrm (2.4.52-1) unstable; urgency=medium
 
   [ Julien Cristau ]


-- 
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/e1ws8oq-00068n...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

2014-05-20 Thread Maarten Lankhorst

 debian/changelog  |9 +++
 debian/patches/mi-dont-process-disabled.patch |   62 
 debian/patches/series |2 
 debian/patches/xi-dont-copy-too-much.patch|   67 ++
 4 files changed, 140 insertions(+)

New commits:
commit a1b1ff9a27765697bc001a42f47dcef11f5e58da
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue May 20 11:32:49 2014 +0200

release to u

diff --git a/debian/changelog b/debian/changelog
index 4ea0d8c..126f08d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.15.1-0ubuntu5) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-0ubuntu5) utopic; urgency=low
 
   * Add upstream patch to fix some valgrind issues.
 - xi-dont-copy-too-much.patch
   * Fix crash related to suspend/shutdown. (LP: #1208473)
 - mi-dont-process-disabled.patch
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 20 May 2014 
10:49:07 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 20 May 2014 
11:32:41 +0200
 
 xorg-server (2:1.15.1-0ubuntu4) utopic; urgency=low
 

commit 2f75edaca4e4f532abf7882d34b8dbbee22eeb71
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue May 20 11:30:52 2014 +0200

Add upstream patches to fix some valgrind issues, and fix crash related to 
suspend/shutdown.

xi-dont-copy-too-much.patch
mi-dont-process-disabled.patch

diff --git a/debian/changelog b/debian/changelog
index 06eb8a8..4ea0d8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.15.1-0ubuntu5) UNRELEASED; urgency=low
+
+  * Add upstream patch to fix some valgrind issues.
+- xi-dont-copy-too-much.patch
+  * Fix crash related to suspend/shutdown. (LP: #1208473)
+- mi-dont-process-disabled.patch
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 20 May 2014 
10:49:07 +0200
+
 xorg-server (2:1.15.1-0ubuntu4) utopic; urgency=low
 
   * Resize touch event history if the array is filled up.
diff --git a/debian/patches/mi-dont-process-disabled.patch 
b/debian/patches/mi-dont-process-disabled.patch
new file mode 100644
index 000..81691ee
--- /dev/null
+++ b/debian/patches/mi-dont-process-disabled.patch
@@ -0,0 +1,62 @@
+Date: Tue, 20 May 2014 14:32:59 +1000
+From: Peter Hutterer peter.hutte...@who-t.net
+Subject: [PATCH] mi: don't process events from disabled devices (#77884)
+
+Once a device is disabled, it doesn't have a sprite pointer anymore. If an
+event is still in the queue and processed after DisableDevice finished, a
+dereference causes a crash. Example backtrace (crash forced by injecting an
+event at the right time):
+
+(EE) 0: /opt/xorg/bin/Xorg (OsSigHandler+0x3c) [0x48d334]
+(EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x37fcc0f74f]
+(EE) 2: /opt/xorg/bin/Xorg (mieqMoveToNewScreen+0x38) [0x609240]
+(EE) 3: /opt/xorg/bin/Xorg (mieqProcessDeviceEvent+0xd4) [0x609389]
+(EE) 4: /opt/xorg/bin/Xorg (mieqProcessInputEvents+0x206) [0x609720]
+(EE) 5: /opt/xorg/bin/Xorg (ProcessInputEvents+0xd) [0x4aeb58]
+(EE) 6: /opt/xorg/bin/Xorg (xf86VTSwitch+0x1a6) [0x4af457]
+(EE) 7: /opt/xorg/bin/Xorg (xf86Wakeup+0x2bf) [0x4af0a7]
+(EE) 8: /opt/xorg/bin/Xorg (WakeupHandler+0x83) [0x4445cb]
+(EE) 9: /opt/xorg/bin/Xorg (WaitForSomething+0x3fe) [0x491bf6]
+(EE) 10: /opt/xorg/bin/Xorg (Dispatch+0x97) [0x435748]
+(EE) 11: /opt/xorg/bin/Xorg (dix_main+0x61d) [0x4438a9]
+(EE) 12: /opt/xorg/bin/Xorg (main+0x28) [0x49ba28]
+(EE) 13: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x37fc821d65]
+(EE) 14: /opt/xorg/bin/Xorg (_start+0x29) [0x425e69]
+(EE) 15: ? (?+0x29) [0x29]
+
+xf86VTSwitch() calls ProcessInputEvents() before disabling a device, and
+DisableDevice() calls mieqProcessInputEvents() again when flushing touches and
+button events. Between that and disabling the device (which causes new events
+to be refused) there is a window where events may be triggered and enqueued.
+On the next call to PIE that event is processed on a now defunct device,
+causing the crash.
+
+The simplest fix to this is to discard events from disabled devices. We flush
+the queue often enough before disabling that when we get here, we really don't
+care about the events from this device.
+
+X.Org Bug 77884 http://bugs.freedesktop.org/show_bug.cgi?id=77884
+---
+Modified by Maarten Lankhorst to pass tests.
+
+ mi/mieq.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mi/mieq.c b/mi/mieq.c
+index 4c07480..188a0b0 100644
+--- a/mi/mieq.c
 b/mi/mieq.c
+@@ -515,6 +515,10 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent 
*event, ScreenPtr screen)
+ 
+ verify_internal_event(event);
+ 
++/* refuse events from disabled devices */
++if (dev  !dev-enabled)
++return 0;
++
+ /* Custom event handler */
+ handler = miEventQueue.handlers[event-any.type];
+ 
+-- 
+1.9.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 93c7b5a..8266f07 100644

mesa: Changes to 'upstream-experimental'

2014-05-20 Thread Maarten Lankhorst

 VERSION   |2 
 bin/.cherry-ignore|3 
 configure.ac  |   28 
 docs/relnotes/10.2.html   |   19 
 src/egl/wayland/wayland-drm/wayland-drm.xml   |   35 
 src/gallium/auxiliary/draw/draw_context.c |2 
 src/gallium/auxiliary/draw/draw_gs.c  |   10 
 src/gallium/auxiliary/draw/draw_private.h |4 
 src/gallium/auxiliary/draw/draw_vs.c  |4 
 src/gallium/auxiliary/draw/draw_vs_exec.c |4 
 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |3 
 src/gallium/drivers/nouveau/nv50/nv50_context.h   |   10 
 src/gallium/drivers/nouveau/nv50/nv50_query.c |6 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|2 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c   |   21 
 src/gallium/drivers/nouveau/nv50/nv50_tex.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_query.c |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |   11 
 src/gallium/drivers/r600/r600_pipe.h  |9 
 src/gallium/drivers/radeon/r600_pipe_common.h |9 
 src/gallium/drivers/radeonsi/si_descriptors.c |4 
 src/gallium/drivers/radeonsi/si_pipe.c|4 
 src/gallium/drivers/radeonsi/si_pipe.h|4 
 src/gallium/drivers/radeonsi/si_state.c   |   17 
 src/gallium/include/pipe/p_state.h|3 
 src/gallium/state_trackers/clover/core/device.cpp |5 
 src/gallium/state_trackers/xa/xa_context.c|2 
 src/glsl/builtin_functions.cpp|8 
 src/glsl/glsl_parser.yy   |   11 
 src/glsl/link_varyings.cpp|8 
 src/glsl/tests/varyings_test.cpp  |   11 
 src/glx/tests/query_renderer_implementation_unittest.cpp  |6 
 src/mesa/drivers/common/meta.c|  293 +++--
 src/mesa/drivers/common/meta.h|   38 
 src/mesa/drivers/common/meta_blit.c   |  179 +--
 src/mesa/drivers/common/meta_generate_mipmap.c|2 
 src/mesa/drivers/dri/i965/Makefile.sources|2 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp  |  124 --
 src/mesa/drivers/dri/i965/brw_context.h   |   14 
 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c |  524 ++
 src/mesa/drivers/dri/i965/brw_meta_updownsample.c |   35 
 src/mesa/drivers/dri/i965/brw_meta_util.c |  160 +++
 src/mesa/drivers/dri/i965/brw_meta_util.h |   46 
 src/mesa/drivers/dri/i965/brw_state.h |6 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   24 
 src/mesa/drivers/dri/i965/gen7_misc_state.c   |   15 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |   17 
 src/mesa/drivers/dri/i965/gen8_depth_state.c  |   17 
 src/mesa/drivers/dri/i965/gen8_generator.cpp  |   14 
 src/mesa/drivers/dri/i965/gen8_surface_state.c|   87 +
 src/mesa/drivers/dri/i965/intel_buffers.c |2 
 src/mesa/drivers/dri/i965/intel_extensions.c  |5 
 src/mesa/drivers/dri/i965/intel_fbo.c |9 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |9 
 src/mesa/drivers/dri/i965/intel_tex_image.c   |1 
 src/mesa/main/context.c   |4 
 src/mesa/main/fbobject.c  |2 
 src/mesa/state_tracker/st_cb_blit.c   |1 
 src/mesa/state_tracker/st_cb_readpixels.c |1 
 src/mesa/state_tracker/st_cb_texture.c|2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|   11 
 65 files changed, 1430 insertions(+), 498 deletions(-)

New commits:
commit d0aa3947411fa48cf03de2ded53d8538998df653
Author: Ian Romanick ian.d.roman...@intel.com
Date:   Fri May 16 23:48:44 2014 -0700

Bump version to 10.2-rc3

Signed-off-by: Ian Romanick ian.d.roman...@intel.com

diff --git a/VERSION b/VERSION
index 827ea06..24ee34e 100644

mesa: Changes to 'debian-experimental'

2014-05-20 Thread Maarten Lankhorst

 VERSION   |2 
 bin/.cherry-ignore|3 
 configure.ac  |   28 
 debian/changelog  |5 
 docs/relnotes/10.2.html   |   19 
 src/egl/wayland/wayland-drm/wayland-drm.xml   |   35 
 src/gallium/auxiliary/draw/draw_context.c |2 
 src/gallium/auxiliary/draw/draw_gs.c  |   10 
 src/gallium/auxiliary/draw/draw_private.h |4 
 src/gallium/auxiliary/draw/draw_vs.c  |4 
 src/gallium/auxiliary/draw/draw_vs_exec.c |4 
 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp|3 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp |4 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp  |3 
 src/gallium/drivers/nouveau/nv50/nv50_context.h   |   10 
 src/gallium/drivers/nouveau/nv50/nv50_query.c |6 
 src/gallium/drivers/nouveau/nv50/nv50_screen.c|2 
 src/gallium/drivers/nouveau/nv50/nv50_surface.c   |   21 
 src/gallium/drivers/nouveau/nv50/nv50_tex.c   |2 
 src/gallium/drivers/nouveau/nvc0/nvc0_query.c |5 
 src/gallium/drivers/nouveau/nvc0/nvc0_screen.c|2 
 src/gallium/drivers/nouveau/nvc0/nvc0_surface.c   |   11 
 src/gallium/drivers/r600/r600_pipe.h  |9 
 src/gallium/drivers/radeon/r600_pipe_common.h |9 
 src/gallium/drivers/radeonsi/si_descriptors.c |4 
 src/gallium/drivers/radeonsi/si_pipe.c|4 
 src/gallium/drivers/radeonsi/si_pipe.h|4 
 src/gallium/drivers/radeonsi/si_state.c   |   17 
 src/gallium/include/pipe/p_state.h|3 
 src/gallium/state_trackers/clover/core/device.cpp |5 
 src/gallium/state_trackers/xa/xa_context.c|2 
 src/glsl/builtin_functions.cpp|8 
 src/glsl/glsl_parser.yy   |   11 
 src/glsl/link_varyings.cpp|8 
 src/glsl/tests/varyings_test.cpp  |   11 
 src/glx/tests/query_renderer_implementation_unittest.cpp  |6 
 src/mesa/drivers/common/meta.c|  293 +++--
 src/mesa/drivers/common/meta.h|   38 
 src/mesa/drivers/common/meta_blit.c   |  179 +--
 src/mesa/drivers/common/meta_generate_mipmap.c|2 
 src/mesa/drivers/dri/i965/Makefile.sources|2 
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp  |  124 --
 src/mesa/drivers/dri/i965/brw_context.h   |   14 
 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c |  524 ++
 src/mesa/drivers/dri/i965/brw_meta_updownsample.c |   35 
 src/mesa/drivers/dri/i965/brw_meta_util.c |  160 +++
 src/mesa/drivers/dri/i965/brw_meta_util.h |   46 
 src/mesa/drivers/dri/i965/brw_state.h |6 
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  |   24 
 src/mesa/drivers/dri/i965/gen7_misc_state.c   |   15 
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |   17 
 src/mesa/drivers/dri/i965/gen8_depth_state.c  |   17 
 src/mesa/drivers/dri/i965/gen8_generator.cpp  |   14 
 src/mesa/drivers/dri/i965/gen8_surface_state.c|   87 +
 src/mesa/drivers/dri/i965/intel_buffers.c |2 
 src/mesa/drivers/dri/i965/intel_extensions.c  |5 
 src/mesa/drivers/dri/i965/intel_fbo.c |9 
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |9 
 src/mesa/drivers/dri/i965/intel_tex_image.c   |1 
 src/mesa/main/context.c   |4 
 src/mesa/main/fbobject.c  |2 
 src/mesa/state_tracker/st_cb_blit.c   |1 
 src/mesa/state_tracker/st_cb_readpixels.c |1 
 src/mesa/state_tracker/st_cb_texture.c|2 
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp|   11 
 66 files changed, 1434 insertions(+), 499 deletions(-)

New commits:
commit d980884d00a9bdf576f431a0c560a52a60efb3a6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue May 20 15:35:34 2014 +0200

bump changelog

diff --git a/debian/changelog b/debian/changelog

mesa: Changes to 'ubuntu-trusty'

New branch 'ubuntu-trusty' available with the following commits:
commit c44e428145a9e54dec158b4664d2db831136ccb1
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon May 12 11:51:32 2014 +0200

release to utopic


-- 
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/e1wjncl-00064g...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

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

New commits:
commit b0419bae653a4751fe0acddf91d72598fa30e54c
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon May 12 11:51:32 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index e45f05d..28c427b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,13 @@
-mesa (10.1.3-0ubuntu1) UNRELEASED; urgency=low
+mesa (10.1.3-0ubuntu1) utopic; urgency=medium
 
   [ Maarten Lankhorst ]
-  * Merge from released debian-unstable.
+  * Merge from unreleased debian-unstable.
 
   [ Timo Aaltonen ]
   * fix-gpu-hangs-on-bdw.diff: Upstream commit to fix various GPU hangs
-on Broadwell.
+on Broadwell. (LP: #1318589)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 08 May 2014 
12:32:52 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 12 May 2014 
09:51:08 +
 
 mesa (10.1.3-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/e1wjnjp-0002fy...@moszumanska.debian.org

mesa: Changes to 'ubuntu-trusty'

Rebased ref, commits from common ancestor:
commit b3a246106cea0c24845faaf062842781ddb12c3a
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon May 12 12:33:54 2014 +0200

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 28c427b..db1efb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.3-0ubuntu0.1) trusty; urgency=medium
+
+  * Copy package back to trusty.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 12 May 2014 
12:11:50 +0200
+
 mesa (10.1.3-0ubuntu1) utopic; urgency=medium
 
   [ Maarten Lankhorst ]

commit b0419bae653a4751fe0acddf91d72598fa30e54c
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon May 12 11:51:32 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index e45f05d..28c427b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,13 @@
-mesa (10.1.3-0ubuntu1) UNRELEASED; urgency=low
+mesa (10.1.3-0ubuntu1) utopic; urgency=medium
 
   [ Maarten Lankhorst ]
-  * Merge from released debian-unstable.
+  * Merge from unreleased debian-unstable.
 
   [ Timo Aaltonen ]
   * fix-gpu-hangs-on-bdw.diff: Upstream commit to fix various GPU hangs
-on Broadwell.
+on Broadwell. (LP: #1318589)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 08 May 2014 
12:32:52 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 12 May 2014 
09:51:08 +
 
 mesa (10.1.3-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/e1wjnjn-0002xr...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

 debian/changelog  |7 +++
 debian/patches/series |1 +
 debian/patches/xi2-resize-touch.patch |   34 ++
 3 files changed, 42 insertions(+)

New commits:
commit 2e84778c7527f10ed10392053cdee9886d193573
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed May 7 14:00:39 2014 +0200

Resize touch event history if the array is filled up.

xi2-resize-touch.patch

diff --git a/debian/changelog b/debian/changelog
index 508e9bd..06eb8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.15.1-0ubuntu4) utopic; urgency=low
+
+  * Resize touch event history if the array is filled up.
+- xi2-resize-touch.patch
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 07 May 2014 
13:52:59 +0200
+
 xorg-server (2:1.15.1-0ubuntu3) utopic; urgency=medium
 
   * Revive the old drm_device_keep_trying.patch.
diff --git a/debian/patches/series b/debian/patches/series
index 0351dc2..93c7b5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,3 +52,4 @@ pixman-validate.patch
 fix-ftbfs-ppc64el.patch
 xmir.patch
 drm_device_keep_trying.patch
+xi2-resize-touch.patch
diff --git a/debian/patches/xi2-resize-touch.patch 
b/debian/patches/xi2-resize-touch.patch
new file mode 100644
index 000..021dd59
--- /dev/null
+++ b/debian/patches/xi2-resize-touch.patch
@@ -0,0 +1,34 @@
+diff --git a/dix/touch.c b/dix/touch.c
+index a7ea213..1478e38 100644
+--- a/dix/touch.c
 b/dix/touch.c
+@@ -460,12 +460,26 @@ TouchEventHistoryPush(TouchPointInfoPtr ti, const 
DeviceEvent *ev)
+ if (ev-flags  (TOUCH_CLIENT_ID | TOUCH_REPLAYING))
+ return;
+ 
++if (ti-history_elements == ti-history_size - 1) {
++DeviceEvent *hist = NULL;
++size_t sz = ti-history_size * 2;
++
++if (sz  1) {
++hist = realloc(ti-history, sz * sizeof(*hist));
++
++if (hist) {
++ti-history = hist;
++ti-history_size = sz;
++memset(hist[sz/2], 0, sizeof(*hist)*sz/2);
++}
++}
++}
++
+ ti-history[ti-history_elements++] = *ev;
+-/* FIXME: proper overflow fixes */
+ if (ti-history_elements  ti-history_size - 1) {
+ ti-history_elements = ti-history_size - 1;
+-DebugF(source device %d: history size %d overflowing for touch %u\n,
+-   ti-sourceid, ti-history_size, ti-client_id);
++ErrorF(source device %d: history size %d overflowing for touch %u\n,
++  ti-sourceid, ti-history_size, ti-client_id);
+ }
+ }
+ 


-- 
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/e1wjrhz-00040s...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

2014-05-08 Thread Maarten Lankhorst

   |   10 
 src/mesa/swrast_setup/ss_context.c|3 
 src/mesa/vbo/vbo_attrib_tmp.h |   45 -
 142 files changed, 2619 insertions(+), 867 deletions(-)

New commits:
commit 12e2822c7e504280988ac3cdc9e3386d4d810e04
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu May 8 12:33:09 2014 +0200

Merge from released debian-unstable.

diff --git a/debian/changelog b/debian/changelog
index baa2f65..20f70f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.2-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from released debian-unstable.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 08 May 2014 
12:32:52 +0200
+
 mesa (10.1.2-1) unstable; urgency=medium
 
   [ Andreas Boll ]

commit 08e28fd2aeb71c665d27fe7b74cabfb19ac2559f
Author: Julien Cristau jcris...@debian.org
Date:   Tue May 6 09:31:28 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 1f5ee66..362977c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-mesa (10.1.2-1) UNRELEASED; urgency=medium
+mesa (10.1.2-1) unstable; urgency=medium
 
-  * New upstream release. (Closes: #746557)
+  [ Andreas Boll ]
+  * New upstream release.
++ i965: Don't enable reset notification support on Gen4-5 (Closes: #746557)
 
- -- Andreas Boll andreas.boll@gmail.com  Mon, 05 May 2014 23:07:27 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 06 May 2014 09:31:26 +0200
 
 mesa (10.1.1-1) unstable; urgency=low
 

commit 0470d1fbbe3036a42ad2346d1145c28ce410fa6f
Author: Andreas Boll andreas.boll@gmail.com
Date:   Mon May 5 23:10:18 2014 +0200

New upstream version.

Closes: #746557

diff --git a/debian/changelog b/debian/changelog
index a22cb9e..1f5ee66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release. (Closes: #746557)
+
+ -- Andreas Boll andreas.boll@gmail.com  Mon, 05 May 2014 23:07:27 +0200
+
 mesa (10.1.1-1) unstable; urgency=low
 
   [ Andreas Boll ]

commit bde31357170e5cbf70795434e9725bb442f31137
Author: Carl Worth cwo...@cworth.org
Date:   Mon May 5 10:53:53 2014 -0700

docs: Add notes for the 10.1.2 release.

diff --git a/docs/relnotes/10.1.2.html b/docs/relnotes/10.1.2.html
new file mode 100644
index 000..035d9e6
--- /dev/null
+++ b/docs/relnotes/10.1.2.html
@@ -0,0 +1,176 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html lang=en
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleMesa Release Notes/title
+  link rel=stylesheet type=text/css href=../mesa.css
+/head
+body
+
+div class=header
+  h1The Mesa 3D Graphics Library/h1
+/div
+
+iframe src=../contents.html/iframe
+div class=content
+
+h1Mesa 10.1.2 Release Notes / (May 5, 2014)/h1
+
+p
+Mesa 10.1.2 is a bug fix release which fixes bugs found since the 10.1.1 
release.
+/p
+p
+Mesa 10.1.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 strongonly/strong available if requested at context creation
+because compatibility contexts are not supported.
+/p
+
+
+h2MD5 checksums/h2
+pre
+/pre
+
+
+h2New features/h2
+pNone/p
+
+h2Bug fixes/h2
+
+pThis list is likely incomplete./p
+
+ul
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=27499;Bug 27499/a 
- [855GM i915] GL_LINE_STIPPLE displays incorrect colors/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=75723;Bug 75723/a 
- (regression since Linux 3.14?) brw_get_graphics_reset_status: Assertion 
`brw-gt;hw_ctx != ((void *)0)' failed/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=76894;Bug 76894/a 
- Piglit/spec/EXT_framebuffer_object/fbo-bind-renderbuffer failed/li
+
+lia href=https://bugs.freedesktop.org/show_bug.cgi?id=77702;Bug 77702/a 
- [i965 Bisected]Piglit spec/NV_conditional_render_blitframebuffer fails/li
+
+/ul
+
+h2Changes/h2
+
+pAnder Conselvan de Oliveira (2):/p
+ul
+  ligbm/dri: Fix out-of-memory error path in dri_device_create()/li
+  liegl: Protect use of gbm_dri with ifdef HAVE_DRM_PLATFORM/li
+/ul
+
+pAnuj Phogat (27):/p
+ul
+  limesa: Fix glGetVertexAttribi(GL_VERTEX_ATTRIB_ARRAY_SIZE)/li
+  liswrast: Add glBlitFramebuffer to commands affected by conditional 
rendering/li
+  limesa: Fix error condition for multisample proxy texture targets/li
+  lii965: Put an assertion to check valid varying_to_slot[varying]/li
+  lii965: Fix component mask and varying_to_slot mapping for gl_Layer/li
+  lii965: Fix component mask and varying_to_slot mapping for 
gl_ViewportIndex/li
+  limesa: Add helper function _mesa_is_format_integer()/li
+  limesa: Add error condition for integer formats

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

2014-04-30 Thread Maarten Lankhorst

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

New commits:
commit 02ebe5ec2de196ecb06e750b3b93447d7764d1f9
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Apr 30 14:47:18 2014 +0200

release to t

diff --git a/debian/changelog b/debian/changelog
index e0cc5a6..75ab4b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:7.3.0-1ubuntu4) utopic; urgency=low
+xserver-xorg-video-ati (1:7.3.0-1ubuntu3.1) trusty-proposed; urgency=medium
 
   * Add upstream patches to fix hybrid mode with prime. (LP: #1301839)
 - fix-key-initialized-crash.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/e1wftvs-0006xv...@moszumanska.debian.org

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

2014-04-30 Thread Maarten 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/e1wftus-00064k...@moszumanska.debian.org

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

2014-04-29 Thread Maarten Lankhorst

 debian/changelog   |8 
 debian/patches/fix-0-crtc-crash.patch  |   50 +
 debian/patches/fix-key-initialized-crash.patch |   30 +++
 debian/patches/series  |2 +
 debian/patches/xmir.patch  |   50 -
 5 files changed, 115 insertions(+), 25 deletions(-)

New commits:
commit 7b53338076504ead162ca1908407d08a2a83a986
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Apr 29 14:27:05 2014 +0200

Add upstream patches to fix hybrid mode with prime.

fix-key-initialized-crash.patch
fix-0-crtc-crash.patch
refresh mir patch

diff --git a/debian/changelog b/debian/changelog
index 90a8262..5be31cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ati (1:7.3.0-1ubuntu4) UNRELEASED; urgency=low
+
+  * Add upstream patches to fix hybrid mode with prime.
+- fix-key-initialized-crash.patch
+- fix-0-crtc-crash.patch
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 29 Apr 2014 
14:26:00 +0200
+
 xserver-xorg-video-ati (1:7.3.0-1ubuntu3) trusty; urgency=low
 
   * Fix crash with Xorg -configure. (LP: #1278046)
diff --git a/debian/patches/fix-0-crtc-crash.patch 
b/debian/patches/fix-0-crtc-crash.patch
new file mode 100644
index 000..c071098
--- /dev/null
+++ b/debian/patches/fix-0-crtc-crash.patch
@@ -0,0 +1,50 @@
+commit cadb6b493942a84bfeb298751dce0dee39257a06
+Author: Alex Deucher alexander.deuc...@amd.com
+Date:   Fri Feb 21 08:33:21 2014 -0500
+
+radeon: don't install colormap handling if there are no crtcs
+
+Fixes a crash on cards with 0 crtcs.
+
+Discussion:
+http://lists.freedesktop.org/archives/dri-devel/2014-February/054186.html
+
+Signed-off-by: Alex Deucher alexander.deuc...@amd.com
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 76b79d8..641e231 100644
+--- a/src/drmmode_display.c
 b/src/drmmode_display.c
+@@ -1939,19 +1939,23 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, 
int numColors,
+ 
+ Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
+ {
++xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
++
+ xf86DrvMsgVerb(pScrn-scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
+   Initializing kms color map\n);
+-if (!miCreateDefColormap(pScreen))
+-return FALSE;
+-/* all radeons support 10 bit CLUTs */
+-if (!xf86HandleColormaps(pScreen, 256, 10,
+- drmmode_load_palette, NULL,
+- CMAP_PALETTED_TRUECOLOR
++if (xf86_config-num_crtc) {
++  if (!miCreateDefColormap(pScreen))
++  return FALSE;
++  /* all radeons support 10 bit CLUTs */
++  if (!xf86HandleColormaps(pScreen, 256, 10,
++   drmmode_load_palette, NULL,
++   CMAP_PALETTED_TRUECOLOR
+ #if 0 /* This option messes up text mode! (e...@suse.de) */
+- | CMAP_LOAD_EVEN_IF_OFFSCREEN
++   | CMAP_LOAD_EVEN_IF_OFFSCREEN
+ #endif
+- | CMAP_RELOAD_ON_MODE_SWITCH))
+- return FALSE;
++   | CMAP_RELOAD_ON_MODE_SWITCH))
++  return FALSE;
++}
+ return TRUE;
+ }
+ 
diff --git a/debian/patches/fix-key-initialized-crash.patch 
b/debian/patches/fix-key-initialized-crash.patch
new file mode 100644
index 000..66c7cf7
--- /dev/null
+++ b/debian/patches/fix-key-initialized-crash.patch
@@ -0,0 +1,30 @@
+commit c84230d686c078aac1dc98d82153f8b02521b2e1
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Fri Apr 25 09:17:51 2014 +0900
+
+dri2: Handle PRIME for source buffer as well in radeon_dri2_copy_region2
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77810
+
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+
+diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
+index d47b035..9a9918b 100644
+--- a/src/radeon_dri2.c
 b/src/radeon_dri2.c
+@@ -409,7 +409,14 @@ radeon_dri2_copy_region2(ScreenPtr pScreen,
+ dst_drawable = dst_private-pixmap-drawable;
+ 
+ if (src_private-attachment == DRI2BufferFrontLeft) {
+-src_drawable = drawable;
++#ifdef USE_DRI2_PRIME
++  if (drawable-pScreen != pScreen) {
++  src_drawable = DRI2UpdatePrime(drawable, src_buffer);
++  if (!src_drawable)
++  return;
++  } else
++#endif
++  src_drawable = drawable;
+ }
+ if (dst_private-attachment == DRI2BufferFrontLeft) {
+ #ifdef USE_DRI2_PRIME
diff --git a/debian/patches/series b/debian/patches/series
index 198acb0..bcf3168 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
+fix-key-initialized-crash.patch
+fix-0-crtc-crash.patch
 fix-xorg-configure.patch
 xmir.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch

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

2014-04-29 Thread Maarten Lankhorst

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

New commits:
commit 1ae0d603030ef94637627046373d041497f03335
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Apr 29 14:32:46 2014 +0200

release to u

diff --git a/debian/changelog b/debian/changelog
index 5be31cf..e0cc5a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xserver-xorg-video-ati (1:7.3.0-1ubuntu4) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.3.0-1ubuntu4) utopic; urgency=low
 
-  * Add upstream patches to fix hybrid mode with prime.
+  * Add upstream patches to fix hybrid mode with prime. (LP: #1301839)
 - fix-key-initialized-crash.patch
 - fix-0-crtc-crash.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/e1wf7dp-0007ie...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

2014-04-28 Thread Maarten Lankhorst

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

New commits:
commit 441e968bd3f9f6f1375333df91cc781c62e3246d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Apr 28 10:08:37 2014 +0200

release to utopic

diff --git a/debian/changelog b/debian/changelog
index db2ff1d..508e9bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.15.1-0ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-0ubuntu3) utopic; urgency=medium
 
   * Revive the old drm_device_keep_trying.patch.
 - Removing the call to get_drm_info fixes switching to guest sessions.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 23 Apr 2014 
11:24:30 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 28 Apr 2014 
10:06:21 +0200
 
 xorg-server (2:1.15.1-0ubuntu2) 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/e1wegcm-0005on...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

2014-04-23 Thread Maarten Lankhorst

 debian/changelog|7 +
 debian/patches/drm_device_keep_trying.patch |  170 
 debian/patches/series   |1 
 3 files changed, 178 insertions(+)

New commits:
commit e4243b84075f5f4c90b7230fcf90f0ccf207a484
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Apr 23 11:25:36 2014 +0200

Revive the old drm_device_keep_trying.patch.

Removing the call to get_drm_info fixes switching to guest sessions.

diff --git a/debian/changelog b/debian/changelog
index 3638c54..db2ff1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.15.1-0ubuntu3) UNRELEASED; urgency=low
+
+  * Revive the old drm_device_keep_trying.patch.
+- Removing the call to get_drm_info fixes switching to guest sessions.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 23 Apr 2014 
11:24:30 +0200
+
 xorg-server (2:1.15.1-0ubuntu2) trusty; urgency=medium
 
   * Disable support for rotations and transforms
diff --git a/debian/patches/drm_device_keep_trying.patch 
b/debian/patches/drm_device_keep_trying.patch
new file mode 100644
index 000..2359851
--- /dev/null
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -0,0 +1,170 @@
+From fe5802680b5ecf5ecef55b839f2f555882207d41 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington br...@canonical.com
+Date: Wed, 13 Feb 2013 11:39:34 -0800
+Subject: [PATCH] If drm device couldn't be opened, keep trying for a sec.
+
+The kernel returns EACCES or EAGAIN on drm open when the drm device is
+currently unavailable, such as if it is in use by another process
+(e.g. plymouth), or hasn't finished initializing (e.g. on a really fast
+SSD).  Check for errors when trying to open the device, and continue
+retrying for a short period before giving up.
+
+Fixes: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/982889
+
+Signed-off-by: Bryce Harrington br...@canonical.com
+---
+ hw/xfree86/os-support/linux/lnx_platform.c |   29 +---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+--- a/config/udev.c
 b/config/udev.c
+@@ -98,7 +98,7 @@
+ if (strncmp(sysname, card, 4) != 0)
+ return;
+ 
+-LogMessage(X_INFO, config/udev: Adding drm device (%s)\n, path);
++LogMessage(X_INFO, config/udev: Adding drm device (%s) %s %s\n, 
path, sysname, syspath);
+ 
+ config_udev_odev_setup_attribs(path, syspath, NewGPUDeviceRequest);
+ return;
+@@ -430,11 +430,23 @@
+ #ifdef CONFIG_UDEV_KMS
+ 
+ static Bool
++get_pci_busid(const char *in, char *pci_str)
++{
++int ret, domain, bus, dev, func;
++ret = sscanf(in, /%04x:%02x:%02x.%d/drm/card%*d, domain, bus, dev, 
func);
++if (ret != 4)
++return FALSE;
++sprintf(pci_str, pci:%04x:%02x:%02x.%d, domain, bus, dev, func);
++return TRUE;
++}
++
++static Bool
+ config_udev_odev_setup_attribs(const char *path, const char *syspath,
+config_odev_probe_proc_ptr probe_callback)
+ {
+ struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
+ int ret;
++const char *platform;
+ 
+ if (!attribs)
+ return FALSE;
+@@ -447,6 +459,33 @@
+ if (ret == FALSE)
+ goto fail;
+ 
++if (strstr(syspath, /devices/pci)) {
++char pci_str[17];
++const char *end = strstr(syspath, /drm/card);
++if (strstr(syspath, /usb))
++ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, );
++else if (get_pci_busid(end - 13, pci_str))
++ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, 
pci_str);
++} else if ((platform = strstr(syspath, /devices/platform/))) {
++/* OMAP relies on this, modesetting doesn't use it */
++const char *end;
++platform += 18;
++end = strchr(platform, '.');
++if (end) {
++char *busid;
++ret = asprintf(busid, platform:%.*s:%02li,
++   (int)(end - platform), platform, strtol(end + 1, 
NULL, 10));
++if (ret = 0) {
++ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_BUSID, 
busid);
++free(busid);
++}
++else
++ret = TRUE;
++}
++}
++if (ret == FALSE)
++goto fail;
++
+ /* ownership of attribs is passed to probe layer */
+ probe_callback(attribs);
+ return TRUE;
+--- a/hw/xfree86/os-support/linux/lnx_platform.c
 b/hw/xfree86/os-support/linux/lnx_platform.c
+@@ -19,44 +19,6 @@
+ 
+ #include hotplug.h
+ 
+-static Bool
+-get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
+-{
+-drmSetVersion sv;
+-char *buf;
+-int fd;
+-int err = 0;
+-
+-fd = open(path, O_RDWR, O_CLOEXEC);
+-if (fd == -1)
+-return FALSE;
+-
+-sv.drm_di_major = 1;
+-sv.drm_di_minor = 4;
+-sv.drm_dd_major = -1;   /* Don't care

xorg-server: Changes to 'ubuntu'

2014-04-23 Thread Maarten Lankhorst

 debian/patches/drm_device_keep_trying.patch |   26 ++
 1 file changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 9bc8fed00d8ef6861701f16f4b94fb290194b9ca
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Apr 23 16:27:26 2014 +0200

fixup drm_device_keep_trying.patch to prevent a drm node being added twice

diff --git a/debian/patches/drm_device_keep_trying.patch 
b/debian/patches/drm_device_keep_trying.patch
index 2359851..8a8f920 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -1,13 +1,16 @@
-From fe5802680b5ecf5ecef55b839f2f555882207d41 Mon Sep 17 00:00:00 2001
-From: Bryce Harrington br...@canonical.com
-Date: Wed, 13 Feb 2013 11:39:34 -0800
-Subject: [PATCH] If drm device couldn't be opened, keep trying for a sec.
+From: Maarten Lankhorst maarten.lankho...@canonical.com
+Subject: [PATCH] do not use drmGetBusid to grab the pci-id name
 
 The kernel returns EACCES or EAGAIN on drm open when the drm device is
 currently unavailable, such as if it is in use by another process
 (e.g. plymouth), or hasn't finished initializing (e.g. on a really fast
-SSD).  Check for errors when trying to open the device, and continue
-retrying for a short period before giving up.
+SSD). Because the probing is done before a vt switch is completed,
+we have no way to ensure that we can own DRM master. This results
+in failing to boot.
+
+Also attrib-unowned is not initialized, always initialize it to fix
+a valgrind warning, and to prevent adding the same device a second time
+after a vt switch.
 
 Fixes: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/982889
 
@@ -144,7 +147,7 @@ Signed-off-by: Bryce Harrington br...@canonical.com
  ret = xf86platformAddDevice(index);
  if (ret == -1)
  xf86_remove_platform_device(index);
-@@ -145,18 +102,12 @@
+@@ -145,18 +102,10 @@
  
  LogMessage(X_INFO, xfree86: Adding drm device (%s)\n, path);
  
@@ -159,11 +162,10 @@ Signed-off-by: Bryce Harrington br...@canonical.com
 -ret = get_drm_info(attribs, path, -1);
 -if (ret == FALSE)
 -goto out_free;
-+if (!xf86VTOwner())
-+/* if we don't currently own the VT then don't probe the device,
-+   just mark it as unowned for later use */
-+attribs-unowned = TRUE;
- 
+-
++/* if we don't currently own the VT then don't probe the device,
++   just mark it as unowned for later use */
++attribs-unowned = !xf86VTOwner();
 +xf86_add_platform_device(attribs);
  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/e1wcy9k-zz...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

2014-04-22 Thread Maarten Lankhorst

 debian/changelog   |7 
 debian/patches/disable-rotation-transform-gpuscreens.patch |   22 +
 debian/patches/series  |1 
 3 files changed, 30 insertions(+)

New commits:
commit aa3984079f1ca0beba0214b81de796c254a656d9
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Apr 16 15:09:00 2014 +0200

Disable support for rotations and transforms on gpu screens for now. (LP: 
#1308515)

diff --git a/debian/changelog b/debian/changelog
index 2e8d17a..3638c54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.15.1-0ubuntu2) trusty; urgency=medium
+
+  * Disable support for rotations and transforms
+on gpu screens for now. (LP: #1308515)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 16 Apr 2014 
10:14:39 +0200
+
 xorg-server (2:1.15.1-0ubuntu1) trusty; urgency=medium
 
   * Merge from unreleased debian unstable.
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch 
b/debian/patches/disable-rotation-transform-gpuscreens.patch
new file mode 100644
index 000..9da6c65
--- /dev/null
+++ b/debian/patches/disable-rotation-transform-gpuscreens.patch
@@ -0,0 +1,22 @@
+--- 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/debian/patches/series b/debian/patches/series
index 93564e1..8adae10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,6 +46,7 @@ rrcrtc-brackets-are-hard.patch
 config-add-no-removal.patch
 xf86-ignore-conflicting-rr-caps.patch
 fix-detach-gpu.patch
+disable-rotation-transform-gpuscreens.patch
 
 pixman-validate.patch
 fix-ftbfs-ppc64el.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/e1wccf5-00044d...@moszumanska.debian.org

xorg-server: Changes to 'debian-unstable'

 ChangeLog   |   42 ++
 configure.ac|6 +++---
 debian/changelog|6 ++
 glx/glxdricommon.c  |2 +-
 hw/kdrive/ephyr/hostx.c |6 ++
 5 files changed, 58 insertions(+), 4 deletions(-)

New commits:
commit ae39d7aa16c85db7b6115301d9e90a20ef73db90
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Apr 14 12:52:48 2014 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 1ff4f4e..83ced73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit 9182af8a09c326bb4b01d3645fb2936e93f02242
+Author: Matt Dew mar...@osource.org
+Date:   Sun Apr 13 20:55:40 2014 -0600
+
+Bump version to 1.15.1
+
+commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
+Author: Eric Anholt e...@anholt.net
+Date:   Thu Mar 6 18:50:07 2014 -0800
+
+glx: Clear new FBConfig attributes to 0 by default.
+
+The visualSelectGroup wasn't getting set (since our DRI drivers don't
+use it), and and since it's the top priority in the sort order, you
+got random sorting of your visuals unless malloc really returned you
+new memory.  This manifested as Xephyr -glamor rendering to a
+multisampled window on my system, which as you might guess was
+slightly lower performance than expected.
+
+Signed-off-by: Eric Anholt e...@anholt.net
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
+Author: Julien Cristau jcris...@debian.org
+Date:   Wed Mar 26 23:24:20 2014 +0100
+
+Xephyr: restore initial window resize lost in xcb conversion
+
+The XResizeWindow call wasn't replaced by the xcb equivalent, so we
+were no longer setting the initial window size, only wm size hints.
+
+Regression from commit a2b73da Xephyr: start converting hostx.c over to
+xcb
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+Reported-by: Laércio de Sousa lbsous...@gmail.com
+Tested-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Signed-off-by: Keith Packard kei...@keithp.com
+
 commit 300458fb8ad0a7957e941cd65f47d204c7886e22
 Author: Matt Dew mar...@osource.org
 Date:   Fri Mar 21 23:49:41 2014 -0600
diff --git a/debian/changelog b/debian/changelog
index 95966e2..76dbbd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 14 Apr 2014 
12:52:18 +0200
+
 xorg-server (2:1.15.0.901-1) unstable; urgency=medium
 
   [ Robert Millan ]

commit 9182af8a09c326bb4b01d3645fb2936e93f02242
Author: Matt Dew mar...@osource.org
Date:   Sun Apr 13 20:55:40 2014 -0600

Bump version to 1.15.1

diff --git a/configure.ac b/configure.ac
index abd4604..b7b78a4 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.15.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2014-03-21
-RELEASE_NAME=Heart Candy-rc1
+AC_INIT([xorg-server], 1.15.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2014-04-13
+RELEASE_NAME=Heart Candy
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AC_USE_SYSTEM_EXTENSIONS

commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
Author: Eric Anholt e...@anholt.net
Date:   Thu Mar 6 18:50:07 2014 -0800

glx: Clear new FBConfig attributes to 0 by default.

The visualSelectGroup wasn't getting set (since our DRI drivers don't
use it), and and since it's the top priority in the sort order, you
got random sorting of your visuals unless malloc really returned you
new memory.  This manifested as Xephyr -glamor rendering to a
multisampled window on my system, which as you might guess was
slightly lower performance than expected.

Signed-off-by: Eric Anholt e...@anholt.net
Reviewed-by: Michel Dänzer michel.daen...@amd.com

diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index fc90272..a97d027 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -132,7 +132,7 @@ createModeFromConfig(const __DRIcoreExtension * core,
 unsigned int attrib, value;
 int i;
 
-config = malloc(sizeof *config);
+config = calloc(1, sizeof *config);
 
 config-driConfig = driConfig;
 

commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 26 23:24:20 2014 +0100

Xephyr: restore initial window resize lost in xcb conversion

The XResizeWindow call wasn't replaced by the xcb equivalent, so we
were no longer setting the initial window size, only wm size hints.

Regression from commit a2b73da Xephyr: start

xorg-server: Changes to 'upstream-unstable'

 configure.ac|6 +++---
 glx/glxdricommon.c  |2 +-
 hw/kdrive/ephyr/hostx.c |6 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 9182af8a09c326bb4b01d3645fb2936e93f02242
Author: Matt Dew mar...@osource.org
Date:   Sun Apr 13 20:55:40 2014 -0600

Bump version to 1.15.1

diff --git a/configure.ac b/configure.ac
index abd4604..b7b78a4 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.15.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2014-03-21
-RELEASE_NAME=Heart Candy-rc1
+AC_INIT([xorg-server], 1.15.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2014-04-13
+RELEASE_NAME=Heart Candy
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AC_USE_SYSTEM_EXTENSIONS

commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
Author: Eric Anholt e...@anholt.net
Date:   Thu Mar 6 18:50:07 2014 -0800

glx: Clear new FBConfig attributes to 0 by default.

The visualSelectGroup wasn't getting set (since our DRI drivers don't
use it), and and since it's the top priority in the sort order, you
got random sorting of your visuals unless malloc really returned you
new memory.  This manifested as Xephyr -glamor rendering to a
multisampled window on my system, which as you might guess was
slightly lower performance than expected.

Signed-off-by: Eric Anholt e...@anholt.net
Reviewed-by: Michel Dänzer michel.daen...@amd.com

diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index fc90272..a97d027 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -132,7 +132,7 @@ createModeFromConfig(const __DRIcoreExtension * core,
 unsigned int attrib, value;
 int i;
 
-config = malloc(sizeof *config);
+config = calloc(1, sizeof *config);
 
 config-driConfig = driConfig;
 

commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
Author: Julien Cristau jcris...@debian.org
Date:   Wed Mar 26 23:24:20 2014 +0100

Xephyr: restore initial window resize lost in xcb conversion

The XResizeWindow call wasn't replaced by the xcb equivalent, so we
were no longer setting the initial window size, only wm size hints.

Regression from commit a2b73da Xephyr: start converting hostx.c over to
xcb

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849

Signed-off-by: Julien Cristau jcris...@debian.org
Reported-by: Laércio de Sousa lbsous...@gmail.com
Tested-by: Jon TURNEY jon.tur...@dronecode.org.uk
Reviewed-by: Jon TURNEY jon.tur...@dronecode.org.uk
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 3e01a47..57e7dc2 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -695,6 +695,12 @@ hostx_screen_init(KdScreenInfo *screen,
 malloc(scrpriv-ximg-stride * buffer_height);
 }
 
+{
+uint32_t mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;
+uint32_t values[2] = {width, height};
+xcb_configure_window(HostX.conn, scrpriv-win, mask, values);
+}
+
 if (scrpriv-win_pre_existing == None  !EphyrWantResize) {
 /* Ask the WM to keep our size static */
 xcb_size_hints_t size_hints = {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/e1wzewf-0002ft...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

 ChangeLog   |   42 ++
 configure.ac|6 +++---
 debian/changelog|   10 --
 glx/glxdricommon.c  |2 +-
 hw/kdrive/ephyr/hostx.c |6 ++
 5 files changed, 60 insertions(+), 6 deletions(-)

New commits:
commit e4f3e6ecea75901832e228931e39bc6d6b710fd8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Apr 14 12:53:58 2014 +0200

bump changelog

diff --git a/debian/changelog b/debian/changelog
index 845ef24..38c8d47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
-xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-0ubuntu1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * Merge from unreleased debian unstable.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 14 Apr 2014 
12:52:18 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 09 Apr 2014 
15:31:23 +0200
 
-xorg-server (2:1.15.0.901-1ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
 
-  * Merge rc1 from released debian unstable.
+  * New upstream release.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 09 Apr 2014 
15:31:23 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 14 Apr 2014 
12:52:18 +0200
 
 xorg-server (2:1.15.0.901-1) unstable; urgency=medium
 

commit ae39d7aa16c85db7b6115301d9e90a20ef73db90
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Apr 14 12:52:48 2014 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 1ff4f4e..83ced73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+commit 9182af8a09c326bb4b01d3645fb2936e93f02242
+Author: Matt Dew mar...@osource.org
+Date:   Sun Apr 13 20:55:40 2014 -0600
+
+Bump version to 1.15.1
+
+commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
+Author: Eric Anholt e...@anholt.net
+Date:   Thu Mar 6 18:50:07 2014 -0800
+
+glx: Clear new FBConfig attributes to 0 by default.
+
+The visualSelectGroup wasn't getting set (since our DRI drivers don't
+use it), and and since it's the top priority in the sort order, you
+got random sorting of your visuals unless malloc really returned you
+new memory.  This manifested as Xephyr -glamor rendering to a
+multisampled window on my system, which as you might guess was
+slightly lower performance than expected.
+
+Signed-off-by: Eric Anholt e...@anholt.net
+Reviewed-by: Michel Dänzer michel.daen...@amd.com
+
+commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
+Author: Julien Cristau jcris...@debian.org
+Date:   Wed Mar 26 23:24:20 2014 +0100
+
+Xephyr: restore initial window resize lost in xcb conversion
+
+The XResizeWindow call wasn't replaced by the xcb equivalent, so we
+were no longer setting the initial window size, only wm size hints.
+
+Regression from commit a2b73da Xephyr: start converting hostx.c over to
+xcb
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+Reported-by: Laércio de Sousa lbsous...@gmail.com
+Tested-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Signed-off-by: Keith Packard kei...@keithp.com
+
 commit 300458fb8ad0a7957e941cd65f47d204c7886e22
 Author: Matt Dew mar...@osource.org
 Date:   Fri Mar 21 23:49:41 2014 -0600
diff --git a/debian/changelog b/debian/changelog
index 95966e2..76dbbd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 14 Apr 2014 
12:52:18 +0200
+
 xorg-server (2:1.15.0.901-1) unstable; urgency=medium
 
   [ Robert Millan ]

commit 9182af8a09c326bb4b01d3645fb2936e93f02242
Author: Matt Dew mar...@osource.org
Date:   Sun Apr 13 20:55:40 2014 -0600

Bump version to 1.15.1

diff --git a/configure.ac b/configure.ac
index abd4604..b7b78a4 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.15.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2014-03-21
-RELEASE_NAME=Heart Candy-rc1
+AC_INIT([xorg-server], 1.15.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2014-04-13
+RELEASE_NAME=Heart Candy
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AC_USE_SYSTEM_EXTENSIONS

commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
Author: Eric Anholt e...@anholt.net
Date:   Thu Mar 6 18:50:07 2014 -0800

glx: Clear new FBConfig attributes to 0 by default.

The visualSelectGroup wasn't getting set (since our DRI drivers don't
use it), and and since it's the top priority in the sort order, you
got random sorting of your visuals

xorg-server: Changes to 'ubuntu'

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

New commits:
commit 493ec8b8b815b185c6ce9d7887950103dd25b5fd
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Apr 14 12:58:07 2014 +0200

release to ubuntu

diff --git a/debian/changelog b/debian/changelog
index 38c8d47..2e8d17a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xorg-server (2:1.15.1-0ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.15.1-0ubuntu1) trusty; urgency=medium
 
   * Merge from unreleased debian unstable.
+- Unbreaks KDE desktop effects on IVB+. (LP: #1294666)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 09 Apr 2014 
15:31:23 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Mon, 14 Apr 2014 
12:57:12 +0200
 
 xorg-server (2:1.15.1-1) UNRELEASED; urgency=low
 


-- 
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/e1wzebv-0003wh...@moszumanska.debian.org

mesa: Changes to 'ubuntu'

2014-04-11 Thread Maarten Lankhorst

 debian/changelog|6 +
 debian/patches/cso-fix-sampler-view-count.patch |   43 
 debian/patches/series   |3 
 debian/patches/svga-move-dirty-buffers.patch|   47 +
 debian/patches/svga-replace-sampler-assertion.patch |   96 
 5 files changed, 195 insertions(+)

New commits:
commit cfd3e7dc2beefe807958cea9bd3bd3b6ae9c7e96
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Apr 10 12:08:27 2014 +0200

release to trusty

diff --git a/debian/changelog b/debian/changelog
index db897a8..3517b54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-mesa (10.1.0-4ubuntu4) UNRELEASED; urgency=low
+mesa (10.1.0-4ubuntu4) trusty; urgency=medium
 
   * Cherry-pick patches to improve stability with vmware. (LP: #1284134)
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 10 Apr 2014 
10:20:53 +0200
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 10 Apr 2014 
12:08:10 +0200
 
 mesa (10.1.0-4ubuntu3) trusty; urgency=medium
 

commit 6c73afdc8cc0e3b8704a8a33f697b8607082ffb5
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Thu Apr 10 10:25:12 2014 +0200

Cherry-pick patches to improve stability with vmware. (LP: #1284134)

diff --git a/debian/changelog b/debian/changelog
index efe0188..db897a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.0-4ubuntu4) UNRELEASED; urgency=low
+
+  * Cherry-pick patches to improve stability with vmware. (LP: #1284134)
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 10 Apr 2014 
10:20:53 +0200
+
 mesa (10.1.0-4ubuntu3) trusty; urgency=medium
 
   * i965-dont-call-abort-on-unknown-dev.diff: Allow using a fallback
diff --git a/debian/patches/cso-fix-sampler-view-count.patch 
b/debian/patches/cso-fix-sampler-view-count.patch
new file mode 100644
index 000..7f21515
--- /dev/null
+++ b/debian/patches/cso-fix-sampler-view-count.patch
@@ -0,0 +1,43 @@
+From 60aae7370934953a6f679fc5309ae567fc3f462c Mon Sep 17 00:00:00 2001
+From: Brian Paul bri...@vmware.com
+Date: Wed, 2 Apr 2014 08:54:41 -0600
+Subject: [PATCH 1/3] cso: fix sampler view count in cso_set_sampler_views()
+
+We want to call pipe-set_sampler_views() with count being the
+maximum of the old number of sampler views and the new number.
+This makes sure we null-out any old sampler views.
+
+We already do the same thing for sampler states in single_sampler_done().
+Fixes some assertions seen in the VMware driver with XA tracker.
+
+Cc: 10.0 10.1 mesa-sta...@lists.freedesktop.org
+Reviewed-by: Thomas Hellstrom thellst...@vmware.com
+Tested-by: Thomas Hellstrom thellst...@vmware.com
+Reviewed-by: Roland Scheidegger srol...@vmware.com
+---
+ src/gallium/auxiliary/cso_cache/cso_context.c | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c 
b/src/gallium/auxiliary/cso_cache/cso_context.c
+index 2dcf01d..9fe0a97 100644
+--- a/src/gallium/auxiliary/cso_cache/cso_context.c
 b/src/gallium/auxiliary/cso_cache/cso_context.c
+@@ -1187,11 +1187,12 @@ cso_set_sampler_views(struct cso_context *ctx,
+   pipe_sampler_view_reference(info-views[i], NULL);
+}
+ 
+-   info-nr_views = count;
+-
+/* bind the new sampler views */
+-   ctx-pipe-set_sampler_views(ctx-pipe, shader_stage, 0, count,
++   ctx-pipe-set_sampler_views(ctx-pipe, shader_stage, 0,
++MAX2(info-nr_views, count),
+ info-views);
++
++   info-nr_views = count;
+ }
+ 
+ 
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index bc6548d..d974949 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,6 @@ i915-dont-default-to-2.1.patch
 fix-bsymbolic-madness.patch
 fix-kwin.diff
 i965-dont-call-abort-on-unknown-dev.diff
+cso-fix-sampler-view-count.patch
+svga-replace-sampler-assertion.patch
+svga-move-dirty-buffers.patch
diff --git a/debian/patches/svga-move-dirty-buffers.patch 
b/debian/patches/svga-move-dirty-buffers.patch
new file mode 100644
index 000..5b2cdcf
--- /dev/null
+++ b/debian/patches/svga-move-dirty-buffers.patch
@@ -0,0 +1,47 @@
+From 192c69d964a2da49bf0654d9bb2c0de48c788207 Mon Sep 17 00:00:00 2001
+From: Brian Paul bri...@vmware.com
+Date: Wed, 9 Apr 2014 11:35:54 -0600
+Subject: [PATCH 3/3] svga: move LIST_INITHEAD(dirty_buffers) earlier in
+ svga_context_create()
+
+Fixes a crash in svga_context_flush_buffers() if we use the 'draw' module
+for AA lines (when the device doesn't support that feature).  We need to
+initialize this list before we setup the swtnl pieces.
+
+Found/fixed by Charmaine Lee.
+
+Cc: 10.0 mesa-sta...@lists.freedesktop.org
+Reviewed-by: Thomas Hellstrom thellst...@vmware.com
+Reviewed-by: Jakob Bornecrantz ja...@vmware.com
+
+Conflicts:
+   src/gallium/drivers/svga/svga_context.c
+---
+ src/gallium/drivers/svga

xserver-xorg-input-synaptics: Changes to 'ubuntu-trusty'

2014-04-09 Thread Maarten Lankhorst

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

New commits:
commit ff82c046c3065dc2e85cef01fb3928d47858e800
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Apr 9 11:25:21 2014 +0200

release to trusty

diff --git a/debian/changelog b/debian/changelog
index 57d7376..865ef63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.7.4-0ubuntu1) trusty; urgency=low
+
+  * New upstream release.
+  * Add patch to fix two touchpoints being handled in the same slot.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Tue, 08 Apr 2014 
12:35:02 +0200
+
 xserver-xorg-input-synaptics (1.7.3-1ubuntu1) trusty; urgency=low
 
   * Merge from 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/e1wxold-0003it...@moszumanska.debian.org

xorg-server: Changes to 'ubuntu'

2014-04-09 Thread Maarten Lankhorst

 ChangeLog   |  338 +++
 Xext/sync.c |7 
 Xi/exevents.c   |   22 +
 Xi/xichangehierarchy.c  |4 
 Xi/xipassivegrab.c  |6 
 config/hal.c|   16 
 config/udev.c   |   15 
 configure.ac|6 
 debian/changelog|   22 +
 debian/control  |4 
 debian/patches/02_kbsd-input-devd.diff  |  551 
 debian/patches/series   |1 
 debian/rules|   10 
 dix/devices.c   |1 
 dix/dixfonts.c  |9 
 dix/getevents.c |2 
 dix/inpututils.c|3 
 hw/xfree86/common/xf86Helper.c  |7 
 hw/xquartz/GL/indirect.c|4 
 hw/xquartz/X11Application.m |   13 
 hw/xquartz/X11Controller.m  |2 
 hw/xquartz/applewm.c|   16 
 hw/xquartz/darwinfb.h   |2 
 hw/xquartz/mach-startup/stub.c  |4 
 hw/xquartz/quartz.c |3 
 hw/xquartz/xpr/appledri.c   |   10 
 hw/xquartz/xpr/x-hook.c |   27 -
 os/utils.c  |   27 +
 test/xi2/protocol-xipassivegrabdevice.c |9 
 29 files changed, 1080 insertions(+), 61 deletions(-)

New commits:
commit ba11fa8a18828b5fda0b75fa63e616b5e89eda5c
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Apr 9 15:36:09 2014 +0200

Merge rc1 from released debian unstable.

diff --git a/debian/changelog b/debian/changelog
index ab7ac06..e4fcd31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.0.901-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge rc1 from released debian unstable.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 09 Apr 2014 
15:31:23 +0200
+
 xorg-server (2:1.15.0.901-1) unstable; urgency=medium
 
   [ Robert Millan ]

commit 97e46f6721051789d490859a30f77c3c562e3af3
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 31 12:21:00 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 84b4a26..95966e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.15.0.901-1) UNRELEASED; urgency=medium
+xorg-server (2:1.15.0.901-1) unstable; urgency=medium
 
   [ Robert Millan ]
   * Add devd input backend for kFreeBSD, and use it instead of hal (closes:
@@ -7,7 +7,7 @@ xorg-server (2:1.15.0.901-1) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * New upstream release
 
- -- Julien Cristau jcris...@debian.org  Mon, 31 Mar 2014 12:12:51 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 31 Mar 2014 12:19:57 +0200
 
 xorg-server (2:1.15.0-2) unstable; urgency=medium
 

commit b1e1771a10240d14c92ae61542a3032e6bd2b817
Author: Julien Cristau jcris...@debian.org
Date:   Mon Mar 31 12:16:31 2014 +0200

Bump changelogs to 1.15.0.901

diff --git a/ChangeLog b/ChangeLog
index 109ce8c..1ff4f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,341 @@
+commit 300458fb8ad0a7957e941cd65f47d204c7886e22
+Author: Matt Dew mar...@osource.org
+Date:   Fri Mar 21 23:49:41 2014 -0600
+
+Bump bersion to 1.15.0.901
+
+commit c971864565eb114e4b34f17b0d2244e8e6e1e005
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Feb 26 07:54:56 2014 +1000
+
+config: search for PnPID on all parents (#75513)
+
+The PnPID for a device may not be on the immediate parent, so search up the
+device tree until we find one.
+
+X.Org Bug 75513 http://bugs.freedesktop.org/show_bug.cgi?id=75513
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Tested-by: Benjamin Tissoires benjamin.tissoi...@gmail.com
+(cherry picked from commit 795066477ee81b5b82e490eac8bed6b656d01f17)
+
+commit 2cbbe80efc485d2d05b06efe1e2e01f81f3e06f6
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Feb 20 13:18:05 2014 +1000
+
+Xi: check for invalid modifiers for XI2 passive grabs
+
+The other values are checked correctly, but if a modifier was outside the
+allowed range, it would go unnoticed and cause a out-of-bounds read error 
for
+any mask equal or larger than 256. The DetailRec where we store the grab 
masks
+is only sized to 8 * sizeof(Mask).
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+(cherry picked from commit 0f10cfd4b903d4db293ec47c8a9a0d8b33965803)
+
+commit b3656c0b52d57333c64f932676a237d0f3a97f36
+Author: Mark Kettenis kette...@openbsd.org
+Date:   Sun Dec 15 14:31:10 2013 +0100
+
+sync: Avoid ridiculously long timeouts
+
+On OpenBSD, passing a timeout longer than 1 seconds to select(2

xserver-xorg-input-synaptics: Changes to 'ubuntu-trusty'

New branch 'ubuntu-trusty' available with the following commits:
commit c174a6301b12882240d4bb7b11dd368ea240542b
Merge: 6d3026c bbaf4d6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Apr 8 12:34:59 2014 +0200

Merge remote-tracking branch 'upstream/synaptics-1.7-branch' into 
ubuntu-trusty

commit bbaf4d646ebf4393a1ee0eb9bcc569054ed878f9
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Mar 20 11:51:17 2014 +1000

Avoid erroneously handling two touchpoints in the same slot

If a slot's ABS_MT_TRACKING_ID event was received during SYN_DROPPED, the
driver isn't aware that a touchpoint has started or ended in that slot. When
the next ABS_MT_TRACKING_ID event arrives, the driver would unconditionally
close or open a new touchpoint. This could lead to two or more touchpoints
being opened in the same slot, the first of which is never terminated.
Or it could lead to a touchpoint being terminated that was never opened.

The event sequences that trigger this are:
ABS_MT_TRACKING_ID 83
ABS_MT_TRACKING_ID -1
SYN_DROPPED // new touchpoint started here
ABS_MT_TRACKING_ID -1

and

ABS_MT_TRACKING_ID 83
SYN_DROPPED // touchpoint ended here
ABS_MT_TRACKING_ID 84
ABS_MT_TRACKING_ID -1

We don't properly handle SYN_DROPPED, but we can avoid this by only 
starting a
new touchpoint when we transition between -1 and a valid tracking ID.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

commit a21b3bd602b31ee995b391a7b917282e7b0a1c33
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Mar 20 10:58:53 2014 +1000

eventcomm: drop assumption of non-zero slot offset

The kernel guarantees this is always 0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

commit 91cc1e82143b939bfb4fce97429b07105333e146
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Mar 10 16:42:34 2014 +1000

eventcomm: drop calculation of slot offset

The kernel guarantees slots start at 0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Hans de Goede hdego...@redhat.com
Reviewed-by: Benjamin Tissoires benjamin.tissoi...@gmail.com
(cherry picked from commit 5b7e1726369d4973859996f225bec743c2e21288)


-- 
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/e1wxtuq-0003so...@moszumanska.debian.org

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

 configure.ac|6 
 src/vmware_bootstrap.c  |   20 ++
 src/vmware_bootstrap.h  |2 
 src/vmwarevideo.c   |4 
 vmwgfx/Makefile.am  |5 
 vmwgfx/vmwgfx_dri2.c|   37 +
 vmwgfx/vmwgfx_driver.c  |  309 ++--
 vmwgfx/vmwgfx_driver.h  |4 
 vmwgfx/vmwgfx_drmi.c|  142 
 vmwgfx/vmwgfx_drmi.h|   13 +
 vmwgfx/vmwgfx_hosted.c  |   71 ++
 vmwgfx/vmwgfx_hosted.h  |  258 
 vmwgfx/vmwgfx_hosted_priv.h |   40 +
 vmwgfx/vmwgfx_overlay.c |8 -
 vmwgfx/vmwgfx_saa.c |  263 -
 vmwgfx/vmwgfx_saa.h |7 
 vmwgfx/vmwgfx_saa_priv.h|2 
 vmwgfx/vmwgfx_tex_video.c   |2 
 vmwgfx/vmwgfx_xa_surface.c  |2 
 vmwgfx/vmwgfx_xmir.c|  178 +
 vmwgfx/vmwgfx_xwayland.c|  186 ++
 21 files changed, 1393 insertions(+), 166 deletions(-)

New commits:
commit 8da981712f62050076cff53e1b40ed1e307fcca8
Author: Thomas Hellstrom thellst...@vmware.com
Date:   Wed Jan 15 11:04:05 2014 +0100

vmware/vmwgfx: Always allocate shared hardware surfaces.

Hardware surfaces are all likely to be shared at some point, and we *really*
don't want to change a hardware surface that is bound as a drm framebuffer.

Signed-off-by: Thomas Hellstrom thellst...@vmware.com
Reviewed-by: Jakob Bornecrantz ja...@vmware.com

diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index 8c97618..b56b05f 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -811,7 +811,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
return TRUE;
 
 new_flags = (vpix-xa_flags  ~vpix-staging_remove_flags) |
-   vpix-staging_add_flags;
+   vpix-staging_add_flags | XA_FLAG_SHARED;
 
 hw = xa_surface_create(vsaa-xat,
   pixmap-drawable.width,
diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
index 2f23c57..189bfdc 100644
--- a/vmwgfx/vmwgfx_xa_surface.c
+++ b/vmwgfx/vmwgfx_xa_surface.c
@@ -318,7 +318,7 @@ vmwgfx_hw_commit(PixmapPtr pixmap)
uint32_t new_flags;
 
new_flags = (vpix-xa_flags  ~vpix-staging_remove_flags) |
-   vpix-staging_add_flags;
+   vpix-staging_add_flags | XA_FLAG_SHARED;
 
if (vpix-staging_format != xa_surface_format(vpix-hw))
LogMessage(X_INFO, Changing hardware format.\n);

commit 31bff9f7f3d9a68fd1449532e8ab50065de63857
Author: Thomas Hellstrom thellst...@vmware.com
Date:   Thu Jan 9 13:53:59 2014 +0100

vmware: Require libdrm 2.4.38 to build XMir.

Signed-off-by: Thomas Hellstrom thellst...@vmware.com
Reviewed-by: Jakob Bornecrantz ja...@vmware.com

diff --git a/configure.ac b/configure.ac
index 123356c..3e8d541 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,12 @@ if test x$BUILD_VMWGFX = xyes; then
  [AC_DEFINE([HAVE_XA_2], 1,
  [Has version 2 of XA])])],
  [],[BUILD_VMWGFX=no])
+#
+# Check for prime.
+#
+   PKG_CHECK_EXISTS([libdrm = 2.4.38],
+[AC_DEFINE([HAVE_LIBDRM_2_4_38], 1,
+[Has version 2.4.38 or greater of libdrm])])
 fi
 
 DRIVER_NAME=vmware
diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c
index d926019..b6fb56d 100644
--- a/vmwgfx/vmwgfx_drmi.c
+++ b/vmwgfx/vmwgfx_drmi.c
@@ -501,6 +501,7 @@ vmwgfx_max_fb_size(int drm_fd, size_t *size)
 return 0;
 }
 
+#ifdef HAVE_LIBDRM_2_4_38
 /**
  * vmwgfx_prime_fd_to_handle - Return a TTM handle to a prime object
  *
@@ -537,3 +538,4 @@ vmwgfx_prime_release_handle(int drm_fd, uint32_t handle)
 (void) drmCommandWrite(drm_fd, DRM_VMW_UNREF_SURFACE, s_arg,
   sizeof(s_arg));
 }
+#endif /* HAVE_LIBDRM_2_4_38 */
diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h
index 1494485..3168088 100644
--- a/vmwgfx/vmwgfx_drmi.h
+++ b/vmwgfx/vmwgfx_drmi.h
@@ -85,9 +85,11 @@ vmwgfx_update_gui_layout(int drm_fd, unsigned int num_rects,
 int
 vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out);
 
+#ifdef HAVE_LIBDRM_2_4_38
 int
 vmwgfx_prime_fd_to_handle(int drm_fd, int prime_fd, uint32_t *handle);
 
 void
 vmwgfx_prime_release_handle(int drm_fd, uint32_t handle);
+#endif /* HAVE_LIBDRM_2_4_38 */
 #endif
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index cb55849..8c97618 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -1618,7 +1618,7 @@ vmwgfx_saa_drop_master(ScreenPtr pScreen)
  * Helpers for hosted.
  */
 
-#if (XA_TRACKER_VERSION_MAJOR = 2)
+#if (XA_TRACKER_VERSION_MAJOR = 2)  defined(HAVE_LIBDRM_2_4_38)
 
 /**
  * vmwgfx_saa_copy_to_surface - Copy Drawable contents to an external surface.
diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h
index 55f0ded..921fabd 100644
--- a/vmwgfx/vmwgfx_saa.h
+++ b/vmwgfx/vmwgfx_saa.h
@@

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

 ChangeLog   |  173 
 configure.ac|   10 +
 debian/changelog|   48 ++
 debian/control  |2 
 debian/rules|8 -
 src/vmware_bootstrap.c  |   20 ++
 src/vmware_bootstrap.h  |2 
 src/vmwaremodes.c   |4 
 src/vmwarevideo.c   |4 
 vmwgfx/Makefile.am  |5 
 vmwgfx/vmwgfx_dri2.c|   37 +
 vmwgfx/vmwgfx_driver.c  |  309 ++--
 vmwgfx/vmwgfx_driver.h  |4 
 vmwgfx/vmwgfx_drmi.c|  142 
 vmwgfx/vmwgfx_drmi.h|   13 +
 vmwgfx/vmwgfx_hosted.c  |   71 ++
 vmwgfx/vmwgfx_hosted.h  |  258 
 vmwgfx/vmwgfx_hosted_priv.h |   40 +
 vmwgfx/vmwgfx_overlay.c |8 -
 vmwgfx/vmwgfx_saa.c |  274 +--
 vmwgfx/vmwgfx_saa.h |7 
 vmwgfx/vmwgfx_saa_priv.h|   13 +
 vmwgfx/vmwgfx_tex_video.c   |2 
 vmwgfx/vmwgfx_xa_surface.c  |   63 +++-
 vmwgfx/vmwgfx_xmir.c|  178 +
 vmwgfx/vmwgfx_xwayland.c|  186 ++
 26 files changed, 1698 insertions(+), 183 deletions(-)

New commits:
commit d1348cd564c9104ce2a486e4083a9e970b14eec2
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Apr 8 16:40:23 2014 +0200

bump changelog

diff --git a/debian/changelog b/debian/changelog
index 470e1a9..0dfd7a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-xserver-xorg-video-vmware (1:13.0.1.git8da9817-0ubuntu1) trusty; urgency=low
+xserver-xorg-video-vmware (1:13.0.1.git.20140115.8da9817-0ubuntu2) trusty; 
urgency=low
+
+  * Rebuild for xorg 1.15 abi.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Wed, 05 Feb 2014 
10:12:27 +
+
+xserver-xorg-video-vmware (1:13.0.1.git.20140115.8da9817-0ubuntu1) trusty; 
urgency=low
 
   * Sync fixes from git to make libxatracker2 work correctly. (LP: #1271186)
 

commit 64e0faf1480663a990e0f6aeef7af0e69845af49
Author: Thomas Hellstrom thellst...@vmware.com
Date:   Wed Apr 2 14:05:23 2014 +0200

vmware/vmwgfx: Don't tell XA that we have a mask when we haven't

In some cases, the X server sends us a composit operation with
mask_pict != NULL, but mask_pix == NULL. Assume there's no mask
involved in that case.

Signed-off-by: Thomas Hellstrom thellst...@vmware.com
Reviewed-by: Brian Paul bri...@vmware.com

diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index 3da0222..99a289d 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -1158,6 +1158,8 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 
op,
  * and check whether XA can accelerate.
  */
 
+if (!mask_pix)
+   mask_pict = NULL;
 xa_comp = vmwgfx_xa_setup_comp(vsaa-vcomp, op,
   src_pict, mask_pict, dst_pict);
 if (!xa_comp)

commit c062d08a50a26c99a3b8f565a8b2b00e8dc21c3f
Author: Thomas Hellstrom thellst...@vmware.com
Date:   Thu Jan 16 18:27:57 2014 +0100

vmware/vmwgfx: Don't change backing-store of active scanout surfaces

With option HwPresents on, the driver would sometimes change backing
store of active scanout surfaces, making the kernel module refuse to
present. This was caused by scanout surfaces not having the RENDERTARGET 
flag
on by default. So when rendered to, using copies or composites, they
would be reallocated. Fix this by adding the RENDERTARGET flag from start.

Also add code that prints out an error message when we change backing store
of active scanout surfaces

Signed-off-by: Thomas Hellstrom thellst...@vmware.com
Reviewed-by: Jakob Bornecrantz ja...@vmware.com

diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index b56b05f..3da0222 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -610,9 +610,9 @@ vmwgfx_pix_resize(PixmapPtr pixmap, unsigned int old_pitch,
 }
 
 if (vpix-hw) {
-   if (xa_surface_redefine(vpix-hw, draw-width, draw-height,
-   draw-depth, xa_type_argb,
-   xa_format_unknown, vpix-xa_flags, 1) != 0)
+  if (!vmwgfx_xa_surface_redefine(vpix, vpix-hw, draw-width,
+ draw-height, draw-depth, xa_type_argb,
+ xa_format_unknown, vpix-xa_flags, 1))
return FALSE;
 }
 
@@ -1504,7 +1504,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry  *entry)
 * The KMS fb will be a HW surface. Create it, add damage
 * and get the handle.
 */
-   if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+   if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT |
+ XA_FLAG_RENDER_TARGET, 0, NULL))
goto out_err

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