xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 10 ++++
debian/patches/111_fix_clipped_window_plane_offset.patch | 33 +++++++++++++++
debian/patches/112_fix_error_in_4c4ad555.patch | 33 +++++++++++++++
debian/patches/series | 2
4 files changed, 78 insertions(+)
New commits:
commit acf8a398621ed4008ceb699448f596ac9fb984ee
Author: Bryce Harrington <bryce@canonical.com>
Date: Mon Feb 14 15:05:34 2011 -0800
Add 111_fix_clipped_window_plane_offset.patch, 112_fix_error_in_4c4ad555.patch: Fixes issue where vertical green line and strange colors shows up when playing gstreamer with certain videos, when dragged. (LP: #460677)
diff --git a/debian/changelog b/debian/changelog
index 4cf328c..17bfc69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.14.0-1ubuntu8) natty; urgency=low
+
+ * Add 111_fix_clipped_window_plane_offset.patch,
+ 112_fix_error_in_4c4ad555.patch: Fixes issue where vertical green line
+ and strange colors shows up when playing gstreamer with certain
+ videos, when dragged.
+ (LP: #460677)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 14 Feb 2011 15:03:28 -0800
+
xserver-xorg-video-intel (2:2.14.0-1ubuntu7) natty; urgency=low
* Rename 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
diff --git a/debian/patches/111_fix_clipped_window_plane_offset.patch b/debian/patches/111_fix_clipped_window_plane_offset.patch
new file mode 100644
index 0000000..0fc9d8c
--- /dev/null
+++ b/debian/patches/111_fix_clipped_window_plane_offset.patch
@@ -0,0 +1,33 @@
+From 4c4ad555564a80311df1a4b762eb1e119c6d95fb Mon Sep 17 00:00:00 2001
+From: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed, 19 Jan 2011 15:25:06 +0000
+Subject: Correct offset of planes within clipped window
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=24767
+Reported-and-tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/intel_video.c b/src/intel_video.c
+index 2786201..0d1ffc5 100644
+--- a/src/intel_video.c
++++ b/src/intel_video.c
+@@ -996,7 +996,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv,
+ /* Copy V data for YV12, or U data for I420 */
+ src2 = buf + /* start of YUV data */
+ (srcH * srcPitch) + /* move over Luma plane */
+- ((top * srcPitch) >> 2) + /* move down from by top lines */
++ ((top >> 1) * srcPitch) + /* move down from by top lines */
+ (left >> 1); /* move left by left pixels */
+
+ #if 0
+@@ -1015,7 +1015,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv,
+ src3 = buf + /* start of YUV data */
+ (srcH * srcPitch) + /* move over Luma plane */
+ ((srcH >> 1) * srcPitch2) + /* move over Chroma plane */
+- ((top * srcPitch) >> 2) + /* move down from by top lines */
++ ((top >> 1) * srcPitch) + /* move down from by top lines */
+ (left >> 1); /* move left by left pixels */
+ #if 0
+ ErrorF("src3 is %p, offset is %ld\n", src3,
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/112_fix_error_in_4c4ad555.patch b/debian/patches/112_fix_error_in_4c4ad555.patch
new file mode 100644
index 0000000..c2e959e
--- /dev/null
+++ b/debian/patches/112_fix_error_in_4c4ad555.patch
@@ -0,0 +1,33 @@
+From 5baa63c634990810a66c3150b4f2b76fcee2df38 Mon Sep 17 00:00:00 2001
+From: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Fri, 21 Jan 2011 00:45:52 +0000
+Subject: Fix an error in 4c4ad555564a80311df1a4b762eb1e119c6d95fb.
+
+See the original patch at https://bugs.freedesktop.org/show_bug.cgi?id=24767
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+diff --git a/src/intel_video.c b/src/intel_video.c
+index 0d1ffc5..5294f73 100644
+--- a/src/intel_video.c
++++ b/src/intel_video.c
+@@ -996,7 +996,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv,
+ /* Copy V data for YV12, or U data for I420 */
+ src2 = buf + /* start of YUV data */
+ (srcH * srcPitch) + /* move over Luma plane */
+- ((top >> 1) * srcPitch) + /* move down from by top lines */
++ ((top >> 1) * srcPitch2) + /* move down from by top lines */
+ (left >> 1); /* move left by left pixels */
+
+ #if 0
+@@ -1015,7 +1015,7 @@ I830CopyPlanarData(intel_adaptor_private *adaptor_priv,
+ src3 = buf + /* start of YUV data */
+ (srcH * srcPitch) + /* move over Luma plane */
+ ((srcH >> 1) * srcPitch2) + /* move over Chroma plane */
+- ((top >> 1) * srcPitch) + /* move down from by top lines */
++ ((top >> 1) * srcPitch2) + /* move down from by top lines */
+ (left >> 1); /* move left by left pixels */
+ #if 0
+ ErrorF("src3 is %p, offset is %ld\n", src3,
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index 050224c..42e6827 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
108_undo_dmg_trans_before_append.patch
109_dont_reconstruct_glyph_cache_on_rotate.patch
110_warnings_cleanup.patch
+111_fix_clipped_window_plane_offset.patch
+112_fix_error_in_4c4ad555.patch
Reply to: