rpms/xorg-x11-drv-i810/devel intel-2.1.1-pciaccess-version.patch, NONE, 1.1 intel-disable-stepping.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.81, 1.82

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.1.1-pciaccess-version.patch 
	intel-disable-stepping.patch 
Log Message:
* Fri Mar 07 2008 Dave Airlie <airlied at redhat.com> 2.2.1-8
- fixup pciaccess version check and autoconf and fallout


intel-2.1.1-pciaccess-version.patch:

--- NEW FILE intel-2.1.1-pciaccess-version.patch ---
diff -up xf86-video-intel-2.2.1/configure.ac.d xf86-video-intel-2.2.1/configure.ac
--- xf86-video-intel-2.2.1/configure.ac.d	2008-03-07 08:06:47.000000000 +1000
+++ xf86-video-intel-2.2.1/configure.ac	2008-03-07 08:06:54.000000000 +1000
@@ -115,9 +115,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
 CFLAGS="$save_CFLAGS"
 
 if test x$XSERVER_LIBPCIACCESS = xyes; then
-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
+	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
 else
-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
+	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
 				       have_libpciaccess=yes,
 				       have_libpciaccess=no)
 fi

intel-disable-stepping.patch:

--- NEW FILE intel-disable-stepping.patch ---
diff -up xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am.da xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am
--- xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am.da	2008-03-07 08:09:46.000000000 +1000
+++ xf86-video-intel-2.2.0-188-g49af3c4/src/reg_dumper/Makefile.am	2008-03-07 08:09:50.000000000 +1000
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = intel_reg_dumper intel_idle intel_stepping
+noinst_PROGRAMS = intel_reg_dumper intel_idle
 
 intel_reg_dumper_SOURCES = \
 	main.c \


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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- xorg-x11-drv-i810.spec	6 Mar 2008 21:53:02 -0000	1.81
+++ xorg-x11-drv-i810.spec	6 Mar 2008 22:16:44 -0000	1.82
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -23,10 +23,12 @@
 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
 
 Patch100: intel-master.patch
 Patch101: intel-batchbuffer.patch
 Patch102: intel-modeset.patch
+Patch103: intel-disable-stepping.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -62,15 +64,19 @@
 %patch3 -p1 -b .xvfix
 #patch4 -p1 -b .xv-compiz
 %patch5 -p1 -b .efi
+%patch6 -p1 -b .pciaccessvers
 %patch100 -p1 -b .intel-master
 
 cd ../xf86-video-intel-%{batchbuffer_version}
+%patch6 -p1 -b .pciaccessvers
 %patch101 -p1 -b .intel-batchbuffer
 %patch102 -p1 -b .intel-modeset
+%patch103 -p1 -b .intel-stepping
 
 %build
 
 cd xf86-video-intel-%{version}
+aclocal; autoheader; automake -a; autoconf
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri
 make
 
@@ -129,6 +135,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Fri Mar 07 2008 Dave Airlie <airlied at redhat.com> 2.2.1-8
+- fixup pciaccess version check and autoconf and fallout
+
 * Fri Mar 07 2008 Dave Airlie <airlied at redhat.com> 2.2.1-7
 - re-run autoconf to build modesetting with batchbuffer