debian/changelog | 30
++++++++--
debian/control | 5 -
debian/patches/fix-sna-external-slave-rotation.patch | 17
+++--
debian/patches/fix-sna-fstat-include.patch | 20
+++---
debian/patches/fix-uxa-fstat-include.patch | 10 +--
debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch | 1
debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff | 13 ++--
7 files changed, 58 insertions(+), 38 deletions(-)
New commits:
commit c5b7e6f95f8a9b49a49b87c83922f01610a58445
Author: Robert Ancell <robert.anc...@canonical.com>
Date: Thu Aug 6 10:03:53 2015 +1200
* Merge with Debian, remaining Ubuntu changes:
* debian/rules:
- Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH)
- Use SNA by default.
* debian/patches/fix-sna-external-slave-rotation.patch:
- Fix rotating external display with optimus results in corruption.
* debian/patches/fix-sna-fstat-include.patch:
* debian/patches/fix-uxa-fstat-include.patch:
- Fix missing include for fstat
* debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch:
- Fix faulty yuv2rgb translation on Intel Generation 8 Graphics.
* debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff:
- Fix rotation on SKL.
diff --git a/debian/changelog b/debian/changelog
index 08502ec..9130413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xserver-xorg-video-intel (2:2.99.917-1ubuntu1) wily; urgency=medium
+
+ * Merge with Debian, remaining Ubuntu changes:
+ * debian/rules:
+ - Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH)
+ - Use SNA by default.
+ * debian/patches/fix-sna-external-slave-rotation.patch:
+ - Fix rotating external display with optimus results in corruption.
+ * debian/patches/fix-sna-fstat-include.patch:
+ * debian/patches/fix-uxa-fstat-include.patch:
+ - Fix missing include for fstat
+ * debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch:
+ - Fix faulty yuv2rgb translation on Intel Generation 8 Graphics.
+ * debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff:
+ - Fix rotation on SKL.
+
+ -- Robert Ancell <robert.anc...@canonical.com> Tue, 14 Jul 2015 15:21:57
+1200
+
+xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
+
+ * Upload to unstable. (Closes: #748753)
+
+ -- Vincent Cheng <vch...@debian.org> Thu, 07 May 2015 00:46:06 -0700
+
xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu3) wily; urgency=medium
* debian/patches/xmir.patch:
@@ -38,12 +62,6 @@ xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid;
urgency=medium
-- Timo Aaltonen <tjaal...@debian.org> Tue, 13 Jan 2015 12:39:09 +0200
-xserver-xorg-video-intel (2:2.99.917-1~exp2) UNRELEASED; urgency=medium
-
- * rules: Fix valgrind-enabling check.
-
- -- Timo Aaltonen <tjaal...@debian.org> Tue, 13 Jan 2015 12:34:17 +0200
-
xserver-xorg-video-intel (2:2.99.917-1~exp1) experimental; urgency=medium
* New upstream prerelease 2.99.917.
diff --git a/debian/control b/debian/control
index ab5fffe..ddc71e9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
-# Depend on latest server to ensure XMir support
- xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
+ xserver-xorg-dev (>= 2:1.11.99.901),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xinerama-dev,
@@ -37,7 +36,7 @@ Build-Depends:
libxcb-dri2-0-dev,
# end xvmc
libudev-dev [linux-any],
- quilt (>= 0.46-7~),
+ quilt,
xutils-dev (>= 1:7.5+4),
valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
# intel-virtual-output:
diff --git a/debian/patches/fix-sna-external-slave-rotation.patch
b/debian/patches/fix-sna-external-slave-rotation.patch
index 80b79f3..5251194 100644
--- a/debian/patches/fix-sna-external-slave-rotation.patch
+++ b/debian/patches/fix-sna-external-slave-rotation.patch
@@ -1,6 +1,7 @@
commit 1cffbd9a8e96642bdbabf4e40829a5f1473b5bf9
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Tue Jan 13 10:50:36 2015 +0000
+Bug-Ubuntu: https://launchpad.net/bugs/1410238
sna: Combine slave CRTC offsets with rotation
@@ -11,11 +12,11 @@ Date: Tue Jan 13 10:50:36 2015 +0000
Reported-by: Maarten Lankhorst <maarten.lankho...@canonical.com>
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index 569c585..0657c47 100644
---- a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -6696,6 +6696,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr
region, struct kgem_bo
+Index: xserver-xorg-video-intel-2.99.917/src/sna/sna_display.c
+===================================================================
+--- xserver-xorg-video-intel-2.99.917.orig/src/sna/sna_display.c
++++ xserver-xorg-video-intel-2.99.917/src/sna/sna_display.c
+@@ -6644,6 +6644,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr
ScreenPtr screen = sna->scrn->pScreen;
DrawablePtr draw = crtc_source(crtc, &sx, &sy);
PictFormatPtr format;
@@ -23,7 +24,7 @@ index 569c585..0657c47 100644
PicturePtr src, dst;
PixmapPtr pixmap;
int depth, error;
-@@ -6735,9 +6736,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+@@ -6683,9 +6684,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr
if (!src)
goto free_pixmap;
@@ -41,7 +42,7 @@ index 569c585..0657c47 100644
if (crtc->filter && crtc->transform_in_use)
SetPicturePictFilter(src, crtc->filter,
-@@ -6789,6 +6795,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+@@ -6737,6 +6743,7 @@ sna_crtc_redisplay__composite(xf86CrtcPt
DrawablePtr draw = crtc_source(crtc, &sx, &sy);
struct sna_composite_op tmp;
PictFormatPtr format;
@@ -49,7 +50,7 @@ index 569c585..0657c47 100644
PicturePtr src, dst;
PixmapPtr pixmap;
const BoxRec *b;
-@@ -6829,9 +6836,14 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+@@ -6777,9 +6784,14 @@ sna_crtc_redisplay__composite(xf86CrtcPt
if (!src)
goto free_pixmap;
diff --git a/debian/patches/fix-sna-fstat-include.patch
b/debian/patches/fix-sna-fstat-include.patch
index 11064d7..027fc8a 100644
--- a/debian/patches/fix-sna-fstat-include.patch
+++ b/debian/patches/fix-sna-fstat-include.patch
@@ -12,10 +12,10 @@ Date: Tue Feb 24 15:25:40 2015 +0000
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
-diff --git a/configure.ac b/configure.ac
-index 7476e2b..de3a4b3 100644
---- a/configure.ac
-+++ b/configure.ac
+Index: xserver-xorg-video-intel-2.99.917/configure.ac
+===================================================================
+--- xserver-xorg-video-intel-2.99.917.orig/configure.ac
++++ xserver-xorg-video-intel-2.99.917/configure.ac
@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev,
if test "x$UDEV" != "xno"; then
@@ -32,7 +32,7 @@ index 7476e2b..de3a4b3 100644
fi
fi
-@@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS"
+@@ -902,6 +906,7 @@ echo " Support for Kernel Mode Setting?
echo " Support for legacy User Mode Setting (for i810)? $UMS"
echo " Support for Direct Rendering Infrastructure:$dri_msg"
echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
@@ -40,11 +40,11 @@ index 7476e2b..de3a4b3 100644
echo " Build additional tools and utilities?$tools_msg"
if test -n "$xp_msg"; then
echo " Experimental support:$xp_msg"
-diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
-index 8c0d0b5..bc20ef0 100644
---- a/src/sna/sna_driver.c
-+++ b/src/sna/sna_driver.c
-@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
+Index: xserver-xorg-video-intel-2.99.917/src/sna/sna_driver.c
+===================================================================
+--- xserver-xorg-video-intel-2.99.917.orig/src/sna/sna_driver.c
++++ xserver-xorg-video-intel-2.99.917/src/sna/sna_driver.c
+@@ -780,6 +780,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DE
}
#if HAVE_UDEV
diff --git a/debian/patches/fix-uxa-fstat-include.patch
b/debian/patches/fix-uxa-fstat-include.patch
index b99021d..c93d558 100644
--- a/debian/patches/fix-uxa-fstat-include.patch
+++ b/debian/patches/fix-uxa-fstat-include.patch
@@ -10,11 +10,11 @@ Date: Tue Feb 24 15:25:40 2015 +0000
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
-diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
-index c554124..6e64b8c 100644
---- a/src/uxa/intel_driver.c
-+++ b/src/uxa/intel_driver.c
-@@ -728,6 +728,8 @@ intel_flush_callback(CallbackListPtr *list,
+Index: xserver-xorg-video-intel-2.99.917/src/uxa/intel_driver.c
+===================================================================
+--- xserver-xorg-video-intel-2.99.917.orig/src/uxa/intel_driver.c
++++ xserver-xorg-video-intel-2.99.917/src/uxa/intel_driver.c
+@@ -735,6 +735,8 @@ intel_flush_callback(CallbackListPtr *li
}
#if HAVE_UDEV
diff --git a/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch
b/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch
index 6aa4db1..0dce694 100644
--- a/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch
+++ b/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch
@@ -5,6 +5,7 @@ Subject: [PATCH] gen8: Fix the YUV->RGB shader
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
+Bug-Ubuntu: https://launchpad.net/bugs/1449892
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
diff --git
a/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
b/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
index 53d50fb..71f0084 100644
--- a/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
+++ b/debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
@@ -1,6 +1,7 @@
commit 15c307d70e00bc035bb61be5d8b6f727925e3d34
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Tue Mar 10 08:48:48 2015 +0000
+Bug-Ubuntu: https://launchpad.net/bugs/1447143
sna: Force frontbuffer to CPU for randr fallback
@@ -10,11 +11,11 @@ Date: Tue Mar 10 08:48:48 2015 +0000
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89053
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index fd6c46c..f648d62 100644
---- a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -6977,6 +6977,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+Index: xserver-xorg-video-intel-2.99.917/src/sna/sna_display.c
+===================================================================
+--- xserver-xorg-video-intel-2.99.917.orig/src/sna/sna_display.c
++++ xserver-xorg-video-intel-2.99.917/src/sna/sna_display.c
+@@ -6665,6 +6665,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr
__FUNCTION__, format->format, depth, draw->bitsPerPixel,
bo->pitch, crtc->mode.HDisplay, crtc->mode.VDisplay));
@@ -29,7 +30,7 @@ index fd6c46c..f648d62 100644
ptr = kgem_bo_map__gtt(&sna->kgem, bo);
if (ptr == NULL)
return;
-@@ -6999,6 +7007,29 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc,
RegionPtr region, struct kgem_bo
+@@ -6687,6 +6695,29 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr
pixman_transform_init_translate(&T, sx << 16, sy << 16);
pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zn6n3-0001cd...@moszumanska.debian.org
