dist-git conversion

#2781)

.gitignore

@@ -3,3 +3,5 @@ xdriinfo-1.0.2.tar.bz2
 MesaDemos-7.3.tar.bz2
 MesaLib-7.3.tar.bz2
 mesa-20090322.tar.bz2
+mesa-20090428.tar.bz2
+mesa-20090612.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: mesa
-# $Id: Makefile,v 1.1 2005/09/12 18:26:05 mharris Exp $
-NAME := mesa
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1,2 +0,0 @@
-mesa-7_2-0_3_fc10:HEAD:mesa-7.2-0.3.fc10.src.rpm:1222723005
-mesa-7_3-1_fc11:HEAD:mesa-7.3-1.fc11.src.rpm:1234080261

mesa-7.1-osmesa-version.patch

@@ -1,21 +1,12 @@
-diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
---- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx	2008-08-28 14:05:47.000000000 -0400
-+++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile	2008-08-28 14:07:13.000000000 -0400
-@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
- 
- $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
+diff -up mesa-20090612/src/mesa/drivers/osmesa/Makefile.dma mesa-20090612/src/mesa/drivers/osmesa/Makefile
+--- mesa-20090612/src/mesa/drivers/osmesa/Makefile.dma	2009-06-12 13:57:29.000000000 +1000
++++ mesa-20090612/src/mesa/drivers/osmesa/Makefile	2009-06-12 13:57:42.000000000 +1000
+@@ -39,7 +39,7 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_
+ # -DCHAN_BITS=16/32.
+ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
  	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 -		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-+		-major 6 -minor 5 -patch 3 \
- 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- 		$(OSMESA_LIB_DEPS) $(OBJECTS)
-@@ -58,7 +58,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
- # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
- osmesa16: $(OBJECTS) $(CORE_MESA)
- 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-+		-major 6 -minor 5 -patch 3 \
++		-major 6 -minor 5 -patch 4 \
  		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
  		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
  		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)

mesa.spec

@@ -1,26 +1,27 @@
 
 # When bootstrapping an arch, omit the -demos subpackage.
 
-# S390 doesn't have video cards, so it's not much use building DRI there.
+# S390 doesn't have video cards, but we need swrast for xserver's GLX
 %ifarch s390 s390x
-%define with_dri 0
-%define driver xlib
+%define with_hardware 0
+%define dri_drivers --with-dri-drivers=swrast
 %else
-%define with_dri 1
-%define driver dri
+%define with_hardware 1
 %endif
 
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.2
-%define gitdate 20090322
+%define gitdate 20090612
 #% define snapshot 
 
+%define demodir %{_libdir}/mesa
+
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 7.5
-Release: 0.9%{?dist}
+Version: 7.6
+Release: 0.3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -40,8 +41,6 @@ Patch1: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
 
-Patch6: radeon-rewrite.patch
-
 Patch7: mesa-7.1-link-shared.patch
 Patch9: intel-revert-vbl.patch
 
@@ -49,10 +48,10 @@ Patch12: mesa-7.1-disable-intel-classic-warn.patch
 Patch13: mesa-7.5-sparc64.patch
 
 BuildRequires: pkgconfig autoconf automake
-%if %{with_dri}
-BuildRequires: libdrm-devel >= 2.4.5-1
+%if %{with_hardware}
 BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
 %endif
+BuildRequires: libdrm-devel >= 2.4.5-1
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
 BuildRequires: xorg-x11-proto-devel >= 7.1-10
@@ -75,9 +74,9 @@ Group: System Environment/Libraries
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides: libGL
-%if %{with_dri}
-Requires: libdrm >= 2.4.5-1
 Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
+Requires: libdrm >= 2.4.5-1
+%if %{with_hardware}
 Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
 %endif
 
@@ -85,13 +84,11 @@ Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
 Mesa libGL runtime library.
 
 
-%if %{with_dri}
 %package dri-drivers
 Summary: Mesa-based DRI drivers
 Group: User Interface/X Hardware Support
 %description dri-drivers
 Mesa-based DRI drivers.
-%endif
 
 
 %package libGL-devel
@@ -165,22 +162,21 @@ This package provides some demo applications for testing Mesa.
 
 
 %prep
-#%setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5
+#setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5
 %setup -q -n mesa-%{gitdate} -b2 -b5
 %patch1 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p0 -b .no-mach64
-%patch6 -p1 -b .radeon-rewrite
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
 %patch12 -p1 -b .intel-nowarn
 %patch13 -p1 -b .sparc64
 
 # Hack the demos to use installed data files
-sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
-sed -i 's,geartrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/geartrain.c
-sed -i 's,isosurf.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/isosurf.c
-sed -i 's,terrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/terrain.c
+sed -i 's,../images,%{_libdir}/mesa,' progs/demos/*.c
+sed -i 's,geartrain.dat,%{_libdir}/mesa/&,' progs/demos/geartrain.c
+sed -i 's,isosurf.dat,%{_libdir}/mesa/&,' progs/demos/isosurf.c
+sed -i 's,terrain.dat,%{_libdir}/mesa/&,' progs/demos/terrain.c
 
 %build
 
@@ -223,8 +219,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
     --disable-glut \
     --disable-gallium \
     --disable-gl-osmesa \
-    --with-driver=%{driver} \
-    --with-dri-driverdir=%{_libdir}/dri
+    --with-driver=dri \
+    --with-dri-driverdir=%{_libdir}/dri \
+    %{dri_drivers}
 
 make #{?_smp_mflags}
 
@@ -248,14 +245,12 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
 
 # just the DRI drivers that are sane
-%if %{with_dri}
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
 for f in i810 i915 i965 mach64 mga r128 r200 r300 radeon savage sis swrast tdfx unichrome; do
     so=%{_lib}/${f}_dri.so
     test -e $so && echo $so
 done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
-%endif
 
 # strip out undesirable headers
 pushd $RPM_BUILD_ROOT%{_includedir}/GL 
@@ -263,20 +258,18 @@ rm [a-fh-np-wyz]*.h gg*.h glf*.h glew.h glut*.h glxew.h
 popd
 
 pushd $RPM_BUILD_ROOT%{_libdir}
-rm libEGL* demodriver.so
+rm -f libEGL*
 popd
 
 # XXX demos, since they don't install automatically.  should fix that.
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{demodir}
 find progs/demos/ -type f -perm /0111 |
-    xargs install -m 0755 -t $RPM_BUILD_ROOT/%{_bindir}
-# bah, name conflicts
-mv $RPM_BUILD_ROOT/%{_bindir}/{rain,mesa-rain}
-install -d $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
-install -m 0644 progs/images/*.rgb $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
-install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
+    xargs install -m 0755 -t $RPM_BUILD_ROOT/%{demodir}
+install -m 0644 progs/images/*.rgb $RPM_BUILD_ROOT/%{demodir}
+install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{demodir}
 
 # and osmesa
 mv osmesa*/* $RPM_BUILD_ROOT%{_libdir}
@@ -313,13 +306,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGL.so.1
 %{_libdir}/libGL.so.1.*
 
-%if %{with_dri}
 %files dri-drivers
 %defattr(-,root,root,-)
 %dir %{_libdir}/dri
 %{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
-%endif
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -329,11 +320,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/glx.h
 %{_includedir}/GL/glx_mangle.h
 %{_includedir}/GL/glxext.h
-%if %{with_dri}
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
 %{_libdir}/pkgconfig/dri.pc
-%endif
 %{_libdir}/libGL.so
 %{_libdir}/pkgconfig/gl.pc
 %{_datadir}/man/man3/gl[^uX]*.3gl*
@@ -374,63 +363,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %files demos
 %defattr(-,root,root,-)
-%{_bindir}/arbfplight
-%{_bindir}/arbfslight
-%{_bindir}/arbocclude
-%{_bindir}/bounce
-%{_bindir}/clearspd
-%{_bindir}/copypix
-%{_bindir}/cubemap
-%{_bindir}/drawpix
-%{_bindir}/engine
-%{_bindir}/fbo_firecube
-%{_bindir}/fire
-%{_bindir}/fogcoord
-%{_bindir}/fplight
-%{_bindir}/fslight
-%{_bindir}/gamma
-%{_bindir}/gearbox
-%{_bindir}/gears
-%{_bindir}/geartrain
-%{_bindir}/glinfo
-%{_bindir}/gloss
-%{_bindir}/glslnoise
-%{_bindir}/gltestperf
-%{_bindir}/glutfx
-%{_bindir}/ipers
-%{_bindir}/isosurf
-%{_bindir}/lodbias
-%{_bindir}/morph3d
-%{_bindir}/multiarb
-%{_bindir}/paltex
-%{_bindir}/pointblast
-%{_bindir}/mesa-rain
-%{_bindir}/ray
-%{_bindir}/readpix
-%{_bindir}/reflect
-%{_bindir}/renormal
-%{_bindir}/shadowtex
-%{_bindir}/singlebuffer
-%{_bindir}/spectex
-%{_bindir}/spriteblast
-%{_bindir}/stex3d
-%{_bindir}/streaming_rect
-%{_bindir}/teapot
-%{_bindir}/terrain
-%{_bindir}/tessdemo
-%{_bindir}/texcyl
-%{_bindir}/texdown
-%{_bindir}/texenv
-%{_bindir}/texobj
-%{_bindir}/textures
-%{_bindir}/trispd
-%{_bindir}/tunnel
-%{_bindir}/tunnel2
-%{_bindir}/vao_demo
-%{_bindir}/winpos
-%{_libdir}/mesa-demos-data
+%{demodir}
 
 %changelog
+* Tue Jun 16 2009 Karsten Hopp <karsten@redhat.com> 7.6-0.3
+- some more fixes for s390(x)
+
+* Tue Jun 16 2009 Adam Jackson <ajax@redhat.com> 7.6-0.2
+- Rework the DRI driver support for s390 and friends.
+
+* Fri Jun 12 2009 Dave Airlie <airlied@redhat.com> 7.6-0.1
+- rebase mesa to latest git snapshot - fixes a lot of radeon issues
+
+* Thu Jun 11 2009 Adam Jackson <ajax@redhat.com> 7.5-0.16
+- Install demos to %%{_libdir}/mesa
+
+* Thu May 21 2009 Adam Jackson <ajax@redhat.com> 7.5-0.15
+- mesa-7.5-r300-batch-accounting.patch: Fix cmdbuf sizing (#501312)
+
+* Tue May 05 2009 Dave Airlie <airlied@redhat.com> 7.5-0.14
+- radeon-rewrite.patch: fixes from upstream for rs690 + r200
+
+* Tue Apr 28 2009 Dave Airlie <airlied@redhat.com> 7.5-0.13
+- radeon fix clip emits
+
+* Tue Apr 28 2009 Dave Airlie <airlied@redhat.com> 7.5-0.12
+- rebase to upstream snapshot + radeon-rewrite
+
+* Thu Apr 16 2009 Dave Airlie <airlied@redhat.com> 7.5-0.11
+- radeon-rewrite-fixes.patch: fix context crash in compiz + r200 fixes
+
+* Tue Apr 14 2009 Adam Jackson <ajax@redhat.com> 7.5-0.10
+- mesa-7.5-get-driver-name.patch: Fix glXGetScreenDriver for DRI2 (#495342)
+
 * Fri Apr 09 2009 Dennis Gilmore <dennis@ausil.us> - 7.5-0.9
 - fix sparc64 asm 
 

sources

@@ -1,3 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2
-2469ad7640d26d1aed61452cfe62fd49  mesa-20090322.tar.bz2
+93b7016851831fc31d02103e7d9551b3  mesa-20090612.tar.bz2