xorg-x11-drv-intel: import patches from ubuntu/debian package

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2893 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xorg-x11-drv-intel/xorg-x11-drv-intel-vl.spec

@@ -7,7 +7,7 @@ Summary(ja):   Xorg X11 Intel ビデオドライバ
 Name:      xorg-x11-drv-intel
 Epoch:     1
 Version:   2.14.0
-Release:   2%{?_dist_release}
+Release:   3%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,13 +16,17 @@ Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-inte
 Source2:   intel.xinf
 Source3:   intel-gpu-tools-%{gputoolsdate}.tar.bz2
 
-#Patch1: kill-svideo.patch
+# import from ubuntu/debian package
-
+Patch101: intel-2.14.0-copy-fb.patch
-#Patch2: intel-2.11.0-copy-fb.patch
+Patch107: intel-2.14.0-solid_nullptr_check.patch
-
+Patch108: intel-2.14.0-undo_dmg_trans_before_append.patch
-# patches from fedora - needs to be upstreamed
+Patch109: intel-2.14.0-dont_reconstruct_glyph_cache_on_rotate.patch
-
+Patch110: intel-2.14.0-warnings_cleanup.patch
-# backported
+Patch111: intel-2.14.0-fix_clipped_window_plane_offset.patch
+Patch112: intel-2.14.0-fix_error_in_4c4ad555.patch
+Patch113: intel-2.14.0-remove_broken_max_base_addresses.patch
+Patch114: intel-2.14.0-warnings_cleanup_part_2.patch
+Patch115: intel-2.14.0-quell_vblank_counter_failed.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -69,8 +73,16 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{version} -b3
 
-#%patch1 -p1 -b .svideo
+%patch101 -p1 -b .copy-fb
-#patch2 -p1 -b .copy-fb
+%patch107 -p1 -b .solid_nullptr_check
+%patch108 -p1 -b .undo_dmg_trans_before_append
+%patch109 -p1 -b .dont_reconstruct_glyph_cache_on_rotate
+%patch110 -p1 -b .warnings_cleanup
+%patch111 -p1 -b .fix_clipped_window_plane_offset
+%patch112 -p1 -b .fix_error_in_4c4ad555
+%patch113 -p1 -b .remove_broken_max_base_addresses
+%patch114 -p1 -b .warnings_cleanup_part_2
+%patch115 -p1 -b .quell_vblank_counter_failed
 
 %build
 autoreconf -vi
@@ -131,6 +143,23 @@ fi ||:
 
 
 %changelog
+* Sun Mar 06 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1:2.14.0-3
+- add Patch101-115 from ubuntu/debian package
+  - Patch101: Plymouth integration patch
+  - Patch107: Check null return from uxa_acquire_solid()
+  - Patch108: Cherry-pick fix from upstream git to fix graphics corruption
+  - Patch109: Fix font corruption (missing glyphs) on rotated screens.
+  - Patch110,114: Cherry picks to fix a large number of build warnings.
+  - Patch111: Fix clipped window plane offset
+  - Patch112: Fix issue where vertical green line and strange colors 
+              shows up when playing gstreamer with certain videos, 
+	      when dragged.  (LP 460677)
+  - Patch113: Fixes GPU lockup during login with
+              "Bad length (4) in MI_DISPLAY_BUFFER_INFO, [3, 3]" 
+	      error messages listed in the gpu dump text. (LP 710321)
+  - Patch115: Don't fill up Xorg.0.log with
+              "get vblank counter failed: Invalid argument" warnings.
+    
 * Mon Feb 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:2.14.0-2
 - rebuild with xserver-1.10.0