rpms/mesa/F-12 .cvsignore, 1.39, 1.40 mesa.spec, 1.260, 1.261 sources, 1.42, 1.43 mesa-7.3-dri-configs-fixes.patch, 1.1, NONE mesa-7.5-sparc64.patch, 1.1, NONE r100-fix-compiz.patch, 1.1, NONE r600-fix-tfp.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3527

Modified Files:
	.cvsignore mesa.spec sources 
Removed Files:
	mesa-7.3-dri-configs-fixes.patch mesa-7.5-sparc64.patch 
	r100-fix-compiz.patch r600-fix-tfp.patch 
Log Message:
* Tue Jan 05 2010 Dave Airlie <airlied at redhat.com> 7.7-1
- rebase to 7.7 release - the best base to move forward at this point in time.
- bump libdrm requires



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-12/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	4 Nov 2009 22:41:44 -0000	1.39
+++ .cvsignore	6 Jan 2010 04:53:04 -0000	1.40
@@ -8,3 +8,5 @@ mesa-20090813.tar.bz2
 mesa-20090909.tar.bz2
 mesa-20090921.tar.bz2
 mesa-20091030.tar.bz2
+MesaLib-7.7.tar.bz2
+MesaDemos-7.7.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-12/mesa.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- mesa.spec	2 Dec 2009 20:17:08 -0000	1.260
+++ mesa.spec	6 Jan 2010 04:53:05 -0000	1.261
@@ -20,18 +20,18 @@
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 7.6
-Release: 0.18%{?dist}
+Version: 7.7
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
+Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}%{?snapshot}/MesaLib-%{version}%{?snapshot}.tar.bz2
 #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
 #Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}%{?snapshot}.tar.bz2
-Source0: %{name}-%{gitdate}.tar.bz2
-#Source1: http://downloads.sf.net/mesa3d/MesaDemos-%{version}.tar.bz2
+#Source0: %{name}-%{gitdate}.tar.bz2
+Source1: ftp://ftp.freedesktop.org/pub/mesa/%{version}${?snapshot}/MesaDemos-%{version}%{?snapshot}.tar.bz2
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
@@ -43,10 +43,7 @@ Patch3: mesa-no-mach64.patch
 
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
-Patch10: r600-fix-tfp.patch
-Patch11: r100-fix-compiz.patch
 
-Patch13: mesa-7.5-sparc64.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
 Patch31: mesa-7.6-glx13-app-warning.patch
@@ -55,7 +52,7 @@ BuildRequires: pkgconfig autoconf automa
 %if %{with_hardware}
 BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
 %endif
-BuildRequires: libdrm-devel >= 2.4.5-1
+BuildRequires: libdrm-devel >= 2.4.17-1
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
 BuildRequires: xorg-x11-proto-devel >= 7.1-10
@@ -80,7 +77,7 @@ Requires(postun): /sbin/ldconfig
 Provides: libGL
 Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
 %if %{with_hardware}
-Requires: libdrm >= 2.4.5-1
+Requires: libdrm >= 2.4.17-1
 Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
 %endif
 
@@ -175,16 +172,13 @@ This package provides some demo applicat
 
 
 %prep
-#setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5
-%setup -q -n mesa-%{gitdate} -b2 -b5
+%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b1 -b2 -b5
+#setup -q -n mesa-%{gitdate} -b2 -b5
 %patch1 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
-%patch10 -p1 -b .r600_tfp
-%patch11 -p1 -b .r100_tfp
-%patch13 -p1 -b .sparc64
 %patch30 -p1 -b .vblank-warning
 %patch31 -p1 -b .glx13-warning
 
@@ -276,7 +270,7 @@ done | xargs install -m 0755 -t $RPM_BUI
 
 # strip out undesirable headers
 pushd $RPM_BUILD_ROOT%{_includedir}/GL 
-rm [a-fh-np-wyz]*.h gg*.h glf*.h glew.h glut*.h glxew.h
+rm -f [a-fh-np-wyz]*.h gg*.h glf*.h glew.h glut*.h glxew.h
 popd
 
 pushd $RPM_BUILD_ROOT%{_libdir}
@@ -397,6 +391,10 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Tue Jan 05 2010 Dave Airlie <airlied at redhat.com> 7.7-1
+- rebase to 7.7 release - the best base to move forward at this point in time.
+- bump libdrm requires
+
 * Wed Dec 02 2009 Adam Jackson <ajax at redhat.com> 7.6-0.18
 - Fix s390 packaging even harder
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-12/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	4 Nov 2009 22:41:45 -0000	1.42
+++ sources	6 Jan 2010 04:53:05 -0000	1.43
@@ -1,3 +1,4 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-3808501d6198933e1866db7ddb329aac  mesa-20091030.tar.bz2
+e3fa64a1508bc23dd9de9dd2cea7cfb1  MesaLib-7.7.tar.bz2
+6fd616b27b9826d0faa23e08e05d9435  MesaDemos-7.7.tar.bz2


--- mesa-7.3-dri-configs-fixes.patch DELETED ---


--- mesa-7.5-sparc64.patch DELETED ---


--- r100-fix-compiz.patch DELETED ---


--- r600-fix-tfp.patch DELETED ---