xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog| 11
debian/patches/series |1
debian/patches/sna-flush-scanout-cache-after-resizing.patch | 228
3 files changed, 240 insertions(+)
New commits:
commit 30fce9c04afb32c5d060d7040d8e28d7de12228b
Author: Bryce Harrington
Date: Fri Apr 19 21:27:20 2013 -0700
Add sna-flush-scanout-cache-after-resizing.patch
diff --git a/debian/changelog b/debian/changelog
index 6c2e6f1..be1fca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu4) raring-proposed; urgency=low
+
+ [Chris Arges]
+ * Add sna-flush-scanout-cache-after-resizing.patch: Flush the scanout
+cache after resizing the display. Fixes a problem that occurs
+e.g. when unplugging an external display, suspend/resume, etc. by
+ensuring the scanout cache is properly sized.
+(LP: #1157678)
+
+ -- Bryce Harrington Fri, 19 Apr 2013 11:12:14 -0700
+
xserver-xorg-video-intel (2:2.21.6-0ubuntu3) raring-proposed; urgency=low
* rules: Drop --enable-valgrind for now (causes FTBS).
diff --git a/debian/patches/series b/debian/patches/series
index 23ed8a4..df7cb15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0002-Update-manpage-for-new-accelmethod-option.patch
+sna-flush-scanout-cache-after-resizing.patch
diff --git a/debian/patches/sna-flush-scanout-cache-after-resizing.patch
b/debian/patches/sna-flush-scanout-cache-after-resizing.patch
new file mode 100644
index 000..bb4928f
--- /dev/null
+++ b/debian/patches/sna-flush-scanout-cache-after-resizing.patch
@@ -0,0 +1,228 @@
+From e083fbdc3f2025f4ccc199070e2488afc5afb2a7 Mon Sep 17 00:00:00 2001
+From: Chris Wilson
+Date: Fri, 12 Apr 2013 11:01:08 +0100
+Subject: [PATCH] sna: Flush the scanout cache after resizing the display
+
+And ensure that any new scanout allocations make the requested size.
+
+Signed-off-by: Chris Wilson
+(cherry picked from commit 9dae6f9f1f169c228929185a8bd94e82afe92574)
+
+Conflicts:
+
+ src/sna/kgem.h
+---
+ src/sna/kgem.c| 88 -
+ src/sna/kgem.h|3 ++
+ src/sna/sna_display.c | 23 -
+ 3 files changed, 83 insertions(+), 31 deletions(-)
+
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index 4136ce9..cb2dea7 100644
+--- a/src/sna/kgem.c
b/src/sna/kgem.c
+@@ -1601,6 +1601,17 @@ inline static void kgem_bo_remove_from_active(struct
kgem *kgem,
+ assert(list_is_empty(&bo->vma));
+ }
+
++static void _kgem_bo_delete_buffer(struct kgem *kgem, struct kgem_bo *bo)
++{
++ struct kgem_buffer *io = (struct kgem_buffer *)bo->proxy;
++
++ DBG(("%s: size=%d, offset=%d, parent used=%d\n",
++ __FUNCTION__, bo->size.bytes, bo->delta, io->used));
++
++ if (ALIGN(bo->delta + bo->size.bytes, UPLOAD_ALIGNMENT) == io->used)
++ io->used = bo->delta;
++}
++
+ static void kgem_bo_clear_scanout(struct kgem *kgem, struct kgem_bo *bo)
+ {
+ assert(bo->scanout);
+@@ -1625,15 +1636,31 @@ static void kgem_bo_clear_scanout(struct kgem *kgem,
struct kgem_bo *bo)
+ bo->reusable = false;
+ }
+
+-static void _kgem_bo_delete_buffer(struct kgem *kgem, struct kgem_bo *bo)
++static bool check_scanout_size(struct kgem *kgem,
++ struct kgem_bo *bo,
++ int width, int height)
+ {
+- struct kgem_buffer *io = (struct kgem_buffer *)bo->proxy;
++ struct drm_mode_fb_cmd info;
+
+- DBG(("%s: size=%d, offset=%d, parent used=%d\n",
+- __FUNCTION__, bo->size.bytes, bo->delta, io->used));
++ assert(bo->scanout);
+
+- if (ALIGN(bo->delta + bo->size.bytes, UPLOAD_ALIGNMENT) == io->used)
+- io->used = bo->delta;
++ VG_CLEAR(info);
++ info.fb_id = bo->delta;
++
++ if (drmIoctl(kgem->fd, DRM_IOCTL_MODE_GETFB, &info))
++ return false;
++
++ gem_close(kgem->fd, info.handle);
++
++ if (width != info.width || height != info.height) {
++ DBG(("%s: not using scanout %d (%dx%d), want (%dx%d)\n",
++ __FUNCTION__,
++ info.fb_id, info.width, info.height,
++ width, height))
++ return false;
++ }
++
++ return true;
+ }
+
+ static void kgem_bo_move_to_scanout(struct kgem *kgem, struct kgem_bo *bo)
+@@ -2769,6 +2796,31 @@ void kgem_purge_cache(struct kgem *kgem)
+ kgem->need_purge = false;
+ }
+
++void kgem_clean_scanout_cache(struct kgem *kgem)
++{
++ while (!list_is_empty(&kgem->scanout)) {
++ struct kgem_bo *bo;
++
++ bo = list_first_entry(&kgem->scanout, struct kgem_bo, list);
++ if (__kgem_busy(kgem, bo->handle))
++ break
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |7 +++
debian/rules |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 5b26c5e4c044ba0fc376edd934c254c3218de27b
Author: Bryce Harrington
Date: Mon Apr 15 10:35:17 2013 -0700
Drop --enable-valgrind to fix FTBS.
diff --git a/debian/changelog b/debian/changelog
index 909ed8c..6c2e6f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu3) raring-proposed; urgency=low
+
+ * rules: Drop --enable-valgrind for now (causes FTBS).
+
+ -- Bryce Harrington Mon, 15 Apr 2013 10:33:24 -0700
+
xserver-xorg-video-intel (2:2.21.6-0ubuntu2) raring; urgency=low
* debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup
apport hook. This hook is now provided by the xdiagnose package.
(LP: #997470)
+ * Re-merge from debian to enable valgrind.
-- Bryce Harrington Thu, 11 Apr 2013 12:11:29 -0700
diff --git a/debian/rules b/debian/rules
index cef06f5..7f8e4ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ BUILDER:= $(shell dpkg-parsechangelog | awk -F': '
'/^Maintainer: / {pri
# Enable SNA, pass builderstring:
override_dh_auto_configure:
- dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=sna
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))"
--enable-valgrind
+ dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=sna
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))"
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
--
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/e1uteyd-0007eg...@vasks.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |8
debian/xserver-xorg-video-intel.udev | 10 --
2 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 653f25dafe935ca94a0a42cd6faa64593fe192fa
Author: Bryce Harrington
Date: Thu Apr 11 12:38:00 2013 -0700
Delete udev rule for the gpu hang apport hook; this is now in xdiagnose.
diff --git a/debian/changelog b/debian/changelog
index f969a53..909ed8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu2) raring; urgency=low
+
+ * debian/xserver-xorg-video-intel.udev: Drop udev rule for gpu lockup
+apport hook. This hook is now provided by the xdiagnose package.
+(LP: #997470)
+
+ -- Bryce Harrington Thu, 11 Apr 2013 12:11:29 -0700
+
xserver-xorg-video-intel (2:2.21.6-0ubuntu1) raring; urgency=low
* Merge from unreleased debian git
diff --git a/debian/xserver-xorg-video-intel.udev
b/debian/xserver-xorg-video-intel.udev
deleted file mode 100644
index bd0ca5d..000
--- a/debian/xserver-xorg-video-intel.udev
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# Jesse Barnes on ubuntu-de...@lists.ubuntu.com:
-# You'll get three events, one when the error is detected, one before the
-# reset and one after. Each has a different environment variable set; the
-# initial error has ERROR=1, the pre-reset event has RESET=1 and the
-# post-reset event has ERROR=0.
-
-# Disable freeze hook.
-SUBSYSTEM=="drm", ACTION=="change", ENV{ERROR}=="1",
RUN+="/usr/share/apport/apport-gpu-error-intel.py"
--
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/e1uqox2-0002sj...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++ debian/patches/no-nv.patch | 24 debian/patches/series |1 + 3 files changed, 31 insertions(+) New commits: commit 51033f99245f8cf5c03bbcf6f33561a095d1e5ea Author: Bryce Harrington Date: Wed Apr 3 13:39:08 2013 -0700 Add no-nv.patch: Don't bother autoprobing -nv on linux anymore. diff --git a/debian/changelog b/debian/changelog index 2d46fd6..e4b55b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.13.3-0ubuntu5) UNRELEASED; urgency=low + + * Add no-nv.patch: Don't autoprobe -nv on linux. + + -- Bryce Harrington Wed, 03 Apr 2013 13:39:50 -0700 + xorg-server (2:1.13.3-0ubuntu4) raring; urgency=low * Do not bother registering xv/xvmc on gpu screens. diff --git a/debian/patches/no-nv.patch b/debian/patches/no-nv.patch new file mode 100644 index 000..4fb23e7 --- /dev/null +++ b/debian/patches/no-nv.patch @@ -0,0 +1,24 @@ +commit b770266fa9c3fab5374bdf109676e0b129ac4546 +Author: Bryce Harrington +Date: Wed Apr 3 13:36:20 2013 -0700 + +Don't bother probing -nv on linux. + +For linux this driver is long obsolete now. It may have some relevance +on non-linux systems. + +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index b2545be..73a662d 100644 +--- a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +@@ -1220,8 +1220,9 @@ xf86VideoPtrToDriverList(struct pci_device *dev, + driverList[idx++] = "nvidia"; + #ifdef __linux__ + driverList[idx++] = "nouveau"; +-#endif ++#else + driverList[idx++] = "nv"; ++#endif + break; + } + case 0x1106: diff --git a/debian/patches/series b/debian/patches/series index 1732dba..d856ee5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,6 +31,7 @@ drm_device_keep_trying.patch xfree86-no-xv-for-gpuscreens.patch xephyr-glx-register.patch +no-nv.patch ## waiting for review by upstream 111_armel-drv-fallbacks.patch -- 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/e1unuxs-0005xr...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog| 12
debian/patches/drm_device_keep_trying.patch | 75
debian/patches/series |1
3 files changed, 88 insertions(+)
New commits:
commit 7e9446f8760566140ba8b9ee3c0421ec41590e67
Author: Bryce Harrington
Date: Wed Mar 6 13:17:16 2013 -0800
Update for release to raring
diff --git a/debian/changelog b/debian/changelog
index 8b4e430..dd5a23e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xorg-server (2:1.13.2-0ubuntu3~lp982889~2) raring; urgency=low
+xorg-server (2:1.13.2-0ubuntu3) raring; urgency=low
* Add drm_device_keep_trying.patch: When kernel reports drm device is
not available, don't give up immediately, but keep retrying for a
little bit. Fixes boot failures due to a race condition with plymouth
or the kernel. Typical symptom is xserver error exit, "Cannot run in
-framebuffer mode".
+framebuffer mode" and Xorg.0.log messages about "setversion 1.4
+failed".
(LP: #982889)
-- Bryce Harrington Tue, 19 Feb 2013 07:58:24 -0800
commit 034f6dc742b0115ac5efdcb98aeb03b094fcaf72
Author: Bryce Harrington
Date: Tue Mar 5 14:36:52 2013 -0800
Provide clearer error messages to differentiate EACCES vs. EAGAIN
diff --git a/debian/changelog b/debian/changelog
index 27183f3..8b4e430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xorg-server (2:1.13.2-0ubuntu3~lp982889~1) raring; urgency=low
+xorg-server (2:1.13.2-0ubuntu3~lp982889~2) raring; urgency=low
- * Add drm_device_keep_trying.patch: When kernel reports drm device is not
available,
-don't give up immediately, but keep retrying for a little bit. Fixes boot
failures
-due to a race condition with plymouth or the kernel. Typical symptom is
xserver error
-exit, "Cannot run in framebuffer mode".
+ * Add drm_device_keep_trying.patch: When kernel reports drm device is
+not available, don't give up immediately, but keep retrying for a
+little bit. Fixes boot failures due to a race condition with plymouth
+or the kernel. Typical symptom is xserver error exit, "Cannot run in
+framebuffer mode".
(LP: #982889)
-- Bryce Harrington Tue, 19 Feb 2013 07:58:24 -0800
diff --git a/debian/patches/drm_device_keep_trying.patch
b/debian/patches/drm_device_keep_trying.patch
index d7a6f9c..13b5f5d 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -1,34 +1,47 @@
-From d650ecb5e638cf5d9e8d6b789412cb1fb5225a73 Mon Sep 17 00:00:00 2001
+From fe5802680b5ecf5ecef55b839f2f555882207d41 Mon Sep 17 00:00:00 2001
From: Bryce Harrington
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 EAGAIN on drm open when the drm device is
+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 this error code, and if it's hit then block
-until it either resolved or some other error returned (and in which
-case, log the appropriate messages to that effect).
+(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
---
- hw/xfree86/os-support/linux/lnx_platform.c | 16 +---
- 1 file changed, 13 insertions(+), 3 deletions(-)
+ hw/xfree86/os-support/linux/lnx_platform.c | 29 +---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/hw/xfree86/os-support/linux/lnx_platform.c
b/hw/xfree86/os-support/linux/lnx_platform.c
-index 76f5583..32107a9 100644
+index 76f5583..e26ef25 100644
--- a/hw/xfree86/os-support/linux/lnx_platform.c
+++ b/hw/xfree86/os-support/linux/lnx_platform.c
-@@ -23,6 +23,8 @@ get_drm_info(struct OdevAttributes *attribs, char *path)
+@@ -7,6 +7,7 @@
+ #include
+ #include
+ #include
++#include
+
+ /* Linux platform device support */
+ #include "xf86_OSproc.h"
+@@ -23,6 +24,12 @@ get_drm_info(struct OdevAttributes *attribs, char *path)
drmSetVersion sv;
char *buf;
int fd;
+int err = 0;
-+int counter = 10;
++int drm_wait_total = 2; /* Max seconds we'll wait for drm */
++int drm_wait_usleep = 50; /* How frequently we'll re-check */
++int drm_wait_max_msgs = 10; /* Max errors we'll print to logs */
++int drm_wait_counter = drm_wait_total * 100 / drm_wait_usleep;
++int drm_wait_msg_time = drm_wait_counter / drm_wait_max_msgs;
fd = open(path, O_RD
libx11: Changes to 'ubuntu'
AUTHORS|5 ChangeLog | 471 + configure.ac | 10 cpprules.in|2 debian/changelog | 65 + debian/control |8 debian/libx11-6.symbols| 10 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 19 debian/patches/015_russian_locale_alias.diff |8 debian/rules | 24 docbook.am |2 man/IsCursorKey.man|1 man/XChangeKeyboardControl.man |4 man/XChangeKeyboardMapping.man |1 man/XLookupKeysym.man |2 man/XStringToKeysym.man|1 modules/im/ximcp/imLcFlt.c | 52 + nls/Makefile.am|6 nls/en_US.UTF-8/Compose.pre| 620 + nls/fi_FI.UTF-8/Compose.pre|4 nls/pt_BR.UTF-8/Compose.pre|8 specs/XIM/xim.xml | 420 ++-- specs/XKB/acknowledgement.xml | 14 specs/XKB/ch01.xml | 17 specs/XKB/ch02.xml | 104 +- specs/XKB/ch04.xml | 110 +-- specs/XKB/ch05.xml | 150 ++-- specs/XKB/ch06.xml | 87 +- specs/XKB/ch07.xml | 13 specs/XKB/ch08.xml | 255 +++ specs/XKB/ch09.xml | 174 ++-- specs/XKB/ch10.xml | 727 ++-- specs/XKB/ch11.xml | 58 - specs/XKB/ch12.xml | 107 +-- specs/XKB/ch13.xml | 625 + specs/XKB/ch14.xml | 207 +++-- specs/XKB/ch15.xml | 346 + specs/XKB/ch16.xml | 735 +++-- specs/XKB/ch17.xml | 194 +++-- specs/XKB/ch18.xml | 175 ++--- specs/XKB/ch19.xml | 19 specs/XKB/ch20.xml | 184 ++--- specs/XKB/ch21.xml | 232 +++--- specs/XKB/ch22.xml | 38 - specs/i18n/framework/framework.xml | 165 ++-- specs/i18n/localedb/localedb.xml | 159 ++-- specs/i18n/trans/trans.xml | 403 +-- specs/libX11/AppA.xml | 26 specs/libX11/AppC.xml | 97 +- specs/libX11/AppD.xml |4 specs/libX11/CH01.xml |5 specs/libX11/CH03.xml | 42 - specs/libX11/CH04.xml |6 specs/libX11/CH06.xml | 24 specs/libX11/CH07.xml | 63 - specs/libX11/CH08.xml |4 specs/libX11/CH09.xml |3 specs/libX11/CH10.xml | 89 +- specs/libX11/CH11.xml | 15 specs/libX11/CH12.xml |9 specs/libX11/CH13.xml | 234 +++--- specs/libX11/CH14.xml | 33 specs/libX11/credits.xml | 10 specs/libX11/glossary.xml |4 src/FSWrap.c |2 src/OpenDis.c | 19 src/QuColors.c | 32 src/UIThrStubs.c |4 src/XlibInt.c |2 src/Xrm.c |2 src/Xxcbint.h |3 src/locking.c |2 src/util/makekeys.c|2 src/xcb_io.c |4 src/xlibi18n/imKStoUCS.c |2 75 files changed, 4688 insertions(+), 3095 deletions(-) New commits: commit b6e23dafb254eacfefe0e20520c2498380489904 Author: Bryce Harrington Date: Thu Feb 28 14:40:34 2013 -0800 Patch from Wookey to update symbols to build for arm64. diff --git a/debian/changelog b/debian/changelog index
xorg-server: Changes to 'ubuntu+1'
debian/patches/series | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit d0d488ed5b330ed1ca0aebed31d47e0aec2f8498 Author: Bryce Harrington Date: Fri Feb 8 16:14:22 2013 -0800 I've re-forwarded 3 of these patches to fdo, and mentioned 3 others. I didn't figure out the status for 111_armel-drv-fallbacks.patch which apparently was already sent in? 232-xf86compatoutput-valgrind.patch needs forwarded but I didn't know enough of the context there to do it. diff --git a/debian/patches/series b/debian/patches/series index db3a9f1..79fa084 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,15 +25,24 @@ 122_xext_fix_card32_overflow_in_xauth.patch # https://bugs.freedesktop.org/show_bug.cgi?id=27134 # http://lists.x.org/archives/xorg-devel/2010-April/00.html +# Resent to mailing list, Feb 2013 165_man_xorg_conf_no_device_ident.patch # https://bugs.freedesktop.org/show_bug.cgi?id=20742 +# Resent to mailing list, Feb 2013 208_switch_on_release.diff # https://bugs.freedesktop.org/show_bug.cgi?id=865 +# - Violates XKB spec: Section 6.3, SA_LockGroup +# http://lists.freedesktop.org/archives/xorg-devel/2013-January/035046.html +# - Different implementation proposed on fdo mailing list 227_null_ptr_midispcur.patch # https://bugs.freedesktop.org/show_bug.cgi?id=24181 +# Probably is just papering over issue; needs further analysis 233-xf86events-valgrind.patch # http://patchwork.freedesktop.org/patch/12156/ +# Upstream review comments need addressed 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch # https://bugzilla.novell.com/show_bug.cgi?id=772279 +# https://bugs.freedesktop.org/show_bug.cgi?id=60514 +# Resent to mailing list, Feb 2013 ## from upstream, drop when rebasing to a new version commit 4175343067d8f3aadef0d5a98270e1b87243f74d Author: Bryce Harrington Date: Fri Feb 8 10:51:55 2013 -0800 Patch 236 came from opensuse originally. Looks like a fix was added to the -intel driver to avoid hitting this bug particularly. However, this patch may still be of value and may still be worth sending upstream. diff --git a/debian/patches/series b/debian/patches/series index 0ed7099..db3a9f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,7 +19,6 @@ ## send upstream 232-xf86compatoutput-valgrind.patch -236-use-fbdev-for-poulsbo-oaktrail-medfield.patch ## waiting for review by upstream 111_armel-drv-fallbacks.patch @@ -34,5 +33,7 @@ # https://bugs.freedesktop.org/show_bug.cgi?id=24181 233-xf86events-valgrind.patch # http://patchwork.freedesktop.org/patch/12156/ +236-use-fbdev-for-poulsbo-oaktrail-medfield.patch +# https://bugzilla.novell.com/show_bug.cgi?id=772279 ## from upstream, drop when rebasing to a new version -- 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/e1u3y7m-0004fp...@vasks.debian.org
xorg-server: Changes to 'ubuntu+1'
debian/changelog |2 +- debian/patches/series | 18 +- 2 files changed, 10 insertions(+), 10 deletions(-) New commits: commit d124f0e8050d883716e23c8cd6f1e710892083a0 Author: Bryce Harrington Date: Thu Feb 7 18:22:44 2013 -0800 Patch 227 appears to fix fdo bug 24181 diff --git a/debian/patches/series b/debian/patches/series index 9167c08..0ed7099 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,7 +18,6 @@ 228_autobind_gpu.patch ## send upstream -227_null_ptr_midispcur.patch 232-xf86compatoutput-valgrind.patch 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch @@ -31,6 +30,8 @@ # https://bugs.freedesktop.org/show_bug.cgi?id=20742 208_switch_on_release.diff # https://bugs.freedesktop.org/show_bug.cgi?id=865 +227_null_ptr_midispcur.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=24181 233-xf86events-valgrind.patch # http://patchwork.freedesktop.org/patch/12156/ commit 9c3bc3811f85b5a21d1cff3fa4d35d18ad96d3cc Author: Bryce Harrington Date: Thu Feb 7 18:19:37 2013 -0800 Reformat series. Some patches to send upstream are there already Looks like these patches were sent to upstream bugzilla, but didn't get picked up. diff --git a/debian/changelog b/debian/changelog index a85064a..3698723 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1651,7 +1651,7 @@ xorg-server (2:1.9.0.902-1ubuntu4) natty; urgency=low long-standing issue where e.g. ++ fails when ctrl+shift is configured for layout switching. (LP: #36812) -2A + -- Bryce Harrington Thu, 06 Jan 2011 14:35:59 -0800 xorg-server (2:1.9.0.902-1ubuntu3) natty; urgency=low diff --git a/debian/patches/series b/debian/patches/series index 3bfda7b..9167c08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,22 +17,21 @@ # drop after desktop support arrives 228_autobind_gpu.patch -## In progress upstream +## send upstream +227_null_ptr_midispcur.patch +232-xf86compatoutput-valgrind.patch +236-use-fbdev-for-poulsbo-oaktrail-medfield.patch + +## waiting for review by upstream +111_armel-drv-fallbacks.patch 122_xext_fix_card32_overflow_in_xauth.patch # https://bugs.freedesktop.org/show_bug.cgi?id=27134 # http://lists.x.org/archives/xorg-devel/2010-April/00.html - 165_man_xorg_conf_no_device_ident.patch # https://bugs.freedesktop.org/show_bug.cgi?id=20742 - -## To send upstream 208_switch_on_release.diff -227_null_ptr_midispcur.patch -232-xf86compatoutput-valgrind.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=865 233-xf86events-valgrind.patch -236-use-fbdev-for-poulsbo-oaktrail-medfield.patch - -## waiting for review by upstream -111_armel-drv-fallbacks.patch +# http://patchwork.freedesktop.org/patch/12156/ ## from upstream, drop when rebasing to a new version -- 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/e1u3sez-dd...@vasks.debian.org
xorg-server: Changes to 'ubuntu+1'
debian/changelog |7 +++
debian/patches/157_check_null_modes.patch | 14 --
debian/patches/162_null_crtc_in_rotation.patch | 14 --
debian/patches/167_nullptr_xisbread.patch | 14 --
debian/patches/series | 11 +++
5 files changed, 14 insertions(+), 46 deletions(-)
New commits:
commit c01147b8cdc8d7377b33679b5e1c9a743d6f61de
Author: Bryce Harrington
Date: Thu Feb 7 16:12:29 2013 -0800
Drop 167 - fixed upstream in a different way
Upstream chose to fix the bug by reworking the code which was passing
XisbRead the null pointer.
This patch is essentially harmless, but it could be hiding other bugs.
Only way we can be certain is to drop the patch and see what turns up.
diff --git a/debian/changelog b/debian/changelog
index a0dc76d..a85064a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.13.99.901-0ubuntu1) UNRELEASED; urgency=low
* 157_check_null_modes.patch: Dropped, patch included upstream.
* 162_null_crtc_in_rotation.patch: Dropped, no longer relevant
(see LP: 139990)
+ * 167_nullptr_xisbread.patch: Dropped, fixed differently upstream.
-- Timo Aaltonen Thu, 07 Feb 2013 20:25:26 +0200
diff --git a/debian/patches/167_nullptr_xisbread.patch
b/debian/patches/167_nullptr_xisbread.patch
deleted file mode 100644
index 6bc6298..000
--- a/debian/patches/167_nullptr_xisbread.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c
-index 3568a57..6eaf594 100644
a/hw/xfree86/common/xisb.c
-+++ b/hw/xfree86/common/xisb.c
-@@ -96,6 +96,9 @@ XisbRead(XISBuffer * b)
- {
- int ret;
-
-+if (b == NULL)
-+return -2;
-+
- if (b->current >= b->end) {
- if (b->block_duration >= 0) {
- if (xf86WaitForInput(b->fd, b->block_duration) < 1)
diff --git a/debian/patches/series b/debian/patches/series
index 2f4b7af..3bfda7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,7 +26,6 @@
# https://bugs.freedesktop.org/show_bug.cgi?id=20742
## To send upstream
-167_nullptr_xisbread.patch
208_switch_on_release.diff
227_null_ptr_midispcur.patch
232-xf86compatoutput-valgrind.patch
commit 7dff2ef5fbda6da30bd29adbae71338ab53ee3f4
Author: Bryce Harrington
Date: Thu Feb 7 16:09:49 2013 -0800
Patch 165 was sent upstream via bugzilla
diff --git a/debian/patches/series b/debian/patches/series
index b641d45..2f4b7af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,8 +22,10 @@
# https://bugs.freedesktop.org/show_bug.cgi?id=27134
# http://lists.x.org/archives/xorg-devel/2010-April/00.html
-## To send upstream
165_man_xorg_conf_no_device_ident.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=20742
+
+## To send upstream
167_nullptr_xisbread.patch
208_switch_on_release.diff
227_null_ptr_midispcur.patch
commit bea77bd9ab8d27fa401b1fa9f242b3afcd12eff3
Author: Bryce Harrington
Date: Thu Feb 7 15:52:20 2013 -0800
Drop 162_null_crtc_in_rotation.patch as no longer relevant
We've carried this patch for a few years, meantime a number of
improvements have been made to upstream handling of multi-GPU.
We're going to optimistically drop this patch in hopes that whatever
situation led to the crash are long since gone. This bug is kind of a
corner case we don't expect very many people to encounter, so this is a
low risk way of handling it. However, if anyone does see this still
happening, please file a new bug report (and reference this one).
(LP: #139990)
diff --git a/debian/changelog b/debian/changelog
index 2af8b1d..a0dc76d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg-server (2:1.13.99.901-0ubuntu1) UNRELEASED; urgency=low
[ Bryce Harrington ]
* 157_check_null_modes.patch: Dropped, patch included upstream.
+ * 162_null_crtc_in_rotation.patch: Dropped, no longer relevant
+(see LP: 139990)
-- Timo Aaltonen Thu, 07 Feb 2013 20:25:26 +0200
diff --git a/debian/patches/162_null_crtc_in_rotation.patch
b/debian/patches/162_null_crtc_in_rotation.patch
deleted file mode 100644
index de6ae55..000
--- a/debian/patches/162_null_crtc_in_rotation.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index a773c34..f9ebb5f 100644
a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -927,7 +927,8 @@ xf86RandR12SetRotations(ScreenPtr pScreen, Rotation
rotations)
- for (c = 0; c < config->num_crtc; c++) {
- xf86CrtcPtr crtc = config->crtc[c];
-
--RRCrtcSetRotations(crtc->randr_crtc, rotations);
-+if (crtc != NULL)
-+RRCrtcSetRotations(crtc->randr_crtc, rotations);
- }
- #endif
- randrp->supported_
xorg-server: Changes to 'ubuntu'
debian/changelog |
8 +
debian/patches/237_dix_save_touchpoint_last_coords_before_transform.patch |
80 ++
debian/patches/series |
1
3 files changed, 89 insertions(+)
New commits:
commit 54e8c5a03305cf55ea197a7664ce07c07cea07c5
Author: Bryce Harrington
Date: Tue Jan 22 14:34:20 2013 -0800
Add 237_dix_save_touchpoint_last_coords_before_transform.patch:
Fix sensitive touch settings on Nexus 7 when input is transformed.
(LP: #1075415, #1076567, #1076627)
diff --git a/debian/changelog b/debian/changelog
index 305deba..5605e51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.13.1.901-0ubuntu2) raring; urgency=low
+
+ * Add 237_dix_save_touchpoint_last_coords_before_transform.patch:
+Fix sensitive touch settings on Nexus 7 when input is transformed.
+(LP: #1075415, #1076567, #1076627)
+
+ -- Bryce Harrington Tue, 22 Jan 2013 13:51:16 -0800
+
xorg-server (2:1.13.1.901-0ubuntu1) raring; urgency=low
* Merge from unreleased debian git.
diff --git
a/debian/patches/237_dix_save_touchpoint_last_coords_before_transform.patch
b/debian/patches/237_dix_save_touchpoint_last_coords_before_transform.patch
new file mode 100644
index 000..84897d4
--- /dev/null
+++ b/debian/patches/237_dix_save_touchpoint_last_coords_before_transform.patch
@@ -0,0 +1,80 @@
+commit 3b9f1c701787965246638c1a6fd99fb2b6078114
+Author: Yuly Novikov
+Date: Mon Nov 19 21:04:57 2012 -0500
+
+dix: Save touchpoint last coordinates before transform. #49347
+
+DDXTouchPointInfoRec.valuators used to store axis values after transform.
+This resulted in Coordinate Transformation Matrix
+being applied multiple times to the last coordinates,
+in the case when only pressure changes in the last touch event.
+
+Changed DDXTouchPointInfoRec.valuators to store values before transform.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=49347
+
+Signed-off-by: Yuly Novikov
+Reviewed-by: Peter Hutterer
+Signed-off-by: Peter Hutterer
+
+# 2012-12-21 - Backport patch to 1.13.0.902
+# Bryce Harrington
+
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 8b4379d..58abdba 100644
+--- a/dix/getevents.c
b/dix/getevents.c
+@@ -1951,32 +1951,27 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr
dev, uint32_t ddx_touchid,
+ default:
+ return 0;
+ }
+-if (t->mode == XIDirectTouch && !(flags & TOUCH_CLIENT_ID)) {
+-if (!valuator_mask_isset(&mask, 0))
+-valuator_mask_set_double(&mask, 0,
+- valuator_mask_get_double(touchpoint.ti->
+- valuators, 0));
+-if (!valuator_mask_isset(&mask, 1))
+-valuator_mask_set_double(&mask, 1,
+- valuator_mask_get_double(touchpoint.ti->
+- valuators, 1));
+-}
+
+ /* Get our screen event co-ordinates (root_x/root_y/event_x/event_y):
+ * these come from the touchpoint in Absolute mode, or the sprite in
+ * Relative. */
+ if (t->mode == XIDirectTouch) {
+-transformAbsolute(dev, &mask);
+-
+ if (!(flags & TOUCH_CLIENT_ID)) {
+-for (i = 0; i < valuator_mask_size(&mask); i++) {
++for (i = 0; i < max(valuator_mask_size(&mask), 2); i++) {
+ double val;
+
+ if (valuator_mask_fetch_double(&mask, i, &val))
+ valuator_mask_set_double(touchpoint.ti->valuators, i,
val);
++/* If the device doesn't post new X and Y axis values,
++ * use the last values posted.
++ */
++else if (i < 2 &&
++valuator_mask_fetch_double(touchpoint.ti->valuators, i,
&val))
++valuator_mask_set_double(&mask, i, val);
+ }
+ }
+
++transformAbsolute(dev, &mask);
+ clipAbsolute(dev, &mask);
+ }
+ else {
+diff --git a/include/inputstr.h b/include/inputstr.h
+index 5a38924..bb0a779 100644
+--- a/include/inputstr.h
b/include/inputstr.h
+@@ -331,7 +331,7 @@ typedef struct _DDXTouchPointInfo {
+ uint32_t ddx_id;/* touch ID given by the DDX */
+ Bool emulate_pointer;
+
+-ValuatorMask *valuators;/* last recorded axis values */
++ValuatorMask *valuators;/* last axis values as posted, pre-transform
*/
+ } DDXTouchPointInfoRec;
+
+ typedef struct _TouchClassRec {
diff --git a/debian/patches/series b/debian/patches/series
index 5ee1be6..b7a346f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@
xorg-server: Changes to 'ubuntu-precise'
debian/changelog | 18 ++ 1 file changed, 18 insertions(+) New commits: commit 7178870591efec2c1d91519e3f3b3133bb971d7d Author: Bryce Harrington Date: Wed Dec 19 17:04:51 2012 -0800 Revert patch 237-dix-set-the-device-transformation-matrix.patch diff --git a/debian/changelog b/debian/changelog index 822627c..714c9b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,13 @@ -xorg-server (2:1.11.4-0ubuntu10.10) UNRELEASED; urgency=low +xorg-server (2:1.11.4-0ubuntu10.11) precise-proposed; urgency=low + + * Drop 237-dix-set-the-device-transformation-matrix.patch: +Bug was targeted to precise, but is only confirmed to affect xserver +1.13 and newer. +(LP: 1041063) + + -- Bryce Harrington Wed, 19 Dec 2012 16:39:23 -0800 + +xorg-server (2:1.11.4-0ubuntu10.10) precise-proposed; urgency=low * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer jumping with absolute pointing device. Initializes device diff --git a/debian/patches/series b/debian/patches/series index 099965c..5681154 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,4 +54,3 @@ #515-dix-disable-all-devices-before-shutdown.patch 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch -237-dix-set-the-device-transformation-matrix.patch commit a7c9677f579d0adbe3c81b46f01325ff8b25c80f Author: Bryce Harrington Date: Wed Dec 19 15:40:14 2012 -0800 Add patch 237 diff --git a/debian/changelog b/debian/changelog index 70398db..822627c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.11.4-0ubuntu10.10) UNRELEASED; urgency=low + + * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer +jumping with absolute pointing device. Initializes device +transformation matrix to an identity matrix. Thanks to a7x. +(LP: #1041063) + + -- Bryce Harrington Fri, 16 Nov 2012 16:04:30 -0800 + xorg-server (2:1.11.4-0ubuntu10.9) precise-proposed; urgency=low [ Maarten Lankhorst ] diff --git a/debian/patches/series b/debian/patches/series index 5681154..099965c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,3 +54,4 @@ #515-dix-disable-all-devices-before-shutdown.patch 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch +237-dix-set-the-device-transformation-matrix.patch -- 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/e1tlun3-0007ib...@vasks.debian.org
xorg: Changes to 'ubuntu'
debian/changelog |8 debian/scripts/vars.armeb |3 +-- debian/scripts/vars.armel |3 +-- debian/scripts/vars.armhf |4 +--- 4 files changed, 11 insertions(+), 7 deletions(-) New commits: commit ebd8e72e701b5d11c0615ae241effef06265b287 Author: Bryce Harrington Date: Mon Nov 26 12:18:53 2012 -0800 Drop -ati and -nouveau for default installation on arm. diff --git a/debian/changelog b/debian/changelog index 45b24b3..5d9886e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg (1:7.7+1ubuntu5) UNRELEASED; urgency=low + + * scripts/vars.arm*: Don't include -ati or -nouveau, to save +installation space. The drivers build for some arm targets, but no +known devices actually work with them. + + -- Bryce Harrington Mon, 26 Nov 2012 12:15:57 -0800 + xorg (1:7.7+1ubuntu4) quantal; urgency=low [ Maarten Lankhorst ] diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb index 1f30685..313eb7a 100644 --- a/debian/scripts/vars.armeb +++ b/debian/scripts/vars.armeb @@ -3,8 +3,7 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-cirrus, \ +XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-cirrus, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-sisusb, \ xserver-xorg-video-vesa, \ diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel index f9cf9ba..8c83ff8 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -3,8 +3,7 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ +XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-fbdev, \ xserver-xorg-video-modesetting, \ xserver-xorg-video-omap, \ xserver-xorg-video-sisusb, \ diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf index 5ac6d6a..f77c066 100644 --- a/debian/scripts/vars.armhf +++ b/debian/scripts/vars.armhf @@ -3,11 +3,9 @@ # # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ +XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-fbdev, \ xserver-xorg-video-modesetting, \ xserver-xorg-video-omap, \ - xserver-xorg-video-nouveau, \ xserver-xorg-video-vesa, \ " -- 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/e1td59b-0002yn...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal-nexus7'
debian/changelog | 10 debian/patches/233_dix_save_touchpoint_coords_before_transform.patch | 205 ++ debian/patches/series|3 3 files changed, 218 insertions(+) New commits: commit b3cc7a2bfebd6c12aacd2f8aa65422dbc0ee0bab Author: Bryce Harrington Date: Wed Nov 21 15:18:54 2012 -0800 Update changelog for release to nexus7 ppa diff --git a/debian/changelog b/debian/changelog index 766c962..dad1c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -xorg-server (2:1.13.0-0ubuntu7) UNRELEASED; urgency=low +xorg-server (2:1.13.0-0ubuntu6.1~nexus7.1) quantal; urgency=low - * Add 233_dix_save_touchpoint_coords_before_transform.patch: Patch -proposed to xorg-devel@ to fix issue where when a transformation -matrix is applied on input, it gets applied multiple times. -(LP: #1076627) + * Add 233_dix_save_touchpoint_coords_before_transform.patch: Fixes issue +where input transformation matrix gets applied multiple times. This +patch was proposed to xorg-devel@ and has not yet been merged to +the upstream tree, so should be replaced with what gets applied. +(LP: #1075415, #1076567, #1076627) -- Bryce Harrington Wed, 21 Nov 2012 19:29:41 + commit 90def7f6690e2346ee9e408a94735effe9d8a70a Author: Bryce Harrington Date: Wed Nov 21 14:23:25 2012 -0800 Add patch 233 to fix touch input while rotated diff --git a/debian/changelog b/debian/changelog index bf4e911..766c962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.13.0-0ubuntu7) UNRELEASED; urgency=low + + * Add 233_dix_save_touchpoint_coords_before_transform.patch: Patch +proposed to xorg-devel@ to fix issue where when a transformation +matrix is applied on input, it gets applied multiple times. +(LP: #1076627) + + -- Bryce Harrington Wed, 21 Nov 2012 19:29:41 + + xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low [ Timo Aaltonen ] diff --git a/debian/patches/233_dix_save_touchpoint_coords_before_transform.patch b/debian/patches/233_dix_save_touchpoint_coords_before_transform.patch new file mode 100644 index 000..adb9d64 --- /dev/null +++ b/debian/patches/233_dix_save_touchpoint_coords_before_transform.patch @@ -0,0 +1,205 @@ +From fetchmail Thu Nov 8 14:21:57 2012 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on + humber.bryceharrington.org +X-Spam-Level: +X-Spam-Status: No, score=-7.4 required=5.0 tests=BWH_DEBIAN,BWH_DEBIAN_2, + BWH_FREE,BWH_FREE_2,BWH_PATCH_1,BWH_PATCH_2,BWH_PATCH_3,BWH_SPELLING_2b, + DKIM_SIGNED,MISSING_FROM,T_DKIM_INVALID autolearn=ham version=3.3.2 +Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) + by vinyl.outflux.net (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id qA8MHM9S009852 + for ; Thu, 8 Nov 2012 14:17:22 -0800 +Received: from cluster-j.mailcontrol.com (cluster-j.mailcontrol.com [85.115.54.190]) + by fiordland.canonical.com (Postfix) with ESMTP id C7169A18CF4 + for ; Thu, 8 Nov 2012 22:17:16 + (UTC) +Received: from arctowski.canonical.com (arctowski.canonical.com [91.189.94.158]) + by rly27j.srv.mailcontrol.com (MailControl) with ESMTP id qA8MHFbx032037 + for ; Thu, 8 Nov 2012 22:17:15 GMT +Received: from fiordland.canonical.com ([91.189.94.145]) + by arctowski.canonical.com with esmtp (Exim 4.71) + (envelope-from ) + id 1TWaPT-0006Wp-Ft + for bryce.harring...@cleanmail.canonical.com; Thu, 08 Nov 2012 22:17:15 + +Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) + by fiordland.canonical.com (Postfix) with ESMTP id 137A3A18CF4 + for ; Thu, 8 Nov 2012 22:17:15 + (UTC) +Received: from gabe.freedesktop.org (localhost [127.0.0.1]) + by gabe.freedesktop.org (Postfix) with ESMTP id 6323D9EF0A + for ; Thu, 8 Nov 2012 14:17:14 -0800 (PST) +X-Original-To: xorg-de...@lists.x.org +Delivered-To: xorg-de...@lists.x.org +Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com + [209.85.223.170]) + by gabe.freedesktop.org (Postfix) with ESMTP id A19AE9E8E1 + for ; Thu, 8 Nov 2012 14:14:11 -0800 (PST) +Received: by mail-ie0-f170.google.com with SMTP id c12so4623944ieb.15 + for ; Thu, 08 Nov 2012 14:14:11 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; + h=from:to:cc:subject:date:message-id:x-mailer; + bh=ChYBhB6uKrVo4Ao196l73x2fAcIlO26+FQDoBGw1w+Q=; + b=jUNE0YMNkPVtK3L8aDM9vAkeTj895KvO6R39IsvdAJLojh5/jNdMluqAJjqIVlAdcy + aSH9eKSyQgpZgq1z6k00gShenCU5LbGcE589ERCy+G88IDzbIt2gVl3kBPtn1afjMKlR + cO7vkm9wjRSbdURKdiM09DrcjDb2uP2LfBAKI= +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message
xorg-server: Changes to 'ubuntu-quantal-nexus7'
New branch 'ubuntu-quantal-nexus7' 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: http://lists.debian.org/e1tbigq-00019c...@vasks.debian.org
xorg-server: Changes to 'ubuntu-quantal'
debian/changelog | 13 +
debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch | 88
++
debian/patches/237-dix-set-the-device-transformation-matrix.patch | 42
debian/patches/series |2
4 files changed, 143 insertions(+), 2 deletions(-)
New commits:
commit 1b68c17c0c91b427d33217f124a889131a0dc1c3
Author: Bryce Harrington
Date: Wed Nov 21 14:19:08 2012 -0800
SRU latest raring change to quantal
diff --git a/debian/changelog b/debian/changelog
index 105864d..05eb38e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low
+xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
[ Maarten Lankhorst ]
* add 233-xf86events-valgrind.patch to fix a xserver corruption
@@ -18,7 +18,7 @@ xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low
* 500_pointer_barrier_thresholds.diff: Update to fix gaps above
barriers at edge of screen (LP: #1073724)
- -- Timo Aaltonen Tue, 09 Oct 2012 10:22:24 +0300
+ -- Bryce Harrington Fri, 16 Nov 2012 15:56:23 -0800
xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low
commit 4af1d9adbb515e2c9d01c514fbaf7a81ad3a225c
Author: Bryce Harrington
Date: Fri Nov 16 15:45:46 2012 -0800
SRU patches 236 and 237 from raring
diff --git a/debian/changelog b/debian/changelog
index 564405c..105864d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-xorg-server (2:1.13.0-0ubuntu6.1) UNRELEASED; urgency=low
+xorg-server (2:1.13.0-0ubuntu6.1) raring; urgency=low
[ Maarten Lankhorst ]
* add 233-xf86events-valgrind.patch to fix a xserver corruption
when acpid is stopped before Xorg is. (LP: #1070481)
* add 235-composite-tracking.diff to fix exa corruption. (LP: #1010794)
+ [ Bryce Harrington ]
+ * Add 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch: Never use Intel
+driver on Poulsbo/Oaktrail/Medfield. Thanks to Matthias Klumpp.
+(LP: #1069031)
+ * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer
+jumping with absolute pointing device. Initializes device
+transformation matrix to an identity matrix. Thanks to a7x.
+(LP: #1041063)
+
[ Tim Lunn ]
* 500_pointer_barrier_thresholds.diff: Update to fix gaps above
barriers at edge of screen (LP: #1073724)
diff --git a/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
b/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
new file mode 100644
index 000..dbf210d
--- /dev/null
+++ b/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
@@ -0,0 +1,88 @@
+From ec3ce5493ec00ca0a9304b705a58a40e364f88fb Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch
+Date: Sun, 22 Jul 2012 12:29:51 +0200
+Subject: [PATCH 3/3] Do not use intel driver on Poulsbo, Oaktrail, Medfield,
CDV.
+
+IDs stolen from Kernel psb driver.
+---
+ hw/xfree86/common/xf86pciBus.c | 64 +++-
+ 1 files changed, 56 insertions(+), 8 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index a2c18eb..258988a 100644
+--- a/hw/xfree86/common/xf86pciBus.c
b/hw/xfree86/common/xf86pciBus.c
+@@ -1147,14 +1147,62 @@ xf86VideoPtrToDriverList(struct pci_device *dev,
+ driverList[0] = "i128";
+ break;
+ case 0x8086:
+-if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
+-driverList[0] = "i740";
+-}
+-else if (dev->device_id == 0x8108) {
+-break; /* "hooray" for poulsbo */
+-}
+-else {
+-driverList[0] = "intel";
++ switch (dev->device_id)
++ {
++ /* Intel i740 */
++ case 0x00d1:
++ case 0x7800:
++ driverList[0] = "i740";
++ break;
++ /* GMA500/Poulsbo */
++ case 0x8108:
++ case 0x8109:
++ /* Try psb driver on Poulsbo - if available */
++ driverList[0] = "psb";
++ driverList[1] = "psb_drv";
++ break;
++ /* GMA600/Oaktrail */
++ case 0x4100:
++ case 0x4101:
++ case 0x4102:
++ case 0x4103:
++ case 0x4104:
++ case 0x4105:
++ case 0x4106:
++ case 0x4107:
++ /* Atom E620/Oaktrail */
++ case 0x4108:
++ /* Medfield */
++ case 0x0130:
++ case 0x0131:
++ case 0x0132:
++ case 0x0133:
++ case 0x0134:
++ case 0x0135:
++ case 0x0136:
++ case 0x0137:
++ /* GMA 3600/CDV */
++
xorg-server: Changes to 'ubuntu'
debian/changelog | 28 ++- debian/patches/234-composite-borderclip.patch | 48 - debian/patches/235-composite-tracking.diff| 78 debian/patches/235-composite-tracking.patch | 78 debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch | 88 ++ debian/patches/237-dix-set-the-device-transformation-matrix.patch | 42 debian/patches/series |5 7 files changed, 229 insertions(+), 138 deletions(-) New commits: commit 7544ad5f070f6a347e89ad071b963b8fbdeae1ab Author: Bryce Harrington Date: Fri Nov 16 14:01:28 2012 -0800 Add 237-dix-set-the-device-transformation-matrix.patch diff --git a/debian/changelog b/debian/changelog index bf7d458..11367e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,16 +7,20 @@ xorg-server (2:1.13.0-0ubuntu7) raring; urgency=low * Add 235-composite-tracking.patch to fix exa corruption. (LP: #1010794) + [ Bryce Harrington ] + * Add 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch: Never use Intel +driver on Poulsbo/Oaktrail/Medfield. Thanks to Matthias Klumpp. +(LP: #1069031) + * Add 237-dix-set-the-device-transformation-matrix.patch: Fix pointer +jumping with absolute pointing device. Initializes device +transformation matrix to an identity matrix. Thanks to a7x. +(LP: #1041063) + [ Tim Lunn ] * 500_pointer_barrier_thresholds.diff: Update to fix gaps above barriers at edge of screen (LP: #1073724) - [ Matthias Klumpp ] - * Add 236-use-fbdev-for-poulsbo-oaktrail-medfield.patch: Never use Intel -driver on Poulsbo/Oaktrail/Medfield -(LP: #1069031) - -- Bryce Harrington Fri, 16 Nov 2012 11:37:26 -0800 xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low diff --git a/debian/patches/237-dix-set-the-device-transformation-matrix.patch b/debian/patches/237-dix-set-the-device-transformation-matrix.patch new file mode 100644 index 000..92a9f57 --- /dev/null +++ b/debian/patches/237-dix-set-the-device-transformation-matrix.patch @@ -0,0 +1,42 @@ +From 3d1051aecbb1955084804133cacd12c7f696833a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 20 Sep 2012 05:56:39 +1000 +Subject: [PATCH] dix: set the device transformation matrix + +The property handler is registered after setting the property, so +dev->transform remains as all-zeros. That causes pixman_f_transform_invert() +to fail (in transformAbsolute()) and invert remains as garbage. This +may then cause a cursor jump to 0,0. + +Since the axes are not yet initialized here and we need to allow for drivers +changing the matrix, we cannot use the property handler for matrix +initialization, essentially duplicating the code. + +Triggered by the fix to (#49347) in 749a593e49adccdf1225be28a521412ec85333f4 + +https://bugzilla.redhat.com/show_bug.cgi?id=852841 + +Signed-off-by: Peter Hutterer +Reviewed-by: Chase Douglas +Signed-off-by: Keith Packard +--- + dix/devices.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/dix/devices.c b/dix/devices.c +index 9cf04ed..66d4406 100644 +--- a/dix/devices.c b/dix/devices.c +@@ -306,6 +306,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart) + /* unity matrix */ + memset(transform, 0, sizeof(transform)); + transform[0] = transform[4] = transform[8] = 1.0f; ++dev->transform.m[0][0] = 1.0; ++dev->transform.m[1][1] = 1.0; ++dev->transform.m[2][2] = 1.0; + + XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM), +XIGetKnownProperty(XATOM_FLOAT), 32, +-- +1.7.11.3 + diff --git a/debian/patches/series b/debian/patches/series index 523f8bf..b2d86a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,3 +35,4 @@ 229_udev-fix.diff 230-fix-compat-output-selection.patch 231-scan-pci-after-probing-devices.patch +237-dix-set-the-device-transformation-matrix.patch commit fd444153524ced3bb41175c7c291d56eaad682e6 Author: Bryce Harrington Date: Fri Nov 16 11:44:33 2012 -0800 Drop patch 234 as per mlankhorst. (Still awaiting response from upstream.) diff --git a/debian/changelog b/debian/changelog index f2f6444..bf7d458 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,6 @@ xorg-server (2:1.13.0-0ubuntu7) raring; urgency=low * Add 233-xf86events-valgrind.patch to fix a xserver corruption when acpid is stopped before Xorg is. (LP: #1070481) - * Add 234-composite-borderclip.patch to fix another valgrind -that I found when investigating a bug. -(LP: #1065113) -- This might not be the cause, though. Patch is wrong, waiting - for upstream response for right fix.. * Add 235-composite-tracking.patch to fix exa corruption. (LP: #1010794) diff --git a/debian/patches/234-composite-borderclip.patch b/debian
xkb-data: Changes to 'ubuntu'
debian/changelog |9 +
debian/patches/114_shift_f10.patch | 36
debian/patches/series |1 +
3 files changed, 46 insertions(+)
New commits:
commit 48ca382473ee4f3e6ef9323ff85e717466e26f3b
Author: Bryce Harrington
Date: Mon Sep 24 15:50:01 2012 -0700
cl
diff --git a/debian/changelog b/debian/changelog
index 6937286..d137168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xkeyboard-config (2.5-1ubuntu7) UNRELEASED; urgency=low
+xkeyboard-config (2.5-1ubuntu7) quantal; urgency=low
* Add patch 114_shift_f10.patch. Don't let Ctrl+Alt consume Shift, else
it causes Shift-F10 to be treated as F10. This can result in popup
commit 36e3ba8adb116038a48eeb10075188e2435722c6
Author: Bryce Harrington
Date: Mon Sep 24 15:25:34 2012 -0700
Add patch to fix F10 menu misbehaviors
diff --git a/debian/changelog b/debian/changelog
index 3dbddef..6937286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xkeyboard-config (2.5-1ubuntu7) UNRELEASED; urgency=low
+
+ * Add patch 114_shift_f10.patch. Don't let Ctrl+Alt consume Shift, else
+it causes Shift-F10 to be treated as F10. This can result in popup
+menus opening when they shouldn't.
+(LP: #937822)
+
+ -- Bryce Harrington Mon, 24 Sep 2012 15:19:25 -0700
+
xkeyboard-config (2.5-1ubuntu6) quantal; urgency=low
* Disable patch 109. The fix causes behavioral changes for right
diff --git a/debian/patches/114_shift_f10.patch
b/debian/patches/114_shift_f10.patch
new file mode 100644
index 000..ff2685b
--- /dev/null
+++ b/debian/patches/114_shift_f10.patch
@@ -0,0 +1,36 @@
+commit a4f62448819764f6f27ebcb86115734d0d57ea8d
+Author: Sergey V. Udaltsov
+Date: Sun Sep 2 08:57:52 2012 +0100
+
+Fixed Shift-F10 behaviour
+
+Preserving shift is essential for many applications
+https://bugs.freedesktop.org/show_bug.cgi?id=45008
+
+diff --git a/types/pc b/types/pc
+index 01a5634..daebe74 100644
+--- a/types/pc
b/types/pc
+@@ -59,17 +59,19 @@ partial default xkb_types "default" {
+ };
+
+ type "CTRL+ALT" {
+- modifiers = Control+Alt+Shift+LevelThree;
++modifiers = Control+Alt+Shift+LevelThree;
+ map[None] = Level1;
+ map[Shift] = Level2;
+ map[LevelThree] = Level3;
+ map[Shift+LevelThree] = Level4;
+- map[Control+Alt] = Level5;
++map[Control+Alt] = Level5;
++preserve[Shift] = Shift;
++preserve[Shift+LevelThree] = Shift;
+ level_name[Level1] = "Base";
+ level_name[Level2] = "Shift";
+ level_name[Level3] = "Alt Base";
+ level_name[Level4] = "Shift Alt";
+- level_name[Level5] = "Ctrl+Alt";
++level_name[Level5] = "Ctrl+Alt";
+ };
+
+// Local eight level
diff --git a/debian/patches/series b/debian/patches/series
index ba3a198..d5b86b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ revert-goodmap-badmap-for-apple.diff
111_cz_ssharp.patch
112_dk_dvorak_tilde.patch
113_ossmath_is_five_levels.patch
+114_shift_f10.patch
--
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/e1tghtp-00048o...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |9 +
debian/control |4 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 09042eb89c00c80de3efb3806949947cff8f4920
Author: Bryce Harrington
Date: Wed Sep 19 12:32:33 2012 -0700
Add recommends on libtxc-dxtn-s2tc0
diff --git a/debian/changelog b/debian/changelog
index fd83836..62f459c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (9.0~git20120917.7cfd42ce-0ubuntu2) quantal; urgency=low
+
+ * Add Recommends on libtxc-dxtn-s2tc0, required by Bastion, Psychonauts,
+Amnesia and other games on Intel graphics. This package provides
+patent-free s3tc texture support.
+(LP: #1053029)
+
+ -- Bryce Harrington Tue, 18 Sep 2012 21:17:11 -0700
+
mesa (9.0~git20120917.7cfd42ce-0ubuntu1) quantal; urgency=low
* Merge from unreleased debian git. (LP: #1047306)
diff --git a/debian/control b/debian/control
index 0dcaf6d..c8d1b72 100644
--- a/debian/control
+++ b/debian/control
@@ -452,7 +452,9 @@ Depends:
${shlibs:Depends},
libglapi-mesa (= ${binary:Version}),
${misc:Depends}
-Recommends: libgl1-mesa-dri (>= 7.2)
+Recommends:
+ libgl1-mesa-dri (>= 7.2),
+ libtxc-dxtn-s2tc0
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
--
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/e1teq19-0002os...@vasks.debian.org
weston: Changes to 'ubuntu'
debian/copyright |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 795f155666b1215162b415f893c1c647e76678f5 Author: Bryce Harrington Date: Thu Sep 13 12:51:55 2012 -0700 Fix syntax error in copyright W: weston source: syntax-error-in-dep5-copyright line 123: Cannot parse line "." diff --git a/debian/copyright b/debian/copyright index 34e3d48..721c66b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -120,7 +120,7 @@ License: otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the authors. -. + . Authors: Eric Anholt Keith Packard -- 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/e1tcfsd-00049b...@vasks.debian.org
weston: Changes to 'ubuntu'
debian/changelog |7 +++ debian/control |3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 9ae4416566a3c4be14a6b184d2660878e7460084 Author: Bryce Harrington Date: Thu Sep 13 12:47:45 2012 -0700 Branch from Benjamin Kerensa to add homepage and bump standards version diff --git a/debian/changelog b/debian/changelog index 0b761ab..f79a76d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +weston (0.95.0-0ubuntu2) quantal; urgency=low + + * debian/control: added Homepage field + * debian/control: bump Standards-Version to 3.9.3 + + -- Benjamin Kerensa Thu, 13 Sep 2012 02:33:39 -0700 + weston (0.95.0-0ubuntu1) quantal; urgency=low * Merge from unreleased debian git. diff --git a/debian/control b/debian/control index f79bfa0..99ebdd0 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,8 @@ Build-Depends: libmtdev-dev, libpam0g-dev, libvpx-dev, -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 +Homepage: http://wayland.freedesktop.org/ Vcs-Git: git://git.debian.org/git/pkg-xorg/wayland/weston Vcs-Browser: http://git.debian.org/?p=pkg-xorg/wayland/weston.git -- 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/e1tcfot-0003yd...@vasks.debian.org
mesa: Changes to 'ubuntu-precise'
debian/changelog |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 82a3ba22d03e159e8cf48d95ac1b535c11e67284 Author: Bryce Harrington Date: Fri Sep 7 15:42:02 2012 -0700 Include mention of the SRU bug report diff --git a/debian/changelog b/debian/changelog index 0f9119f..2c9fe92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -mesa (8.0.4-0ubuntu0.1) UNRELEASED; urgency=low +mesa (8.0.4-0ubuntu0.1) precise-proposed; urgency=low - * New upstream stable release. + * New upstream stable release. (LP: #1019444) + Fixes crash in intel_miptree_release() (LP: #952896) + Fixes slow WebGL in firefox @@ -20,7 +20,7 @@ mesa (8.0.4-0ubuntu0.1) UNRELEASED; urgency=low Cherrypick from mesa master. (LP: #981883) - -- Timo Aaltonen Thu, 16 Aug 2012 10:23:26 +0300 + -- Bryce Harrington Fri, 07 Sep 2012 13:59:12 -0700 mesa (8.0.3-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: http://lists.debian.org/e1ta7lv-0006pd...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |1 + 1 file changed, 1 insertion(+) New commits: commit 66948c555241d645cb2398f674219af266cc340f Author: Bryce Harrington Date: Fri Aug 17 14:41:01 2012 -0700 Note that this fixes a mesa bug requesting Trinity PCI IDs diff --git a/debian/changelog b/debian/changelog index 6fdd7a9..5cefb70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mesa (8.1~git20120816.1597176f-0ubuntu1) UNRELEASED; urgency=low * Merge from unreleased debian git. +- Includes support for ATI Trinity PCI IDs (LP: #1009089) * rules, control, libgl1-mesa-swx11*: Remove swx11 support. * Refresh patches: - drop 115_llvm_dynamic_linking.diff, -- 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/e1t2uin-0003wd...@vasks.debian.org
xterm: Changes to 'ubuntu'
INSTALL | 24 Imakefile|7 MANIFEST |4 Makefile.in | 36 THANKS |7 Tekproc.c| 10 VTPrsTbl.c | 27 VTparse.def | 10 VTparse.h| 10 aclocal.m4 | 299 - button.c | 834 +++ cachedGCs.c | 62 charproc.c | 526 +- charsets.c | 63 configure| 3751 +-- configure.in | 34 ctlseqs.ms | 151 ctlseqs.txt | 135 debian/changelog | 81 debian/control |5 debian/copyright |2 debian/local/xterm.faq.html | 8340 +-- debian/patches/900_debian_xterm.diff | 87 debian/patches/902_windowops.diff|2 debian/patches/904_fontops.diff |6 debian/rules | 21 debian/xterm.install |1 doublechr.c | 62 fontutils.c | 374 - fontutils.h | 64 input.c | 23 koi8rxterm.man |6 linedata.c | 62 main.c | 1122 ++-- main.h | 14 menu.c | 26 menu.h | 10 minstall.sh | 125 misc.c | 831 ++- os2main.c| 43 package/debian/changelog | 43 package/xterm.spec |4 print.c | 62 ptydata.c| 62 ptyx.h | 72 resize.c | 41 resize.man | 47 screen.c |4 scrollback.c | 62 scrollbar.c |4 tabs.c |5 termcap | 48 terminfo | 24 testxmc.c| 62 trace.c | 110 trace.h | 22 util.c | 104 uxterm.man |6 version.h| 19 vttests/16colors.sh |6 vttests/8colors.sh |6 vttests/acolors.sh |6 vttests/doublechars.sh |6 vttests/dynamic.sh |6 vttests/dynamic2.sh |6 vttests/fonts.sh |6 vttests/resize.sh|6 vttests/title.sh |6 xcharmouse.h |7 xstrings.c | 246 - xstrings.h | 74 xterm.h | 102 xterm.log.html | 305 + xterm.man| 602 +- xterm_io.h |4 xtermcap.h | 66 xtermcfg.hin | 69 xutf8.c | 43 78 files changed, 12544 insertions(+), 7126 deletions(-) New commits: commit d8b5da1c1273f179d9f75a9387384db80d8ff7ba Author: Bryce Harrington Date: Thu Aug 16 13:10:07 2012 -0700 Merge from debian. Branch by Logan Rosen https://code.launchpad.net/~logan/ubuntu/quantal/xterm/debian-merge/+merge/114117 diff --git a/INSTALL b/INSTALL index 028375a..0d0a4de 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.125 2011/07/07 01:01:14 tom Exp $ +-- $XTermId: INSTALL,v 1.127 2011/12/22 01:59:16 tom Exp $ --- -- Copyright 1997-2010,2011 by Thomas E. Dickey -- @@ -281,6 +281,11 @@ The options (in alphabetic order): Do not compile-in code that suppresses redundant updates to the titlebar when the text has not changed. + --disable-selection-ops disable selection operations + + Do not compile-in code to support the actions which allow users + to bind keys that use the selection or extract data from the screen. + --disable-session-mgt enable support for session management Do not compile-in code which adds simple session management hooks @@ -537,6 +542,23 @@ The options (in alphabetic order): at existing ".desktop" files for xterm and commo
x11-utils: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit 97134272ceae1942cba443d5c38b15e86e87dce2 Author: Bryce Harrington Date: Mon Aug 6 15:46:29 2012 -0700 Add patch to fix segfault in xwininfo -- 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/e1sywjk-we...@vasks.debian.org
xorg-server: Changes to 'ubuntu-precise'
debian/changelog |
9 +
debian/patches/229_randr_first_check_pScrPriv_before_using_the_pointer.patch |
30 +
debian/patches/230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch |
52 ++
debian/patches/series|
4
4 files changed, 94 insertions(+), 1 deletion(-)
New commits:
commit 373f2fbc415e40e1fb8b0564b23d0e45d96b9435
Author: Bryce Harrington
Date: Mon Aug 6 11:50:08 2012 -0700
Patches to fix X crash when mixing randr and non-randr displays
diff --git a/debian/changelog b/debian/changelog
index 5842c13..4e066c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.11.4-0ubuntu10.8) precise-proposed; urgency=low
+
+ * Add upstream patches to avoid seg fault in case the user is running with
+multiple screens and xrandr is only enabled at one (LP: #1015292):
+- 229_randr_first_check_pScrPriv_before_using_the_pointer.patch
+- 230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch
+
+ -- Ricardo Salveti de Araujo Thu, 19 Jul 2012
22:57:12 -0300
+
xorg-server (2:1.11.4-0ubuntu10.7) precise-proposed; urgency=low
* Re-enable 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
diff --git
a/debian/patches/229_randr_first_check_pScrPriv_before_using_the_pointer.patch
b/debian/patches/229_randr_first_check_pScrPriv_before_using_the_pointer.patch
new file mode 100644
index 000..8c9cf71
--- /dev/null
+++
b/debian/patches/229_randr_first_check_pScrPriv_before_using_the_pointer.patch
@@ -0,0 +1,30 @@
+From 32603f57ca03b6390b109960f8bb5ea53ac95ecb Mon Sep 17 00:00:00 2001
+From: Ricardo Salveti de Araujo
+Date: Thu, 21 Jun 2012 00:55:53 -0300
+Subject: [PATCH] randr: first check pScrPriv before using the pointer at
+ RRFirstOutput
+
+Fix a seg fault in case pScrPriv is NULL at ProcRRGetScreenInfo,
+which later calls RRFirstOutput.
+
+Signed-off-by: Ricardo Salveti de Araujo
+Reviewed-by: Keith Packard
+Signed-off-by: Keith Packard
+---
+ randr/randr.c |3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: xorg-server-1.11.4/randr/randr.c
+===
+--- xorg-server-1.11.4.orig/randr/randr.c 2012-07-17 18:46:06.0
-0300
xorg-server-1.11.4/randr/randr.c 2012-07-17 18:48:35.169824448 -0300
+@@ -454,6 +454,9 @@
+ rrScrPriv(pScreen);
+ RROutputPtr output;
+ int i, j;
++
++if (!pScrPriv)
++return NULL;
+
+ if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc)
+ return pScrPriv->primaryOutput;
diff --git
a/debian/patches/230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch
b/debian/patches/230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch
new file mode 100644
index 000..e37d073
--- /dev/null
+++
b/debian/patches/230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch
@@ -0,0 +1,52 @@
+From 855003c333a0ead1db912695bc9705ef2b3144b4 Mon Sep 17 00:00:00 2001
+From: Keith Packard
+Date: Thu, 21 Jun 2012 18:45:18 -0700
+Subject: [PATCH] randr: Catch two more potential unset rrScrPriv uses
+
+Ricardo Salveti found one place where the
+randr code could use the randr screen private data without checking
+for null first. This happens when the X server is running with
+multiple screens, some of which are randr enabled and some of which
+are not. Applications making protocol requests to the non-randr
+screens can cause segfaults where the server touches the unset private
+structure.
+
+I audited the code and found two more possible problem spots; the
+trick to auditing for this issue was to look for functions not taking
+a RandR data structure and where there was no null screen private
+check above them in the call graph.
+
+Signed-off-by: Keith Packard
+---
+ randr/rroutput.c |3 ++-
+ randr/rrscreen.c |3 +++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index 091e06b..fbd0e32 100644
+--- a/randr/rroutput.c
b/randr/rroutput.c
+@@ -546,7 +546,8 @@ ProcRRSetOutputPrimary(ClientPtr client)
+ }
+
+ pScrPriv = rrGetScrPriv(pWin->drawable.pScreen);
+-RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);
++if (pScrPriv)
++RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output);
+
+ return Success;
+ }
+diff --git a/randr/rrscreen.c b/randr/rrscreen.c
+index f570afa..55110e0 100644
+--- a/randr/rrscreen.c
b/randr/rrscreen.c
+@@ -261,6 +261,9 @@
+
+ pScreen = pWin->drawable.pScreen;
+ pScrPriv = rrGetScrPriv(pScreen);
++if (!pScrPriv)
++return BadMatch;
++
+ if (stuff->width < pScrPriv->minWidth || pScrPriv->maxWidth <
stuff->width)
+ {
+ client->errorValue = stuff->width;
diff --git a/debian/patches/series b/d
mesa: Changes to 'ubuntu-oneiric'
debian/changelog |8
debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch | 221
++
2 files changed, 229 insertions(+)
New commits:
commit 30a4a84a8f8a8ff0c30df08add104fe6e443fcf1
Author: Bryce Harrington
Date: Thu Jul 19 15:01:40 2012 -0700
Add 125_nv50_nvc0_use_screen_for_flush_notifier.patch
diff --git a/debian/changelog b/debian/changelog
index ed508bb..c9361a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.11-0ubuntu3.3) oneiric-proposed; urgency=low
+
+ * Add 125_nv50_nvc0_use_screen_for_flush_notifier.patch to fix es2_info
+crash. Backport from mesa 8.0.
+(LP: #926918)
+
+ -- Bryce Harrington Thu, 19 Jul 2012 13:37:06 -0700
+
mesa (7.11-0ubuntu3.2) oneiric-proposed; urgency=low
* Add patch series from upstream stable release to fix various issues:
diff --git a/debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch
b/debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch
new file mode 100644
index 000..f02e75d
--- /dev/null
+++ b/debian/patches/125_nv50_nvc0_use_screen_for_flush_notifier.patch
@@ -0,0 +1,221 @@
+commit 3069a7eaa5d83e7f41616347ba244c0dc0d944ae
+Author: Christoph Bumiller
+Date: Thu Jul 7 14:58:29 2011 +0200
+
+nv50,nvc0: use screen instead of context for flush notifier
+
+Context may become NULL and we still have to be able to flush
+pending fences.
+
+diff --git a/src/gallium/drivers/nv50/nv50_context.c
b/src/gallium/drivers/nv50/nv50_context.c
+index ceb83f6..ac3e361 100644
+--- a/src/gallium/drivers/nv50/nv50_context.c
b/src/gallium/drivers/nv50/nv50_context.c
+@@ -60,13 +60,13 @@ nv50_texture_barrier(struct pipe_context *pipe)
+ void
+ nv50_default_flush_notify(struct nouveau_channel *chan)
+ {
+- struct nv50_context *nv50 = chan->user_private;
++ struct nv50_screen *screen = chan->user_private;
+
+- if (!nv50)
++ if (!screen)
+ return;
+
+- nouveau_fence_update(&nv50->screen->base, TRUE);
+- nouveau_fence_next(&nv50->screen->base);
++ nouveau_fence_update(&screen->base, TRUE);
++ nouveau_fence_next(&screen->base);
+ }
+
+ static void
+@@ -100,10 +100,8 @@ nv50_destroy(struct pipe_context *pipe)
+
+draw_destroy(nv50->draw);
+
+- if (nv50->screen->cur_ctx == nv50) {
+- nv50->screen->base.channel->user_private = NULL;
++ if (nv50->screen->cur_ctx == nv50)
+ nv50->screen->cur_ctx = NULL;
+- }
+
+FREE(nv50);
+ }
+@@ -140,7 +138,6 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
+
+if (!screen->cur_ctx)
+ screen->cur_ctx = nv50;
+- screen->base.channel->user_private = nv50;
+screen->base.channel->flush_notify = nv50_default_flush_notify;
+
+nv50_init_query_functions(nv50);
+diff --git a/src/gallium/drivers/nv50/nv50_screen.c
b/src/gallium/drivers/nv50/nv50_screen.c
+index cc921d0..4cda303 100644
+--- a/src/gallium/drivers/nv50/nv50_screen.c
b/src/gallium/drivers/nv50/nv50_screen.c
+@@ -215,6 +215,7 @@ nv50_screen_destroy(struct pipe_screen *pscreen)
+ nouveau_fence_wait(screen->base.fence.current);
+ nouveau_fence_ref (NULL, &screen->base.fence.current);
+}
++ screen->base.channel->user_private = NULL;
+
+nouveau_bo_ref(NULL, &screen->code);
+nouveau_bo_ref(NULL, &screen->tls_bo);
+@@ -300,6 +301,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct
nouveau_device *dev)
+ FAIL_SCREEN_INIT("nouveau_screen_init failed: %d\n", ret);
+
+chan = screen->base.channel;
++ chan->user_private = screen;
+
+pscreen->winsys = ws;
+pscreen->destroy = nv50_screen_destroy;
+diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c
b/src/gallium/drivers/nv50/nv50_state_validate.c
+index 11561f5..d29c1e9 100644
+--- a/src/gallium/drivers/nv50/nv50_state_validate.c
b/src/gallium/drivers/nv50/nv50_state_validate.c
+@@ -282,8 +282,7 @@ nv50_switch_pipe_context(struct nv50_context *ctx_to)
+if (!ctx_to->zsa)
+ ctx_to->dirty &= ~NV50_NEW_ZSA;
+
+- ctx_to->screen->base.channel->user_private = ctx_to->screen->cur_ctx =
+- ctx_to;
++ ctx_to->screen->cur_ctx = ctx_to;
+ }
+
+ static struct state_validate {
+diff --git a/src/gallium/drivers/nv50/nv50_vbo.c
b/src/gallium/drivers/nv50/nv50_vbo.c
+index bb08941..f23008a 100644
+--- a/src/gallium/drivers/nv50/nv50_vbo.c
b/src/gallium/drivers/nv50/nv50_vbo.c
+@@ -389,11 +389,11 @@ nv50_prim_gl(unsigned prim)
+ static void
+ nv50_draw_vbo_flush_notify(struct nouveau_channel *chan)
+ {
+- struct nv50_context *nv50 = chan->user_private;
++ struct nv50_screen *screen = chan->user_private;
+
+- nouveau_fence_update(&nv50->screen->base, TRUE);
++ nouveau_fence_update(&screen->base, TRUE);
+
+- n
xkb-data: Changes to 'ubuntu'
debian/changelog |8 debian/patches/series |2 +- 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 4e0f95c31489bd8edecc6d03564ceef0138af3ea Author: Bryce Harrington Date: Thu Jul 19 14:12:05 2012 -0700 Disable patch 109 as per bug #1013881 diff --git a/debian/changelog b/debian/changelog index 8bfd3cf..3dbddef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xkeyboard-config (2.5-1ubuntu6) quantal; urgency=low + + * Disable patch 109. The fix causes behavioral changes for right +control. Needs to be fixed differently; discussion ongoing upstream. +(LP: #1013881) + + -- Bryce Harrington Thu, 19 Jul 2012 14:08:18 -0700 + xkeyboard-config (2.5-1ubuntu5) quantal; urgency=low * Add 113_ossmath_is_five_levels.patch: Some keymaps like fr/oss fail to diff --git a/debian/patches/series b/debian/patches/series index ded6420..ba3a198 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,7 @@ docs.diff revert-goodmap-badmap-for-apple.diff 105_intelligent_keyboard.patch 108_fix_intltool_make_check.diff -109_fr_oss_space_char.patch +#109_fr_oss_space_char.patch 110_dead_hook_horn.patch 111_cz_ssharp.patch 112_dk_dvorak_tilde.patch -- 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/e1sry1h-0001o8...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |1 + 1 file changed, 1 insertion(+) New commits: commit 16a364b0e6aab8c55ac752528be9b3e54a15f884 Author: Bryce Harrington Date: Thu Jul 19 11:36:55 2012 -0700 Note a bug # this release will fix. diff --git a/debian/changelog b/debian/changelog index 30cc1a7..b7b924c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xorg-server (2:1.12.99.902-1) UNRELEASED; urgency=low * New upstream release snapshot (on the way to 1.13). +- Fixes QT5 app segfaults (LP: #1015292) * Bump minimum required abi, randr, dri2 and gl protos. * Refreshed patches to apply on x1.13 * Remove patches merged upstream: -- 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/e1srvb8-00049e...@vasks.debian.org
mesa: Changes to 'ubuntu-precise'
/mesa/drivers/dri/intel/intel_context.c |7 src/mesa/drivers/dri/intel/intel_extensions_es.c|2 src/mesa/drivers/dri/intel/intel_fbo.c | 59 - src/mesa/drivers/dri/intel/intel_fbo.h |3 src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 26 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c |4 src/mesa/drivers/dri/intel/intel_regions.c |7 src/mesa/drivers/dri/intel/intel_tex.c |2 src/mesa/drivers/dri/intel/intel_tex_image.c| 17 src/mesa/drivers/dri/intel/intel_tex_obj.h |1 src/mesa/drivers/dri/intel/intel_tex_validate.c | 10 src/mesa/drivers/dri/r200/r200_maos_arrays.c|2 src/mesa/drivers/dri/radeon/radeon_maos_arrays.c|2 src/mesa/drivers/windows/gdi/wmesa.c| 97 -- src/mesa/main/api_arrayelt.c| 10 src/mesa/main/api_validate.c| 14 src/mesa/main/attrib.c | 24 src/mesa/main/bufferobj.c | 25 src/mesa/main/dlist.c | 46 + src/mesa/main/extensions.c |2 src/mesa/main/fbobject.c|4 src/mesa/main/format_unpack.c | 58 + src/mesa/main/formats.c |4 src/mesa/main/imports.c |2 src/mesa/main/light.c |2 src/mesa/main/mipmap.c |1 src/mesa/main/readpix.c | 71 +- src/mesa/main/teximage.c| 114 ++- src/mesa/main/uniform_query.cpp |6 src/mesa/main/varray.c |1 src/mesa/main/version.h |4 src/mesa/program/ir_to_mesa.cpp |2 src/mesa/state_tracker/st_cb_drawpixels.c | 10 src/mesa/state_tracker/st_extensions.c |2 src/mesa/swrast/s_aaline.c |1 src/mesa/swrast/s_aatriangle.c |1 src/mesa/swrast/s_blit.c|9 src/mesa/swrast/s_context.c |1 src/mesa/swrast/s_lines.c |1 src/mesa/swrast/s_texture.c | 21 src/mesa/swrast/s_triangle.c|1 src/mesa/swrast/swrast.h|4 src/mesa/vbo/vbo_attrib_tmp.h | 58 - src/mesa/vbo/vbo_exec_api.c | 95 ++ src/mesa/vbo/vbo_exec_array.c | 85 -- src/mesa/vbo/vbo_save_api.c | 57 + src/mesa/vbo/vbo_save_draw.c|4 123 files changed, 2239 insertions(+), 1263 deletions(-) New commits: commit 5a8facdd910cd7448091a618393be6ead525dfb8 Author: Bryce Harrington Date: Wed Jul 18 11:00:21 2012 -0700 Realign changelog with precise-proposed's changelog diff --git a/debian/changelog b/debian/changelog index e155a85..a682350 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,7 +35,7 @@ mesa (8.0.2-2) unstable; urgency=low -- Cyril Brulebois Tue, 01 May 2012 21:42:35 +0200 -mesa (8.0.2-0ubuntu4) quantal; urgency=low +mesa (8.0.2-0ubuntu3.1) precise-proposed; urgency=low * Add 118_fix_rendering_from_textures.patch: Postpone the setup of the workaround render target miptree until update_renderbuffer time. commit 15f9005b4dd31de49f63478af904f2170adb32a8 Author: Bryce Harrington Date: Tue Jul 10 19:03:13 2012 -0700 Release 8.0.3-0ubuntu0.1 diff --git a/debian/changelog b/debian/changelog index d2a1376..e155a85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (8.0.3-0ubuntu1~precise~1) precise-proposed; urgency=low +mesa (8.0.3-0ubuntu0.1) precise-proposed; urgency=low * New upstream stable release. + Fixes crash in intel_miptree_release() @@ -20,7 +20,7 @@ mesa (8.0.3-0ubuntu1~precise~1) precise-proposed; urgency=low Cherrypick from mesa master. (LP: #981883) - -- Robert Hooker Fri, 01 Jun 2012 13:01:35 -0400 + -- Bryce Harrington Tue, 10 Jul 2012 18:45:26 -0700 mesa (8.0.3-1) UNRELEASED; urgency=low commit caf06c836f53ff089e9ff7d36317bf35a7c88e64 Author: Bryce Harrington Date: Mon Jul 2 17:02:06 2012 -0700 Prep changelog for testing diff --git a/debian/changelog b/debian/changelog index c5f8b6f..d2a1376 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (8.0.3-0ubuntu1) UNRELEASED; urgency=low +mesa (8.0.3-0ubuntu1~precise~1) precise-proposed; urgency=low * New upstream stable re
xorg-server: Changes to 'ubuntu-precise'
debian/changelog| 19 -
debian/patches/228_log-format-fix.patch | 441
debian/patches/509_log-format-fix.patch | 441
debian/patches/series | 25 +
4 files changed, 464 insertions(+), 462 deletions(-)
New commits:
commit 692211f7c48e2ade16f629b75223662190dcd594
Author: Bryce Harrington
Date: Mon Jul 16 11:08:23 2012 -0700
Disable 10.2 and 10.3 changes, as they cause an xserver crash regression.
diff --git a/debian/changelog b/debian/changelog
index 8745a47..fad498f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,14 @@
-xorg-server (2:1.11.4-0ubuntu10.6) UNRELEASED; urgency=low
+xorg-server (2:1.11.4-0ubuntu10.6) precise-proposed; urgency=low
- [ Timo Aaltonen ]
- * Add 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
-from upstream 1.12.2. Fixes the server from entering in an infinite
-loop in certain situations. (LP: #921236)
-
- [ Maarten Lankhorst ]
- * This was 2:1.11.4-0ubuntu10.4 but got kicked from -proposed due to
-a race with a security update.
+ * Revert changes from 10.2 and 10.3 (and the unreleased SRU 10.4). 10.2
+attempted to fix bug 968845, but this caused the xserver to crash
+under rare conditions (1009629). 10.3 attempted to fix that crash,
+but resulted in a more commonly seen crash such as when using GIMP.
+(LP: #1021517)
+ * Rename patch 509_log-format-fix.patch to 228_log-format-fix.patch,
+to reserve the 5xx numbering for input stack patches.
- -- Maarten Lankhorst Thu, 12 Jul 2012
11:46:44 +0200
+ -- Bryce Harrington Mon, 16 Jul 2012 10:42:25 -0700
xorg-server (2:1.11.4-0ubuntu10.5) precise-security; urgency=low
diff --git a/debian/patches/228_log-format-fix.patch
b/debian/patches/228_log-format-fix.patch
new file mode 100644
index 000..61e7eae
--- /dev/null
+++ b/debian/patches/228_log-format-fix.patch
@@ -0,0 +1,441 @@
+Description: extreme backport of upstream log format fixes (CVE-2012-2118).
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/996250
+Origin: http://patchwork.freedesktop.org/patch/10001/
+
+Index: xorg-server-1.11.4/os/log.c
+===
+--- xorg-server-1.11.4.orig/os/log.c 2012-05-06 11:03:17.621808123 -0700
xorg-server-1.11.4/os/log.c2012-05-06 11:03:18.057814189 -0700
+@@ -167,6 +167,12 @@
+ #ifndef X_NOT_IMPLEMENTED_STRING
+ #define X_NOT_IMPLEMENTED_STRING "(NI)"
+ #endif
++#ifndef X_DEBUG_STRING
++#define X_DEBUG_STRING "(DB)"
++#endif
++#ifndef X_NONE_STRING
++#define X_NONE_STRING ""
++#endif
+
+ /*
+ * LogInit is called to start logging to a file. It is also called (with
+@@ -223,7 +229,7 @@
+ * needed.
+ */
+ if (saveBuffer && bufferSize > 0) {
+- free(saveBuffer); /* Must be free(), not free() */
++ free(saveBuffer);
+ saveBuffer = NULL;
+ bufferSize = 0;
+ }
+@@ -265,36 +271,19 @@
+ }
+
+ /* This function does the actual log message writes. */
+-
+-void
+-LogVWrite(int verb, const char *f, va_list args)
++static void
++LogSWrite(int verb, const char *buf, size_t len, Bool end_line)
+ {
+-static char tmpBuffer[1024];
+-int len = 0;
+ static Bool newline = TRUE;
+
+-if (newline) {
+- sprintf(tmpBuffer, "[%10.3f] ", GetTimeInMillis() / 1000.0);
+- len = strlen(tmpBuffer);
+- if (logFile)
+- fwrite(tmpBuffer, len, 1, logFile);
+-}
+-
+-/*
+- * Since a va_list can only be processed once, write the string to a
+- * buffer, and then write the buffer out to the appropriate output
+- * stream(s).
+- */
+-if (verb < 0 || logFileVerbosity >= verb || logVerbosity >= verb) {
+- vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
+- len = strlen(tmpBuffer);
+-}
+-newline = (tmpBuffer[len-1] == '\n');
+-if ((verb < 0 || logVerbosity >= verb) && len > 0)
+- fwrite(tmpBuffer, len, 1, stderr);
+-if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
++if (verb < 0 || logVerbosity >= verb)
++fwrite(buf, len, 1, stderr);
++if (verb < 0 || logFileVerbosity >= verb) {
+ if (logFile) {
+- fwrite(tmpBuffer, len, 1, logFile);
++if (newline)
++fprintf(logFile, "[%10.3f] ", GetTimeInMillis() / 1000.0);
++newline = end_line;
++fwrite(buf, len, 1, logFile);
+ if (logFlush) {
+ fflush(logFile);
+ #ifndef WIN32
+@@ -311,13 +300,19 @@
+ FatalError("realloc() failed while saving log messages\n");
+ }
+ bufferUnused -= len;
+- memcpy(saveBuffer + bufferPos, tmpBuffer, len);
++memcpy(saveBuffer + bufferPos, buf,
mesa: Changes to 'ubuntu-precise-803'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 15f9005b4dd31de49f63478af904f2170adb32a8 Author: Bryce Harrington Date: Tue Jul 10 19:03:13 2012 -0700 Release 8.0.3-0ubuntu0.1 diff --git a/debian/changelog b/debian/changelog index d2a1376..e155a85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (8.0.3-0ubuntu1~precise~1) precise-proposed; urgency=low +mesa (8.0.3-0ubuntu0.1) precise-proposed; urgency=low * New upstream stable release. + Fixes crash in intel_miptree_release() @@ -20,7 +20,7 @@ mesa (8.0.3-0ubuntu1~precise~1) precise-proposed; urgency=low Cherrypick from mesa master. (LP: #981883) - -- Robert Hooker Fri, 01 Jun 2012 13:01:35 -0400 + -- Bryce Harrington Tue, 10 Jul 2012 18:45:26 -0700 mesa (8.0.3-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: http://lists.debian.org/e1somhu-0002wq...@vasks.debian.org
mesa: Changes to 'ubuntu-precise-803'
New branch 'ubuntu-precise-803' available with the following commits: commit caf06c836f53ff089e9ff7d36317bf35a7c88e64 Author: Bryce Harrington Date: Mon Jul 2 17:02:06 2012 -0700 Prep changelog for testing -- 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/e1soi9o-0005cx...@vasks.debian.org
xserver-xorg-video-ati: Changes to 'ubuntu-precise'
New branch 'ubuntu-precise' 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: http://lists.debian.org/e1snjvb-0001zm...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog|8
debian/control | 22 --
debian/libg3dvl-mesa.install.in |4
debian/not-installed|5 +
debian/rules|5 +
5 files changed, 2 insertions(+), 42 deletions(-)
New commits:
commit 7a5ebdac3433d68df3899fedfdbe48c05195de07
Author: Bryce Harrington
Date: Tue Jun 26 12:44:03 2012 -0700
Revert "Add gallium vdpau and xvmc driver support"
This reverts commit 04d0857389f40992c7cfc6115c077c0a78f8a9b7.
Timo says...
"The commit should probably be reverted for now, since it looks like the
current version is not complete. Might be best to wait until it's
committed to Debian, which should happen soon enough for quantal."
diff --git a/debian/changelog b/debian/changelog
index 77afb74..ba9be3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-mesa (8.0.2-0ubuntu4) UNRELEASED; urgency=low
-
- * Add g3dvl.diff from Debian bug 656719: Enables gallium vdpau and xvmc
-driver support on at least Radeon r300+ and r600+.
-(LP: #1002224)
-
- -- Timo Mon, 21 May 2012 12:46:40 +0300
-
mesa (8.0.3-0ubuntu1) quantal; urgency=low
* New upstream stable release.
diff --git a/debian/control b/debian/control
index 45b2549..9f2e4c7 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ Build-Depends:
bison,
llvm-3.0-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libwayland-dev (>= 0.85.0) [linux-any],
- libvdpau-dev (>= 0.4.1) [linux-any],
- libxvmc-dev (>= 1.0.6) [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/
@@ -793,24 +791,4 @@ Description: Mesa OpenGL utility library -- development
files
For a complete description of GLU, please look at the libglu1-mesa
package.
-Package: libg3dvl-mesa
-Section: libs
-Architecture: linux-any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: xvmc and vdpau Gallium3D video acceleration drivers
-
-Package: libg3dvl-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends:
- libg3dvl-mesa (= ${binary:Version}),
- ${misc:Depends},
-Description: xvmc and vdpau Gallium3D video acceleration drivers
- .
- This package contains the debugging symbols for the g3dvl libraries.
-
-
# vim: tw=0
diff --git a/debian/libg3dvl-mesa.install.in b/debian/libg3dvl-mesa.install.in
deleted file mode 100644
index e013276..000
--- a/debian/libg3dvl-mesa.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-build/dri/${DEB_HOST_MULTIARCH}/gallium/libvdpau_* usr/lib/vdpau
-build/dri/${DEB_HOST_MULTIARCH}/gallium/libXvMC* usr/lib/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/XvMCConfig usr/lib
-build/dri/${DEB_HOST_MULTIARCH}/gallium/XvMCConfig etc
diff --git a/debian/not-installed b/debian/not-installed
index b20640a..869f017 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -18,10 +18,7 @@ NOT_INSTALLED := \
usr/include/GL/glx_mangle.h \
usr/include/GL/vms_x_fix.h \
usr/include/GL/wglext.h \
- usr/include/GL/wmesa.h \
- dri/usr/lib/*/libXvMC* \
- dri/usr/*/libXvMC* \
- dri/usr/lib/*/vdpau/
+ usr/include/GL/wmesa.h
# Same for linux, kfreebsd, and hurd on i386:
NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
diff --git a/debian/rules b/debian/rules
index 692c42d..f0326a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,6 @@ confflags-dri = \
--enable-shared-dricore \
--enable-shared-glapi \
--enable-texture-float \
- --enable-gallium-g3dvl \
--enable-xa \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
@@ -211,8 +210,6 @@ $(STAMP_DIR)/stamp:
$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
build: build-stamp
- # XvMCConfig configuration file:
- ln -s /etc/X11/XvMCConfig
build/dri/$(DEB_HOST_MULTIARCH)/gallium/XvMCConfig
build-stamp: $(BUILD_STAMPS)
# Build pot file for pkgstriptranslations
@@ -306,7 +303,7 @@ binary-arch: install
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
- set -e; for file in $(NOT_INSTALLED); do rm -r debian/tmp/$$file; done
+ set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f
debian/tmp/$$file; done
# No need for this .so, libglapi is just a convenience library:
--
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/e1sjbh8-0005bl...@vasks.debian.org
xkb-data: Changes to 'ubuntu-precise'
debian/changelog |7 +-- debian/patches/series |2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 29c6463fb1e78025692a1bf46611ce652bff6eb9 Author: Bryce Harrington Date: Tue Jun 26 12:26:12 2012 -0700 Reject nbsp fix for fr(oss) due to r-ctrl. Re-release 2.5-1ubuntu1.3 diff --git a/debian/changelog b/debian/changelog index 4f8d26d..37a7c2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ xkeyboard-config (2.5-1ubuntu1.3) precise-proposed; urgency=low - * Add 113_ossmath_is_five_levels.patch: Some keymaps like fr/oss fail to + * Add 113_ossmath_is_five_levels.patch: Some keymaps like fr(oss) fail to load because they include ossmath (via keypad(oss)) which misconfigures the keypad as 4-level when it should be 5-level. This patch from upstream bugzilla fixes this by adding the 5th level to the ossmath definition. (LP: #985065) + * Drop 109_fr_oss_space_char.patch change; the fix causes behavioral +changes for right control which a fr(oss) user did not like. +(LP: #1013881) -- Bryce Harrington Mon, 25 Jun 2012 17:32:15 -0700 @@ -25,7 +28,7 @@ xkeyboard-config (2.5-1ubuntu1.1) precise-proposed; urgency=low * Add 109_fr_oss_space_char.patch: Fix problems using space bar in various applications when using the fr(oss) keymap. -(LP: #221112) +(was for LP bug 221112) * Add 110_dead_hook_horn.patch: Add two deadkeys on level 3 and 4 of the j key for the latin keymap. (LP: #825624) diff --git a/debian/patches/series b/debian/patches/series index ded6420..ba3a198 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,7 @@ docs.diff revert-goodmap-badmap-for-apple.diff 105_intelligent_keyboard.patch 108_fix_intltool_make_check.diff -109_fr_oss_space_char.patch +#109_fr_oss_space_char.patch 110_dead_hook_horn.patch 111_cz_ssharp.patch 112_dk_dvorak_tilde.patch -- 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/e1sjbpf-0003hx...@vasks.debian.org
xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9aa36e831443129912112720782d9df57c4f9550 Author: Bryce Harrington Date: Tue Jun 26 11:45:41 2012 -0700 Bump changelog for 1.6.2-1ubuntu1 release diff --git a/debian/changelog b/debian/changelog index b63e262..deffdc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-synaptics (1.6.2-1ubuntu1) UNRELEASED; urgency=low +xserver-xorg-input-synaptics (1.6.2-1ubuntu1) quantal; urgency=low * Merged from Debian unstable * Removed patches that were cherry picked commits and now in 1.6.2: -- 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/e1sjamb-0007gf...@vasks.debian.org
xkb-data: Changes to 'ubuntu-precise'
debian/changelog| 11 ++
debian/patches/113_ossmath_is_five_levels.patch | 42
debian/patches/series |1
3 files changed, 54 insertions(+)
New commits:
commit 4b8b1ce524c915de9a2b226da869f526b15ad1f4
Author: Bryce Harrington
Date: Mon Jun 25 17:33:02 2012 -0700
Add 113_ossmath_is_five_levels.patch
diff --git a/debian/changelog b/debian/changelog
index a85706f..4f8d26d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xkeyboard-config (2.5-1ubuntu1.3) precise-proposed; urgency=low
+
+ * Add 113_ossmath_is_five_levels.patch: Some keymaps like fr/oss fail to
+load because they include ossmath (via keypad(oss)) which
+misconfigures the keypad as 4-level when it should be 5-level. This
+patch from upstream bugzilla fixes this by adding the 5th level to the
+ossmath definition.
+(LP: #985065)
+
+ -- Bryce Harrington Mon, 25 Jun 2012 17:32:15 -0700
+
xkeyboard-config (2.5-1ubuntu1.2) precise-proposed; urgency=low
* Add 111_cz_ssharp.patch: Fix mapping of 4th level of the AC11 key to
diff --git a/debian/patches/113_ossmath_is_five_levels.patch
b/debian/patches/113_ossmath_is_five_levels.patch
new file mode 100644
index 000..47765ea
--- /dev/null
+++ b/debian/patches/113_ossmath_is_five_levels.patch
@@ -0,0 +1,42 @@
+From 98aba92ebb0720abfb4d676bdf29944decc6f7bf Mon Sep 17 00:00:00 2001
+From: Peter Hutterer
+Date: Thu, 21 Jun 2012 10:16:31 +1000
+Subject: [PATCH] symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (#43541)
+
+having KPMU defined as FOUR_LEVEL, with 4 symbols only, triggers an xkb
+error when the keypad stuff picks up the CTRL+ALT (from x11) and waits for 5
+symbols instead.
+
+X.Org Bug 43541 <http://bugs.freedesktop.org/show_bug.cgi?id=43541>
+
+Signed-off-by: Peter Hutterer
+---
+ symbols/keypad | 11 +--
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/symbols/keypad b/symbols/keypad
+index 1bab391..b362ebc 100644
+--- a/symbols/keypad
b/symbols/keypad
+@@ -267,13 +267,12 @@ xkb_symbols "legacymath" {
+ partial keypad_keys
+ xkb_symbols "ossmath" {
+
+-key.type[Group1]="FOUR_LEVEL_X" ;
+-
+-key { [ KP_Divide, 0x1002215, 0x1F7, XF86_Ungrab ] }; //
/ ∕ ÷
+-key { [ KP_Multiply, 0x10022C5, 0x1D7, XF86_ClearGrab ] }; //
* ⋅ ×
+-key { [ KP_Subtract, 0x1002212, 0x1002212, XF86_Prev_VMode ] }; //
- − −
++key.type[Group1]="CTRL+ALT" ;
+
+-key { [ KP_Add, 0x12B, 0x12B, XF86_Next_VMode ] }; //
+ + +
++key { [ KP_Divide, 0x1002215, 0x1F7, VoidSymbol,
XF86_Ungrab ] }; // / ∕ ÷
++key { [ KP_Multiply, 0x10022C5, 0x1D7, VoidSymbol,
XF86_ClearGrab ] }; // * ⋅ ×
++key { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol,
XF86_Prev_VMode ] }; // - − −
++key { [ KP_Add, 0x12B, 0x12B, VoidSymbol,
XF86_Next_VMode ] }; // + + +
+
+ };
+
+--
+1.7.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index d4fe280..ded6420 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ revert-goodmap-badmap-for-apple.diff
110_dead_hook_horn.patch
111_cz_ssharp.patch
112_dk_dvorak_tilde.patch
+113_ossmath_is_five_levels.patch
--
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/e1sjjie-0007vy...@vasks.debian.org
xkb-data: Changes to 'ubuntu'
debian/changelog| 11 ++
debian/patches/113_ossmath_is_five_levels.patch | 42
debian/patches/series |1
3 files changed, 54 insertions(+)
New commits:
commit 7b77804d0f67665e1710a5df4f01bb7233ad30e4
Author: Bryce Harrington
Date: Mon Jun 25 13:37:07 2012 -0700
Add 113_ossmath_is_five_levels.patch
diff --git a/debian/changelog b/debian/changelog
index 1cba3d0..8bfd3cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xkeyboard-config (2.5-1ubuntu5) quantal; urgency=low
+
+ * Add 113_ossmath_is_five_levels.patch: Some keymaps like fr/oss fail to
+load because they include ossmath (via keypad(oss)) which
+misconfigures the keypad as 4-level when it should be 5-level. This
+patch from upstream bugzilla fixes this by adding the 5th level to the
+ossmath definition.
+(LP: #985065)
+
+ -- Bryce Harrington Mon, 25 Jun 2012 09:30:19 -0700
+
xkeyboard-config (2.5-1ubuntu4) quantal; urgency=low
* Actually apply patch 112
diff --git a/debian/patches/113_ossmath_is_five_levels.patch
b/debian/patches/113_ossmath_is_five_levels.patch
new file mode 100644
index 000..47765ea
--- /dev/null
+++ b/debian/patches/113_ossmath_is_five_levels.patch
@@ -0,0 +1,42 @@
+From 98aba92ebb0720abfb4d676bdf29944decc6f7bf Mon Sep 17 00:00:00 2001
+From: Peter Hutterer
+Date: Thu, 21 Jun 2012 10:16:31 +1000
+Subject: [PATCH] symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (#43541)
+
+having KPMU defined as FOUR_LEVEL, with 4 symbols only, triggers an xkb
+error when the keypad stuff picks up the CTRL+ALT (from x11) and waits for 5
+symbols instead.
+
+X.Org Bug 43541 <http://bugs.freedesktop.org/show_bug.cgi?id=43541>
+
+Signed-off-by: Peter Hutterer
+---
+ symbols/keypad | 11 +--
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/symbols/keypad b/symbols/keypad
+index 1bab391..b362ebc 100644
+--- a/symbols/keypad
b/symbols/keypad
+@@ -267,13 +267,12 @@ xkb_symbols "legacymath" {
+ partial keypad_keys
+ xkb_symbols "ossmath" {
+
+-key.type[Group1]="FOUR_LEVEL_X" ;
+-
+-key { [ KP_Divide, 0x1002215, 0x1F7, XF86_Ungrab ] }; //
/ ∕ ÷
+-key { [ KP_Multiply, 0x10022C5, 0x1D7, XF86_ClearGrab ] }; //
* ⋅ ×
+-key { [ KP_Subtract, 0x1002212, 0x1002212, XF86_Prev_VMode ] }; //
- − −
++key.type[Group1]="CTRL+ALT" ;
+
+-key { [ KP_Add, 0x12B, 0x12B, XF86_Next_VMode ] }; //
+ + +
++key { [ KP_Divide, 0x1002215, 0x1F7, VoidSymbol,
XF86_Ungrab ] }; // / ∕ ÷
++key { [ KP_Multiply, 0x10022C5, 0x1D7, VoidSymbol,
XF86_ClearGrab ] }; // * ⋅ ×
++key { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol,
XF86_Prev_VMode ] }; // - − −
++key { [ KP_Add, 0x12B, 0x12B, VoidSymbol,
XF86_Next_VMode ] }; // + + +
+
+ };
+
+--
+1.7.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index d4fe280..ded6420 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ revert-goodmap-badmap-for-apple.diff
110_dead_hook_horn.patch
111_cz_ssharp.patch
112_dk_dvorak_tilde.patch
+113_ossmath_is_five_levels.patch
--
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/e1sjg2k-eh...@vasks.debian.org
xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 15cbeba357c76a940cbf37058a10de39285ded2f Author: Bryce Harrington Date: Mon Jun 25 09:32:28 2012 -0700 Improve version number (as suggested by jcristau) diff --git a/debian/changelog b/debian/changelog index ee293b5..3b57cb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-ati (1:6.14.99~git20120608.9425c50e-0ubuntu1) quantal; urgency=low +xserver-xorg-video-ati (1:6.14.99~really6.14.4-0ubuntu1) quantal; urgency=low * Merge from Debian. Remaining Ubuntu changes: - debian/control: commit 83c59e8edf4383d07e8e18c5d9d9850233ab8406 Author: Bryce Harrington Date: Thu Jun 21 12:56:31 2012 -0700 Tag for release in quantal diff --git a/debian/changelog b/debian/changelog index 55e3de8..ee293b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -xserver-xorg-video-ati (1:6.14.99~git20120608.9425c50e-0ubuntu1) UNRELEASED; urgency=low +xserver-xorg-video-ati (1:6.14.99~git20120608.9425c50e-0ubuntu1) quantal; urgency=low - [ Maarten Lankhorst ] * Merge from Debian. Remaining Ubuntu changes: - debian/control: + firmware-linux -> linux-firmware -- 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/e1sjcdn-0007vd...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog|8
debian/control | 22 ++
debian/libg3dvl-mesa.install.in |4
debian/not-installed|5 -
debian/rules|5 -
5 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit 04d0857389f40992c7cfc6115c077c0a78f8a9b7
Author: Bryce Harrington
Date: Thu Jun 21 15:35:03 2012 -0700
Add gallium vdpau and xvmc driver support
diff --git a/debian/changelog b/debian/changelog
index ba9be3d..77afb74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (8.0.2-0ubuntu4) UNRELEASED; urgency=low
+
+ * Add g3dvl.diff from Debian bug 656719: Enables gallium vdpau and xvmc
+driver support on at least Radeon r300+ and r600+.
+(LP: #1002224)
+
+ -- Timo Mon, 21 May 2012 12:46:40 +0300
+
mesa (8.0.3-0ubuntu1) quantal; urgency=low
* New upstream stable release.
diff --git a/debian/control b/debian/control
index 9f2e4c7..45b2549 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Build-Depends:
bison,
llvm-3.0-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libwayland-dev (>= 0.85.0) [linux-any],
+ libvdpau-dev (>= 0.4.1) [linux-any],
+ libxvmc-dev (>= 1.0.6) [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/
@@ -791,4 +793,24 @@ Description: Mesa OpenGL utility library -- development
files
For a complete description of GLU, please look at the libglu1-mesa
package.
+Package: libg3dvl-mesa
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: xvmc and vdpau Gallium3D video acceleration drivers
+
+Package: libg3dvl-mesa-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends:
+ libg3dvl-mesa (= ${binary:Version}),
+ ${misc:Depends},
+Description: xvmc and vdpau Gallium3D video acceleration drivers
+ .
+ This package contains the debugging symbols for the g3dvl libraries.
+
+
# vim: tw=0
diff --git a/debian/libg3dvl-mesa.install.in b/debian/libg3dvl-mesa.install.in
new file mode 100644
index 000..e013276
--- /dev/null
+++ b/debian/libg3dvl-mesa.install.in
@@ -0,0 +1,4 @@
+build/dri/${DEB_HOST_MULTIARCH}/gallium/libvdpau_* usr/lib/vdpau
+build/dri/${DEB_HOST_MULTIARCH}/gallium/libXvMC* usr/lib/dri
+build/dri/${DEB_HOST_MULTIARCH}/gallium/XvMCConfig usr/lib
+build/dri/${DEB_HOST_MULTIARCH}/gallium/XvMCConfig etc
diff --git a/debian/not-installed b/debian/not-installed
index 869f017..b20640a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -18,7 +18,10 @@ NOT_INSTALLED := \
usr/include/GL/glx_mangle.h \
usr/include/GL/vms_x_fix.h \
usr/include/GL/wglext.h \
- usr/include/GL/wmesa.h
+ usr/include/GL/wmesa.h \
+ dri/usr/lib/*/libXvMC* \
+ dri/usr/*/libXvMC* \
+ dri/usr/lib/*/vdpau/
# Same for linux, kfreebsd, and hurd on i386:
NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
diff --git a/debian/rules b/debian/rules
index f0326a3..692c42d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,6 +115,7 @@ confflags-dri = \
--enable-shared-dricore \
--enable-shared-glapi \
--enable-texture-float \
+ --enable-gallium-g3dvl \
--enable-xa \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
@@ -210,6 +211,8 @@ $(STAMP_DIR)/stamp:
$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
build: build-stamp
+ # XvMCConfig configuration file:
+ ln -s /etc/X11/XvMCConfig
build/dri/$(DEB_HOST_MULTIARCH)/gallium/XvMCConfig
build-stamp: $(BUILD_STAMPS)
# Build pot file for pkgstriptranslations
@@ -303,7 +306,7 @@ binary-arch: install
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
- set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
+ set -e; for file in $(NOT_INSTALLED); do rm -r debian/tmp/$$file; done
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f
debian/tmp/$$file; done
# No need for this .so, libglapi is just a convenience library:
--
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/e1shpyv-0004ak...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 22c26395810e314a9609431bad58c58895c46632 Author: Bryce Harrington Date: Mon Jun 18 19:03:32 2012 -0700 Bump changelog for release diff --git a/debian/changelog b/debian/changelog index c5f8b6f..ba9be3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (8.0.3-0ubuntu1) UNRELEASED; urgency=low +mesa (8.0.3-0ubuntu1) quantal; urgency=low * New upstream stable release. + Fixes crash in intel_miptree_release() @@ -20,7 +20,7 @@ mesa (8.0.3-0ubuntu1) UNRELEASED; urgency=low Cherrypick from mesa master. (LP: #981883) - -- Robert Hooker Fri, 01 Jun 2012 13:01:35 -0400 + -- Bryce Harrington Mon, 18 Jun 2012 19:02:09 -0700 mesa (8.0.3-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: http://lists.debian.org/e1sgnni-00072b...@vasks.debian.org
xkb-data: Changes to 'ubuntu'
debian/changelog | 29 +
debian/patches/109_fr_oss_space_char.patch | 22 ++
debian/patches/110_dead_hook_horn.patch| 21 +
debian/patches/111_cz_ssharp.patch | 21 +
debian/patches/112_dk_dvorak_tilde.patch | 18 ++
debian/patches/series |4
6 files changed, 115 insertions(+)
New commits:
commit b855eb7a0debe8fa140628f7c91f96d8a0fbcf06
Author: Bryce Harrington
Date: Mon Jun 4 18:32:08 2012 -0700
cl
diff --git a/debian/changelog b/debian/changelog
index 4b928f9..1cba3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xkeyboard-config (2.5-1ubuntu4) quantal; urgency=low
+
+ * Actually apply patch 112
+
+ -- Bryce Harrington Mon, 04 Jun 2012 18:30:47 -0700
+
xkeyboard-config (2.5-1ubuntu3) quantal; urgency=low
* Add 111_cz_ssharp.patch: Fix mapping of 4th level of the AC11 key to
commit 12a54fd6ac94493dda2d24928296721f7e827fd2
Author: Bryce Harrington
Date: Mon Jun 4 18:30:11 2012 -0700
Add patch 112
diff --git a/debian/changelog b/debian/changelog
index 65c2327..4b928f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xkeyboard-config (2.5-1ubuntu3) quantal; urgency=low
ssharp rather than quotedbl for the Czech layout. Cherrypick of
patch from upstream.
(LP: #953477)
+ * Add 112_dk_dvorak_tilde.patch: Fix tilde key in the Danish Dvorak
+layout. It's not the same as Norwegian as has been assumed previously.
+(LP: #989626)
-- Bryce Harrington Mon, 04 Jun 2012 18:11:53 -0700
diff --git a/debian/patches/112_dk_dvorak_tilde.patch
b/debian/patches/112_dk_dvorak_tilde.patch
new file mode 100644
index 000..e43ebf9
--- /dev/null
+++ b/debian/patches/112_dk_dvorak_tilde.patch
@@ -0,0 +1,18 @@
+commit a76516530698afb567230f367c04b804ebda044b
+Author: Sergey V. Udaltsov
+Date: Tue May 1 00:37:26 2012 +0100
+
+Added missing tilde to dk(dvorak)
+
+https://bugs.freedesktop.org/show_bug.cgi?id=49312
+
+diff --git a/symbols/dk b/symbols/dk
+index 1187a99..1deea28 100644
+--- a/symbols/dk
b/symbols/dk
+@@ -69,4 +69,5 @@ xkb_symbols "dvorak" {
+ include "no(dvorak)"
+
+ name[Group1]= "Danish (Dvorak)";
++key { [ asciitilde, asciicircum, dead_diaeresis, dead_tilde ] };
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 3141a5b..d4fe280 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ revert-goodmap-badmap-for-apple.diff
109_fr_oss_space_char.patch
110_dead_hook_horn.patch
111_cz_ssharp.patch
+112_dk_dvorak_tilde.patch
commit d56160dfe062bc2ae7560b52a1ac48b826491150
Author: Bryce Harrington
Date: Mon Jun 4 18:21:07 2012 -0700
Add patch 111
diff --git a/debian/changelog b/debian/changelog
index 825a88e..65c2327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xkeyboard-config (2.5-1ubuntu3) quantal; urgency=low
+
+ * Add 111_cz_ssharp.patch: Fix mapping of 4th level of the AC11 key to
+ssharp rather than quotedbl for the Czech layout. Cherrypick of
+patch from upstream.
+(LP: #953477)
+
+ -- Bryce Harrington Mon, 04 Jun 2012 18:11:53 -0700
+
xkeyboard-config (2.5-1ubuntu2) quantal; urgency=low
* Add 109_fr_oss_space_char.patch: Fix problems using space bar in various
diff --git a/debian/patches/111_cz_ssharp.patch
b/debian/patches/111_cz_ssharp.patch
new file mode 100644
index 000..77cfa7b
--- /dev/null
+++ b/debian/patches/111_cz_ssharp.patch
@@ -0,0 +1,21 @@
+commit 8640e24c91e80675016458d50d7a1ad8546e32ff
+Author: Sergey V. Udaltsov
+Date: Sun Apr 8 05:41:11 2012 +0100
+
+Czech (qwerty) layout has " instead of ß in the 4th level
+
+https://bugs.freedesktop.org/show_bug.cgi?id=48252
+
+diff --git a/symbols/cz b/symbols/cz
+index 25fd54a..db3dd48 100644
+--- a/symbols/cz
b/symbols/cz
+@@ -90,7 +90,7 @@ xkb_symbols "qwerty" {
+
+ key { [ z, Z, degree,
NoSymbol ] };
+ key { [ uring, quotedbl,semicolon,
colon ] };
+-key { [ section, exclam, apostrophe,
quotedbl ] };
++key { [ section, exclam, apostrophe,
ssharp ] };
+ key { [ y, Y, NoSymbol,
NoSymbol ] };
+ key { [uacute, slash, bracketleft,
braceleft ] };
+ key { [parenright, parenleft, bracketright,
braceright ] };
diff --git a/debian/patches/series b/debian/patches/series
index fa86d66..3141a5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ revert-goodmap-badmap-for-apple.diff
108_fix_intltool_make_check.diff
109_fr_oss_space_char.patch
110_dead_hook_horn.patch
+111_cz_ssharp.patch
commit a438418a4aedebdbb0d2c
xkb-data: Changes to 'ubuntu-precise'
New branch 'ubuntu-precise' available with the following commits: commit 6aa88f9407e69ec04fea0510648424f22cb74899 Author: Bryce Harrington Date: Fri Jun 15 01:05:46 2012 -0700 Bump changelog commit 12a54fd6ac94493dda2d24928296721f7e827fd2 Author: Bryce Harrington Date: Mon Jun 4 18:30:11 2012 -0700 Add patch 112 commit d56160dfe062bc2ae7560b52a1ac48b826491150 Author: Bryce Harrington Date: Mon Jun 4 18:21:07 2012 -0700 Add patch 111 commit a438418a4aedebdbb0d2c03d5fa2b240b86cfe88 Author: Bryce Harrington Date: Wed May 16 18:53:17 2012 -0700 Add patches 109 and 110 -- 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/e1sfryu-0002pf...@vasks.debian.org
xserver-xorg-input-vmmouse: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit f18c574fedeaef3e2fadd55040c294e2017dd1a4 Author: Bryce Harrington Date: Tue Jun 12 20:12:12 2012 -0700 Release a pre-release to quantal -- 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/e1see0w-0004e5...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog | 15 ++
debian/patches/118_glsl_initialize_samplers.patch | 53 ++
debian/patches/series |1
3 files changed, 69 insertions(+)
New commits:
commit d85ce6e03407be0b50fff34122b67026ab03d2c3
Author: Bryce Harrington
Date: Tue Jun 12 19:30:57 2012 -0700
Update changelog for 8.0.3-0ubuntu1.
mesa (8.0.3-0ubuntu1) UNRELEASED; urgency=low
* New upstream stable release.
+ Fixes crash in intel_miptree_release()
(LP: #952896)
+ Fixes slow WebGL in firefox
(LP: #988343)
[ Bryce Harrington ]
* Add 117_nullptr_check_in_query_version.patch: Fix null pointer
deref in QueryVersion() during login.
(LP: #968284)
* Add 118_glsl_initialize_samplers.patch: Initialize samplers to 0, as
required by the spec. Fixes rendering corruption in MapsGL labels.
Cherrypick from mesa master.
(LP: #981883)
diff --git a/debian/changelog b/debian/changelog
index ed29ad2..c5f8b6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,25 @@
mesa (8.0.3-0ubuntu1) UNRELEASED; urgency=low
* New upstream stable release.
++ Fixes crash in intel_miptree_release()
+ (LP: #952896)
++ Fixes slow WebGL in firefox
+ (LP: #988343)
+
+ [ Robert Hooker ]
* Drop 118_fix_rendering_from_textures.patch and
117_intel_fix_hiz_null_dereference.patch, both included upstream.
* Refresh patches.
+ [ Bryce Harrington ]
+ * Add 117_nullptr_check_in_query_version.patch: Fix null pointer
+deref in QueryVersion() during login.
+(LP: #968284)
+ * Add 118_glsl_initialize_samplers.patch: Initialize samplers to 0, as
+required by the spec. Fixes rendering corruption in MapsGL labels.
+Cherrypick from mesa master.
+(LP: #981883)
+
-- Robert Hooker Fri, 01 Jun 2012 13:01:35 -0400
mesa (8.0.3-1) UNRELEASED; urgency=low
commit 26a9ab3e38ab08835f69b67a1524a6845df041ae
Author: Bryce Harrington
Date: Tue Jun 12 19:30:11 2012 -0700
Add 118_glsl_initialize_samplers.patch to fix LP #981883
diff --git a/debian/patches/118_glsl_initialize_samplers.patch
b/debian/patches/118_glsl_initialize_samplers.patch
new file mode 100644
index 000..6083148
--- /dev/null
+++ b/debian/patches/118_glsl_initialize_samplers.patch
@@ -0,0 +1,53 @@
+commit b610881317a7775a7ffe5f032099d8b2dc45eff0
+Author: Ian Romanick
+Date: Tue Apr 10 10:40:11 2012 -0700
+
+glsl: Initialize samplers to 0, propagate sampler values to the gl_program
+
+The spec requires that samplers be initialized to 0. Since this
+differs from the 1-to-1 mapping of samplers to texture units assumed
+by ARB assembly shaders (and the gl_program structure), be sure to
+propagate this date from the gl_shader_program to the gl_program.
+
+Signed-off-by: Ian Romanick
+Reviewed-by: Eric Anholt
+Reviewed-by: Kenneth Graunke
+CC: Vadim Girlin
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49088
+
+diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
+index 81a995e..92e2a1f 100644
+--- a/src/glsl/link_uniforms.cpp
b/src/glsl/link_uniforms.cpp
+@@ -329,9 +329,16 @@ link_assign_uniform_locations(struct gl_shader_program
*prog)
+ prog->UniformHash = new string_to_uint_map;
+}
+
+- for (unsigned i = 0; i < Elements(prog->SamplerUnits); i++) {
+- prog->SamplerUnits[i] = i;
+- }
++ /* Uniforms that lack an initializer in the shader code have an initial
++* value of zero. This includes sampler uniforms.
++*
++* Page 24 (page 30 of the PDF) of the GLSL 1.20 spec says:
++*
++* "The link time initial value is either the value of the variable's
++* initializer, if present, or 0 if no initializer is present. Sampler
++* types cannot have initializers."
++*/
++ memset(prog->SamplerUnits, 0, sizeof(prog->SamplerUnits));
+
+/* First pass: Count the uniform resources used by the user-defined
+ * uniforms. While this happens, each active uniform will have an index
+diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
+index be1e172..e6604b1 100644
+--- a/src/mesa/main/uniforms.c
b/src/mesa/main/uniforms.c
+@@ -65,6 +65,7 @@ _mesa_update_shader_textures_used(struct gl_shader_program
*shProg,
+ {
+GLuint s;
+
++ memcpy(prog->SamplerUnits, shProg->SamplerUnits,
sizeof(prog->SamplerUnits));
+memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));
+
+for (s = 0; s < MAX_SAMPLERS; s++) {
diff --git a/debian/patches/series b/debian/patches/series
index 8c4295e..8cf2c56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
117_nullptr_check_in_query_version.patch
+118_glsl_initialize_samplers
mesa: Changes to 'ubuntu'
debian/patches/117_nullptr_check_in_query_version.patch | 25
debian/patches/series |1
2 files changed, 26 insertions(+)
New commits:
commit 563c45c06e0fe47dc5608e98627a53f78f1fd6a1
Author: Bryce Harrington
Date: Tue Jun 12 18:36:35 2012 -0700
Add 117_nullptr_check_in_query_version.patch to fix LP: #952896
diff --git a/debian/patches/117_nullptr_check_in_query_version.patch
b/debian/patches/117_nullptr_check_in_query_version.patch
new file mode 100644
index 000..0cafb60
--- /dev/null
+++ b/debian/patches/117_nullptr_check_in_query_version.patch
@@ -0,0 +1,25 @@
+commit 7062625c601478d108da1c8da7201f023bd35b54
+Author: Bryce Harrington
+Date: Tue Jun 12 17:32:21 2012 -0700
+
+Check for NULL return from xcb_glx_query_version_reply() before deref.
+
+This can get triggered during login when called from
+gnome-session-check-accelerated-helper.
+
+Fixes: https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/968284
+Signed-off-by: Bryce Harrington
+
+diff --git a/src/glx/glxext.c b/src/glx/glxext.c
+index 12fff22..5da2570 100644
+--- a/src/glx/glxext.c
b/src/glx/glxext.c
+@@ -293,6 +293,8 @@ QueryVersion(Display * dpy, int opcode, int *major, int
*minor)
+
GLX_MINOR_VERSION),
+ NULL);
+
++ if (!reply)
++ return GL_FALSE;
+if (reply->major_version != GLX_MAJOR_VERSION) {
+ free(reply);
+ return GL_FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index 748f4a1..8c4295e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
101_ubuntu_hidden_glname.patch
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
+117_nullptr_check_in_query_version.patch
--
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/e1secs7-0005cz...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60273997d7092ef619cd4c6dcc3540190e5d7d7f Author: Bryce Harrington Date: Wed Jun 6 00:32:26 2012 -0700 Reset version to -1ubuntu1 diff --git a/debian/changelog b/debian/changelog index ea59df6..6800c19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.12.1.902-1ubuntu2) UNRELEASED; urgency=medium +xorg-server (2:1.12.1.902-1ubuntu1) UNRELEASED; urgency=medium [ Maarten Lankhorst ] * Refresh patches to apply on x-server 1.12 -- 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/e1scako-tc...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog| 16 +-
debian/patches/166_nullptr_xinerama_keyrepeat.patch | 15 -
debian/patches/198_nohwaccess.patch | 52
debian/patches/201_report-real-dpi.patch| 46 -
debian/patches/209_add_legacy_bgnone_option.patch | 22
debian/patches/series |4 -
6 files changed, 14 insertions(+), 141 deletions(-)
New commits:
commit e7d3fda981a1bbca3ce47029eb5e8581c2a14b97
Author: Bryce Harrington
Date: Mon Jun 4 19:16:26 2012 -0700
Drop several patches no longer needed, as discussed on ubuntu-x@.
diff --git a/debian/changelog b/debian/changelog
index 9b56bf9..ea59df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.12.1.902-1ubuntu1) UNRELEASED; urgency=medium
+xorg-server (2:1.12.1.902-1ubuntu2) UNRELEASED; urgency=medium
+ [ Maarten Lankhorst ]
* Refresh patches to apply on x-server 1.12
- patch-x-indent.sh from xorg-pkg-tools was used to redo coding style
* Deleted following patches because they have been committed upstream
@@ -11,7 +12,18 @@ xorg-server (2:1.12.1.902-1ubuntu1) UNRELEASED;
urgency=medium
* Non-trivial refresh of 500_pointer_barrier_thresholds.diff, based on
xorg-edgers
* Rest was refreshed with patch-x-indent.sh to survive coding style changes
- -- Maarten Lankhorst Mon, 21 May 2012
21:08:48 +0200
+ [ Bryce Harrington ]
+ * Drop 209_add_legacy_bgnone_option.patch: lightdm and other *dm's have
+switched to the new standard -background option. No need to continue
+providing the legacy -nr synonym.
+ * Drop 201_report-real-dpi.patch: Commented out in series.
+ * Drop 198_nohwaccess.patch: Rootless-X no longer a development focus
+for us; the patch would need reworked anyway to provide proper
+support.
+ * Drop 166_nullptr_xinerama_keyrepeat.patch: Fixed differently upstream
+in commit 24e682d0, as verified by original reporter.
+
+ -- Bryce Harrington Mon, 04 Jun 2012 19:12:23 -0700
xorg-server (2:1.12.1.902-1) unstable; urgency=medium
diff --git a/debian/patches/166_nullptr_xinerama_keyrepeat.patch
b/debian/patches/166_nullptr_xinerama_keyrepeat.patch
deleted file mode 100644
index e18f5db..000
--- a/debian/patches/166_nullptr_xinerama_keyrepeat.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/mi/mipointer.c b/mi/mipointer.c
-index de6698a..907f2e4 100644
a/mi/mipointer.c
-+++ b/mi/mipointer.c
-@@ -362,6 +362,10 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y)
- SetupScreen(pScreen);
- pPointer = MIPOINTER(pDev);
-
-+/* Null pointer causes crash on keyrepeat with Xinerama LP: (#324465) */
-+if (pPointer == NULL)
-+return;
-+
- if (pPointer->pScreen != pScreen) {
- (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE);
- changedScreen = TRUE;
diff --git a/debian/patches/198_nohwaccess.patch
b/debian/patches/198_nohwaccess.patch
deleted file mode 100644
index 6f25661..000
--- a/debian/patches/198_nohwaccess.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c
b/hw/xfree86/os-support/linux/lnx_init.c
-index c938b87..35e73e1 100644
a/hw/xfree86/os-support/linux/lnx_init.c
-+++ b/hw/xfree86/os-support/linux/lnx_init.c
-@@ -44,6 +44,7 @@ static int activeVT = -1;
- static char vtname[11];
- static struct termios tty_attr; /* tty state to restore */
- static int tty_mode;/* kbd mode to restore */
-+Bool NoHwAccess = FALSE;
-
- static void
- drain_console(int fd, void *closure)
-@@ -313,6 +314,10 @@ xf86ProcessArgument(int argc, char *argv[], int i)
- KeepTty = TRUE;
- return 1;
- }
-+if (!strcmp(argv[i], "-nohwaccess")) {
-+NoHwAccess = TRUE;
-+return (1);
-+}
-
- if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {
- if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) {
-@@ -331,4 +336,6 @@ xf86UseMsg(void)
- ErrorF("vtXX use the specified VT number\n");
- ErrorF("-keeptty ");
- ErrorF("don't detach controlling tty (for debugging only)\n");
-+ErrorF("-nohwaccess");
-+ErrorF("don't access hardware ports directly\n");
- }
-diff --git a/hw/xfree86/os-support/linux/lnx_video.c
b/hw/xfree86/os-support/linux/lnx_video.c
-index 3526a21..9650597 100644
a/hw/xfree86/os-support/linux/lnx_video.c
-+++ b/hw/xfree86/os-support/linux/lnx_video.c
-@@ -46,6 +46,7 @@
- #include
- #endif
-
-+extern Bool NoHwAccess;
- static Bool ExtendedEnabled = FALSE;
-
- #ifdef __ia64__
-@@ -488,6 +489,9 @@ xf86EnableIO(void)
- int fd;
- unsigned int ioBase_phys;
- #endif
-+/* Fake it... */
-+if (NoHwAccess)
-+return TRUE;
-
-
xorg-server: Changes to 'ubuntu'
debian/patches/214_glx_dri_searchdirs.patch | 240
1 file changed, 240 deletions(-)
New commits:
commit 8cfca1bdc534f49c06e838939f7980256761337c
Author: Bryce Harrington
Date: Fri Jun 1 15:37:53 2012 -0700
Excise patch that was dropped in version 2:1.11.3-0ubuntu10
xorg-server (2:1.11.3-0ubuntu10) precise; urgency=low
* Drop 214_glx_dri_searchdirs.patch, drisearchdirs is no longer
exported in mesa's dri.pc because of multiarch and the only consumer
(dri-alternates) is no longer used.
-- Robert Hooker Thu, 02 Feb 2012 12:08:55 -0500
diff --git a/debian/patches/214_glx_dri_searchdirs.patch
b/debian/patches/214_glx_dri_searchdirs.patch
deleted file mode 100644
index 3baa38f..000
--- a/debian/patches/214_glx_dri_searchdirs.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-Index: xorg-server/glx/glxdricommon.h
-===
xorg-server.orig/glx/glxdricommon.h2011-09-11 18:41:08.0
-0500
-+++ xorg-server/glx/glxdricommon.h 2011-09-11 18:41:43.381346390 -0500
-@@ -39,7 +39,7 @@
- extern const __DRIsystemTimeExtension systemTimeExtension;
-
- void *
--glxProbeDriver(const char *name,
-+glxProbeDriver(const char *name, void **cookie,
- void **coreExt, const char *coreName, int coreVersion,
- void **renderExt, const char *renderName, int renderVersion);
-
-Index: xorg-server/glx/glxdriswrast.c
-===
xorg-server.orig/glx/glxdriswrast.c2011-09-11 18:41:08.0
-0500
-+++ xorg-server/glx/glxdriswrast.c 2011-09-11 18:41:43.381346390 -0500
-@@ -427,6 +427,7 @@
- const char *driverName = "swrast";
- __GLXDRIscreen *screen;
- const __DRIconfig **driConfigs;
-+void *cookie = NULL;
-
- screen = calloc(1, sizeof *screen);
- if (screen == NULL)
-@@ -438,7 +439,7 @@
- screen->base.swapInterval = NULL;
- screen->base.pScreen = pScreen;
-
--screen->driver = glxProbeDriver(driverName,
-+screen->driver = glxProbeDriver(driverName, &cookie,
- (void **)&screen->core,
- __DRI_CORE, __DRI_CORE_VERSION,
- (void **)&screen->swrast,
-Index: xorg-server/configure.ac
-===
xorg-server.orig/configure.ac 2011-09-11 18:41:08.0 -0500
-+++ xorg-server/configure.ac 2011-09-11 18:41:43.381346390 -0500
-@@ -1260,7 +1260,12 @@
- AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous
config path])
- AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])
- dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
--AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
-+drisearchdirs=`$PKG_CONFIG --variable=drisearchdirs dri`
-+if test -n "$drisearchdirs" ; then
-+ AC_DEFINE_DIR(DRI_DRIVER_PATH, drisearchdirs, [Default DRI search dirs])
-+else
-+ AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
-+fi
- AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])
- AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor
name])
- AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])
-Index: xorg-server/glx/glxdricommon.c
-===
xorg-server.orig/glx/glxdricommon.c2011-09-11 18:41:08.0
-0500
-+++ xorg-server/glx/glxdricommon.c 2011-09-11 18:46:45.296354364 -0500
-@@ -209,7 +209,7 @@
- static const char dri_driver_path[] = DRI_DRIVER_PATH;
-
- void *
--glxProbeDriver(const char *driverName,
-+glxProbeDriver(const char *driverName, void **cookie,
- void **coreExt, const char *coreName, int coreVersion,
- void **renderExt, const char *renderName, int renderVersion)
- {
-@@ -218,49 +218,60 @@
- char filename[PATH_MAX];
- const __DRIextension **extensions;
- int from = X_ERROR;
--
--snprintf(filename, sizeof filename, "%s/%s_dri.so",
-- dri_driver_path, driverName);
--
--driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
--if (driver == NULL) {
-- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
-- filename, dlerror());
-- goto cleanup_failure;
--}
--
--extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
--if (extensions == NULL) {
-- LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",
-- driverName, dlerror());
-- goto cleanup_failure;
--}
--
--for (i = 0; extensions[i]; i++) {
-- if (strcmp(extensions[i]->name, coreName) == 0 &&
-- extensions[i]->v
xorg-server: Changes to 'ubuntu-oneiric'
New branch 'ubuntu-oneiric' 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: http://lists.debian.org/e1svcic-0002rx...@vasks.debian.org
mesa: Changes to 'ubuntu-precise'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 700eea77bf661fbb48a162378b2c7509f4f3d2af Author: Bryce Harrington Date: Mon May 14 16:24:15 2012 -0700 s/updates/proposed/ diff --git a/debian/changelog b/debian/changelog index 63b5064..4017b1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (8.0.2-0ubuntu3.1) precise-updates; urgency=low +mesa (8.0.2-0ubuntu3.1) precise-proposed; urgency=low * Add 118_fix_rendering_from_textures.patch: Postpone the setup of the workaround render target miptree until update_renderbuffer time. -- 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/e1su4cy-0004re...@vasks.debian.org
mesa: Changes to 'ubuntu-precise'
New branch 'ubuntu-precise' available with the following commits: commit 406480f316d38d161905b9be1ad8f82ceb52af22 Author: Bryce Harrington Date: Mon May 14 11:05:43 2012 -0700 Retarget quantal fix to precise -- 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/e1stzis-0008oq...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |6 ++ debian/patches/series |1 + 2 files changed, 7 insertions(+) New commits: commit 5042d16f315953b76dc59a6d8063638a42f23b18 Author: Bryce Harrington Date: Mon Apr 16 10:50:28 2012 -0700 Enable 227_null_ptr_midispcur.patch to apply diff --git a/debian/changelog b/debian/changelog index 8abf057..8565293 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.11.4-0ubuntu11) UNRELEASED; urgency=low + + * Enable 227_null_ptr_midispcur.patch to apply + + -- Bryce Harrington Mon, 16 Apr 2012 10:50:08 -0700 + xorg-server (2:1.11.4-0ubuntu10) precise; urgency=low * Fix touchscreen pointer emulation (LP: #949791) diff --git a/debian/patches/series b/debian/patches/series index e07cbea..6e7c71d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -29,6 +29,7 @@ 224_return_BadWindow_not_BadMatch.diff 225_non-root_config_paths.patch 226_fall_back_to_autoconfiguration.patch +227_null_ptr_midispcur.patch # Temporary, until it's reviewed & accepted upstream 500_pointer_barrier_thresholds.diff -- 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/e1sjq4y-0004xy...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog| 11 +-- debian/patches/.gitignore |1 + debian/patches/227_null_ptr_midispcur.patch | 14 ++ 3 files changed, 24 insertions(+), 2 deletions(-) New commits: commit d8e24bf6634b0ef80a21ac1d1b13412d88aa7800 Author: Bryce Harrington Date: Tue Mar 27 18:50:58 2012 -0700 Fix crash after connecting a bluetooth keyboard (LP: #930936) diff --git a/debian/changelog b/debian/changelog index 07f3208..720bf45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -xorg-server (2:1.11.4-0ubuntu8) UNRELEASED; urgency=low +xorg-server (2:1.11.4-0ubuntu9) UNRELEASED; urgency=low + [ Chase Douglas ] * Fix crash at startup due to input option abi break (LP: #931397) - Revert two commits from upstream 1.12 input stack - -- Chase Douglas Fri, 23 Mar 2012 17:26:12 -0700 + [ Bryce Harrington ] + * debian/patches/227_null_ptr_midispcur.patch: +- Check for NULL pointer before dereferencing pointer from + miGetDCDevice. Fixes crash after connecting a bluetooth keyboard. + (LP: #930936) + + -- Bryce Harrington Tue, 27 Mar 2012 18:46:03 -0700 xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore new file mode 100644 index 000..69f1bf4 --- /dev/null +++ b/debian/patches/.gitignore @@ -0,0 +1 @@ +!*.patch diff --git a/debian/patches/227_null_ptr_midispcur.patch b/debian/patches/227_null_ptr_midispcur.patch new file mode 100644 index 000..6d871ee --- /dev/null +++ b/debian/patches/227_null_ptr_midispcur.patch @@ -0,0 +1,14 @@ +diff -u a/mi/midispcur.c b/mi/midispcur.c +--- a/mi/midispcur.c2011-08-05 09:59:03.0 +0400 b/mi/midispcur.c2012-02-16 10:07:52.524576132 +0400 +@@ -479,6 +479,10 @@ + GCPtr pGC; + + pBuffer = miGetDCDevice(pDev, pScreen); ++ ++if (!pBuffer) ++ return FALSE; ++ + pSave = pBuffer->pSave; + + pWin = pScreen->root; -- 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/e1sci4r-yn...@vasks.debian.org
mesa: Changes to 'ubuntu-oneiric'
debian/changelog | 10 +++
debian/patches/120_fix_tfp_texture_free.patch | 37 ++
debian/patches/series |1
3 files changed, 48 insertions(+)
New commits:
commit 41ea52abb2198581d7530340044c469fddf1fd28
Author: Bryce Harrington
Date: Fri Feb 17 10:06:43 2012 -0800
* Add 120_fix_tfp_texture_free.patch: Fixes segmentation fault in
nv50_screen_fence_update when running nouveau with the egl_dri2
driver or running the /usr/bin/es2_info utility. This is an
upstream backport of a patch from mesa 8.0.
(LP: #926918)
diff --git a/debian/changelog b/debian/changelog
index 9770c22..e3cc9f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (7.11-0ubuntu3.1) oneiric-proposed; urgency=low
+
+ * Add 120_fix_tfp_texture_free.patch: Fixes segmentation fault in
+nv50_screen_fence_update when running nouveau with the egl_dri2 driver
+or running the /usr/bin/es2_info utility. This is an upstream
+backport of a patch from mesa 8.0.
+(LP: #926918)
+
+ -- Bryce Harrington Thu, 16 Feb 2012 12:07:57 -0800
+
mesa (7.11-0ubuntu3) oneiric; urgency=low
[ Christopher James Halse Rogers ]
diff --git a/debian/patches/120_fix_tfp_texture_free.patch
b/debian/patches/120_fix_tfp_texture_free.patch
new file mode 100644
index 000..f9e97ae
--- /dev/null
+++ b/debian/patches/120_fix_tfp_texture_free.patch
@@ -0,0 +1,37 @@
+commit b2f1366c2825aeee3411c88db5c8e6b426191487
+Author: Bryce Harrington
+Date: Thu Jan 26 15:30:24 2012 -0800
+
+Backport of the following patch to oneiric:
+
+commit d430e81c3287eba4ee84ca1639a23f92bbe22c8e
+Author: Eric Anholt
+Date: Wed Sep 21 15:17:36 2011 -0700
+
+intel: Fix improper freeing of texture data in TFP.
+
+If there happened to be ->Data present, we assertion failed instead
+of handling it correctly.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35234
+Acked-by: Kenneth Graunke
+
+Most of the surrounding code has changed, so it's unclear if this change
+alone is sufficient to resolve the problem.
+
+diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c
b/src/mesa/drivers/dri/intel/intel_tex_image.c
+index 269faef..4d0968e 100644
+--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
b/src/mesa/drivers/dri/intel/intel_tex_image.c
+@@ -822,10 +822,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
+texImage = _mesa_get_tex_image(&intel->ctx, texObj, target, level);
+intelImage = intel_texture_image(texImage);
+
+- if (intelImage->mt) {
+- intel_miptree_release(intel, &intelImage->mt);
+- assert(!texImage->Data);
+- }
++ ctx->Driver.FreeTextureImageBuffer(ctx, image);
+if (intelObj->mt)
+ intel_miptree_release(intel, &intelObj->mt);
+
diff --git a/debian/patches/series b/debian/patches/series
index ec47260..f8fe42b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
117_handle_dri2connect_errors_when_indirect.diff
118_fix_24bpp_software_renering.diff
119_r600g_gnome_shell_rendering_fix.diff
+120_fix_tfp_texture_free.patch
--
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/e1ryvxt-0008a0...@vasks.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/patches/.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit c07a683eba11d66654ee3a8f8ed00158a80b6e26 Author: Bryce Harrington Date: Fri Feb 17 13:37:53 2012 -0800 Allow diffs here too. diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore index 69f1bf4..14231a9 100644 --- a/debian/patches/.gitignore +++ b/debian/patches/.gitignore @@ -1 +1,2 @@ !*.patch +!*.diff -- 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/e1ryvvu-00080y...@vasks.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog|9 +
debian/patches/.gitignore |1
debian/patches/104_uxa_fix_gtt_mapping_limits.patch | 152
debian/patches/series |1
4 files changed, 163 insertions(+)
New commits:
commit 2beba5ab4dfc338437d04a679fe4cacd18289d39
Author: Bryce Harrington
Date: Wed Feb 15 17:20:41 2012 -0800
Add 104_uxa_fix_gtt_mapping_limits.patch: Fix SIGBUS errors
encountered with loading/manipulating large pixmap images.
Cherrypicks from upstream.
(LP: #889068)
diff --git a/debian/changelog b/debian/changelog
index e19d468..5244f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.17.0-1ubuntu4) precise; urgency=low
+
+ * Add 104_uxa_fix_gtt_mapping_limits.patch: Fix SIGBUS errors
+encountered with loading/manipulating large pixmap images.
+Backport of three upstream commits.
+(LP: #889068)
+
+ -- Bryce Harrington Wed, 15 Feb 2012 17:16:19 -0800
+
xserver-xorg-video-intel (2:2.17.0-1ubuntu3) precise; urgency=low
* Readd 103_fix_uxa_fill_spans.patch from 2:2.15.901-1ubuntu4, it
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
new file mode 100644
index 000..69f1bf4
--- /dev/null
+++ b/debian/patches/.gitignore
@@ -0,0 +1 @@
+!*.patch
diff --git a/debian/patches/104_uxa_fix_gtt_mapping_limits.patch
b/debian/patches/104_uxa_fix_gtt_mapping_limits.patch
new file mode 100644
index 000..97ebcc0
--- /dev/null
+++ b/debian/patches/104_uxa_fix_gtt_mapping_limits.patch
@@ -0,0 +1,152 @@
+This is a backport of 3 patches from Chris Wilson
+ that fixes issues with loading or rotating
+large images.
+
+commit 85d3dc5910a2eea3a10b822e01443e11eaae9291
+Date: Fri Dec 2 10:22:51 2011 +
+uxa: Reset size limits based on AGP size
+
+commit f6c82c73b673ec3c9cce432fe38d5e0076234efd
+Date: Fri Dec 2 10:34:10 2011 +
+uxa: Fix runtime linking of previous commit
+
+commit 735219cd59e6184a6622d3d429a704ca3f58b9cd
+Date: Fri Dec 2 10:42:00 2011 +
+uxa: Ensure that we can fallback with all of (src, mask, dst) as GTT
mappings
+
+
+diff -Nurp patched/src/intel_display.c build/src/intel_display.c
+--- patched/src/intel_display.c2012-02-15 17:31:03.643780719 -0800
build/src/intel_display.c 2012-02-15 17:28:32.779466879 -0800
+@@ -411,8 +411,6 @@ intel_crtc_apply(xf86CrtcPtr crtc)
+ }
+ }
+
+- intel_set_gem_max_sizes(scrn);
+-
+ if (scrn->pScreen)
+ xf86_reload_cursors(scrn->pScreen);
+
+diff -Nurp patched/src/intel_driver.c build/src/intel_driver.c
+--- patched/src/intel_driver.c 2012-02-15 17:31:03.643780719 -0800
build/src/intel_driver.c 2012-02-15 17:28:59.439522179 -0800
+@@ -1164,8 +1164,6 @@ static Bool I830EnterVT(int scrnIndex, i
+ strerror(errno));
+ }
+
+- intel_set_gem_max_sizes(scrn);
+-
+ intel_copy_fb(scrn);
+
+ if (!xf86SetDesiredModes(scrn))
+diff -Nurp patched/src/intel.h build/src/intel.h
+--- patched/src/intel.h2012-02-15 17:31:03.643780719 -0800
build/src/intel.h 2012-02-15 17:26:25.543203927 -0800
+@@ -543,7 +543,6 @@ int intel_crtc_to_pipe(xf86CrtcPtr crtc)
+ unsigned long intel_get_fence_size(intel_screen_private *intel, unsigned long
size);
+ unsigned long intel_get_fence_pitch(intel_screen_private *intel, unsigned
long pitch,
+ uint32_t tiling_mode);
+-void intel_set_gem_max_sizes(ScrnInfoPtr scrn);
+
+ drm_intel_bo *intel_allocate_framebuffer(ScrnInfoPtr scrn,
+ int w, int h, int cpp,
+diff -Nurp patched/src/intel_memory.c build/src/intel_memory.c
+--- patched/src/intel_memory.c 2012-02-15 17:30:43.823739363 -0800
build/src/intel_memory.c 2012-02-15 17:30:25.571701312 -0800
+@@ -169,6 +169,39 @@ static inline int intel_pad_drawable_wid
+ return ALIGN(width, 64);
+ }
+
++
++static size_t
++agp_aperture_size(struct pci_device *dev, int gen)
++{
++ return dev->regions[gen < 30 ? 0 : 2].size;
++}
++
++static void intel_set_gem_max_sizes(ScrnInfoPtr scrn)
++{
++ intel_screen_private *intel = intel_get_screen_private(scrn);
++ size_t agp_size = agp_aperture_size(intel->PciInfo,
++ INTEL_INFO(intel)->gen);
++
++ /* The chances of being able to mmap an object larger than
++ * agp_size/2 are slim. Moreover, we may be forced to fallback
++ * using a gtt mapping as both the source and a mask, as well
++ * as a destination and all need to fit into the aperture.
++ */
++ intel->max_gtt_map_size = agp_size / 4;
++
++ /* Let objects be tiled up to the size where only 4 would fit in
++ * the aperture, presuming best case alignment. Also if we
++ * cannot mmap it using the GTT we will be stuck. */
++ intel->
xserver-xorg-video-ati: Changes to 'ubuntu'
ChangeLog | 380 ++
debian/changelog | 49 ++
debian/control|4
debian/patches/100_radeon-6.9.0-bgnr-enable.patch | 16
debian/patches/series |1
debian/rules |2
man/radeon.man| 46 +-
src/ati.c |1
src/ati.h |1
src/ati_pciids_gen.h | 19 +
src/atipciids.h |1
src/atombios_output.c |9
src/cayman_reg.h | 31 -
src/drmmode_display.c |5
src/evergreen_accel.c | 11
src/evergreen_exa.c | 149 +---
src/evergreen_reg.h | 31 -
src/evergreen_state.h |1
src/evergreen_textured_videofuncs.c |2
src/pcidb/ati_pciids.csv | 19 +
src/r600_exa.c| 164 ++---
src/r600_reg.h| 35 --
src/radeon.h | 74
src/radeon_bios.c |2
src/radeon_chipinfo_gen.h | 19 +
src/radeon_chipset_gen.h | 19 +
src/radeon_dri.c | 30 +
src/radeon_dri2.c | 65 ++-
src/radeon_driver.c | 10
src/radeon_exa.c |3
src/radeon_exa_funcs.c| 16
src/radeon_kms.c | 22 -
src/radeon_pci_chipset_gen.h | 19 +
src/radeon_pci_device_match_gen.h | 19 +
src/radeon_probe.c| 29 +
src/radeon_probe.h| 66 +++
src/radeon_textured_video.c | 19 -
src/radeon_video.c| 10
src/theatre.c |4
39 files changed, 1080 insertions(+), 323 deletions(-)
New commits:
commit b66beef73c5484910a7faf4bb67608ff4d7d83bd
Author: Bryce Harrington
Date: Fri Feb 3 14:42:25 2012 -0800
Fix firmware Suggests
diff --git a/debian/changelog b/debian/changelog
index d742012..9b1696b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ati (1:6.14.99~git20111219.aacbd629-0ubuntu2) precise;
urgency=low
+
+ * debian/control: Suggest linux-firmware rather than firmware-linux.
+The latter is only in Debian.
+(LP: #894693)
+
+ -- Bryce Harrington Fri, 03 Feb 2012 14:10:31 -0800
+
xserver-xorg-video-ati (1:6.14.99~git20111219.aacbd629-0ubuntu1) precise;
urgency=low
* Merge from Debian. Remaining Ubuntu changes:
diff --git a/debian/control b/debian/control
index fa35738..1473912 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ Depends:
${misc:Depends},
${xviddriver:Depends}
Provides: ${xviddriver:Provides}
-Suggests: firmware-linux
+Suggests: linux-firmware
Description: X.Org X server -- AMD/ATI Radeon display driver
This package provides the 'radeon' driver for the AMD/ATI Radeon, FireGL,
FireMV, FirePro and FireStream series.
commit 89ab1db5ff6836d2dc278c8d8b2993793206702b
Author: Christopher James Halse Rogers
Date: Mon Dec 19 19:08:03 2011 +1100
Merge new upstream version; drop plymouth patch merged upstream
diff --git a/debian/changelog b/debian/changelog
index 804ee77..d742012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xserver-xorg-video-ati (1:6.14.99~git20111219.aacbd629-0ubuntu1) precise;
urgency=low
+
+ * Merge from Debian. Remaining Ubuntu changes:
+- debian/rules:
+- debian/radeon-kms.conf:
+ + Don't install modprobe rule for KMS; the Ubuntu kernel defaults to KMS.
+ * New upstream snapshot:
+- More PCIIDs.
+- Endianness fixes.
+ * Drop 100_radeon-6.9.0-bgnr-enable.patch; merged upstream.
+
+ -- Christopher James Halse Rogers Mon, 19 Dec 2011
18:57:23 +1100
+
xserver-xorg-video-ati (1:6.14.99~git20110811.g93fc084-0ubuntu1) oneiric;
urgency=low
[ Christopher James Halse Rogers ]
diff --git a/debian/patches/100_radeon-6.9.0-bgnr-enable.patch
b/debian/patches/100_radeon-6.9.0-bgnr-enable.patch
deleted file mode 100644
index 36f8179..000
--- a/debian/patches/100_radeon-6.9.0-bgnr-enable.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: xserver-xorg-video-ati/src/radeon_kms.c
-===
xserver-xorg-video-ati.orig/src/radeon_kms.c 2011-01-31
19:
xserver-xorg-video-ati: Changes to 'ubuntu+1'
debian/changelog |8
debian/control |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit b66beef73c5484910a7faf4bb67608ff4d7d83bd
Author: Bryce Harrington
Date: Fri Feb 3 14:42:25 2012 -0800
Fix firmware Suggests
diff --git a/debian/changelog b/debian/changelog
index d742012..9b1696b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ati (1:6.14.99~git20111219.aacbd629-0ubuntu2) precise;
urgency=low
+
+ * debian/control: Suggest linux-firmware rather than firmware-linux.
+The latter is only in Debian.
+(LP: #894693)
+
+ -- Bryce Harrington Fri, 03 Feb 2012 14:10:31 -0800
+
xserver-xorg-video-ati (1:6.14.99~git20111219.aacbd629-0ubuntu1) precise;
urgency=low
* Merge from Debian. Remaining Ubuntu changes:
diff --git a/debian/control b/debian/control
index fa35738..1473912 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ Depends:
${misc:Depends},
${xviddriver:Depends}
Provides: ${xviddriver:Provides}
-Suggests: firmware-linux
+Suggests: linux-firmware
Description: X.Org X server -- AMD/ATI Radeon display driver
This package provides the 'radeon' driver for the AMD/ATI Radeon, FireGL,
FireMV, FirePro and FireStream series.
--
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/e1rti12-0002l1...@vasks.debian.org
intel-gpu-tools: Changes to 'ubuntu'
debian/changelog| 16 +++- debian/patches/100_drmtest_exit_not_abort.patch | 43 debian/patches/series |1 3 files changed, 57 insertions(+), 3 deletions(-) New commits: commit 5ac9fb8a31ce75e44e740b0cde1fc5ead74cd34c Author: Bryce Harrington Date: Wed Jan 25 09:48:02 2012 -0800 Patch to stop triggering apport on usage errors diff --git a/debian/changelog b/debian/changelog index 9152e90..f6bfe78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +intel-gpu-tools (1.1-0ubuntu2) precise; urgency=low + + * Add 100_drmtest_exit_not_abort.patch ++ Fix SEGV when running benchmarks as non-root. + (LP: #657529) + + -- Bryce Harrington Tue, 24 Jan 2012 22:38:04 -0800 + intel-gpu-tools (1.1-0ubuntu1) precise; urgency=low * Pre-release merge of Debian's packaging of new upstream release. diff --git a/debian/patches/100_drmtest_exit_not_abort.patch b/debian/patches/100_drmtest_exit_not_abort.patch new file mode 100644 index 000..d539393 --- /dev/null +++ b/debian/patches/100_drmtest_exit_not_abort.patch @@ -0,0 +1,43 @@ +From 73af5dcd1d361543a79189456e66b951bc4c9cb3 Mon Sep 17 00:00:00 2001 +From: Bryce Harrington +Date: Tue, 24 Jan 2012 19:35:28 -0800 +Subject: [PATCH intel-gpu-tools 1/1] drmtest: exit() rather than abort() for simple usage errors. + +When the benchmarks are run as non-root, they terminate since they can't +read the drm files. However, by terminating with abort(), this raises +SIGABRT which has the side effect of triggering crash reporting +utilities (e.g. apport). As a result we've been accumulating bug +reports about it. + +As the code is displaying a unique error message prior to termination, +it should be discoverable enough where in the code the failure occurs, +so an exit(1) should be sufficient for termination. + +Signed-off-by: Bryce Harrington +--- + lib/drmtest.c |4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/drmtest.c b/lib/drmtest.c +index fc40ad1..5ebd6d6 100644 +--- a/lib/drmtest.c b/lib/drmtest.c +@@ -65,7 +65,7 @@ int drm_open_any(void) + close(fd); + } + fprintf(stderr, "failed to open any drm device. retry as root?\n"); +- abort(); ++ exit(1); + } + + +@@ -108,5 +108,5 @@ int drm_open_any_master(void) + return fd; + } + fprintf(stderr, "Couldn't find an un-controlled DRM device\n"); +- abort(); ++ exit(1); + } +-- +1.7.4.1 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..069dcea --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +100_drmtest_exit_not_abort.patch commit 340ece96e431139b4a450f5b129ae1fddf105a9d Author: Bryce Harrington Date: Tue Jan 24 19:10:12 2012 -0800 Update changelog for 1.1-0ubuntu1 diff --git a/debian/changelog b/debian/changelog index 6ef4625..9152e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,11 @@ intel-gpu-tools (1.1-0ubuntu1) precise; urgency=low + Adds GPU test suite, GPU debugger, intel_backlight, intel_disable_clock_gating, intel_gpu_abrt, intel_reg_checker, intel_reg_snapshot, forcewaked. -+ Fixes LP: #752967 - intel_gpu_top crash in libx_start_main() - * control: Add Conflicts with -intel<2.9.1 due to intel_reg_dumper. -(LP: #591203) ++ Many bug fixes (LP: #752967, #740252, #758437) + * control: ++ Add dependency on xutils-dev. Fixes FTBS. ++ Add Conflicts with -intel<2.9.1 due to intel_reg_dumper. + (LP: #591203) * rules: Add gentarball target to make it easier to update to new git snapshots when needed. -- 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/e1rq6xf-0005dz...@vasks.debian.org
intel-gpu-tools: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit ceb9c537c5d149ea90893becfbb02896d072832c Author: Bryce Harrington Date: Tue Jan 24 09:12:38 2012 -0800 Add gentarball rule (for future convenience) commit 03782307f6497893aced866af591c0b6b9e5d436 Author: Bryce Harrington Date: Tue Jan 24 09:12:15 2012 -0800 Add xutils-dev dependency commit c1a9e68ce3665a4787ef43a954d3f49d11c6e126 Author: Bryce Harrington Date: Tue Jan 24 07:51:51 2012 -0800 Pre-release merge of Debian's packaging of 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: http://lists.debian.org/e1rpk2n-0005c6...@vasks.debian.org
xserver-xorg-video-qxl: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rolpj-00026u...@vasks.debian.org
xserver-xorg-video-qxl: Changes to 'ubuntu'
Rebased ref, commits from common ancestor: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1roloq-000248...@vasks.debian.org
xserver-xorg-video-qxl: Changes to 'upstream-ubuntu'
New branch 'upstream-ubuntu' available with the following commits: commit 75478d7bb33745dc7907fa4a1227ad634ffb6f24 Merge: 68a20c0 1b5a3f6 Author: Bryce Harrington Date: Fri Jan 20 12:48:46 2012 -0800 Merge ../xf86-video-qxl into upstream-ubuntu commit 1b5a3f606a16fd704cdbd296b29f7dc89faf8471 Author: Søren Sandmann Pedersen Date: Thu Jan 19 14:56:30 2012 -0500 Use u64_to_pointer() instead of a cast to void * commit 8aad7d4d95cd095e8e11cabbfde10b5d3b755a72 Author: Søren Sandmann Pedersen Date: Thu Jan 19 08:18:58 2012 -0500 Track damage for PolyLine fallbacks. This is a substantial speedup for the Gimp. commit c2ae430e572a1c7c8cebb8174482ded743a0b7f2 Author: Alon Levy Date: Tue Jan 17 17:50:18 2012 +0200 qxl-driver: call vgaHWSetStdFuncs explicitly Previously it was called via vgaHWGetHWRec, since 1.11.99.901 it is no longer so. The relevant xserver commit: 4bd6579188e718654c35f95623fd4772f9e0ef06 vgahw: Don't default to standard (port space) access routines From: Adam Jackson commit 37230939c6ebebac1ee9ce0f3de66a9a22355ab0 Author: Alon Levy Date: Fri Jan 13 17:15:42 2012 +0200 build fixes: sched_yield and missing declaration From: Adam Jackson commit c02da3f529513fc42afce9185e41852b8ae1407a Author: Søren Sandmann Pedersen Date: Wed Jan 18 08:40:18 2012 -0500 Guard access to "pci" with #ifndef XPSICE commit 89f71d1be4a28e7bf0d60e3089b1f28202fb821f Author: Søren Sandmann Pedersen Date: Tue Jan 17 11:24:29 2012 -0500 Fix mis-merge qxl_reset() has to be defined before qxl_close_screen(). commit 9600e4a0b57693da451f3f5ca61637d0275c3836 Author: Søren Sandmann Pedersen Date: Wed Oct 5 12:27:27 2011 -0400 Reset non-primary device out of CloseScreen(). Otherwise, client windows will linger even after the server shuts down. Don't reset the primary device so that we can preserve the fonts etc. commit e2fad1c9afe55ee9909a3ec8f142d2611f88b3f7 Author: Søren Sandmann Pedersen Date: Sat Mar 19 12:47:52 2011 -0400 If qxl_pre_init() is called without a confScreen, just return FALSE. Otherwise, the driver crashes when called from Xorg -configure. commit 420876da9eafeece83e4719a469d2e1ce0b13478 Author: Søren Sandmann Pedersen Date: Tue Aug 9 05:16:56 2011 -0400 Transmit images in smaller chunks This makes use of the 'chunks' feature of the SPICE protocol to send images in chunks smaller than 512 * 512 bytes. This reduces the likelihood of running out of memory when big image are transmitted. commit 5da2a6e4999265b717a7fd18039a90edcd9ba941 Author: Alon Levy Date: Sun Dec 18 19:48:57 2011 +0200 configure.ac: support autoconf 2.63 AC_CHECK_FILE(cond,[not-empty],[]) in autoconf 2.63 produces an empty else that is illegal for bash, but forgoes the else when given a AC_CHECK_FILE(cond,[not-empty]). 2.68 produces correct output on both, so it's unaffected. commit 10d122e7bc9a78be17b130c27495564562bf0f93 Author: Søren Sandmann Pedersen Date: Mon Dec 19 02:09:37 2011 -0500 Revert "Use new 8BIT_A format for 8 bit pixmaps." This reverts commit 8ea466a2f408524a9fcc08ed0a17f3c935857afa. (This change was pushed accidentally) commit 635a5887c52382b481de1ecca463a3fbb7fd6aa3 Author: Søren Sandmann Date: Sat Dec 17 05:39:32 2011 -0500 Don't translate newly generated paccess region The region passed to uxa_prepare_access() is in screen coordinates, but the driver wants drawable coordinates. Hence we do a translation. However, when the passed region is NULL, we generate the region ourselves based on the full drawable extents. This region is already in drawable space so shouldn't be translated. commit 8ea466a2f408524a9fcc08ed0a17f3c935857afa Author: Søren Sandmann Date: Tue Dec 13 03:51:35 2011 -0500 Use new 8BIT_A format for 8 bit pixmaps. commit 30b4b72cdbdf9f0e92a8d1c4e01779f60f15a741 Author: Gerd Hoffmann Date: Thu Oct 6 17:06:10 2011 +0200 support _ASYNC io calls and interrupt handling (busy wait) rebased with Xspice changes. Signed-off-by: Alon Levy commit c77ba9f217093f946a4c6bf6edf9f34b24844d8d Author: Søren Sandmann Date: Fri Oct 28 12:56:30 2011 -0400 Translate the access region according to the drawable offset. The driver code expects to be given coordinates relative to the offscreen pixmap. commit 0d3a9a626402ef0cc52430fe4cb35d7b5da68536 Author: Alon Levy Date: Tue Aug 2 21:31:11 2011 +0300 rename xspice Xspice commit 38cedb7ad42f11fe451507d82922d4e94cdcf15d Author: Alon Levy Date: Mon Aug 1 19:17:48 2011 +0300 xspice: make --cgdb non magical, use XSPICE_ENABLE_GDB commit b89a0b11b1133bf2991580203867830747ad4de1 Author: Søren Sandmann Pedersen Date: Sun Aug 21 10:11:48 2011 -0400 Only save th
mesa: Changes to 'ubuntu-oneiric'
New branch 'ubuntu-oneiric' 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: http://lists.debian.org/e1ro3b3-0001i8...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b6d2a0ffba8ad9f737b2bf5414f9391425dee3db Author: Bryce Harrington Date: Sat Sep 3 00:55:52 2011 -0700 Include mention of a LP bug fixed in the new upstream release diff --git a/debian/changelog b/debian/changelog index 67936a5..dab2757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.10.4-1ubuntu2) UNRELEASED; urgency=low +xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low [ Christopher James Halse Rogers ] * Drop i8xx-disablement patch. 2.6.39 and later kernels contain a patch @@ -10,6 +10,7 @@ xorg-server (2:1.10.4-1ubuntu2) UNRELEASED; urgency=low [ Timo Aaltonen ] * Merge from Debian unstable. +- Fixes Xephyr assert failure in dixGetPrivateAddr (LP: #821090) * debian/rules: Modify the patch stampdir creation. * Update patch 500_xi2.1.patch to apply. * Refresh patches. -- 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/e1qzl5r-0004fn...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |8 ++-- debian/control |1 + debian/rules |8 +++- 3 files changed, 14 insertions(+), 3 deletions(-) New commits: commit b55289248415579757ace3f4163d2441ee1fec90 Author: Bryce Harrington Date: Wed Aug 24 23:33:48 2011 -0700 Add a check target to rules, which invokes xvfb-run to verify it works. diff --git a/debian/changelog b/debian/changelog index 7ea4721..67936a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ xorg-server (2:1.10.4-1ubuntu2) UNRELEASED; urgency=low [ Bryce Harrington ] * debian/rules: Add check target invoking xvfb-run to test that it works + * debian/control: Add build dependency on xauth, required by xvfb-run -- Bryce Harrington Wed, 24 Aug 2011 19:39:26 -0700 diff --git a/debian/control b/debian/control index f2446c9..88cde28 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: flex, automake, libtool, + xauth, xutils-dev (>= 1:7.5+4), xfonts-utils (>= 1:7.5+1), x11proto-bigreqs-dev (>= 1:1.1.0), diff --git a/debian/rules b/debian/rules index 05d8b4c..f89a65f 100755 --- a/debian/rules +++ b/debian/rules @@ -361,7 +361,9 @@ binary-indep: build install check check: dh_testdir - debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -noreset" true + + # Make sure Xvfb at least starts up + debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -nolisten tcp -noreset" true binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install commit cddcb092536dd55ffb02ee57443d1df519bd330d Author: Bryce Harrington Date: Wed Aug 24 19:57:11 2011 -0700 Add a check target which invokes xvfb-run to verify it works. (Note, this fails due to not finding xauth, so that needs worked around) diff --git a/debian/changelog b/debian/changelog index 204c337..7ea4721 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low +xorg-server (2:1.10.4-1ubuntu2) UNRELEASED; urgency=low [ Christopher James Halse Rogers ] * Drop i8xx-disablement patch. 2.6.39 and later kernels contain a patch @@ -14,7 +14,10 @@ xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low * Update patch 500_xi2.1.patch to apply. * Refresh patches. - -- Christopher James Halse Rogers Mon, 01 Aug 2011 16:27:52 +1000 + [ Bryce Harrington ] + * debian/rules: Add check target invoking xvfb-run to test that it works + + -- Bryce Harrington Wed, 24 Aug 2011 19:39:26 -0700 xorg-server (2:1.10.4-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 812ec22..05d8b4c 100755 --- a/debian/rules +++ b/debian/rules @@ -351,7 +351,7 @@ endif # Build architecture-independent files here -binary-indep: build install +binary-indep: build install check $(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial dh_install -i --sourcedir=debian/tmp dh_installdocs -i @@ -359,5 +359,9 @@ binary-indep: build install $(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb +check: + dh_testdir + debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -noreset" true + binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install -- 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/e1qwtwa-0003h5...@vasks.debian.org
wayland-demos: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit cc759336179b5dd37a8f24dc6c4b59da2e24d16a Author: Bryce Harrington Date: Tue Aug 9 13:37:49 2011 -0700 Cherrypick patch to fix build without cairl egl commit 0eed896847875608e7a62c1e70e2c11ea44343da Author: Bryce Harrington Date: Tue Aug 9 13:30:38 2011 -0700 libxkbcommon-dev is required as well commit e3d21a83daedbe1678f72c5c52993c84d022a2ec Author: Bryce Harrington Date: Mon Aug 8 15:44:26 2011 -0700 control: Add dependencies on libx11-xcb1, libudev-dev commit b897e45c8a56dffe32e99e6ae6d88eff6185b048 Author: Bryce Harrington Date: Tue Jul 12 15:52:52 2011 -0700 Merge Ubuntu package with Debian commit 104f642b415066549a259ff4099c61a7535e77a2 Author: Bryce Harrington Date: Tue Jul 12 15:35:48 2011 -0700 Bring over wstart script from old packaging. -- 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/e1qqxni-0006ao...@vasks.debian.org
wayland-demos: Changes to 'upstream-ubuntu'
New branch 'upstream-ubuntu' available with the following commits:
commit cd0d10b75274fc555b89d89dc0ed1309df60a9e0
Author: Kristian Høgsberg
Date: Fri Jun 24 08:28:07 2011 -0400
compositor: Damage surface when raising
commit 8e9e6264c1ed68e8c3f4e7e6534f4c9b245fb358
Author: Benjamin Franzke
Date: Fri Jun 24 13:43:08 2011 +0200
openwfd: Combine native_resolution/rect/width,height into union
commit 9b1f2d2e8ede3fb5a9789004d397bcea68e46445
Author: Benjamin Franzke
Date: Fri Jun 24 13:12:21 2011 +0200
compositor-openwfd: Expose physical size
commit 259037d1d8830232e6631e84b06612a7a3d1d197
Author: Benjamin Franzke
Date: Fri Jun 24 13:01:03 2011 +0200
compositor-openwfd: Expose all modes
commit a16e002bd814510e99e99469a69fe941428e9faa
Author: Benjamin Franzke
Date: Fri Jun 24 11:56:25 2011 +0200
compositor-drm: Pass physical size to output_init
commit a691aeefd7f4bed97e60543723fa9b76888fbce3
Author: Kristian Høgsberg
Date: Thu Jun 23 21:43:50 2011 -0400
compositor: Track opaque region of a surface
commit aee7f84347dd51d3c463fc9a91ffef92b4511d3d
Author: Kristian Høgsberg
Date: Thu Jun 23 21:25:20 2011 -0400
compositor: Stop repainting below opaque surfaces
commit 53df1d8a6b47be8309459b1b7df3245ae101ff0f
Author: Kristian Høgsberg
Date: Thu Jun 23 21:11:19 2011 -0400
compositor: Fix a couple of region leaks
commit b8a983395da84fea468ebccc1e65a684e3b9a4b0
Author: Kristian Høgsberg
Date: Thu Jun 23 21:00:04 2011 -0400
compositor: Add helper to damage surface below
commit 8b72f604788ef3c596695aede5f773a401b2e0df
Author: Kristian Høgsberg
Date: Thu Jun 23 20:46:34 2011 -0400
compositor: Clip away obscured damage
commit 20300ba11259ba7535c3993f08261b7053fc9a04
Author: Kristian Høgsberg
Date: Thu Jun 23 20:29:12 2011 -0400
compositor: Accumulate damage in per-surface regions
commit b1ba0d1f997c4715c444edeb7371a47907f404ed
Merge: 9d4db09 b7c00a4
Author: Kristian Høgsberg
Date: Thu Jun 23 17:44:13 2011 -0400
Merge remote-tracking branch 'bnf/fix'
commit b7c00a437643480a9573f97c91d6fca7acce895f
Author: Benjamin Franzke
Date: Thu Jun 23 23:30:30 2011 +0200
Send keyboard_focus only to client surfaces
commit 9d4db0996f48872482409345e6c458a46b9e8630
Author: Kristian Høgsberg
Date: Thu Jun 23 17:23:28 2011 -0400
compositor: Launch X server rootless
commit 758dd3ea55cfe67f61044322a2728e2880b18cdb
Author: Kristian Høgsberg
Date: Thu Jun 23 15:51:43 2011 -0400
compsitor: Put background surface in the big surface list
commit 8244b44524434d728b035aa2f3c74aff39f4e65d
Author: Kristian Høgsberg
Date: Thu Jun 23 15:44:14 2011 -0400
compositor: Put cursor surfaces into the big surface list
commit 751b5bcdd29dba4ed15bd3feecbea76810eab723
Author: Kristian Høgsberg
Date: Thu Jun 23 15:33:47 2011 -0400
compositor: Change default background to be a png
commit 060cf805bb511cf8de27d661850564c4686d2fa4
Author: Benjamin Franzke
Date: Sat Apr 30 09:32:11 2011 +0200
Use gbm for compositor-{drm,openwfd}
commit 41402f8ec6e06a75145853efba541e3e66f5318e
Author: Benjamin Franzke
Date: Thu Jun 23 16:12:17 2011 +0200
compositor-openwfd: Update to mode changes
This is just to have it running again.
Todo: Expose all modes, subpixel..
commit 14f7ff91ad43aad67760775055d49f8adcc78917
Author: Benjamin Franzke
Date: Thu Jun 23 12:10:51 2011 +0200
window: Set egl_window_resize late and once
Previously we resized in attach_surface and create_surface.
THe second resize overwrote dx or dy from the first.
commit d4af320178ec0502d98104b3d57fb4925ee12992
Author: Kristian Høgsberg
Date: Tue Jun 21 17:43:31 2011 -0400
meego-tablet-shell: Use central sigchild handler
commit 27da538ab525c8f72e0d8aaa84f9cdc25c7c9248
Author: Kristian Høgsberg
Date: Tue Jun 21 17:32:25 2011 -0400
compositor: Add socket based activation for X server
commit 57eca7424aeae38098e820e12243e89cb036a2b7
Author: Kristian Høgsberg
Date: Tue Jun 21 16:40:56 2011 -0400
meego-tablet-shell: Generalize zoom animation
commit 54b868378430649aeca94f8a8f373bf9006f28ca
Author: Kristian Høgsberg
Date: Tue Jun 21 16:31:11 2011 -0400
terminal: Don't set terminal size before we have the pty
commit 487213defdb16e62cbe90cc956a07297f391a6e3
Author: Kristian Høgsberg
Date: Tue Jun 21 15:40:31 2011 -0400
Damage surface before attaching new buffer
This reverts cde9bfc80545030a6e5e4579a1adc7263ab7bfe8. We need to damage
the
area covered by the old surface when attaching a new buffer. The new
surface
area will be damaged by the client.
commit fd94bf0fd06560982decbb2c016973454ae55078
Author: Kristian Høgsberg
Date: Tue Jun 21 15:33:18 2011 -0400
compositor: Fix region leak
commit e75cb7f64b64d264b82831bb0d6bedf673e3019e
Author: Kristian Høgsberg
Date: Tue Jun 21 15:27:41 2011 -0400
compositor: Store the output rectangle in a region
commit ef0
xorg: Changes to 'ubuntu'
debian/changelog |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f03328fe66ae59da131dde14437dee08b8fa7456
Author: Bryce Harrington
Date: Fri Jul 22 13:37:27 2011 -0700
Sp.
diff --git a/debian/changelog b/debian/changelog
index ea7a16b..73fb79e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
xorg (1:7.6+7ubuntu6) oneiric; urgency=low
* debian/control: Remove Recommends on xdiagnose as well; apparently it
-still causes gtk3 to be included for kubuntu. Derivitive distros will
+still causes gtk3 to be included for kubuntu. Derivative distros will
need to opt-in with their seeds if they wish to have X diagnostics
-included.
+included, or users will have to manually install xdiagnose themselves.
-- Bryce Harrington Fri, 22 Jul 2011 13:30:15 -0700
commit e37c5fc67f8508b250a0282864f869c6fa57d660
Author: Bryce Harrington
Date: Fri Jul 22 13:34:05 2011 -0700
Drop xdiagnose as a direct dependency of xorg
Since it depends on gtk, this pulls gtk in for kubuntu which they
dislike. This will exclude derivative distros from X diagnostics,
unless xdiagnose is manually installed.
diff --git a/debian/changelog b/debian/changelog
index d6b1dbf..ea7a16b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6+7ubuntu6) oneiric; urgency=low
+
+ * debian/control: Remove Recommends on xdiagnose as well; apparently it
+still causes gtk3 to be included for kubuntu. Derivitive distros will
+need to opt-in with their seeds if they wish to have X diagnostics
+included.
+
+ -- Bryce Harrington Fri, 22 Jul 2011 13:30:15 -0700
+
xorg (1:7.6+7ubuntu5) oneiric; urgency=low
* debian/control: Move xdiagnose dependency to ubuntu-desktop.
diff --git a/debian/control b/debian/control
index 2e69ccd..1363381 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Package: x11-common
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2)
-Recommends: xdiagnose
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
--
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/e1qkmtf-0004kb...@vasks.debian.org
xorg: Changes to 'ubuntu'
debian/changelog |9 +
debian/control |1 -
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 3b637af274603c0b4fbc66fd495e5795bbb09633
Author: Bryce Harrington
Date: Fri Jul 22 13:34:05 2011 -0700
Drop xdiagnose as a direct dependency of xorg
Since it depends on gtk, this pulls gtk in for kubuntu which they
dislike. This will exclude derivative distros from X diagnostics,
unless xdiagnose is manually installed.
diff --git a/debian/changelog b/debian/changelog
index d6b1dbf..ea7a16b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6+7ubuntu6) oneiric; urgency=low
+
+ * debian/control: Remove Recommends on xdiagnose as well; apparently it
+still causes gtk3 to be included for kubuntu. Derivitive distros will
+need to opt-in with their seeds if they wish to have X diagnostics
+included.
+
+ -- Bryce Harrington Fri, 22 Jul 2011 13:30:15 -0700
+
xorg (1:7.6+7ubuntu5) oneiric; urgency=low
* debian/control: Move xdiagnose dependency to ubuntu-desktop.
diff --git a/debian/control b/debian/control
index 2e69ccd..1363381 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Package: x11-common
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2)
-Recommends: xdiagnose
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
--
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/e1qkms9-0004h3...@vasks.debian.org
xorg: Changes to 'ubuntu'
debian/changelog |8
debian/control |3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit bd2319509b0ce3757b934365b13f1dbcf87e7955
Author: Bryce Harrington
Date: Thu Jul 21 17:48:41 2011 -0700
Revert dependency on xdiagnose for kubuntu
diff --git a/debian/changelog b/debian/changelog
index a36f106..d6b1dbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.6+7ubuntu5) oneiric; urgency=low
+
+ * debian/control: Move xdiagnose dependency to ubuntu-desktop.
+xdiagnose has a gtk dependency, which would pull in gtk3 to kubuntu.
+(LP: #814346)
+
+ -- Bryce Harrington Thu, 21 Jul 2011 17:47:16 -0700
+
xorg (1:7.6+7ubuntu4) oneiric; urgency=low
* debian/control: Add Depends on xdiagnose, to ensure it always gets
diff --git a/debian/control b/debian/control
index 9e77e5d..2e69ccd 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
Package: x11-common
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2), xdiagnose
+Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2)
+Recommends: xdiagnose
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
--
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/e1qk3vd-0006ax...@vasks.debian.org
xorg: Changes to 'ubuntu'
debian/changelog |9 -
debian/control |3 +--
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 9b17062301023ef65b225f07e245343810e39075
Author: Bryce Harrington
Date: Tue Jul 19 18:20:50 2011 -0700
Depends on xdiagnose so it will always be installed
diff --git a/debian/changelog b/debian/changelog
index 9562104..a36f106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
+xorg (1:7.6+7ubuntu4) oneiric; urgency=low
+
+ * debian/control: Add Depends on xdiagnose, to ensure it always gets
+installed.
+
+ -- Bryce Harrington Tue, 19 Jul 2011 18:19:24 -0700
+
xorg (1:7.6+7ubuntu3) oneiric; urgency=low
* debian/rules:
- Reverse the symlinking of /usr/share/doc directories to x11-common.
This should now be handled automatically by pkgbinarymangler, and the
directory symlink now causes file conflicts. (LP: #812665)
-
+
-- Christopher James Halse Rogers Tue, 19 Jul 2011
17:32:01 +1000
xorg (1:7.6+7ubuntu2) oneiric; urgency=low
diff --git a/debian/control b/debian/control
index 2e69ccd..9e77e5d 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
Package: x11-common
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2)
-Recommends: xdiagnose
+Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2), xdiagnose
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
--
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/e1qjlyf-0004kf...@vasks.debian.org
xorg: Changes to 'ubuntu'
debian/changelog |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 521f1b7f572cddf50f6a0735f60f0a3fade7ae21 Author: Bryce Harrington Date: Mon Jul 18 12:12:53 2011 -0700 Bump for release diff --git a/debian/changelog b/debian/changelog index 32ddb21..e12b0c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg (1:7.6+7ubuntu2) UNRELEASED; urgency=low +xorg (1:7.6+7ubuntu2) oneiric; urgency=low - * add debian/local/Xsession.d/60x11-common_xdg_path to set -xdg path depending on the selected session -(compatible with lightdm, gdm and kdm now) (LP: #804734) + * debian/local/Xsession.d/60x11-common_xdg_path: Add session script to +set xdg path depending on the selected session (compatible with +lightdm, gdm and kdm now) (LP: #804734) -- Didier Roche Wed, 06 Jul 2011 09:39:17 +0200 -- 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/e1qitjn-0007p7...@vasks.debian.org
wayland: Changes to 'upstream-ubuntu'
New branch 'upstream-ubuntu' available with the following commits: commit aa7bbb210b7121b9314993228960240358e9b123 Author: Laszlo Agocs Date: Wed Jun 29 17:54:11 2011 +0300 Add touch events to protocol. commit 40b0a6bf630b45550ec1e5e62395006cbf4223aa Author: Kristian Høgsberg Date: Wed Jun 29 11:43:11 2011 -0400 server: Add wl_client_flush() Flush output queue up for the specified client. commit ff20a0417af35a1614ec761a67160963de6471e0 Author: Kristian Høgsberg Date: Thu Jun 23 06:43:47 2011 -0400 event-loop: Make idle handlers work again commit b6fdded54bc86260f2b6126d34648c85f4f2d7b1 Author: Kristian Høgsberg Date: Tue Jun 21 16:25:28 2011 -0400 Update TODO commit 7dc36984af4b70018e4c70a39cf19172693d33fc Merge: bfea3d6 4c2500c Author: Kristian Høgsberg Date: Tue Jun 21 12:15:31 2011 -0400 Merge remote-tracking branch 'bnf/buffer.release' commit 4c2500c2e2abc380f34e3222d31222fd103015a5 Author: Benjamin Franzke Date: Tue Jun 21 17:37:18 2011 +0200 Drop wl_compoositor parameter in wl_buffer commit a56c0455717c4772e8e4b78e56af439ccd2356af Author: Benjamin Franzke Date: Tue May 10 12:01:00 2011 +0200 Add busy_count and client parameter to wl_buffer Can be used to implement release event. commit 2fcebfed95447b994649f58f7b0d40e8bac8de08 Author: Benjamin Franzke Date: Mon May 9 17:35:58 2011 +0200 Add buffer.release event commit bfea3d6befdb688d5354e6f15a9400ea637febf9 Author: Kristian Høgsberg Date: Mon Jun 20 20:34:55 2011 -0400 Add more protocol for communicating screen geometry commit aae9f214e5f0d8d1deac4816fe40f76b2cf84f55 Author: Laszlo Agocs Date: Tue Jun 14 10:35:46 2011 +0200 Add wl_display_remove_global. Change 4453ba084aae5a00318b9dfdeda95e8eaa17494c disallows using post_global with objects not on the global list. Therefore selection and drag offers have to be added to the global list from now on. However these may often get replaced by a newer object and thus need a way to remove a global from the global list. commit 9c36ea776b48decd84828d0b51842c91e2c9124a Author: Laszlo Agocs Date: Tue Jun 14 11:41:54 2011 +0200 Do not leak globals and listeners. From 3fa2ad7dec42f85795449f33b2a4c9461aa4924d Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 14 Jun 2011 11:35:28 +0200 Subject: [PATCH] Do not leak globals and listeners. commit a2db57517b3648f52410c6861704b5c4190416c1 Author: Kristian Høgsberg Date: Sat Jun 18 08:17:40 2011 -0400 Move map functionality into shell Initial surface.attach makes the surface visible and clients can set the surface type using shell.set_transient etc or other interfaces prior to that. -- 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/e1qha8m-0005ec...@vasks.debian.org
wayland: Changes to 'ubuntu'
debian/changelog | 13 +
debian/control |6 +++---
debian/wayland.lintian-overrides |1 +
3 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 50a53b172b575d8fe071db6c33d85b4322d9ac65
Author: Bryce Harrington
Date: Wed Jul 13 11:44:15 2011 -0700
Add lintian overrides for package-name-doesnt-match-sonames
diff --git a/debian/changelog b/debian/changelog
index 590cc1d..cb691db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wayland (0.1.0~0-1ubuntu3) oneiric; urgency=low
+
+ * wayland.lintian-overrides: libwayland-client and libwayland-server are
+shipped in a single lib package and share the same soname.
+
+ -- Bryce Harrington Wed, 13 Jul 2011 11:40:09 -0700
+
wayland (0.1.0~0-1ubuntu2) oneiric; urgency=low
* control: Limit architecture to amd64, i386, and armel.
diff --git a/debian/wayland.lintian-overrides b/debian/wayland.lintian-overrides
new file mode 100644
index 000..7809072
--- /dev/null
+++ b/debian/wayland.lintian-overrides
@@ -0,0 +1 @@
+wayland: package-name-doesnt-match-sonames libwayland-client0
libwayland-server0
commit 6043c3b5449db9138c7c9113d4c2b3c117b345b1
Author: Bryce Harrington
Date: Tue Jul 12 18:17:43 2011 -0700
Omit powerpc architecture
diff --git a/debian/changelog b/debian/changelog
index efc7229..590cc1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wayland (0.1.0~0-1ubuntu2) oneiric; urgency=low
+
+ * control: Limit architecture to amd64, i386, and armel.
+
+ -- Bryce Harrington Tue, 12 Jul 2011 17:23:07 -0700
+
wayland (0.1.0~0-1ubuntu1) oneiric; urgency=low
* Merge with Debian (experimental) packaging.
diff --git a/debian/control b/debian/control
index 4711ba0..e54a97e 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Homepage: http://wayland.freedesktop.org
Package: libwayland0
Section: libs
-Architecture: any
+Architecture: amd64 i386 armel
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -39,7 +39,7 @@ Description: wayland compositor infrastructure - shared
libraries
Package: libwayland0-dbg
Section: debug
Priority: extra
-Architecture: any
+Architecture: amd64 i386 armel
Depends:
libwayland0 (= ${binary:Version}),
${shlibs:Depends},
@@ -57,7 +57,7 @@ Description: wayland compositor infrastructure - shared
libraries (debug)
Package: libwayland-dev
Section: libdevel
-Architecture: any
+Architecture: amd64 i386 armel
Priority: extra
Depends:
libwayland0 (= ${binary:Version}),
--
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/e1qh4qu-0007ye...@vasks.debian.org
wayland: Changes to 'ubuntu'
debian/changelog |1 +
debian/control |4
2 files changed, 5 insertions(+)
New commits:
commit 201f0da33de9d5507951f5d48c5067e1f012a1bf
Author: Bryce Harrington
Date: Tue Jul 12 13:51:44 2011 -0700
Replaces/Conflicts on old binaries
diff --git a/debian/changelog b/debian/changelog
index 1aa8ae3..efc7229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ wayland (0.1.0~0-1ubuntu1) oneiric; urgency=low
binary package. Use shorter dependencies list. New package
descriptions.
* Remaining Ubuntu changes:
+- control: Replaces/Conflicts on previous binary names
- control: Include wayland homepage
- copyright: dep5 metadata
- libwayland0.symbols.in: omit blank line (dpkg-gensymbols warning)
diff --git a/debian/control b/debian/control
index bde369a..4711ba0 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Replaces: libwayland-server0, libwayland-client0
+Conflicts: libwayland-server0, libwayland-client0
Description: wayland compositor infrastructure - shared libraries
Wayland is a protocol for a compositor to talk to its clients as well
as a C library implementation of that protocol. The compositor can be
@@ -61,6 +63,8 @@ Depends:
libwayland0 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
+Replaces: libwayland-server0-dev, libwayland-client0-dev
+Conflicts: libwayland-server0-dev, libwayland-client0-dev
Description: wayland compositor infrastructure - development files
Wayland is a protocol for a compositor to talk to its clients as well
as a C library implementation of that protocol. The compositor can be
--
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/e1qgjw6-0003iy...@vasks.debian.org
wayland: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit a6c2f022a89903b222838adb90f010d54e10b295 Author: Bryce Harrington Date: Tue Jul 12 13:33:32 2011 -0700 Merge Ubuntu package with Debian. -- 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/e1qgjes-0002fs...@vasks.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |9 - debian/rules |3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) New commits: commit f404f18251774d1b031e8c2f930858fb2c2d595b Author: Bryce Harrington Date: Tue Jul 5 17:21:39 2011 -0700 patch rule depends on stampdir creation diff --git a/debian/changelog b/debian/changelog index 5c58781..383f7f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -xorg-server (2:1.10.2.902-1ubuntu1) UNRELEASED; urgency=low +xorg-server (2:1.10.2.902-1ubuntu2) UNRELEASED; urgency=low + + * rules: patch needs to depend on stampdir, else it doesn't get created, +and 'debian/rules patch' malfunctions. + + -- Bryce Harrington Tue, 05 Jul 2011 17:11:42 -0700 + +xorg-server (2:1.10.2.902-1ubuntu1) oneiric; urgency=low * Merge from Debian unstable. (LP: 441653) - Update 500_xi2.1.patch to apply. diff --git a/debian/rules b/debian/rules index 2f6bc12..402d050 100755 --- a/debian/rules +++ b/debian/rules @@ -184,6 +184,9 @@ confflags_udeb = \ $(config_backend_udeb) \ $(void) +patch: $(STAMP_DIR)/stampdir + >$@ + $(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN) dh_testdir autoreconf -vfi -- 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/e1qefsn-0005n2...@vasks.debian.org
xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog | 10 +
debian/patches/.gitignore |1
debian/patches/102_disable_pageflipping_for_transformed_displays.patch | 64
++
debian/patches/series |1
4 files changed, 76 insertions(+)
New commits:
commit 4d9ef31faba62ab7b0691817f6209ebc61ec5580
Author: Bryce Harrington
Date: Tue Jun 21 12:56:37 2011 -0700
Add cherrypick to disable pageflipping on rotated displays
diff --git a/debian/changelog b/debian/changelog
index faf8c50..23863d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-ati (1:6.14.0-0ubuntu5) oneiric; urgency=low
+
+ * 102_disable_pageflipping_for_transformed_displays.patch:
+Add cherrypick patch to not enable pageflipping if display has been
+rotated. Fixes issue where garbage appears on rotated screens
+while rotated.
+(LP: #772111)
+
+ -- Bryce Harrington Tue, 21 Jun 2011 12:41:28 -0700
+
xserver-xorg-video-ati (1:6.14.0-0ubuntu4) natty; urgency=low
* Bump the build-dep on xserver-xorg-dev.
diff --git
a/debian/patches/102_disable_pageflipping_for_transformed_displays.patch
b/debian/patches/102_disable_pageflipping_for_transformed_displays.patch
new file mode 100644
index 000..6a2cf0b
--- /dev/null
+++ b/debian/patches/102_disable_pageflipping_for_transformed_displays.patch
@@ -0,0 +1,64 @@
+commit 04293a3a84acd96ccdf8e5e865cf973325ca43a1
+Author: Alex Deucher
+Date: Thu Feb 24 02:33:41 2011 -0500
+
+dri2: disable pageflipping for transformed displays
+
+Based on Ben's nouveau patch.
+
+Signed-off-by: Alex Deucher
+
+diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
+index e8e16ff..66df03c 100644
+--- a/src/radeon_dri2.c
b/src/radeon_dri2.c
+@@ -626,12 +626,21 @@ radeon_dri2_schedule_flip(ScrnInfoPtr scrn, ClientPtr
client,
+ }
+
+ static Bool
+-can_exchange(DRI2BufferPtr front, DRI2BufferPtr back)
++can_exchange(ScrnInfoPtr pScrn,
++ DRI2BufferPtr front, DRI2BufferPtr back)
+ {
+ struct dri2_buffer_priv *front_priv = front->driverPrivate;
+ struct dri2_buffer_priv *back_priv = back->driverPrivate;
+ PixmapPtr front_pixmap = front_priv->pixmap;
+ PixmapPtr back_pixmap = back_priv->pixmap;
++xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
++int i;
++
++for (i = 0; i < xf86_config->num_crtc; i++) {
++ xf86CrtcPtr crtc = xf86_config->crtc[i];
++ if (crtc->enabled && crtc->rotatedData)
++ return FALSE;
++}
+
+ if (front_pixmap->drawable.width != back_pixmap->drawable.width)
+ return FALSE;
+@@ -712,7 +721,7 @@ void radeon_dri2_frame_event_handler(unsigned int frame,
unsigned int tv_sec,
+ case DRI2_FLIP:
+ if (info->allowPageFlip &&
+ DRI2CanFlip(drawable) &&
+- can_exchange(event->front, event->back) &&
++ can_exchange(scrn, event->front, event->back) &&
+ radeon_dri2_schedule_flip(scrn,
+ event->client,
+ drawable,
+@@ -727,7 +736,7 @@ void radeon_dri2_frame_event_handler(unsigned int frame,
unsigned int tv_sec,
+ /* else fall through to exchange/blit */
+ case DRI2_SWAP:
+ if (DRI2CanExchange(drawable) &&
+- can_exchange(event->front, event->back)) {
++ can_exchange(scrn, event->front, event->back)) {
+ radeon_dri2_exchange_buffers(drawable, event->front, event->back);
+ swap_type = DRI2_EXCHANGE_COMPLETE;
+ } else {
+@@ -1075,7 +1084,7 @@ static int radeon_dri2_schedule_swap(ClientPtr client,
DrawablePtr draw,
+ /* Flips need to be submitted one frame before */
+ if (info->allowPageFlip &&
+ DRI2CanFlip(draw) &&
+- can_exchange(front, back)) {
++ can_exchange(scrn, front, back)) {
+ swap_type = DRI2_FLIP;
+ flip = 1;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 139a73c..b321e86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
100_radeon-6.9.0-bgnr-enable.patch
101_fix_build_aginst_1.10rc3.diff
+102_disable_pageflipping_for_transformed_displays.patch
commit f6bfa7ecf3fea90129b52d50ff943d15a9111bd3
Author: Bryce Harrington
Date: Tue Jun 21 12:54:48 2011 -0700
Don't ignore .patch files in debian/patches
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
new file mode 100644
index 000..69f1bf4
--- /dev/null
+++ b/debian/patches/.gitignore
@@ -0,0 +1 @@
+!*.patch
--
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/e1qz7af-00028v...@vasks.debian.org
xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog | 18 ++ debian/control|1 debian/patches/.gitignore |1 debian/patches/101_resolution_detect_option.patch | 137 ++ debian/patches/series |1 5 files changed, 156 insertions(+), 2 deletions(-) New commits: commit c3e66773705f762284fc8c03601ed83b80210860 Author: Bryce Harrington Date: Tue Jun 7 23:15:26 2011 -0700 Disable the xtst extension; causes bug 774978 diff --git a/debian/changelog b/debian/changelog index d0c1975..1ff0743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu14) oneiric; urgency=low + + * Drop libxtst-dev build dependency so syndaemon does not use XRecord, +preventing a wide range of crashes in _CallCallbacks. (LP: #774978) + + -- Robert Hooker Mon, 23 May 2011 10:13:09 -0400 + xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu13) oneiric; urgency=low * Re-add 116_resolution_detect_option.patch as 101_resolution_detect_option.patch: diff --git a/debian/control b/debian/control index 26cd301..a5343e8 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: libx11-dev, libxext-dev, libxi-dev (>= 2:1.2.0), - libxtst-dev, x11proto-core-dev, xserver-xorg-dev (>= 2:1.9.99.902-2ubuntu1), pkg-config, commit 589cc551bf88fec506b7e2285d10ee6dceeb884d Author: Bryce Harrington Date: Fri May 20 08:14:12 2011 -0700 * Re-add 116_resolution_detect_option.patch as 101_resolution_detect_option.patch: - This patch was introduced in 1.2.2-2ubuntu7 but got erroneously dropped in the merge for 1.3.99+git20110116.0e27ce3a-0ubuntu1. (LP: #327428) diff --git a/debian/changelog b/debian/changelog index 023d7db..d0c1975 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu13) oneiric; urgency=low + + * Re-add 116_resolution_detect_option.patch as 101_resolution_detect_option.patch: +- This patch was introduced in 1.2.2-2ubuntu7 but got erroneously dropped in the + merge for 1.3.99+git20110116.0e27ce3a-0ubuntu1. + (LP: #327428) + + -- Bryce Harrington Fri, 20 May 2011 11:14:44 -0700 + xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu12) natty; urgency=low * syndaemon: Drain spurious events from XRecord connection as a work around @@ -110,7 +119,7 @@ xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu1) natty; urgen * debian/patches/114_jumpy_cursor_first_part.patch: - Refresh for new upstream. Drop the multi-touch chunk of the quirk, as that is handled by upstream commit a6ca4d25. - + -- Christopher James Halse Rogers Tue, 25 Jan 2011 20:01:58 +1100 xserver-xorg-input-synaptics (1.3.0-1) experimental; urgency=low diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore new file mode 100644 index 000..69f1bf4 --- /dev/null +++ b/debian/patches/.gitignore @@ -0,0 +1 @@ +!*.patch diff --git a/debian/patches/101_resolution_detect_option.patch b/debian/patches/101_resolution_detect_option.patch new file mode 100644 index 000..4cce724 --- /dev/null +++ b/debian/patches/101_resolution_detect_option.patch @@ -0,0 +1,137 @@ +diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h +index 9c6a2ee..150ba53 100644 +--- a/include/synaptics-properties.h b/include/synaptics-properties.h +@@ -140,6 +140,9 @@ + #define SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR "Synaptics Pressure Motion Factor" + + /* 8 bit (BOOL) */ ++#define SYNAPTICS_PROP_RESOLUTION_DETECT "Synaptics Resolution Detect" ++ ++/* 8 bit (BOOL) */ + #define SYNAPTICS_PROP_GRAB "Synaptics Grab Event Device" + + /* 8 bit (BOOL), 1 value, tap-and-drag */ +diff --git a/man/synaptics.man b/man/synaptics.man +index 3f1ca9d..1ab36ca 100644 +--- a/man/synaptics.man b/man/synaptics.man +@@ -446,6 +446,18 @@ The gesture is enabled by default and can be disabled by setting the + TapAndDragGesture option to false. Property: "Synaptics Gestures" + . + .TP ++.BI "Option \*ResolutionDetect\*q \*q" boolean \*q ++Allow or prevent the synaptics driver from reporting the size of the ++touchpad to the X server. The X server normally uses this information ++to scale movements so that touchpad movement corresponds visually to ++mouse cursor movements on the screen. However, in some rare cases where ++the touchpad height/width ratio is significantly different from the ++laptop, it can cause the mouse cursor to skip pixels in the X or Y axis. ++This option allows disabling this scaling behavior, which can provide ++smoother mouse movement in such cases. ++Property: "Synaptics Resolution Detect" ++. ++.TP + .BI "Option \*qVertResolutio
libxi: Changes to 'ubuntu'
debian/patches/.gitignore |1 debian/patches/100_len_raw_events.patch | 51 2 files changed, 52 insertions(+) New commits: commit 236593e3f348176b2a44e5118c35fac11bce2204 Author: Bryce Harrington Date: Thu May 19 10:26:44 2011 -0700 Add missing patch. Stop git from ignoring patches. diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore new file mode 100644 index 000..69f1bf4 --- /dev/null +++ b/debian/patches/.gitignore @@ -0,0 +1 @@ +!*.patch diff --git a/debian/patches/100_len_raw_events.patch b/debian/patches/100_len_raw_events.patch new file mode 100644 index 000..9320f27 --- /dev/null +++ b/debian/patches/100_len_raw_events.patch @@ -0,0 +1,51 @@ +commit af65475b1f6b7209750220a74aaad9968d54aaf7 +Author: Peter Hutterer +Date: Tue May 3 13:21:02 2011 +1000 + +Allocate enough memory for raw events + extra data. + +Necessary space was calculated, but not actually used to allocate memory. As +a result, valuator data would overwrite the allocated memory. + +==4166== Invalid write of size 1 +==4166==at 0x4C29F04: memcpy (mc_replace_strmem.c:497) +==4166==by 0x8F39180: ??? (in /usr/lib/libXi.so.6.1.0) +==4166==by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0) +==4166==by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0) +==4166==by 0x49C3E3: process_key (x11_be.c:1065) +==4166==by 0x49EA5C: event_key_release (x11_be.c:2201) +==4166==by 0x49DD6E: x11_be_process_events (x11_be.c:1892) +==4166==by 0x4A38F4: x11_be_main_loop (x11_be.c:4353) +==4166==by 0x4A39E1: x11_be_thread_main (x11_be.c:4385) +==4166==by 0x87549C9: start_thread (pthread_create.c:300) +==4166==by 0x8A516FC: clone (clone.S:112) +==4166== Address 0x168afe80 is 0 bytes after a block of size 96 alloc'd +==4166==at 0x4C284A8: malloc (vg_replace_malloc.c:236) +==4166==by 0x8F390BD: ??? (in /usr/lib/libXi.so.6.1.0) +==4166==by 0x7433D48: _XCopyEventCookie (in /usr/lib/libX11.so.6.3.0) +==4166==by 0x7425166: XPeekEvent (in /usr/lib/libX11.so.6.3.0) +==4166==by 0x49C3E3: process_key (x11_be.c:1065) +==4166==by 0x49EA5C: event_key_release (x11_be.c:2201) +==4166==by 0x49DD6E: x11_be_process_events (x11_be.c:1892) +==4166==by 0x4A38F4: x11_be_main_loop (x11_be.c:4353) +==4166==by 0x4A39E1: x11_be_thread_main (x11_be.c:4385) +==4166==by 0x87549C9: start_thread (pthread_create.c:300) + +Reported-by: Roger Cruz +Signed-off-by: Peter Hutterer +Reviewed-by: Jeremy Huddleston +Reviewed-by: Daniel Stone + +diff --git a/src/XExtInt.c b/src/XExtInt.c +index d1451cc..134ccc6 100644 +--- a/src/XExtInt.c b/src/XExtInt.c +@@ -1259,7 +1259,7 @@ copyRawEvent(XGenericEventCookie *cookie_in, + len = sizeof(XIRawEvent) + in->valuators.mask_len; + len += bits * sizeof(double) * 2; + +-ptr = cookie_out->data = malloc(sizeof(XIRawEvent)); ++ptr = cookie_out->data = malloc(len); + if (!ptr) + return False; + -- 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/e1qn70a-0005kh...@alioth.debian.org
xorg-server: Changes to 'ubuntu-natty'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2a31d72610e1753c639ced41a3ce0e0e503b282 Author: Bryce Harrington Date: Thu May 19 09:18:25 2011 -0700 Target to natty-proposed diff --git a/debian/changelog b/debian/changelog index ad15306..db37153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.10.1-1ubuntu1.1) oneiric; urgency=low +xorg-server (2:1.10.1-1ubuntu1.1) natty-proposed; urgency=low [ Chase Douglas ] * Fix masked transformed valuator handling (LP: #774938) -- 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/e1qn5xi-0003b5...@alioth.debian.org
xorg-server: Changes to 'ubuntu-natty'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af94c08c913c578c4be3f55f131548b8fe09d4ee Author: Bryce Harrington Date: Thu May 19 08:51:46 2011 -0700 releasing version 2:1.10.1-1ubuntu1.1 diff --git a/debian/changelog b/debian/changelog index dffe8c9..ad15306 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.10.1-1ubuntu1.1) UNRELEASED; urgency=low +xorg-server (2:1.10.1-1ubuntu1.1) oneiric; urgency=low [ Chase Douglas ] * Fix masked transformed valuator handling (LP: #774938) -- 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/e1qn5w2-0002us...@alioth.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/apport-gpu-error-intel.py | 138 ---
debian/changelog |7 +
debian/control |5 -
debian/rules |2
4 files changed, 7 insertions(+), 145 deletions(-)
New commits:
commit 7eda07c4dea6e6f2ae6e6892bf6f77af0834f231
Author: Bryce Harrington
Date: Wed May 18 05:34:54 2011 +0200
* debian/apport-gpu-error-intel.py, debian/control, debian/rules:
- Migrate apport hook out of video driver, to xdiagnose
diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
deleted file mode 100644
index 9cd9fee..000
--- a/debian/apport-gpu-error-intel.py
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/python
-
-import os
-import os.path
-import sys
-import re
-
-from apport.hookutils import *
-
-from apport import unicode_gettext as _
-
-pci_devices = [
-{ 'name':'i810','re':'(8086:7121)','supported':False },
-{ 'name':'i810dc', 're':'(8086:7123)','supported':False },
-{ 'name':'i810e', 're':'(8086:7125)','supported':False },
-{ 'name':'i815','re':'(8086:1132|82815)', 'supported':False },
-{ 'name':'i830','re':'(8086:3577|82830)', 'supported':False },
-{ 'name':'i845','re':'(8086:2562|82845G)', 'supported':False },
-{ 'name':'i855','re':'(8086:3582|855GM)', 'supported':False },
-{ 'name':'i865','re':'(8086:2572|82865G)', 'supported':False },
-{ 'name':'i915g', 're':'(8086:2582)' },
-{ 'name':'i915gm', 're':'(8086:2592|915GM)' },
-{ 'name':'e7221', 're':'(8086:258a)','supported':False },
-{ 'name':'i945g', 're':'(8086:2772|945G[ \/]|82945G[ \/])' },
-{ 'name':'i945gm', 're':'(8086:27a2|945GM[ \/]|82945GM[ \/])' },
-{ 'name':'i945gme', 're':'(8086:27ae|945GME|82945GME)' },
-{ 'name':'IGDg','re':'(8086:a001)' },
-{ 'name':'IGDgm', 're':'(8086:a011)' },
-{ 'name':'pineviewg', 're':'(8086:a001)' },
-{ 'name':'pineviewgm', 're':'(8086:a011)' },
-{ 'name':'i946gz', 're':'(8086:2972|82946GZ)' },
-{ 'name':'g35', 're':'(8086:2982|82G35)' },
-{ 'name':'i965q', 're':'(8086:2992|Q965)' },
-{ 'name':'i965g', 're':'(8086:29a2|G965)' },
-{ 'name':'g33', 're':'(8086:29c2|82G33)' },
-{ 'name':'q35', 're':'(8086:29b2)' },
-{ 'name':'q33', 're':'(8086:29d2)' },
-{ 'name':'i965gm', 're':'(8086:2a02|GM965)' },
-{ 'name':'i965gme', 're':'(8086:2a12)' },
-{ 'name':'gm45','re':'(8086:2a42)' },
-{ 'name':'IGDeg', 're':'(8086:2e02)' },
-{ 'name':'q45', 're':'(8086:2e12)' },
-{ 'name':'g45', 're':'(8086:2e22)' },
-{ 'name':'g41', 're':'(8086:2e32)' },
-{ 'name':'b43', 're':'(8086:2e42)' },
-{ 'name':'clarkdale', 're':'(8086:0042)' },
-{ 'name':'arrandale', 're':'(8086:0046)' },
-{ 'name':'sandybridge-gt1', 're':'(8086:0102)' },
-{ 'name':'sandybridge-m-gt1', 're':'(8086:0106)' },
-{ 'name':'sandybridge-s', 're':'(8086:010a)' },
-{ 'name':'sandybridge-gt2', 're':'(8086:0112)' },
-{ 'name':'sandybridge-m-gt2', 're':'(8086:0116)'
xorg-server: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bb1fe5d9d7eda6e667a710c0870c30fedf8c6867 Author: Bryce Harrington Date: Wed May 18 11:59:07 2011 -0700 releasing version 2:1.10.1-1ubuntu2 diff --git a/debian/changelog b/debian/changelog index 9e457c3..9b23fd9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg-server (2:1.10.1-1ubuntu2) UNRELEASED; urgency=low +xorg-server (2:1.10.1-1ubuntu2) oneiric; urgency=low * Fix masked transformed valuator handling (LP: #774938) - Added debian/patches/503_fix_masked_transformed_valuators.patch - -- Chase Douglas Fri, 29 Apr 2011 11:43:59 -0400 + -- Bryce Harrington Tue, 17 May 2011 14:44:58 -0700 xorg-server (2:1.10.1-1ubuntu1) natty; urgency=low -- 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/e1qmlxr-0006cn...@alioth.debian.org
xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py| 468
debian/changelog|8
debian/control |1
debian/local/Failsafe/README| 20 -
debian/local/Failsafe/failsafeBlacklist |6
debian/local/Failsafe/failsafeXServer | 160 --
debian/local/Failsafe/failsafeXinit | 231 ---
debian/po-failsafe/POTFILES.in |1
debian/rules|3
debian/x11-common.failsafe-x.upstart| 13
debian/x11-common.install |2
debian/x11-common.links | 55 ---
debian/x11-common.postinst.in |5
debian/x11-common.postrm.in |5
debian/x11-common.preinst.in|5
15 files changed, 21 insertions(+), 962 deletions(-)
New commits:
commit 32586e8e14e5879e313eb840c2004c0344601317
Author: Bryce Harrington
Date: Fri May 13 08:33:12 2011 -0700
* apport/source_xorg.py:
- Simplify answers for bug reporters filing post-release reports.
(LP: 778758)
- Remove attach_drm_info(). This is useful info but we use it very
infrequently, and it is already available in other log files. But the
call makes bug reports a bit cluttered since it adds a lot of lines to
the report itself.
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a60ad4c..1b03afe 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -148,9 +148,9 @@ def check_is_supported(report, ui=None):
"certain it should be reported here?" %(distro_codename),
[
"I don't know",
-"Yes, I already know the fix for this problem.",
-"Yes, The problem began right after doing a system software
update.",
-"Yes, I have gone through technical support, and they have
referred me here.",
+"Yes, and I know the fix for this problem.",
+"Yes, the problem began right after doing a system software
update.",
+"Yes.",
"No, please point me to a good place to get support.",
]
)
diff --git a/debian/changelog b/debian/changelog
index 65a62d2..b8f2637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low
- * apport/source_xorg.py: Remove attach_drm_info(). This is useful info
-but we use it very infrequently, and it is already available in other
-log files. But the call makes bug reports a bit cluttered since it
-adds a lot of lines to the report itself.
+ * apport/source_xorg.py:
+- Simplify answers for bug reporters filing post-release reports.
+ (LP: #778758)
+- Remove attach_drm_info(). This is useful info but we use it very
+ infrequently, and it is already available in other log files. But the
+ call makes bug reports a bit cluttered since it adds a lot of lines to
+ the report itself.
-- Bryce Harrington Thu, 07 Apr 2011 14:02:40 -0700
commit c4d45fbfec0a4792d7dbd2e668d32b894e5e1c7c
Author: Bryce Harrington
Date: Wed May 18 03:24:10 2011 +0200
Migrate the failsafe-x bits out of xorg to xdiagnose
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
deleted file mode 100644
index a60ad4c..000
--- a/debian/apport/source_xorg.py
+++ /dev/null
@@ -1,468 +0,0 @@
-#!/usr/bin/python
-
-'''Xorg Apport interface
-
-Copyright (C) 2007, 2008 Canonical Ltd.
-Author: Bryce Harrington
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version. See http://www.gnu.org/copyleft/gpl.html for
-the full text of the license.
-
-Testing: APPORT_STAGING="yes"
-'''
-
-import os.path
-import glob
-import re
-import subprocess
-from apport.hookutils import *
-from launchpadlib.launchpad import Launchpad
-
-core_x_packages = [
-'xorg', 'xorg-server', 'xserver-xorg-core', 'mesa'
-]
-keyboard_packages = [
-'xorg', 'xkeyboard-config', 'xserver-xorg-input-keyboard',
'xserver-xorg-input-evdev'
-]
-
-##
-#
-# Apport helper routines
-#
-##
-def retrieve_ubuntu_release_statuses():
-'''
-Attempts to access launchpad to get a mapping of Ubuntu releases to status.
-
-Returns a dictionary of ubuntu release keywords to their current status,
-or None in cause of a failure reading launchpad.
-'''
-releases = { }
-try:
-lp = Launchpad.login_anonymously('apport', 'pro
xorg: Changes to 'ubuntu-failsafex-extraction'
New branch 'ubuntu-failsafex-extraction' available with the following commits: commit 1c5870fb9d2ca18525b23f218645af64ef38f87c Author: Bryce Harrington Date: Wed May 18 03:51:53 2011 +0200 Re-remove apport hook commit 1a9f8f7d47e27a11218770ad947d055f1c7679c1 Merge: a6b6833 52f6e85 Author: Bryce Harrington Date: Wed May 18 03:51:32 2011 +0200 Merge branch 'ubuntu' of ssh://git.debian.org/git/pkg-xorg/debian/xorg into ubuntu Conflicts: debian/apport/source_xorg.py commit a6b68336823c27949f36f67ea2c4ce45c9dddd52 Author: Bryce Harrington Date: Wed May 18 03:24:52 2011 +0200 Update packaging to reflect removal of failsafe-x commit 4c236a1891cfd90442572a59000c64e29402e5b9 Author: Bryce Harrington Date: Wed May 18 03:24:10 2011 +0200 Migrate the failsafe-x bits out of xorg to xdiagnose -- 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/e1qmvzn-0003uw...@alioth.debian.org
xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py |6 +++--- debian/changelog | 13 - 2 files changed, 11 insertions(+), 8 deletions(-) New commits: commit 52f6e8547a11cb711b439d5c0beeacdaa75aae6a Author: Bryce Harrington Date: Fri May 13 08:33:12 2011 -0700 * apport/source_xorg.py: - Simplify answers for bug reporters filing post-release reports. (LP: 778758) - Remove attach_drm_info(). This is useful info but we use it very infrequently, and it is already available in other log files. But the call makes bug reports a bit cluttered since it adds a lot of lines to the report itself. diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index a60ad4c..1b03afe 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -148,9 +148,9 @@ def check_is_supported(report, ui=None): "certain it should be reported here?" %(distro_codename), [ "I don't know", -"Yes, I already know the fix for this problem.", -"Yes, The problem began right after doing a system software update.", -"Yes, I have gone through technical support, and they have referred me here.", +"Yes, and I know the fix for this problem.", +"Yes, the problem began right after doing a system software update.", +"Yes.", "No, please point me to a good place to get support.", ] ) diff --git a/debian/changelog b/debian/changelog index 65a62d2..c4b78b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low +xorg (1:7.6+4ubuntu5) natty; urgency=low - * apport/source_xorg.py: Remove attach_drm_info(). This is useful info -but we use it very infrequently, and it is already available in other -log files. But the call makes bug reports a bit cluttered since it -adds a lot of lines to the report itself. + * apport/source_xorg.py: +- Simplify answers for bug reporters filing post-release reports. + (LP: 778758) +- Remove attach_drm_info(). This is useful info but we use it very + infrequently, and it is already available in other log files. But the + call makes bug reports a bit cluttered since it adds a lot of lines to + the report itself. -- Bryce Harrington Thu, 07 Apr 2011 14:02:40 -0700 -- 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/e1qkumq-0008af...@alioth.debian.org
libxi: Changes to 'ubuntu'
debian/changelog | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 893b749962ad45b10e13ce4c9adf7c2705a467a2 Author: Bryce Harrington Date: Thu May 5 23:41:48 2011 -0700 Add 100_len_raw_events.patch: Cherrypick upstream patch to correct the use of the calculated structure length for memory allocations. Fixes issue where incorrect memory size was allocated, leading to valuator data overwriting memory, resulting in an error "Invalid write of size 1" and heap corruption causing applications to crash when they use Raw Events. (LP: #770522) diff --git a/debian/changelog b/debian/changelog index d26e303..a5ed924 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libxi (2:1.4.1-1ubuntu3) oneiric; urgency=low + + * Add 100_len_raw_events.patch: Cherrypick upstream patch to correct the +use of the calculated structure length for memory allocations. Fixes +issue where incorrect memory size was allocated, leading to valuator +data overwriting memory, resulting in an error "Invalid write of size +1" and heap corruption causing applications to crash when they use Raw +Events. (LP: #770522) + + -- Bryce Harrington Thu, 05 May 2011 14:11:39 -0700 + libxi (2:1.4.1-1ubuntu2) natty; urgency=low * FFe LP: #733501: build for multiarch. -- 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/e1qiejc-00069s...@alioth.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog| 13 +++--
debian/patches/120_check_privates.patch | 14 ++
debian/patches/series |1 +
3 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit 16e2a4244cd619f228ba3d698e308ff5410a15b7
Author: Bryce Harrington
Date: Wed May 4 19:13:42 2011 -0700
Target to oneiric
diff --git a/debian/changelog b/debian/changelog
index fffdfa7..9c81a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.14.0-4ubuntu8) natty; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4ubuntu8) oneiric; urgency=low
* Add 120_check_privates.patch: Check for null privates pointer
on render_dest_picture. Prevents segmentation fault with Tk
strings in widgets beyond a certain length.
(LP: #731424)
- -- Bryce Harrington Wed, 04 May 2011 18:52:29 -0700
+ -- Bryce Harrington Wed, 04 May 2011 19:13:24 -0700
xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
commit 6cfdaa37217322f2279138f403c6c47da6a9848f
Author: Bryce Harrington
Date: Wed May 4 18:53:34 2011 -0700
Check null pointer at lower level, right before dereference.
diff --git a/debian/changelog b/debian/changelog
index 58f0608..fffdfa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.14.0-4ubuntu7.2) natty; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4ubuntu8) natty; urgency=low
* Add 120_check_privates.patch: Check for null privates pointer
on render_dest_picture. Prevents segmentation fault with Tk
strings in widgets beyond a certain length.
(LP: #731424)
- -- Bryce Harrington Wed, 04 May 2011 17:24:35 -0700
+ -- Bryce Harrington Wed, 04 May 2011 18:52:29 -0700
xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
diff --git a/debian/patches/120_check_privates.patch
b/debian/patches/120_check_privates.patch
index 58d0c66..be8d879 100644
--- a/debian/patches/120_check_privates.patch
+++ b/debian/patches/120_check_privates.patch
@@ -1,22 +1,14 @@
diff --git a/src/i965_render.c b/src/i965_render.c
-index b1ac6ba..7831caf 100644
+index b1ac6ba..c5eb611 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
-@@ -1761,6 +1761,7 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int
maskX, int maskY,
- {
- ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(scrn);
-+ PicturePtr dest_picture = intel->render_dest_picture;
- struct gen4_render_state *render_state = intel->gen4_render_state;
- Bool has_mask;
- float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
-@@ -1842,6 +1843,9 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int
maskX, int maskY,
+@@ -1126,6 +1126,9 @@ i965_set_picture_surface_state(intel_screen_private
*intel,
+ uint32_t write_domain, read_domains;
+ int offset;
- intel_batch_start_atomic(scrn, 200);
- if (intel->needs_render_state_emit) {
-+ if (!dest_picture->devPrivates)
-+ return;
++ if (!priv)
++ return;
+
- i965_bind_surfaces(intel);
-
- if (INTEL_INFO(intel)->gen >= 60)
+ if (is_dst) {
+ write_domain = I915_GEM_DOMAIN_RENDER;
+ read_domains = I915_GEM_DOMAIN_RENDER;
commit 94bfee39d75b0c151fa8bd194be7869ca5790c0b
Author: Bryce Harrington
Date: Wed May 4 17:57:50 2011 -0700
Add patch to check for null privates pointer before deref
diff --git a/debian/changelog b/debian/changelog
index 0e1fc66..58f0608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-4ubuntu7.2) natty; urgency=low
+
+ * Add 120_check_privates.patch: Check for null privates pointer
+on render_dest_picture. Prevents segmentation fault with Tk
+strings in widgets beyond a certain length.
+ (LP: #731424)
+
+ -- Bryce Harrington Wed, 04 May 2011 17:24:35 -0700
+
xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
* Add 119_disable_relaxed_fencing.patch: The relaxed fencing
diff --git a/debian/patches/120_check_privates.patch
b/debian/patches/120_check_privates.patch
new file mode 100644
index 000..58d0c66
--- /dev/null
+++ b/debian/patches/120_check_privates.patch
@@ -0,0 +1,22 @@
+diff --git a/src/i965_render.c b/src/i965_render.c
+index b1ac6ba..7831caf 100644
+--- a/src/i965_render.c
b/src/i965_render.c
+@@ -1761,6 +1761,7 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int
maskX, int maskY,
+ {
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
++ PicturePtr dest_picture = intel->render_dest_picture;
+ struct gen4_render_state *render
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a834505cb0a39cb5c9816d5eee105e7c1ef5ecb8 Author: Bryce Harrington Date: Fri Apr 22 17:55:08 2011 -0700 Add a couple other bugs that have accumulated lots of dupes (LP just times out when I try to set these as dupes of each other) diff --git a/debian/changelog b/debian/changelog index 24f6cd9..83eb429 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,9 @@ xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low optimization is suspected as the cause for various i915/945 gpu lockup issues. This disables the optimization by default but adds an xorg.conf parameter to let people experiment with it turned on. -(LP: #727594) +(LP: #727594, #761143, #761632) - -- Bryce Harrington Fri, 22 Apr 2011 17:34:53 -0700 + -- Bryce Harrington Fri, 22 Apr 2011 17:54:51 -0700 xserver-xorg-video-intel (2:2.14.0-4ubuntu7) natty; urgency=low -- 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/e1qdr8s-0005z4...@alioth.debian.org
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog| 10 ++
debian/patches/119_disable_relaxed_fencing.path | 113
debian/patches/series |1
3 files changed, 124 insertions(+)
New commits:
commit 9223bdadaa370bfaf4ed34256a42f7feea115c66
Author: Bryce Harrington
Date: Fri Apr 22 17:38:43 2011 -0700
Add relaxed fencing path as an SRU. Fixes i915/i945 freeze bugs.
diff --git a/debian/changelog b/debian/changelog
index a880598..24f6cd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
+
+ * Add 119_disable_relaxed_fencing.patch: The relaxed fencing
+optimization is suspected as the cause for various i915/945 gpu lockup
+issues. This disables the optimization by default but adds an
+xorg.conf parameter to let people experiment with it turned on.
+(LP: #727594)
+
+ -- Bryce Harrington Fri, 22 Apr 2011 17:34:53 -0700
+
xserver-xorg-video-intel (2:2.14.0-4ubuntu7) natty; urgency=low
* Add 102_gen6_invalidate_texture_cache.patch: Fix corruption in KDE
diff --git a/debian/patches/119_disable_relaxed_fencing.path
b/debian/patches/119_disable_relaxed_fencing.path
new file mode 100644
index 000..06e25da
--- /dev/null
+++ b/debian/patches/119_disable_relaxed_fencing.path
@@ -0,0 +1,113 @@
+diff --git a/man/intel.man b/man/intel.man
+index db4c145..0c9cc0d 100644
+--- a/man/intel.man
b/man/intel.man
+@@ -187,6 +187,15 @@ performance.
+ .IP
+ Default: enabled.
+ .TP
++.BI "Option \*qRelaxedFencing\*q \*q" boolean \*q
++This option controls whether we attempt to allocate the minimal amount of
++memory required for the buffers. The reduction in working set has a
substantial
++improvement on system performance. However, this has been demonstrate to be
++buggy on older hardware (845-865 and 915-945, but ok on PineView and later)
++so on those chipsets defaults to off.
++.IP
++Default: Enabled for G33 (includes PineView), and later, class machines.
++.TP
+ .BI "Option \*qXvMC\*q \*q" boolean \*q
+ Enable XvMC driver. Current support MPEG2 MC on 915/945 and G33 series.
+ User should provide absolute path to libIntelXvMC.so in XvMCConfig file.
+diff --git a/src/intel_driver.c b/src/intel_driver.c
+index 1275e4b..2d9bc02 100644
+--- a/src/intel_driver.c
b/src/intel_driver.c
+@@ -108,6 +108,7 @@ typedef enum {
+OPTION_DEBUG_FLUSH_CACHES,
+OPTION_DEBUG_WAIT,
+OPTION_HOTPLUG,
++ OPTION_RELAXED_FENCING,
+ } I830Opts;
+
+ static OptionInfoRec I830Options[] = {
+@@ -127,6 +128,7 @@ static OptionInfoRec I830Options[] = {
+{OPTION_DEBUG_FLUSH_CACHES, "DebugFlushCaches", OPTV_BOOLEAN, {0}, FALSE},
+{OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE},
+{OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0},TRUE},
++ {OPTION_RELAXED_FENCING, "RelaxedFencing", OPTV_BOOLEAN, {0},
TRUE},
+{-1, NULL, OPTV_NONE, {0},FALSE}
+ };
+ /* *INDENT-ON* */
+@@ -464,6 +466,30 @@ static void I830XvInit(ScrnInfoPtr scrn)
+ intel->colorKey);
+ }
+
++static Bool drm_has_boolean_param(struct intel_screen_private *intel,
++ int param)
++{
++drm_i915_getparam_t gp;
++int value;
++
++/* The BLT ring was introduced at the same time as the
++ * automatic flush for the busy-ioctl.
++ */
++
++gp.value = &value;
++gp.param = param;
++if (drmIoctl(intel->drmSubFD, DRM_IOCTL_I915_GETPARAM, &gp))
++return FALSE;
++
++return value;
++}
++
++
++static Bool has_relaxed_fencing(struct intel_screen_private *intel)
++{
++return drm_has_boolean_param(intel, I915_PARAM_HAS_RELAXED_FENCING);
++}
++
+ static Bool can_accelerate_blt(struct intel_screen_private *intel)
+ {
+ if (0 && (IS_I830(intel) || IS_845G(intel))) {
+@@ -630,6 +656,18 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
+ " 2D GPU acceleration disabled.\n");
+ }
+
++ intel->has_relaxed_fencing =
++ xf86ReturnOptValBool(intel->Options,
++ OPTION_RELAXED_FENCING,
++ INTEL_INFO(intel)->gen >= 33);
++ /* And override the user if there is no kernel support */
++ if (intel->has_relaxed_fencing)
++ intel->has_relaxed_fencing = has_relaxed_fencing(intel);
++
++ xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
++ "Relaxed fencing %s\n",
++ intel->has_relaxed_fencing ? "enabled" : "disabled");
++
+ /* SwapBuffers delays to avoid tearing */
+ intel->swapbuffers_wait = TRUE;
+
+diff --git a/src/intel_memory.c b/src/intel_memory.c
+index e9ea58d..e88fcef 100644
+--- a/src
xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit ab5074ff9f195b918efd759b9181a601888447d8 Author: Bryce Harrington Date: Fri Apr 15 13:56:08 2011 -0700 formatting diff --git a/debian/changelog b/debian/changelog index d3b4a2c..023d7db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu12) natty; urgency=low * syndaemon: Drain spurious events from XRecord connection as a work around -for a buggy X server. This keeps syndaemon from busy looping (LP: #754470) +for a buggy X server. This keeps syndaemon from busy looping +(LP: #754470) -- Chase Douglas Thu, 14 Apr 2011 14:15:33 -0400 commit cc32cd010bfa429b3a6109f80f2e064a73c2bf38 Author: Bryce Harrington Date: Fri Apr 15 13:55:34 2011 -0700 Bump for release diff --git a/debian/changelog b/debian/changelog index 7554fe1..d3b4a2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu12) UNRELEASED; urgency=low +xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu12) natty; urgency=low * syndaemon: Drain spurious events from XRecord connection as a work around for a buggy X server. This keeps syndaemon from busy looping (LP: #754470) -- 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/e1qaq3x-0008jq...@alioth.debian.org
xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f70c7f04d1fd23ee384015046996874b006394ca Author: Bryce Harrington Date: Fri Apr 8 14:17:29 2011 -0700 bump diff --git a/debian/changelog b/debian/changelog index e58e074..aa5d1c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu11) UNRELEASED; urgency=low +xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu11) natty; urgency=low * Fix jumpy cursor on multitouch trackpads (LP: #751525) - Added 123_order_ProcessTouch_for_numFingers.patch -- 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/e1q8j3o-00060p...@alioth.debian.org
xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py |1 - debian/changelog |9 + 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit b5c016102f7ce49e280eeb831a5353386597c361 Author: Bryce Harrington Date: Thu Apr 7 14:05:00 2011 -0700 apport/source_xorg.py: Remove attach_drm_info(). This is useful info but we use it very infrequently, and it is already available in other log files. But the call makes bug reports a bit cluttered since it adds a lot of lines to the report itself. diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index e228488..a60ad4c 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -450,7 +450,6 @@ def add_info(report, ui): attach_dist_upgrade_status(report, ui) attach_graphic_card_pci_info(report, ui) attach_hardware(report) -attach_drm_info(report) attach_dkms_info(report, ui) attach_nvidia_info(report, ui) attach_fglrx_info(report, ui) diff --git a/debian/changelog b/debian/changelog index 3d87b11..65a62d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg (1:7.6+4ubuntu4) UNRELEASED; urgency=low + + * apport/source_xorg.py: Remove attach_drm_info(). This is useful info +but we use it very infrequently, and it is already available in other +log files. But the call makes bug reports a bit cluttered since it +adds a lot of lines to the report itself. + + -- Bryce Harrington Thu, 07 Apr 2011 14:02:40 -0700 + xorg (1:7.6+4ubuntu3) natty; urgency=low * apport/source_xorg.py: Fix typo in previous upload -- 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/e1q7wol-0001v9...@alioth.debian.org
xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py |4 ++--
debian/changelog |6 ++
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit c34ef2e7703ad4c832f35369ba972d7f73c683e0
Author: Bryce Harrington
Date: Tue Apr 5 11:58:12 2011 -0700
apport/source_xorg.py: Fix typo in previous upload
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 646f671..e228488 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -292,7 +292,7 @@ def attach_xorg_package_versions(report, ui=None):
"xserver-xorg-video-ati",
"xserver-xorg-video-nouveau"]:
report['version.%s' %(package)] = package_versions(package)
-if report['Architecture'] == 'amd64':
+if 'Architecture' in report and report['Architecture'] == 'amd64':
report['version.ia32-libs'] = package_versions('ia32-libs')
def attach_2d_info(report, ui=None):
@@ -334,7 +334,7 @@ def attach_3d_info(report, ui=None):
'drirc')
if (is_process_running('compiz') or
-(report.get('SourcePackage','Unknown') == "compiz" and
report.get('ProblemType', '') == 'Crash'
+(report.get('SourcePackage','Unknown') == "compiz" and
report.get('ProblemType', '') == 'Crash')
):
report['CompositorRunning'] = 'compiz'
compiz_version = command_output(['compiz', '--version'])
diff --git a/debian/changelog b/debian/changelog
index cbc1fac..3d87b11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.6+4ubuntu3) natty; urgency=low
+
+ * apport/source_xorg.py: Fix typo in previous upload
+
+ -- Bryce Harrington Tue, 05 Apr 2011 11:57:48 -0700
+
xorg (1:7.6+4ubuntu2) natty; urgency=low
* apport/source_xorg.py:
--
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/e1q7bsh-0003hb...@alioth.debian.org
xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py |7 +--
debian/changelog | 11 +++
2 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 4ef86f851228a6971e14e60f48102dcdf3c66f8c
Author: Bryce Harrington
Date: Mon Apr 4 19:03:14 2011 -0700
* apport/source_xorg.py:
+ Wildcarding package names doesn't seem to work. Look for dri
experimental package directly.
(LP: #749809, #747725)
+ Include compiz version tag if the problem is a compiz crash
(LP: #744355)
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index d703a31..646f671 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -284,7 +284,8 @@ def attach_xorg_package_versions(report, ui=None):
for package in [
"xserver-xorg",
"libgl1-mesa-glx",
-"libgl1-mesa-dri*",
+"libgl1-mesa-dri",
+"libgl1-mesa-dri-experimental",
"libdrm2",
"compiz",
"xserver-xorg-video-intel",
@@ -332,7 +333,9 @@ def attach_3d_info(report, ui=None):
os.path.expanduser('~/.drirc'),
'drirc')
-if is_process_running('compiz'):
+if (is_process_running('compiz') or
+(report.get('SourcePackage','Unknown') == "compiz" and
report.get('ProblemType', '') == 'Crash'
+ ):
report['CompositorRunning'] = 'compiz'
compiz_version = command_output(['compiz', '--version'])
if compiz_version:
diff --git a/debian/changelog b/debian/changelog
index c6095c3..cbc1fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.6+4ubuntu2) natty; urgency=low
+
+ * apport/source_xorg.py:
++ Wildcarding package names doesn't seem to work. Look for dri
+ experimental package directly.
+ (LP: #749809, #747725)
++ Include compiz version tag if the problem is a compiz crash
+ (LP: #744355)
+
+ -- Bryce Harrington Mon, 04 Apr 2011 19:01:36 -0700
+
xorg (1:7.6+4ubuntu1) natty; urgency=low
[ Timo Aaltonen ]
--
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/e1q6vcp-kk...@alioth.debian.org
libdrm: Changes to 'ubuntu'
debian/changelog | 14 ++-
debian/patches/100_intel_remember_named_bo.patch | 99 +++
debian/patches/series|1
3 files changed, 112 insertions(+), 2 deletions(-)
New commits:
commit 75fa93e6f343689d87dcfd2de76f32319e43b058
Author: Bryce Harrington
Date: Fri Apr 1 17:53:49 2011 -0700
Looks like u5 was in the archive but not in git, updating to u6
diff --git a/debian/changelog b/debian/changelog
index 319c05a..6d5d78f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-libdrm (2.4.23-1ubuntu5) UNRELEASED; urgency=low
+libdrm (2.4.23-1ubuntu6) natty; urgency=low
+
+ * Add 100_intel_remember_named_bo.patch: Reuse already requested buffer
+objects if re-requested. Fixes error where dmesg shows "Object
+... appears more than once in object list". Cherrypick from upstream
+libdrm 2.4.24 tree.
+(LP: #747205)
+
+ -- Bryce Harrington Fri, 01 Apr 2011 17:53:28 -0700
+
+libdrm (2.4.23-1ubuntu5) natty; urgency=low
* Fix up libdrm-dev symlinks for multiarch.
- -- Steve Langasek Sat, 19 Mar 2011 20:59:37 -0700
+ -- Bryce Harrington Fri, 01 Apr 2011 11:44:30 -0700
libdrm (2.4.23-1ubuntu4) natty; urgency=low
diff --git a/debian/patches/100_intel_remember_named_bo.patch
b/debian/patches/100_intel_remember_named_bo.patch
new file mode 100644
index 000..5c76ce5
--- /dev/null
+++ b/debian/patches/100_intel_remember_named_bo.patch
@@ -0,0 +1,99 @@
+commit 36d4939343d8789d9066f7245fa2d4fe69119dd8
+Author: Chris Wilson
+Date: Mon Feb 14 09:39:06 2011 +
+
+intel: Remember named bo
+
+... and if asked to open a bo by the same global name, return a fresh
+reference to the previously allocated buffer.
+
+Signed-off-by: Chris Wilson
+
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 092b56a..3cdffce 100644
+--- a/intel/intel_bufmgr_gem.c
b/intel/intel_bufmgr_gem.c
+@@ -95,6 +95,8 @@ typedef struct _drm_intel_bufmgr_gem {
+ int num_buckets;
+ time_t time;
+
++ drmMMListHead named;
++
+ uint64_t gtt_size;
+ int available_fences;
+ int pci_device;
+@@ -124,6 +126,7 @@ struct _drm_intel_bo_gem {
+* Kenel-assigned global name for this object
+*/
+ unsigned int global_name;
++ drmMMListHead name_list;
+
+ /**
+* Index of the buffer within the validation list while preparing a
+@@ -690,6 +693,8 @@ retry:
+ drm_intel_gem_bo_free(&bo_gem->bo);
+ return NULL;
+ }
++
++ DRMINITLISTHEAD(&bo_gem->name_list);
+ }
+
+ bo_gem->name = name;
+@@ -792,6 +797,23 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr
*bufmgr,
+ int ret;
+ struct drm_gem_open open_arg;
+ struct drm_i915_gem_get_tiling get_tiling;
++ drmMMListHead *list;
++
++ /* At the moment most applications only have a few named bo.
++ * For instance, in a DRI client only the render buffers passed
++ * between X and the client are named. And since X returns the
++ * alternating names for the front/back buffer a linear search
++ * provides a sufficiently fast match.
++ */
++ for (list = bufmgr_gem->named.next;
++ list != &bufmgr_gem->named;
++ list = list->next) {
++ bo_gem = DRMLISTENTRY(drm_intel_bo_gem, list, name_list);
++ if (bo_gem->global_name == handle) {
++ drm_intel_gem_bo_reference(&bo_gem->bo);
++ return &bo_gem->bo;
++ }
++ }
+
+ bo_gem = calloc(1, sizeof(*bo_gem));
+ if (!bo_gem)
+@@ -834,6 +856,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
+ /* XXX stride is unknown */
+ drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem);
+
++ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
+ DBG("bo_create_from_handle: %d (%s)\n", handle, bo_gem->name);
+
+ return &bo_gem->bo;
+@@ -925,6 +948,8 @@ drm_intel_gem_bo_unreference_final(drm_intel_bo *bo,
time_t time)
+ bo_gem->relocs = NULL;
+ }
+
++ DRMLISTDEL(&bo_gem->name_list);
++
+ bucket = drm_intel_gem_bo_bucket_for_size(bufmgr_gem, bo->size);
+ /* Put the buffer into our internal cache for reuse if we can. */
+ if (bufmgr_gem->bo_reuse && bo_gem->reusable && bucket != NULL &&
+@@ -1771,6 +1796,8 @@ drm_intel_gem_bo_flink(drm_intel_bo *bo, uint32_t * name)
+ return -errno;
+ bo_gem->global_name = flink.name;
+ bo_gem->reusable = 0;
++
++ DRMLISTADDTAIL(&bo_gem->name_list, &bufmgr_gem->named);
+ }
+
+ *name = bo_gem->global_name;
+@@ -
xorg: Changes to 'ubuntu'
debian/changelog | 14 --
debian/scripts/vars.arm | 23 +--
debian/scripts/vars.armeb | 22 +-
3 files changed, 10 insertions(+), 49 deletions(-)
New commits:
commit 87190c3d4b4970af744892a33308a9adb7a9fbc0
Author: Bryce Harrington
Date: Fri Apr 1 00:08:10 2011 -0700
Mention cleanup of vars.arm*
diff --git a/debian/changelog b/debian/changelog
index f3ecca7..c6095c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
xorg (1:7.6+4ubuntu1) natty; urgency=low
- [Timo Aaltonen]
+ [ Timo Aaltonen ]
* Merge from Debian unstable. Remaining Ubuntu changes:
- Add apport hook
- Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
@@ -26,15 +26,17 @@ xorg (1:7.6+4ubuntu1) natty; urgency=low
* control, rules: Don't build xsf-docs, markdown and wkhtmltopdf are in
universe.
- [Bryce Harrington]
+ [ Bryce Harrington ]
* apport/source_xorg.py:
- Include 'xinput list' output for input device issues.
- For amd64 arch's, include version of ia32-libs package.
- * scripts/amd64, scripts/i386: Include the -qxl video driver in
-video-all for amd64 and i386, to provide remote graphical
-desktop functionality for KVM.
+ * scripts/vars.amd64, scripts/vars.i386:
+- Include the -qxl video driver in video-all for amd64 and i386, to
+ provide remote graphical desktop functionality for KVM.
+ * scripts/vars.arm, scripts/vars.armeb, scripts/vars.armel:
+- Drop obscure drivers that are likely irrelevant for ARM.
- -- Bryce Harrington Thu, 31 Mar 2011 23:19:10 -0700
+ -- Bryce Harrington Fri, 01 Apr 2011 00:05:38 -0700
xorg (1:7.6+4) unstable; urgency=low
commit ca186ff7d0dfdb15c04122067eef75cf846a702c
Author: Bryce Harrington
Date: Fri Apr 1 00:05:10 2011 -0700
Also update the arm and armeb video drivers same as armel
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index dfef521..1f30685 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -3,35 +3,14 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS=" \
- xserver-xorg-video-ati, \
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
xserver-xorg-video-vesa, \
"
-# xserver-xorg-video-apm,
-# xserver-xorg-video-ark,
-# xserver-xorg-video-glide,
-# xserver-xorg-video-chips,
-# xserver-xorg-video-i128,
-# xserver-xorg-video-i740,
-# xserver-xorg-video-tseng,
-# xserver-xorg-video-voodoo,
-
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics"
-
XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 87c6ba7..1f30685 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,34 +3,14 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
- xserver-xorg-video-ark, \
- xserver-xorg-video-ati, \
- xserver-xorg-video-chips, \
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-i128, \
- xserver-xorg-video-i740, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
"
-# xserver-xorg-video-glide,
-
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics"
-
XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
--
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/e1q5yt9-0006cv...@alioth.debian.org
