Mon Aug 11 13:10:22 UTC 2008

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15039/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Added Files:
	import.log 
Removed Files:
	intel-2.1.1-efi.patch intel-2.1.1-fix-vt-switch.patch 
	intel-2.1.1-fix-xv-compiz.patch 
	intel-2.1.1-pciaccess-version.patch intel-2.2.0-alloca.patch 
	intel-2.2.1-disable-fbc.patch intel-backlight.patch 
	intel-batchbuffer.patch intel-disable-stepping.patch 
	intel-fix-modeset-vt-switch.patch intel-modeset.patch 
	intel-quirk-dvo.patch 
Log Message:
intel 2.4.0

--- NEW FILE import.log ---
xorg-x11-drv-i810-2_4_0-1_fc10:HEAD:xorg-x11-drv-i810-2.4.0-1.fc10.src.rpm:1218460158


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	3 Apr 2008 02:59:10 -0000	1.29
+++ .cvsignore	11 Aug 2008 13:09:52 -0000	1.30
@@ -1,4 +1 @@
-xf86-video-intel-2.2.1.tar.bz2
-xf86-video-intel-2.2.0-188-g49af3c4.tar.bz2
-xf86-video-intel-2.2.0-217-g58956ca.tar.bz2
-xf86-video-intel-2.2.0-219-gc9676d0.tar.bz2
+xf86-video-intel-2.4.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	3 Apr 2008 02:59:10 -0000	1.30
+++ sources	11 Aug 2008 13:09:52 -0000	1.31
@@ -1,2 +1 @@
-3334dc5142871b78fc609fd1b3dac3f2  xf86-video-intel-2.2.1.tar.bz2
-f76595f3a439ceb587cc299cd450194f  xf86-video-intel-2.2.0-219-gc9676d0.tar.bz2
+81a84e891c138b713947ed06556ec53c  xf86-video-intel-2.4.0.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- xorg-x11-drv-i810.spec	8 Apr 2008 18:47:04 -0000	1.94
+++ xorg-x11-drv-i810.spec	11 Aug 2008 13:09:52 -0000	1.95
@@ -5,8 +5,8 @@
 
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   2.2.1
-Release:   20%{?dist}
+Version:   2.4.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,31 +16,18 @@
 
 # Update git snapshot by saying make dist distdir=$(git-describe) from
 # the intel-batchbuffer branch.
-Source1:   xf86-video-intel-%{batchbuffer_version}.tar.bz2 
+#Source1:   xf86-video-intel-%{batchbuffer_version}.tar.bz2 
 Source2:   i810.xinf
 Source3:   intel-stub.c
 
-Patch2: intel-2.1.1-fix-vt-switch.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
-Patch4: intel-2.1.1-fix-xv-compiz.patch
-Patch5: intel-2.1.1-efi.patch
-Patch6: intel-2.1.1-pciaccess-version.patch
-Patch7: intel-quirk-dvo.patch
 Patch8: intel-2.1.1-disable-ttm.patch
 
 # EXA on 965 without DRI is broken - fix for now so installer can run
+# Actually no, let's shake this out again.
 Patch9: intel-2.2.0-xaadefault.patch
 
-Patch10: intel-backlight.patch
-
-# Framebuffer compression causes artifacts, display blanking
-# https://bugs.freedesktop.org/show_bug.cgi?id=13326
-Patch11: intel-2.2.1-disable-fbc.patch
-
 Patch100: intel-master.patch
-Patch101: intel-batchbuffer.patch
-Patch103: intel-disable-stepping.patch
-Patch104: intel-fix-modeset-vt-switch.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -68,35 +55,14 @@
 X.Org X11 Intel video driver XvMC development package.
 
 %prep
-%setup -q -c %{name}-%{version} -a1
-
-cd xf86-video-intel-%{version}
-# XXX rebase me plz
-#patch2 -p1 -b .vtswitch
+%setup -q -n xf86-video-intel-%{version}
 %patch3 -p1 -b .xvfix
-#patch4 -p1 -b .xv-compiz
-%patch5 -p1 -b .efi
-%patch6 -p1 -b .pciaccessvers
-%patch7 -p1 -b .quirk
 %patch8 -p1 -b .disablettm
-%patch9 -p1 -b .xaadefault
-%patch10 -p1 -b .backlight
-%patch11 -p1 -b .fbc
+#patch9 -p1 -b .xaadefault
 %patch100 -p1 -b .intel-master
 
-cd ../xf86-video-intel-%{batchbuffer_version}
-%patch101 -p1 -b .intel-batchbuffer
-%patch103 -p1 -b .intel-stepping
-%patch104 -p1 -b .intel-fix-vt-modeset
-%patch11 -p1 -b .fbc
 %build
 
-cd xf86-video-intel-%{version}
-aclocal; autoheader; automake -a; autoconf
-%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri
-make
-
-cd ../xf86-video-intel-%{batchbuffer_version}
 aclocal; autoheader; automake -a; autoconf
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri
 make
@@ -104,27 +70,13 @@
 # Build the wrapper driver that lets us load either intel_master or
 # intel_batchbuffer driver as just 'intel'
 
-cd ..
-gcc -o intel_drv.so -shared -fPIC -DPIC %{SOURCE3} \
-	$RPM_OPT_FLAGS $(pkg-config --cflags --libs xorg-server)
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make -C xf86-video-intel-%{version} install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_drv.so  $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_master_drv.so
-
-make -C xf86-video-intel-%{batchbuffer_version} install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_drv.so  $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_batchbuffer_drv.so
-
-mkdir -p $RPM_BUILD_ROOT%{driverdir}
-install -m 0755 %{_builddir}/%{name}-%{version}/intel_drv.so \
-	$RPM_BUILD_ROOT%{driverdir}
-
+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 --
 
 %clean
@@ -134,23 +86,26 @@
 %defattr(-,root,root,-)
 %{driverdir}/i810_drv.so
 %{driverdir}/intel_drv.so
-%{driverdir}/intel_master_drv.so
-%{driverdir}/intel_batchbuffer_drv.so
 %{driverdir}/ch7xxx.so
 %{driverdir}/sil164.so
 %{driverdir}/ch7017.so
 %{driverdir}/ivch.so
 %{driverdir}/tfp410.so
 %{_datadir}/hwdata/videoaliases/i810.xinf
-%{_libdir}/libI810XvMC.so.1
-%{_libdir}/libI810XvMC.so.1.0.0
+%{_libdir}/libI810XvMC.so.1*
+%{_libdir}/libIntelXvMC.so.1*
 %{_mandir}/man4/i*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libI810XvMC.so
+%{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Aug 11 2008 Adam Jackson <ajax at redhat.com> 2.4.0-1
+- intel 2.4.0.
+- Switch back to EXA by default.  Let's see if it works this time.
+
 * Tue Apr  8 2008 Bill Nottingham <notting at redhat.com> - 2.2.1-20
 - disable framebuffer compression by default (fdo #13326)
 


--- intel-2.1.1-efi.patch DELETED ---


--- intel-2.1.1-fix-vt-switch.patch DELETED ---


--- intel-2.1.1-fix-xv-compiz.patch DELETED ---


--- intel-2.1.1-pciaccess-version.patch DELETED ---


--- intel-2.2.0-alloca.patch DELETED ---


--- intel-2.2.1-disable-fbc.patch DELETED ---


--- intel-backlight.patch DELETED ---


--- intel-batchbuffer.patch DELETED ---


--- intel-disable-stepping.patch DELETED ---


--- intel-fix-modeset-vt-switch.patch DELETED ---


--- intel-modeset.patch DELETED ---


--- intel-quirk-dvo.patch DELETED ---


