xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 10
debian/patches/fix-sna-fstat-include.patch | 55
debian/patches/fix-uxa-fstat-include.patch | 25 +
debian/patches/series |6
debian/patches/xmir.patch | 391 -
5 files changed, 92 insertions(+), 395 deletions(-)
New commits:
commit 21eab81f1c2ed0a533d8959a3bf2fd6a73f0dd05
Author: Timo Aaltonen
Date: Thu Jun 18 15:46:13 2015 +0300
import 2:2.99.917-1~exp1ubuntu3
diff --git a/debian/changelog b/debian/changelog
index 2b82360..08502ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu3) wily; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Drop XMir patch, we don't need it with new glamor based XMir (LP:
#1462994)
+ * debian/patches/fix-sna-fstat-include.patch:
+ * debian/patches/fix-uxa-fstat-include.patch:
+- Fix missing include for fstat
+
+ -- Robert Ancell Tue, 09 Jun 2015 15:17:18
+1200
+
xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.2) vivid-proposed;
urgency=medium
* fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation
diff --git a/debian/patches/fix-sna-fstat-include.patch
b/debian/patches/fix-sna-fstat-include.patch
new file mode 100644
index 000..11064d7
--- /dev/null
+++ b/debian/patches/fix-sna-fstat-include.patch
@@ -0,0 +1,55 @@
+commit 12af8a575d1518d40416f83195049157c3a062a5
+Author: Chris Wilson
+Date: Tue Feb 24 15:25:40 2015 +
+
+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
+
+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
++
+ 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 000..b99021d
--- /dev/null
+++ b/debian/patches/fix-uxa-fstat-include.patch
@@ -0,0 +1,25 @@
+commit 369ceec0e4910ba2c37736a59c55c0d6c26433bf
+Author: Chris Wilson
+Date: Tue Feb 24 15:25:40 2015 +
+
+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
+
+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
++
+ static void
+ I830HandleUEvents(int fd, void *closure)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index ceb8885..309cac2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
fix-sna-external-slave-rotation.patch
-
-# XMir series
-xmir.patch
-
sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
fix-yuv-to-rgb-shared-on-intel-gen8.patch
+fix-sna-fstat-include.patch
+fix-uxa-fstat-include.patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
deleted file mode 100644
index b32b654..000
--- a/debian/patches/xmir.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-commit 80d
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog |7 ++
debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch | 51 +++
debian/patches/series|1
3 files changed, 59 insertions(+)
New commits:
commit b36a85972c55e44a7f3fb0c29c8910c11c406037
Author: Timo Aaltonen
Date: Thu Jun 18 14:48:07 2015 +0300
import 2:2.99.917-1~exp1ubuntu2.2
diff --git a/debian/changelog b/debian/changelog
index 12eaca5..2b82360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.2) vivid-proposed;
urgency=medium
+
+ * fix-yuv-to-rgb-shared-on-intel-gen8.patch: Fix faulty yuv2rgb translation
+on Intel Generation 8 Graphics. (LP: #1449892)
+
+ -- Alessio Treglia Fri, 29 May 2015 11:46:27 +0100
+
xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu2.1) vivid; urgency=medium
* sna-force-frontbuffer-to-cpu-for-randr-fallback.diff: Fix rotation
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 000..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?=
+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ä
+---
+ 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>FCrn_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>FCbn_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 },
+{ 0x0061, 0x24003ae0, 0x008d0320, 0x },
+{ 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba },
+- { 0x0061, 0x24003ae0, 0x008d0320, 0x },
++ { 0x0061, 0x24003ae0, 0x008d0300, 0x },
+{ 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 },
+{ 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 },
+{ 0x0061, 0x24003ae0, 0x008d0320, 0x },
+--
+2.0.5
diff --git a/debian/patches/series b/debian/patches/series
index f458319..ceb8885 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-sna-external-slave-rotation.patch
xmir.patch
sna-force-frontbuffer-to-cpu-for-randr-fallback.diff
+fix-yuv-to-rgb-shared-on-intel-gen8.patch
--
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/e1z5z8s-00053n...@moszumanska.debian.org
mesa: Changes to 'debian-experimental'
VERSION|2 configure.ac |1 debian/changelog | 14 debian/control |2 debian/libgles1-mesa.symbols |2 debian/libgles2-mesa.symbols |2 docs/relnotes/10.6.0.html | 243 ++ src/Makefile.am|3 src/egl/main/eglcontext.c |5 src/gallium/auxiliary/cso_cache/cso_context.c |7 src/gallium/auxiliary/draw/draw_llvm.c |4 src/gallium/auxiliary/util/u_math.h|1 src/gallium/drivers/freedreno/Makefile.am |3 src/gallium/drivers/freedreno/a3xx/fd3_program.c |9 src/gallium/drivers/freedreno/ir3/ir3_cmdline.c|8 src/gallium/drivers/freedreno/ir3/ir3_compiler.c | 14 src/gallium/drivers/llvmpipe/lp_query.c|2 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |6 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp |1 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |6 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 20 src/gallium/drivers/nouveau/nv30/nv30_clear.c |2 src/gallium/drivers/nouveau/nv30/nv30_context.h|2 src/gallium/drivers/nouveau/nv30/nv30_draw.c | 74 src/gallium/drivers/nouveau/nv30/nv30_fragprog.c |5 src/gallium/drivers/nouveau/nv30/nv30_state_validate.c | 26 src/gallium/drivers/nouveau/nv30/nv30_vbo.c|2 src/gallium/drivers/nouveau/nv30/nv30_vertprog.c |5 src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c |5 src/gallium/drivers/nouveau/nv50/nv50_miptree.c|2 src/gallium/drivers/nouveau/nvc0/nvc0_program.c|2 src/gallium/drivers/radeonsi/si_state_shaders.c| 11 src/gallium/state_trackers/clover/api/interop.cpp |7 src/gallium/state_trackers/clover/core/error.hpp |1 src/gallium/state_trackers/dri/dri2.c |2 src/gallium/state_trackers/dri/dri_context.c |9 src/gallium/state_trackers/xa/xa_tracker.c | 12 src/gallium/targets/d3dadapter9/Makefile.am|2 src/gallium/targets/dri/Makefile.am|6 src/gallium/targets/osmesa/Makefile.am |1 src/gallium/targets/pipe-loader/Makefile.am|2 src/glsl/Makefile.am | 13 src/glsl/SConscript|4 src/glsl/linker.cpp| 10 src/glsl/main.cpp |6 src/glsl/tests/common.c| 30 src/loader/Makefile.am | 10 src/mapi/glapi/gen/Makefile.am |3 src/mapi/glapi/gen/apiexec.py | 240 ++ src/mapi/glapi/gen/gl_genexec.py | 54 src/mesa/Android.libmesa_glsl_utils.mk |6 src/mesa/drivers/dri/Makefile.am |1 src/mesa/drivers/dri/common/Android.mk |4 src/mesa/drivers/dri/common/Makefile.am|6 src/mesa/drivers/dri/common/Makefile.sources |4 src/mesa/drivers/dri/common/SConscript |2 src/mesa/drivers/dri/i915/intel_extensions.c |1 src/mesa/drivers/dri/i965/Makefile.am |1 src/mesa/drivers/dri/i965/brw_context.c|7 src/mesa/drivers/dri/i965/brw_eu_compact.c |6 src/mesa/drivers/dri/i965/brw_fs.cpp | 13 src/mesa/drivers/dri/i965/brw_fs.h |3 src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 18 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 17 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |6 src/mesa/drivers/dri/i965/brw_util.h | 15 src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 18 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 20 src/mesa/drivers/dri/i965/gen6_sf_state.c |6 src/mesa/drivers/dri/i965/
mesa: Changes to 'upstream-experimental'
VERSION|2 configure.ac |1 docs/relnotes/10.6.0.html | 243 ++ src/Makefile.am|3 src/egl/main/eglcontext.c |5 src/gallium/auxiliary/cso_cache/cso_context.c |7 src/gallium/auxiliary/draw/draw_llvm.c |4 src/gallium/auxiliary/util/u_math.h|1 src/gallium/drivers/freedreno/Makefile.am |3 src/gallium/drivers/freedreno/a3xx/fd3_program.c |9 src/gallium/drivers/freedreno/ir3/ir3_cmdline.c|8 src/gallium/drivers/freedreno/ir3/ir3_compiler.c | 14 src/gallium/drivers/llvmpipe/lp_query.c|2 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp |6 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_gm107.cpp |1 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp |6 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 20 src/gallium/drivers/nouveau/nv30/nv30_clear.c |2 src/gallium/drivers/nouveau/nv30/nv30_context.h|2 src/gallium/drivers/nouveau/nv30/nv30_draw.c | 74 src/gallium/drivers/nouveau/nv30/nv30_fragprog.c |5 src/gallium/drivers/nouveau/nv30/nv30_state_validate.c | 26 src/gallium/drivers/nouveau/nv30/nv30_vbo.c|2 src/gallium/drivers/nouveau/nv30/nv30_vertprog.c |5 src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c |5 src/gallium/drivers/nouveau/nv50/nv50_miptree.c|2 src/gallium/drivers/nouveau/nvc0/nvc0_program.c|2 src/gallium/drivers/radeonsi/si_state_shaders.c| 11 src/gallium/state_trackers/clover/api/interop.cpp |7 src/gallium/state_trackers/clover/core/error.hpp |1 src/gallium/state_trackers/dri/dri2.c |2 src/gallium/state_trackers/dri/dri_context.c |9 src/gallium/state_trackers/xa/xa_tracker.c | 12 src/gallium/targets/d3dadapter9/Makefile.am|2 src/gallium/targets/dri/Makefile.am|6 src/gallium/targets/osmesa/Makefile.am |1 src/gallium/targets/pipe-loader/Makefile.am|2 src/glsl/Makefile.am | 13 src/glsl/SConscript|4 src/glsl/linker.cpp| 10 src/glsl/main.cpp |6 src/glsl/tests/common.c| 30 src/loader/Makefile.am | 10 src/mapi/glapi/gen/Makefile.am |3 src/mapi/glapi/gen/apiexec.py | 240 ++ src/mapi/glapi/gen/gl_genexec.py | 54 src/mesa/Android.libmesa_glsl_utils.mk |6 src/mesa/drivers/dri/Makefile.am |1 src/mesa/drivers/dri/common/Android.mk |4 src/mesa/drivers/dri/common/Makefile.am|6 src/mesa/drivers/dri/common/Makefile.sources |4 src/mesa/drivers/dri/common/SConscript |2 src/mesa/drivers/dri/i915/intel_extensions.c |1 src/mesa/drivers/dri/i965/Makefile.am |1 src/mesa/drivers/dri/i965/brw_context.c|7 src/mesa/drivers/dri/i965/brw_eu_compact.c |6 src/mesa/drivers/dri/i965/brw_fs.cpp | 13 src/mesa/drivers/dri/i965/brw_fs.h |3 src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 18 src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 17 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |6 src/mesa/drivers/dri/i965/brw_util.h | 15 src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 18 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 20 src/mesa/drivers/dri/i965/gen6_sf_state.c |6 src/mesa/drivers/dri/i965/gen7_sf_state.c |6 src/mesa/drivers/dri/i965/gen8_depth_state.c | 10 src/mesa/drivers/dri/i965/gen8_sf_state.c |6 src/mesa/drivers/dri/i965/intel_blit.c | 55 src/mesa/drivers/dri/i965/
