xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/README.source | 6 +
debian/changelog | 19 +++++
debian/patches/fix-sna-fstat-include.patch | 55 +++++++++++++++
debian/patches/fix-uxa-fstat-include.patch | 25 ++++++
debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch | 51 +++++++++++++
debian/patches/series | 4 -
debian/rules | 4 -
7 files changed, 161 insertions(+), 3 deletions(-)
New commits:
commit f09c2cf695635cf87173dacd233d0994646254db
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Jan 28 18:24:31 2015 +0200
README.source: Mention that dpkg-source complains about symlinks which are real files on the tarball, and add a command to clean those before source build (copied from libdrm).
diff --git a/debian/README.source b/debian/README.source
index 4ecd5e6..f9bb7c6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -14,6 +14,12 @@ Quick Guide To Patching This Package For The Impatient
Alternatively, instead of using quilt directly, you can drop the patch in to
debian/patches and add the name of the patch to debian/patches/series.
+While building from git, dpkg-source can complain about symlinks vs.
+normal files mismatches. To work around this issue, before uploading,
+and without committing:
+
+ find -type l | while read dest; do src=$(readlink -f $dest); rm $dest; cp $src $dest; done
+
------------------------------------
Guide To The X Strike Force Packages
------------------------------------
diff --git a/debian/changelog b/debian/changelog
index afd2683..25e331c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; urgency=medium
[ Timo Aaltonen ]
* rules: Fix valgrind-enabling check.
+ * README.source: Mention that dpkg-source complains about symlinks
+ which are real files on the tarball, and add a command to clean
+ those before source build (copied from libdrm).
-- Vincent Cheng <vcheng@debian.org> Thu, 16 Jul 2015 01:00:41 -0700
commit 53b8d09453821f4f41316ab60e83cd8798606746
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Jan 13 12:34:40 2015 +0200
rules: Fix valgrind-enabling check.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index c2d54db..afd2683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; urgency=medium
* fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation
on Intel Generation 8 Graphics. (LP: #1449892, Closes: #787142)
+ [ Timo Aaltonen ]
+ * rules: Fix valgrind-enabling check.
+
-- Vincent Cheng <vcheng@debian.org> Thu, 16 Jul 2015 01:00:41 -0700
xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index e2161e2..318c14d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,9 @@ export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-ifeq ($(DEB_HOST_ARCH), linux)
+ifeq ($(DEB_HOST_ARCH_OS), linux)
valgrind = --enable-valgrind
else
valgrind = --disable-valgrind
commit 9c0699c089a1b24e15960e2a840156e95ecb4d52
Author: Vincent Cheng <vcheng@debian.org>
Date: Thu Jul 16 01:16:18 2015 -0700
Fix faulty yuv2rgb translation on Intel Generation 8 Graphics
diff --git a/debian/changelog b/debian/changelog
index 8694f2f..c2d54db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; urgency=medium
* debian/patches/fix-uxa-fstat-include.patch:
- Fix missing include for fstat (Closes: #790911)
+ [ Alessio Treglia ]
+ * fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation
+ on Intel Generation 8 Graphics. (LP: #1449892, Closes: #787142)
+
-- Vincent Cheng <vcheng@debian.org> Thu, 16 Jul 2015 01:00:41 -0700
xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
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
new file mode 100644
index 0000000..6aa4db1
--- /dev/null
+++ b/debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch
@@ -0,0 +1,51 @@
+From b6029105e404c9a7f7cdd230012cd5063c824ed4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
+Date: Mon, 30 Mar 2015 16:51:29 +0300
+Subject: [PATCH] gen8: Fix the YUV->RGB shader
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+---
+ src/render_program/exa_wm_yuv_rgb.g8a | 4 ++--
+ src/render_program/exa_wm_yuv_rgb.g8b | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb.g8a
+index 7def093..34973ba 100644
+--- a/src/render_program/exa_wm_yuv_rgb.g8a
++++ b/src/render_program/exa_wm_yuv_rgb.g8a
+@@ -76,7 +76,7 @@ add (16) Cbn<1>F Cb<8,8,1>F -0.501961F { compr align1 };
+ /*
+ * R = Y + Cr * 1.596
+ */
+-mov (8) acc0<1>F Yn<8,8,1>F { compr align1 };
++mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 };
+ mac.sat(8) src_sample_r_01<1>F Crn_01<8,8,1>F 1.596F { compr align1 };
+
+ mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 };
+@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_23<1>F Crn_23<8,8,1>F 1.596F { compr align1 };
+ /*
+ * G = Crn * -0.813 + Cbn * -0.392 + Y
+ */
+-mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 };
++mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 };
+ mac (8) acc0<1>F Crn_01<8,8,1>F -0.813F { compr align1 };
+ mac.sat(8) src_sample_g_01<1>F Cbn_01<8,8,1>F -0.392F { compr align1 };
+
+diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb.g8b
+index 4494953..2cd6fc4 100644
+--- a/src/render_program/exa_wm_yuv_rgb.g8b
++++ b/src/render_program/exa_wm_yuv_rgb.g8b
+@@ -6,7 +6,7 @@
+ { 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba },
+ { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
+ { 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba },
+- { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
++ { 0x00600001, 0x24003ae0, 0x008d0300, 0x00000000 },
+ { 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 },
+ { 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 },
+ { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
+--
+2.0.5
diff --git a/debian/patches/series b/debian/patches/series
index 0c5990d..69043b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix-yuv-to-rgb-shared-on-intel-gen8.patch
fix-sna-fstat-include.patch
fix-uxa-fstat-include.patch
commit 9e39d465e203862a432dfdd2919ae958f8db20c6
Author: Vincent Cheng <vcheng@debian.org>
Date: Thu Jul 16 01:12:49 2015 -0700
Fix missing include for fstat
diff --git a/debian/changelog b/debian/changelog
index 1593856..8694f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; urgency=medium
+
+ [ Robert Ancell ]
+ * debian/patches/fix-sna-fstat-include.patch:
+ * debian/patches/fix-uxa-fstat-include.patch:
+ - Fix missing include for fstat (Closes: #790911)
+
+ -- Vincent Cheng <vcheng@debian.org> Thu, 16 Jul 2015 01:00:41 -0700
+
xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
* Upload to unstable. (Closes: #748753)
diff --git a/debian/patches/fix-sna-fstat-include.patch b/debian/patches/fix-sna-fstat-include.patch
new file mode 100644
index 0000000..11064d7
--- /dev/null
+++ b/debian/patches/fix-sna-fstat-include.patch
@@ -0,0 +1,55 @@
+commit 12af8a575d1518d40416f83195049157c3a062a5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Feb 24 15:25:40 2015 +0000
+
+ sna: udev integration depends on fstat and sys/stat.h
+
+ src/sna/sna_driver.c: In function 'sna_handle_uevents':
+ src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
+
+ Also take the opportunity to include udev support in the configure
+ summary.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/configure.ac b/configure.ac
+index 7476e2b..de3a4b3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev,
+
+ if test "x$UDEV" != "xno"; then
+ PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
++ AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"])
+ if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then
+ AC_MSG_ERROR([udev support requested but not found (libudev)])
+ fi
+ if test "x$udev" = "xyes"; then
+ AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
++ udev_msg=" yes"
++ else
++ udev_msg=" no"
+ fi
+ fi
+
+@@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS"
+ 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"
++echo " Support for display hotplug notifications (udev):$udev_msg"
+ 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)
+ }
+
+ #if HAVE_UDEV
++#include <sys/stat.h>
++
+ static void
+ sna_handle_uevents(int fd, void *closure)
+ {
diff --git a/debian/patches/fix-uxa-fstat-include.patch b/debian/patches/fix-uxa-fstat-include.patch
new file mode 100644
index 0000000..b99021d
--- /dev/null
+++ b/debian/patches/fix-uxa-fstat-include.patch
@@ -0,0 +1,25 @@
+commit 369ceec0e4910ba2c37736a59c55c0d6c26433bf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Feb 24 15:25:40 2015 +0000
+
+ uxa: udev integration depends on fstat and sys/stat.h
+
+ src/uxa/intel_driver.c: In function 'I830HandleUEvents':
+ src/uxa/intel_driver.c:738:14: error: storage size of 's' isn't known
+ src/uxa/intel_driver.c:746:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
+
+ Signed-off-by: Chris Wilson <chris@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,
+ }
+
+ #if HAVE_UDEV
++#include <sys/stat.h>
++
+ static void
+ I830HandleUEvents(int fd, void *closure)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index cdafd3f..0c5990d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-# no patches currently applied
+fix-sna-fstat-include.patch
+fix-uxa-fstat-include.patch
Reply to: