Bug#794644: xorg-server: FTBFS on hurd-i386

2015-08-05 Thread Svante Signell 
Source: xorg-server
Version: 1.17.2-1
Severity: important
Tags: patch
User: debian-h...@lists.debian.org
Usertags: hurd

Hi,

Currently xorg-server fails to build on GNU/Hurd, see [1]. The build
failure during dh_install is due to that the man page modesetting.4 is
not created since no modesetting code is compiled. The attached patch
debian_rules.diff avoids the installation of that manpage on Hurd by
excluding files containing modesetting in their name. This problem
occurred by fixing bug #789646:
* Install the modesetting.4 manpage into xserver-xorg-core (Closes: #789646)

Thanks!

[1] 
https://buildd.debian.org/status/fetch.php?pkg=xorg-server&arch=hurd-i386&ver=2%3A1.17.2-1&stamp=1435816870

--- xorg-server-1.17.2/debian/rules	2015-07-31 12:42:07.0 +0200
+++ xorg-server-1.17.2/debian/rules	2015-07-31 14:59:26.0 +0200
@@ -358,7 +358,11 @@
 
 	dh_installdocs -s
 	dh_installchangelogs -s
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
+	dh_install -Xmodesetting $(DH_INSTALL_OPTIONS) -s --list-missing
+else
 	dh_install $(DH_INSTALL_OPTIONS) -s --list-missing
+endif
 	$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
 	# Extract only the major ABI version:
 	abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \

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

2015-08-05 Thread Robert Ancell 
 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 
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   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   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   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   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 
 Date:   Tue Jan 13 10:50:36 2015 +
+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 +
 Reported-by: Maarten Lankhorst 
 Signed-off-by: Chris Wilson 
 
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index 569c585..0657c47 100644
 a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -6696,6 +6696,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr 
region, struct kgem_bo
+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