|
|
@@ -6,8 +6,8 @@ Summary: Xorg X11 Intel video driver
|
|
|
Summary(ja): Xorg X11 Intel ビデオドライバ
|
|
|
Name: xorg-x11-drv-intel
|
|
|
Epoch: 1
|
|
|
-Version: 2.14.0
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Version: 2.15.0
|
|
|
+Release: 1%{?_dist_release}
|
|
|
URL: http://www.x.org
|
|
|
License: MIT
|
|
|
Group: User Interface/X Hardware Support
|
|
|
@@ -17,16 +17,7 @@ Source2: intel.xinf
|
|
|
Source3: intel-gpu-tools-%{gputoolsdate}.tar.bz2
|
|
|
|
|
|
# import from ubuntu/debian package
|
|
|
-Patch101: intel-2.14.0-copy-fb.patch
|
|
|
-Patch107: intel-2.14.0-solid_nullptr_check.patch
|
|
|
-Patch108: intel-2.14.0-undo_dmg_trans_before_append.patch
|
|
|
-Patch109: intel-2.14.0-dont_reconstruct_glyph_cache_on_rotate.patch
|
|
|
-Patch110: intel-2.14.0-warnings_cleanup.patch
|
|
|
-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
|
|
|
+Patch101: intel-2.15.0-copy-fb.patch
|
|
|
|
|
|
ExclusiveArch: %{ix86} x86_64 ia64
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
@@ -34,7 +25,7 @@ BuildRequires: autoconf, automake, libtool
|
|
|
BuildRequires: xorg-x11-server-sdk >= 1.7.99
|
|
|
BuildRequires: libXvMC-devel
|
|
|
BuildRequires: libGL-devel >= 7.10
|
|
|
-BuildRequires: libdrm-devel >= 2.4.23
|
|
|
+BuildRequires: libdrm-devel >= 2.4.25
|
|
|
BuildRequires: kernel-headers >= 2.6.33
|
|
|
BuildRequires: libudev-devel
|
|
|
BuildRequires: libxcb-devel >= 1.5
|
|
|
@@ -73,16 +64,7 @@ Debugging tools for Intel graphics chips
|
|
|
%prep
|
|
|
%setup -q -n xf86-video-intel-%{version} -b3
|
|
|
|
|
|
-%patch101 -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
|
|
|
+#%patch101 -p1 -b .copy-fb
|
|
|
|
|
|
%build
|
|
|
autoreconf -vi
|
|
|
@@ -143,6 +125,12 @@ fi ||:
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 15 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.15.0-1
|
|
|
+- new upstream release
|
|
|
+- drop upstream patches: 107-115
|
|
|
+- temporary disabled patch101
|
|
|
+- BR: libdrm >= 2.4.25
|
|
|
+
|
|
|
* 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
|
daisuke