xorg-x11-drv-intel-2.10.0-2

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

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

@@ -1,11 +1,12 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
+%define gputoolsdate 20090908
 
 Summary:   Xorg X11 Intel video driver
 Summary(ja):   Xorg X11 Intel ビデオドライバ
 Name:      xorg-x11-drv-intel
 Epoch:     1
-Version:   2.9.1
+Version:   2.10.0
 Release:   2%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
@@ -13,11 +14,18 @@ Group:     User Interface/X Hardware Support
 
 Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
 Source2:   intel.xinf
+Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
+
+Patch1: kill-svideo.patch
+Patch2: copy-fb.patch
 
 # patches from fedora - needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
 Patch21: intel-2.8.0-lvds-first.patch
 
+Patch60: uevent.patch
+Patch70: lvds-modes.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf, automake, libtool
@@ -25,9 +33,14 @@ BuildRequires: xorg-x11-server-sdk
 BuildRequires: libXvMC-devel
 BuildRequires: mesa-libGL-devel
 BuildRequires: libdrm-devel >= 2.4.16
+BuildRequires: kernel-headers >= 2.6.33
+BuildRequires: libudev-devel
+BuildRequires: libxcb-devel >= 1.5
+BuildRequires: xcb-util-devel
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg
+Requires:  xcb-util
 
 Obsoletes: xorg-x11-drv-i810
 Provides: xorg-x11-drv-i810
@@ -47,27 +60,52 @@ Provides:  xorg-x11-drv-intel-devel = %{version}-%{release}
 %description devel
 X.Org X11 Intel video driver XvMC development package.
 
+%package -n intel-gpu-tools
+Summary:    Debugging tools for Intel graphics chips
+Group:      Development/Tools
+
+%description -n intel-gpu-tools
+Debugging tools for Intel graphics chips
+
+
 %prep
-%setup -q -n xf86-video-intel-%{version}
+%setup -q -n xf86-video-intel-%{version} -b3
 
+%patch1 -p1 -b .svideo
+%patch2 -p1 -b .copy-fb
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
+%patch60 -p1 -b .uevent
+%patch70 -p1 -b .lvds-modes
 
 %build
-%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri
+autoreconf -vi
+
+%configure \
+  --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
+  --enable-dri --enable-xvmc
+make
+
+pushd ../intel-gpu-tools-%{gputoolsdate}
+autoreconf -v --install
+%configure
 make
+popd
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
-find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
+pushd ../intel-gpu-tools-%{gputoolsdate}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/i810_drv.so
+
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,11 +120,6 @@ fi ||:
 %files
 %defattr(-,root,root,-)
 %{driverdir}/intel_drv.so
-%{driverdir}/ch7xxx.so
-%{driverdir}/sil164.so
-%{driverdir}/ch7017.so
-%{driverdir}/ivch.so
-%{driverdir}/tfp410.so
 %{_datadir}/hwdata/videoaliases/intel.xinf
 %{_libdir}/libI810XvMC.so.*
 %{_libdir}/libIntelXvMC.so.*
@@ -97,7 +130,24 @@ fi ||:
 %{_libdir}/libI810XvMC.so
 %{_libdir}/libIntelXvMC.so
 
+%files -n intel-gpu-tools
+%defattr(-,root,root,-)
+%{_bindir}/intel_*
+%{_mandir}/man1/intel_*.1*
+
+
 %changelog
+* Thu Mar 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.10.0-2
+- add intel-gpu-tools as sub-package
+- rebuild with libdrm-2.4.18
+
+* Mon Mar 08 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.10.0-1
+- new upstream release
+- import Patch1,2,60,70 from fedora
+- add BR: kernel-headers >= 2.6.33 (new drm header required)
+- add BR: xcb-util-devel, libxcb-devel and R: xcb-util fot XvMC client
+- add BR; libudev-devel and autoreconf for Patch60
+
 * Mon Jan 04 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1:2.9.1-2
 - rebuild with libdrm-2.4.17