Processed: reassign 718549 to xserver-xorg-video-nouveau
Processing commands for cont...@bugs.debian.org: > reassign 718549 xserver-xorg-video-nouveau 1:1.0.1-5 Bug #718549 [xorg] xorg: artifacts of the pointer are left all over the screen Bug reassigned from package 'xorg' to 'xserver-xorg-video-nouveau'. No longer marked as found in versions xorg/1:7.7+3~deb7u1. Ignoring request to alter fixed versions of bug #718549 to the same values previously set Bug #718549 [xserver-xorg-video-nouveau] xorg: artifacts of the pointer are left all over the screen Marked as found in versions xserver-xorg-video-nouveau/1:1.0.1-5. > thanks Stopping processing here. Please contact me if you need assistance. -- 718549: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718549 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.137543775612379.transcr...@bugs.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |6
debian/control | 13
debian/patches/series|1
debian/patches/xmir.patch| 1619 +++
debian/rules |3
debian/serverminver |2
debian/xserver-xorg-core.install |4
debian/xserver-xorg-xmir.install |1
8 files changed, 1647 insertions(+), 2 deletions(-)
New commits:
commit 727fbe5c19783153427d612c338af5f998400634
Author: Christopher James Halse Rogers
Date: Fri Aug 2 20:25:58 2013 +1000
Version the build-dep on libmirclient-dev to ensure we don't get built
until a fixed version is available
diff --git a/debian/control b/debian/control
index c3e5a14..a4ad044 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Build-Depends:
xkb-data,
x11-xkb-utils,
# XMir
- libmirclient-dev,
+ libmirclient-dev (>= 0.0.8+13.10.20130803) [linux-any],
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
commit 465f528f924a2ee9a4c10ca582f70e84f9a8280e
Author: Christopher James Halse Rogers
Date: Fri Aug 2 20:16:46 2013 +1000
Fix damage tracking.
I'm not entirely sure why checking against xorg_list_is_empty was failing,
but checking against ->damaged is no worse, and works
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 953d82c..71f80a4 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -1,7 +1,7 @@
Index: xserver/configure.ac
===
xserver.orig/configure.ac 2013-08-02 15:09:08.852352007 +1000
-+++ xserver/configure.ac 2013-08-02 15:09:08.832352006 +1000
+--- xserver.orig/configure.ac 2013-08-02 17:45:27.679768902 +1000
xserver/configure.ac 2013-08-02 17:45:27.671768903 +1000
@@ -639,6 +639,7 @@
AC_ARG_ENABLE(libdrm, AS_HELP_STRING([--enable-libdrm], [Build Xorg
with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build
Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval],
[CLIENTIDS=yes])
@@ -36,8 +36,8 @@ Index: xserver/configure.ac
hw/dmx/doc/Makefile
Index: xserver/hw/xfree86/Makefile.am
===
xserver.orig/hw/xfree86/Makefile.am2013-08-02 15:09:08.852352007
+1000
-+++ xserver/hw/xfree86/Makefile.am 2013-08-02 15:09:08.836352006 +1000
+--- xserver.orig/hw/xfree86/Makefile.am2013-08-02 17:45:27.679768902
+1000
xserver/hw/xfree86/Makefile.am 2013-08-02 17:45:27.671768903 +1000
@@ -25,15 +25,20 @@
INT10_SUBDIR = int10
endif
@@ -63,8 +63,8 @@ Index: xserver/hw/xfree86/Makefile.am
nodist_Xorg_SOURCES = sdksyms.c
Index: xserver/hw/xfree86/common/xf86Config.c
===
xserver.orig/hw/xfree86/common/xf86Config.c2013-08-02
15:09:08.852352007 +1000
-+++ xserver/hw/xfree86/common/xf86Config.c 2013-08-02 15:09:08.836352006
+1000
+--- xserver.orig/hw/xfree86/common/xf86Config.c2013-08-02
17:45:27.679768902 +1000
xserver/hw/xfree86/common/xf86Config.c 2013-08-02 17:45:27.671768903
+1000
@@ -117,6 +117,7 @@
{.name = "fb",.toLoad = TRUE,.load_opt = NULL},
{.name = "shadow",.toLoad = TRUE,.load_opt = NULL},
@@ -93,8 +93,8 @@ Index: xserver/hw/xfree86/common/xf86Config.c
* not be loaded
Index: xserver/hw/xfree86/common/xf86Globals.c
===
xserver.orig/hw/xfree86/common/xf86Globals.c 2013-08-02
15:09:08.852352007 +1000
-+++ xserver/hw/xfree86/common/xf86Globals.c2013-08-02 15:09:08.836352006
+1000
+--- xserver.orig/hw/xfree86/common/xf86Globals.c 2013-08-02
17:45:27.679768902 +1000
xserver/hw/xfree86/common/xf86Globals.c2013-08-02 17:45:27.671768903
+1000
@@ -206,3 +206,6 @@
#endif
RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
@@ -104,8 +104,8 @@ Index: xserver/hw/xfree86/common/xf86Globals.c
+const char *mirSocket = NULL;
Index: xserver/hw/xfree86/common/xf86Init.c
===
xserver.orig/hw/xfree86/common/xf86Init.c 2013-08-02 15:09:08.852352007
+1000
-+++ xserver/hw/xfree86/common/xf86Init.c 2013-08-02 15:11:54.768358939
+1000
+--- xserver.orig/hw/xfree86/common/xf86Init.c 2013-08-02 17:45:27.679768902
+1000
xserver/hw/xfree86/common/xf86Init.c 2013-08-02 17:45:27.671768903
+1000
@@ -554,7 +554,7 @@
* needed at this early stage.
*/
@@ -178,8 +178,8 @@ Index: xserver/hw/xfree86/common/xf86Init.c
ErrorF("\n");
Index: xserver/hw/xfree86/common/xf86Priv.h
mesa: Changes to 'debian-unstable'
Makefile.am |2 bin/.cherry-ignore | 25 +++ bin/get-pick-list.sh|2 configure.ac|6 debian/changelog| 10 - docs/relnotes-9.1.5.html|4 docs/relnotes-9.1.6.html| 166 src/egl/drivers/dri2/platform_x11.c | 14 + src/gallium/auxiliary/vl/vl_winsys_dri.c| 20 ++ src/gallium/drivers/nv50/nv50_stateobj.h|2 src/gallium/drivers/nvc0/nvc0_stateobj.h|2 src/gallium/drivers/nvc0/nvc0_video.c |2 src/gallium/drivers/r300/r300_context.c |6 src/gallium/drivers/r300/r300_render.c | 70 +++- src/gallium/drivers/r300/r300_screen_buffer.c |7 src/gallium/drivers/r300/r300_texture_desc.c|1 src/gallium/drivers/r600/r600_shader.c |2 src/gallium/drivers/r600/r600_shader.h |4 src/gallium/state_trackers/egl/wayland/native_shm.c |2 src/glsl/glsl_lexer.ll |2 src/glsl/loop_analysis.cpp |3 src/glx/apple/apple_glx.c |2 src/mesa/drivers/common/meta.c | 23 ++ src/mesa/drivers/dri/i965/brw_fs.cpp| 10 - src/mesa/drivers/dri/i965/brw_fs_visitor.cpp|4 src/mesa/drivers/dri/i965/brw_vec4.cpp | 12 + src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |4 src/mesa/drivers/dri/i965/brw_vs.c |8 src/mesa/drivers/dri/i965/brw_vs_state.c| 27 ++- src/mesa/main/mipmap.c | 68 +--- src/mesa/main/texgetimage.c | 52 ++ src/mesa/main/version.h |4 32 files changed, 430 insertions(+), 136 deletions(-) New commits: commit d483ad18f36de0d9088943ccd0eee2d5e8308f33 Author: Andreas Boll Date: Fri Aug 2 12:14:09 2013 +0200 debian/changelog: Add changelog entry diff --git a/debian/changelog b/debian/changelog index 87709bf..2ef33bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mesa (9.1.6-1) UNRELEASED; urgency=low * New upstream release. (Closes: #717410) + * Cherry-pick commit 0dbbfa0 (mesa: Fix MESA_PATCH version) from +upstream. -- Andreas Boll Fri, 02 Aug 2013 12:04:47 +0200 commit a4921e7ba7916addf224e188ca73a897ff19c7a6 Author: Andreas Boll Date: Fri Aug 2 09:51:24 2013 +0200 mesa: Fix MESA_PATCH version (cherry picked from commit 0dbbfa054c91980a093c0146bd281624cc74695d) diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 6eab691..27eb76d 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -34,7 +34,7 @@ struct gl_context; /* Mesa version */ #define MESA_MAJOR 9 #define MESA_MINOR 1 -#define MESA_PATCH 4 +#define MESA_PATCH 6 #define MESA_VERSION_STRING "9.1.6" /* To make version comparison easy */ commit 86a52b857f578a14d81ffc094a9c1dcffb129431 Author: Andreas Boll Date: Fri Aug 2 12:08:46 2013 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 66d4421..87709bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,8 @@ -mesa (9.1.5-1) UNRELEASED; urgency=low +mesa (9.1.6-1) UNRELEASED; urgency=low - * New upstream release. - * Cherry-pick commit b20b2b6 (osmesa: link against static libglapi -library too to get the gl exports) from upstream (Closes: #717410). + * New upstream release. (Closes: #717410) - -- Andreas Boll Thu, 18 Jul 2013 18:32:24 +0200 + -- Andreas Boll Fri, 02 Aug 2013 12:04:47 +0200 mesa (9.1.4-1) unstable; urgency=low commit 1ed76d697fccba03e72b1a48f3ce866984fa3899 Author: Carl Worth Date: Thu Aug 1 14:21:21 2013 -0700 docs: Add release notes for 9.1.6 release diff --git a/docs/relnotes-9.1.6.html b/docs/relnotes-9.1.6.html new file mode 100644 index 000..1e55b8e --- /dev/null +++ b/docs/relnotes-9.1.6.html @@ -0,0 +1,166 @@ +http://www.w3.org/TR/html4/loose.dtd";> + + + + Mesa Release Notes + + + + + + The Mesa 3D Graphics Library + + + + + +Mesa 9.1.6 Release Notes / August 1, 2013 + + +Mesa 9.1.6 is a bug fix release which fixes bugs found since the 9.1.5 release. + + +Mesa 9.1 implements the OpenGL 3.1 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.1. OpenGL +3.1 is only available if requested at context creation +because GL_ARB_compatibility is not supported. + + +MD5 checksums + +TBD + + +New features +None. + +Bug fixes + +This list is likely incomplete. + + + +ht
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |5
debian/control|3
debian/patches/series |1
debian/patches/xmir.patch | 595 ++
4 files changed, 602 insertions(+), 2 deletions(-)
New commits:
commit 293f821ee866f13097ed68e0314d16d11d1e0388
Author: Christopher James Halse Rogers
Date: Thu Aug 1 16:08:32 2013 +1000
Add initial XMir patch
diff --git a/debian/changelog b/debian/changelog
index b25ec80..6093547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED;
urgency=low
* Cherry-pick 3 commits from upstream git to fix SNA regressions in 2.21.12
(34c9b759f, 7f76a2bf3, a764a6e69b)
- -- Maarten Lankhorst Thu, 18 Jul 2013
13:51:58 +0200
+ [ Christopher James Halse Rogers ]
+ * Add initial XMir support patch
+
+ -- Christopher James Halse Rogers Thu, 01 Aug 2013
16:06:42 +1000
xserver-xorg-video-intel (2:2.21.12-1) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 716a434..b686176 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.11.99.901),
+# Depend on latest server to ensure XMir support
+ xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xinerama-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 2c1177d..c72571f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
sna-note-that-borderClip-region.patch
sna-fix-typo-in-computing-box.patch
sna-fall-back-to-proc-cpuinfo.patch
+xmir.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
new file mode 100644
index 000..0ca2bc2
--- /dev/null
+++ b/debian/patches/xmir.patch
@@ -0,0 +1,595 @@
+commit ea3344d571ff728f5cb84c6920635e552090ec7c
+Author: Chris Wilson
+Date: Wed Jul 24 01:44:30 2013 +0100
+
+sna: Preliminary patch for XMir
+
+For the intrepid explorer, who is desperate to encounter all the bugs we
+fixed long ago. /o\
+
+Signed-off-by: Chris Wilson
+
+Index: xf86-video-intel/src/Makefile.am
+===
+--- xf86-video-intel.orig/src/Makefile.am 2013-08-01 16:06:54.220945668
+1000
xf86-video-intel/src/Makefile.am 2013-08-01 16:06:54.212945668 +1000
+@@ -46,6 +46,7 @@
+ intel_device.c \
+ intel_options.c \
+ intel_module.c \
++ intel_xmir.h \
+ compat-api.h \
+ $(NULL)
+
+Index: xf86-video-intel/src/intel_device.c
+===
+--- xf86-video-intel.orig/src/intel_device.c 2013-08-01 16:06:54.220945668
+1000
xf86-video-intel/src/intel_device.c2013-08-01 16:06:54.212945668
+1000
+@@ -92,7 +92,7 @@
+ if (drmIoctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
+ ret = FALSE;
+ }
+- if (ret) {
++ if (ret && !xorgMir) {
+ struct drm_mode_card_res res;
+
+ memset(&res, 0, sizeof(res));
+@@ -121,10 +121,34 @@
+ return fd;
+ }
+
++static int __intel_open_xmir(const struct pci_device *pci,
++ char **path)
++{
++ char id[20];
++ int fd;
++
++ 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;
++
++ 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;
+@@ -199,6 +223,12 @@
+ dev->open_count = 0;
+ dev->master_count = 0;
+
++ /* If hosted under a system compositor, just pretend to be master */
++ if (xorgMir) {
++ dev->open_count++;
++ dev->master_count++;
++ }
++
+ xf86GetEntityPrivate(entity_num, intel_device_key)->ptr = dev;
+
+ return fd;
+@@ -222,6 +252,8 @@
+ drmSetVersion sv;
+ int retry = 2000;
+
++ assert(!xorgMir);
++
+ /* 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.
+@@ -267,6 +299,7 @@
+ if (dev->master_count++ == 0) {
+ int retry = 2000;
+
++ assert(!xorgMir);
+ do {
+ ret = drmSetMaster(dev->fd);
+ if (ret == 0)
+@@ -288,6 +321,7 @@
+
mesa: Changes to 'upstream-unstable'
Makefile.am |2 bin/.cherry-ignore | 25 +++ bin/get-pick-list.sh|2 configure.ac|6 docs/relnotes-9.1.5.html|4 docs/relnotes-9.1.6.html| 166 src/egl/drivers/dri2/platform_x11.c | 14 + src/gallium/auxiliary/vl/vl_winsys_dri.c| 20 ++ src/gallium/drivers/nv50/nv50_stateobj.h|2 src/gallium/drivers/nvc0/nvc0_stateobj.h|2 src/gallium/drivers/nvc0/nvc0_video.c |2 src/gallium/drivers/r300/r300_context.c |6 src/gallium/drivers/r300/r300_render.c | 70 +++- src/gallium/drivers/r300/r300_screen_buffer.c |7 src/gallium/drivers/r300/r300_texture_desc.c|1 src/gallium/drivers/r600/r600_shader.c |2 src/gallium/drivers/r600/r600_shader.h |4 src/gallium/state_trackers/egl/wayland/native_shm.c |2 src/glsl/glsl_lexer.ll |2 src/glsl/loop_analysis.cpp |3 src/glx/apple/apple_glx.c |2 src/mesa/drivers/common/meta.c | 23 ++ src/mesa/drivers/dri/i965/brw_fs.cpp| 10 - src/mesa/drivers/dri/i965/brw_fs_visitor.cpp|4 src/mesa/drivers/dri/i965/brw_vec4.cpp | 12 + src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |4 src/mesa/drivers/dri/i965/brw_vs.c |8 src/mesa/drivers/dri/i965/brw_vs_state.c| 27 ++- src/mesa/drivers/osmesa/Makefile.am |6 src/mesa/main/mipmap.c | 68 +--- src/mesa/main/texgetimage.c | 52 ++ src/mesa/main/version.h |2 32 files changed, 427 insertions(+), 133 deletions(-) New commits: commit 1ed76d697fccba03e72b1a48f3ce866984fa3899 Author: Carl Worth Date: Thu Aug 1 14:21:21 2013 -0700 docs: Add release notes for 9.1.6 release diff --git a/docs/relnotes-9.1.6.html b/docs/relnotes-9.1.6.html new file mode 100644 index 000..1e55b8e --- /dev/null +++ b/docs/relnotes-9.1.6.html @@ -0,0 +1,166 @@ +http://www.w3.org/TR/html4/loose.dtd";> + + + + Mesa Release Notes + + + + + + The Mesa 3D Graphics Library + + + + + +Mesa 9.1.6 Release Notes / August 1, 2013 + + +Mesa 9.1.6 is a bug fix release which fixes bugs found since the 9.1.5 release. + + +Mesa 9.1 implements the OpenGL 3.1 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.1. OpenGL +3.1 is only available if requested at context creation +because GL_ARB_compatibility is not supported. + + +MD5 checksums + +TBD + + +New features +None. + +Bug fixes + +This list is likely incomplete. + + + +https://bugs.freedesktop.org/show_bug.cgi?id=47824";>Bug 47824 - osmesa using --enable-shared-glapi depends on libgl + +https://bugs.freedesktop.org/show_bug.cgi?id=62362";>Bug 62362 - Crash when using Wayland EGL platform + +https://bugs.freedesktop.org/show_bug.cgi?id=63435";>Bug 63435 - [Regression since 9.0] Flickering in EGL OpenGL full-screen window with swap interval 1 + +https://bugs.freedesktop.org/show_bug.cgi?id=64087";>Bug 64087 - Webgl conformance shader-with-non-reserved-words crash when mesa is compiled without --enable-debug + +https://bugs.freedesktop.org/show_bug.cgi?id=64330";>Bug 64330 - WebGL snake demo crash in loop_analysis.cpp:506: bool is_loop_terminator(ir_if*): assertion „inst != __null“ failed. + +https://bugs.freedesktop.org/show_bug.cgi?id=65236";>Bug 65236 - [i965] Rendering artifacts in VDrift/GL2 + +https://bugs.freedesktop.org/show_bug.cgi?id=66558";>Bug 66558 - RS690: 3D artifacts when playing SuperTuxKart + +https://bugs.freedesktop.org/show_bug.cgi?id=66847";>Bug 66847 - compilation broken with llvm 3.3 + +https://bugs.freedesktop.org/show_bug.cgi?id=66850";>Bug 66850 - glGenerateMipmap crashes when using GL_TEXTURE_2D_ARRAY with compressed internal format + +https://bugs.freedesktop.org/show_bug.cgi?id=66921";>Bug 66921 - [r300g] Heroes of Newerth: HiZ related corruption + +https://bugs.freedesktop.org/show_bug.cgi?id=67283";>Bug 67283 - VDPAU doesn't work on hybrid laptop through DRI_PRIME + + + +Changes +The full set of changes can be viewed by using the following GIT command: + + + git log mesa-9.1.4..mesa-9.1.5 + + +Andreas Boll (1): + + configure.ac: Require llvm-3.2 for r600g/radeonsi llvm backends + + +Brian Paul (4): + + mesa: handle 2D texture arrays in get_tex_rgba_compressed() + meta: handle 2D texture arrays in decompress_texture_image() + mes
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a6bfcf6faff436754ce57195ec22de5048f00f9d Author: Christopher James Halse Rogers Date: Fri Aug 2 20:29:15 2013 +1000 Release to Saucy diff --git a/debian/changelog b/debian/changelog index 6093547..ca51f66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.21.12-1ubuntu1) UNRELEASED; urgency=low +xserver-xorg-video-intel (2:2.21.12-1ubuntu1) saucy; urgency=low [ Maarten Lankhorst ] * Merge from unreleased debian git (LP: #1198409, #1173557, #1199746, #1200766) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1v5cbv-0001bu...@vasks.debian.org
xserver-xorg-video-ati: Changes to 'ubuntu'
autogen.sh|4
configure.ac |4
debian/changelog | 12
debian/control|4
debian/patches/drmmode-fail.patch | 31 -
debian/patches/fixup-close.patch | 131
debian/patches/series |3
debian/patches/xmir.patch | 622 ++
man/radeon.man| 25 +
src/ati_pciids_gen.h | 59 +++
src/cayman_shader.c | 590 +++-
src/drmmode_display.c | 141 +++-
src/drmmode_display.h | 10
src/evergreen_accel.c | 12
src/evergreen_exa.c | 287 +
src/evergreen_shader.c| 596 +++-
src/evergreen_state.h |2
src/pcidb/ati_pciids.csv | 107 +-
src/r600_exa.c| 14
src/radeon.h | 28 +
src/radeon_bo_helper.c| 70
src/radeon_bo_helper.h|7
src/radeon_chipinfo_gen.h | 107 +-
src/radeon_chipset_gen.h | 59 +++
src/radeon_dri2.c | 286 ++---
src/radeon_exa.c | 65 ---
src/radeon_exa_funcs.c|3
src/radeon_exa_render.c | 12
src/radeon_glamor.c | 81
src/radeon_kms.c | 81
src/radeon_pci_chipset_gen.h | 59 +++
src/radeon_pci_device_match_gen.h | 59 +++
src/radeon_probe.h|7
src/radeon_video.c|6
src/radeon_video.h|1
35 files changed, 2741 insertions(+), 844 deletions(-)
New commits:
commit e1444928fb3c61172434d0465cbb28a3eb196c28
Author: Christopher James Halse Rogers
Date: Fri Aug 2 20:38:44 2013 +1000
New upstream snapshot, bonus XMir support
diff --git a/debian/changelog b/debian/changelog
index efb4ed8..ee8f4ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xserver-xorg-video-ati (1:7.1.0+git20130801.g2ae6bb1-0ubuntu1) saucy;
urgency=low
+
+ * "In the finest traditions of the Watch"
+ * New upstream snapshot
+- Support for new chip families
+- EXA optimisations
+ * Drop fixup-close.patch and drmmode-fail.patch; included upstream
+ * Add XMir support
+- xmir.patch
+
+ -- Christopher James Halse Rogers Thu, 01 Aug 2013
20:24:11 +1000
+
xserver-xorg-video-ati (1:7.1.0-0ubuntu2.1) raring; urgency=critical
* Rebuild for xserver 1.14
diff --git a/debian/control b/debian/control
index 2c7a36a..32fcf15 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.12.99.901),
+ xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
x11proto-gl-dev,
x11proto-xext-dev,
x11proto-core-dev,
@@ -18,7 +18,7 @@ Build-Depends:
x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2),
x11proto-render-dev,
- libdrm-dev (>= 2.4.39) [!hurd-i386],
+ libdrm-dev (>= 2.4.46) [!hurd-i386],
x11proto-dri2-dev,
x11proto-xf86dri-dev,
libudev-dev [linux-any],
diff --git a/debian/patches/drmmode-fail.patch
b/debian/patches/drmmode-fail.patch
deleted file mode 100644
index f3ad262..000
--- a/debian/patches/drmmode-fail.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 35b384a00a0c76ea556f55787fccc95ecd51bc0c
-Author: Maarten Lankhorst
-Date: Thu Mar 21 15:34:21 2013 +0100
-
-drmmode: handle failure of drmModeGetConnector
-
-Signed-off-by: Maarten Lankhorst
-
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 87ab268..4c50a1b 100644
a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -716,6 +716,8 @@ drmmode_output_detect(xf86OutputPtr output)
- drmModeFreeConnector(drmmode_output->mode_output);
-
- drmmode_output->mode_output = drmModeGetConnector(drmmode->fd,
drmmode_output->output_id);
-+ if (!drmmode_output->mode_output)
-+ return XF86OutputStatusDisconnected;
-
- switch (drmmode_output->mode_output->connection) {
- case DRM_MODE_CONNECTED:
-@@ -749,6 +751,9 @@ drmmode_output_get_modes(xf86OutputPtr output)
- drmModePropertyPtr props;
- xf86MonPtr mon = NULL;
-
-+ if (!koutput)
-+ return NULL;
-+
- /* look for an EDID property */
- for (i = 0; i < koutput->count_props; i++) {
- props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
diff --git a/debian/patches/fixup-close.patch b/debian/patches/fixup-close.patch
deleted file mode 100644
index 7d6f605..000
--- a/debian/patches/fixup-close.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 0d73856..87ab268 100644
a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -1575,15 +1575,37 @@ void drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr
drmmode)
- RADEONEntPtr pRADEONE
xserver-xorg-video-nouveau: Changes to 'ubuntu'
debian/changelog |6
debian/control|2
debian/patches/series |1
debian/patches/xmir.patch | 406 ++
4 files changed, 414 insertions(+), 1 deletion(-)
New commits:
commit c47e57c97b4f3a51b82718ce1cd5efeba787606b
Author: Christopher James Halse Rogers
Date: Fri Aug 2 20:41:29 2013 +1000
Add XMir support
diff --git a/debian/changelog b/debian/changelog
index 709b3f6..7e5adb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:1.0.8-0ubuntu2) saucy; urgency=low
+
+ * Add XMir support
+
+ -- Christopher James Halse Rogers Thu, 01 Aug 2013
20:58:29 +1000
+
xserver-xorg-video-nouveau (1:1.0.8-0ubuntu1) saucy; urgency=low
* Sync to unreleased debian experimental git.
diff --git a/debian/control b/debian/control
index 8e919c1..70ce991 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.14.2-0ubuntu4~),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
diff --git a/debian/patches/series b/debian/patches/series
index e8e209c..8dfdb49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
# Ubuntu patches
100-vblank-on.diff
+xmir.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
new file mode 100644
index 000..94ce066
--- /dev/null
+++ b/debian/patches/xmir.patch
@@ -0,0 +1,406 @@
+commit 4515628ff78e07aea0d661ff3fd999c29cc55259
+Author: Christopher James Halse Rogers
+Date: Mon Jul 22 17:46:58 2013 +1000
+
+Support running nested in a Mir compositor
+
+Signed-off-by: Christopher James Halse Rogers
+
+Index: xf86-video-nouveau/src/nouveau_dri2.c
+===
+--- xf86-video-nouveau.orig/src/nouveau_dri2.c 2013-08-01 20:57:06.744921258
+1000
xf86-video-nouveau/src/nouveau_dri2.c 2013-08-01 20:57:06.740921258
+1000
+@@ -267,7 +267,7 @@
+ NVPtr pNv = NVPTR(scrn);
+ int i;
+
+- if (!xf86_config->num_crtc)
++ if (xorgMir || !xf86_config->num_crtc)
+ return FALSE;
+
+ for (i = 0; i < xf86_config->num_crtc; i++) {
+@@ -290,7 +290,7 @@
+ ScrnInfoPtr scrn = xf86ScreenToScrn(draw->pScreen);
+ NVPtr pNv = NVPTR(scrn);
+
+- return pNv->glx_vblank &&
++ return pNv->glx_vblank && !xorgMir &&
+ nv_window_belongs_to_crtc(scrn, draw->x, draw->y,
+ draw->width, draw->height);
+ }
+@@ -766,6 +766,19 @@
+ free(flip);
+ }
+
++#if DRI2INFOREC_VERSION >= 8 && defined(XMIR)
++static int nouveau_dri2_auth_magic(ScreenPtr pScreen, uint32_t magic)
++{
++ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
++NVPtr pNv = NVPTR(pScrn);
++
++if (xorgMir)
++ return xmir_auth_drm_magic(pNv->xmir, magic);
++else
++ return drmAuthMagic(pNv->dev->fd, magic);
++}
++#endif
++
+ Bool
+ nouveau_dri2_init(ScreenPtr pScreen)
+ {
+@@ -804,6 +817,11 @@
+ dri2.GetParam = NULL;
+ #endif
+
++#if DRI2INFOREC_VERSION >= 8 && defined(XMIR)
++ dri2.version = 8;
++ dri2.AuthMagic2 = nouveau_dri2_auth_magic;
++#endif
++
+ #if DRI2INFOREC_VERSION >= 9
+ dri2.version = 9;
+ dri2.CreateBuffer2 = nouveau_dri2_create_buffer2;
+Index: xf86-video-nouveau/src/nv_driver.c
+===
+--- xf86-video-nouveau.orig/src/nv_driver.c2013-08-01 20:57:06.744921258
+1000
xf86-video-nouveau/src/nv_driver.c 2013-08-01 20:57:40.208921211 +1000
+@@ -226,6 +226,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 @@
+ }
+
+ static Bool
++NVHasMirSupport(struct pci_device *pci_dev)
++{
++ char *busid;
++
++ busid = XNFprintf("pci:%04x:%02x:%02x.%d",
++pci_dev->domain, pci_dev->bus, pci_dev->dev,
pci_dev->func);
++
++ if (xmir_get_drm_fd(busid) < 0) {
++ xf86DrvMsg(-1, X_ERROR, "[XMir] GPU %s not handled by Mir\n",
busid);
++ free(busid);
++ return FALSE;
++ }
++ free(busid);
++ return TRUE;
++}
++
++static Bool
+ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
+ intptr_t match_data)
+ {
+@@ -343,6 +362,9 @@
+ };
+ ScrnInfoPtr pScrn = NULL;
+
++ if (xorgMir && !NVHasMirSupport(pci_dev))
++ return FALSE;
++
+ if (!NVHasKMS(pci_dev))
+ return FALSE;
+
+@@ -367,6 +389,9 @@
+ if (!dev->pdev)
+ return FALSE;
+
++ if (xorgMir && !NVHasMirSupport(dev->pdev))
++ return FALSE;
++
+ if (!NVHasKMS(dev->p
mesa: Changes to 'ubuntu'
debian/changelog | 21
debian/control | 14
debian/libegl1-mesa-drivers.install.linux.in |2
debian/libegl1-mesa.symbols |1
debian/libgbm1.install.in|2
debian/libgl1-mesa-dri.install.in|4
debian/libopenvg1-mesa-dev.install.in|6
debian/libopenvg1-mesa.install.in|2
debian/patches/aarch64.diff | 12
debian/patches/egl-platform-mir.patch| 1550 +++
debian/patches/series|3
debian/rules | 37
12 files changed, 1632 insertions(+), 22 deletions(-)
New commits:
commit fdefb253e21e87ca5c4310168f454d0433e62e3c
Author: Christopher James Halse Rogers
Date: Fri Aug 2 20:43:44 2013 +1000
Add Mir EGL platform patch
diff --git a/debian/changelog b/debian/changelog
index 4c58b09..a16a96b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (9.1.4-0ubuntu6) saucy; urgency=low
+
+ * Add Mir EGL platform
+
+ -- Christopher James Halse Rogers Fri, 02 Aug 2013
13:30:23 +1000
+
mesa (9.1.4-0ubuntu5) saucy; urgency=low
* Fix the build on Aarch64, disabling most of the acceleration
diff --git a/debian/control b/debian/control
index e6f4449..f7c2d41 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Build-Depends:
bison,
llvm-3.2-dev (>= 1:3.2repack-7~) [amd64 i386 kfreebsd-amd64 kfreebsd-i386
armhf powerpc],
libwayland-dev (>= 1.0.2) [linux-any],
+ libmirclient-dev [linux-any],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
@@ -183,6 +184,7 @@ Depends:
libxcb-glx0-dev,
libxcb-dri2-0-dev,
libx11-xcb-dev,
+ libmirclient-dev [linux-any],
${misc:Depends},
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index 0f89904..3af6509 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -9,6 +9,7 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
(arch=linux-any)dri2_get_device_name_for_fd@Base 8.1~0
(arch=linux-any)dri2_get_driver_for_fd@Base 8.1~0
(arch=linux-any)dri2_initialize_drm@Base 8.1~0
+ (arch=linux-any)dri2_initialize_mir@Base 9.1.4-0ubuntu6~
(arch=linux-any)dri2_initialize_wayland@Base 8.1~0
dri2_initialize_x11@Base 8.1~0
dri2_load_driver@Base 8.1~0
diff --git a/debian/patches/egl-platform-mir.patch
b/debian/patches/egl-platform-mir.patch
new file mode 100644
index 000..58c69b4
--- /dev/null
+++ b/debian/patches/egl-platform-mir.patch
@@ -0,0 +1,1550 @@
+Index: mesa/configure.ac
+===
+--- mesa.orig/configure.ac 2013-08-02 13:52:39.909145976 +1000
mesa/configure.ac 2013-08-02 13:52:39.893145977 +1000
+@@ -1547,7 +1547,9 @@
+
+ android|gdi)
+ ;;
+-
++mir)
++PKG_CHECK_MODULES([MIR], [mirclient])
++;;
+ *)
+ AC_MSG_ERROR([EGL platform '$plat' does not exist])
+ ;;
+@@ -1575,6 +1577,7 @@
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm'
>/dev/null 2>&1)
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev'
>/dev/null 2>&1)
+ AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null'
>/dev/null 2>&1)
++AM_CONDITIONAL(HAVE_EGL_PLATFORM_MIR, echo "$egl_platforms" | grep 'mir'
>/dev/null 2>&1)
+
+ AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
+ AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x")
+Index: mesa/include/EGL/eglplatform.h
+===
+--- mesa.orig/include/EGL/eglplatform.h2013-08-02 13:52:39.909145976
+1000
mesa/include/EGL/eglplatform.h 2013-08-02 13:52:39.893145977 +1000
+@@ -104,6 +104,13 @@
+ typedef struct egl_native_pixmap_t *EGLNativePixmapType;
+ typedef void*EGLNativeDisplayType;
+
++#elif defined(MIR_EGL_PLATFORM)
++
++#include
++typedef MirEGLNativeDisplayType EGLNativeDisplayType;
++typedef void *EGLNativePixmapType;
++typedef MirEGLNativeWindowType EGLNativeWindowType;
++
+ #elif defined(__unix__)
+
+ #ifdef MESA_EGL_NO_X11_HEADERS
+Index: mesa/include/GL/internal/dri_interface.h
+===
+--- mesa.orig/include/GL/internal/dri_interface.h 2013-08-02
13:52:39.909145976 +1000
mesa/include/GL/internal/dri_interface.h 2013-08-02 13:52:39.893145977
+1000
+@@ -766,10 +766,12 @@
+ unsigned int pitch;
+ unsigned int cpp;
+ unsigned int flags;
++unsigned int fd;/**
xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog |7
debian/patches/xmir.patch | 72 +++---
2 files changed, 44 insertions(+), 35 deletions(-)
New commits:
commit ddb3136a7dfa537181681e8e9e09ffbd596d7e1d
Author: Christopher James Halse Rogers
Date: Fri Aug 2 21:00:31 2013 +1000
Fix flushing for XMir
diff --git a/debian/changelog b/debian/changelog
index ee8f4ef..30fd8a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:7.1.0+git20130801.g2ae6bb1-0ubuntu2) saucy;
urgency=low
+
+ * xmir.patch: Flush rendering before submitting to Mir. Fixes occasional
missing
+rendering.
+
+ -- Christopher James Halse Rogers Fri, 02 Aug 2013
21:00:11 +1000
+
xserver-xorg-video-ati (1:7.1.0+git20130801.g2ae6bb1-0ubuntu1) saucy;
urgency=low
* "In the finest traditions of the Watch"
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 59606ac..87b7956 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,8 +8,8 @@ Date: Mon Jul 22 17:02:17 2013 +1000
Index: xf86-video-ati/src/drmmode_display.c
===
xf86-video-ati.orig/src/drmmode_display.c 2013-08-01 20:43:13.072922426
+1000
-+++ xf86-video-ati/src/drmmode_display.c 2013-08-01 20:43:13.060922426
+1000
+--- xf86-video-ati.orig/src/drmmode_display.c 2013-08-02 20:57:42.475265082
+1000
xf86-video-ati/src/drmmode_display.c 2013-08-02 20:57:42.467265083
+1000
@@ -1887,7 +1887,7 @@
if (!miCreateDefColormap(pScreen))
return FALSE;
@@ -21,8 +21,8 @@ Index: xf86-video-ati/src/drmmode_display.c
#if 0 /* This option messes up text mode! (e...@suse.de) */
Index: xf86-video-ati/src/radeon.h
===
xf86-video-ati.orig/src/radeon.h 2013-08-01 20:43:13.072922426 +1000
-+++ xf86-video-ati/src/radeon.h2013-08-01 20:43:13.060922426 +1000
+--- xf86-video-ati.orig/src/radeon.h 2013-08-02 20:57:42.475265082 +1000
xf86-video-ati/src/radeon.h2013-08-02 20:57:42.467265083 +1000
@@ -87,6 +87,13 @@
#include "picturestr.h"
#endif
@@ -52,8 +52,8 @@ Index: xf86-video-ati/src/radeon.h
/* radeon_accel.c */
Index: xf86-video-ati/src/radeon_bo_helper.c
===
xf86-video-ati.orig/src/radeon_bo_helper.c 2013-08-01 20:43:13.072922426
+1000
-+++ xf86-video-ati/src/radeon_bo_helper.c 2013-08-01 20:43:13.060922426
+1000
+--- xf86-video-ati.orig/src/radeon_bo_helper.c 2013-08-02 20:57:42.475265082
+1000
xf86-video-ati/src/radeon_bo_helper.c 2013-08-02 20:57:42.467265083
+1000
@@ -201,19 +201,25 @@
}
@@ -113,8 +113,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.c
Index: xf86-video-ati/src/radeon_bo_helper.h
===
xf86-video-ati.orig/src/radeon_bo_helper.h 2013-08-01 20:43:13.072922426
+1000
-+++ xf86-video-ati/src/radeon_bo_helper.h 2013-08-01 20:43:13.064922426
+1000
+--- xf86-video-ati.orig/src/radeon_bo_helper.h 2013-08-02 20:57:42.475265082
+1000
xf86-video-ati/src/radeon_bo_helper.h 2013-08-02 20:57:42.467265083
+1000
@@ -33,6 +33,7 @@
extern Bool
@@ -126,8 +126,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.h
#endif /* RADEON_BO_HELPER_H */
Index: xf86-video-ati/src/radeon_dri2.c
===
xf86-video-ati.orig/src/radeon_dri2.c 2013-08-01 20:43:13.072922426
+1000
-+++ xf86-video-ati/src/radeon_dri2.c 2013-08-01 20:43:13.064922426 +1000
+--- xf86-video-ati.orig/src/radeon_dri2.c 2013-08-02 20:57:42.475265082
+1000
xf86-video-ati/src/radeon_dri2.c 2013-08-02 20:57:42.471265083 +1000
@@ -1535,6 +1535,18 @@
#endif /* USE_DRI2_SCHEDULING */
@@ -170,8 +170,8 @@ Index: xf86-video-ati/src/radeon_dri2.c
dri2_info.CreateBuffer2 = radeon_dri2_create_buffer2;
Index: xf86-video-ati/src/radeon_exa.c
===
xf86-video-ati.orig/src/radeon_exa.c 2013-08-01 20:43:13.072922426
+1000
-+++ xf86-video-ati/src/radeon_exa.c2013-08-01 20:43:13.064922426 +1000
+--- xf86-video-ati.orig/src/radeon_exa.c 2013-08-02 20:57:42.475265082
+1000
xf86-video-ati/src/radeon_exa.c2013-08-02 20:57:42.471265083 +1000
@@ -326,12 +326,12 @@
Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
{
@@ -189,8 +189,8 @@ Index: xf86-video-ati/src/radeon_exa.c
#endif
Index: xf86-video-ati/src/radeon_glamor.c
===
xf86-video-ati.orig/src/radeon_glamor.c2013-08-01 20:43:13.072922426
+1000
-+++ xf86-video-ati/src/radeon_glamor.c 2013-08-01 20:43:13.064922426 +1000
+--- xf86-video-ati.orig/src/radeon_glamor.c2013-08-02 20:57:42.4752
Processed: Re: Bug#718595: x11-common: Graphical and console display scrambled on resume from sleep/hibernate
Processing control commands: > reassign -1 src:linux 3.2.46-1 Bug #718595 [x11-common] x11-common: Graphical and console display scrambled on resume from sleep/hibernate Bug reassigned from package 'x11-common' to 'src:linux'. No longer marked as found in versions xorg/1:7.7+3~deb7u1. Ignoring request to alter fixed versions of bug #718595 to the same values previously set Bug #718595 [src:linux] x11-common: Graphical and console display scrambled on resume from sleep/hibernate Marked as found in versions linux/3.2.46-1. -- 718595: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718595 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.b718595.13754812054383.transcr...@bugs.debian.org
xorg-server: Changes to 'debian-experimental'
debian/changelog |5 - debian/patches/02_improve-posix-saved-ids-check.diff | 65 +++ debian/patches/02_kbsd-issetugid.diff| 57 debian/patches/03_kbsd-parser-include.diff | 26 --- debian/patches/03_static-nettle.diff | 17 debian/patches/04_hashtabletest-s390x.diff | 27 +++ debian/patches/series|5 - 7 files changed, 115 insertions(+), 87 deletions(-) New commits: commit c1cb0e67380f8d0c21929bd5e8e1dec0cb1c4bc0 Author: Julien Cristau Date: Sat Aug 3 00:10:53 2013 +0200 Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64). diff --git a/debian/changelog b/debian/changelog index 17a6253..e705c9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low Require dpkg-dev 1.16.1. * Also improve POSIX_SAVED_IDS check to work on kbsd. * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb). + * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64). -- Julien Cristau Sat, 27 Jul 2013 18:48:37 +0200 diff --git a/debian/patches/04_hashtabletest-s390x.diff b/debian/patches/04_hashtabletest-s390x.diff new file mode 100644 index 000..0401035 --- /dev/null +++ b/debian/patches/04_hashtabletest-s390x.diff @@ -0,0 +1,27 @@ +From 3562cb865b13d6f59e5c3b472d073ad6bbc06ceb Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Fri, 2 Aug 2013 23:40:55 +0200 +Subject: [PATCH] test: include dix-config.h in hashtabletest.c + +Missing _XSERVER64 define caused inconsistent sizeof(XID) between the +test and hashtable code, leading to test failures on 64bit big endian +archs like s390x or ppc64. +--- + test/hashtabletest.c |4 + 1 file changed, 4 insertions(+) + +diff --git a/test/hashtabletest.c b/test/hashtabletest.c +index 64c7091..6af14a8 100644 +--- a/test/hashtabletest.c b/test/hashtabletest.c +@@ -1,3 +1,7 @@ ++#ifdef HAVE_DIX_CONFIG_H ++#include ++#endif ++ + #include + #include + #include +-- +1.7.10.4 + diff --git a/debian/patches/series b/debian/patches/series index 015811b..c42a991 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,7 @@ 001_fedora_extramodes.patch 02_improve-posix-saved-ids-check.diff 03_static-nettle.diff +04_hashtabletest-s390x.diff 05_Revert-Unload-submodules.diff 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff 08_xfree86_fix_ia64_inx_outx.diff commit 73d2fba2c9c61d4e4f45089fece8e18a58d9becb Author: Julien Cristau Date: Fri Aug 2 20:18:37 2013 +0200 Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb). diff --git a/debian/changelog b/debian/changelog index 4318093..17a6253 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS. Require dpkg-dev 1.16.1. * Also improve POSIX_SAVED_IDS check to work on kbsd. + * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb). -- Julien Cristau Sat, 27 Jul 2013 18:48:37 +0200 diff --git a/debian/patches/03_static-nettle.diff b/debian/patches/03_static-nettle.diff new file mode 100644 index 000..4a48338 --- /dev/null +++ b/debian/patches/03_static-nettle.diff @@ -0,0 +1,17 @@ +Link against static libnettle + +There's no libnettle udeb. + +Index: xorg-server/configure.ac +=== +--- xorg-server.orig/configure.ac 2013-08-02 20:15:25.471466837 +0200 xorg-server/configure.ac 2013-08-02 20:17:12.875999417 +0200 +@@ -1433,7 +1433,7 @@ + if test "x$with_sha1" = xlibnettle; then + AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1], + [Use libnettle SHA1 functions]) +- SHA1_LIBS=-lnettle ++ SHA1_LIBS=-l:libnettle.a + fi + AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes]) + if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then diff --git a/debian/patches/series b/debian/patches/series index c85071a..015811b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ ## Ubuntu patches start with 100. 001_fedora_extramodes.patch 02_improve-posix-saved-ids-check.diff +03_static-nettle.diff 05_Revert-Unload-submodules.diff 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff 08_xfree86_fix_ia64_inx_outx.diff commit d816d729d2746a186ee1489ce4ddc3cdd211fa4b Author: Julien Cristau Date: Fri Aug 2 19:18:47 2013 +0200 Replace kbsd fix with a better one issetugid is now declared by libc, and we can use _POSIX_SAVED_IDS diff --git a/debian/changelog b/debian/changelog index 6938725..4318093 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low * Use libbsd-
