rpms
/
mesa
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mesa 7.1

This commit is contained in:
Adam Jackson 2008-08-28 20:27:28 +00:00
parent 74b06fee87
commit bfc5e44725
8 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cvsignore
View File

@ -1,2 +1,3 @@
gl-manpages-1.0.1.tar.bz2
mesa-20080627.tar.bz2
MesaDemos-7.1.tar.bz2
MesaLib-7.1.tar.bz2

1
import.log
View File

@ -1 +1,2 @@
mesa-7_1-0_36_fc9:F-9:mesa-7.1-0.36.fc9.src.rpm:1214593148
mesa-7_1-1_fc9:F-9:mesa-7.1-1.fc9.src.rpm:1219955239

42
mesa-7.1-link-shared.patch
View File

@ -1,6 +1,6 @@
diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.dricore mesa-20080612/src/mesa/drivers/dri/Makefile
--- mesa-20080612/src/mesa/drivers/dri/Makefile.dricore 2008-06-12 12:06:50.000000000 +1000
+++ mesa-20080612/src/mesa/drivers/dri/Makefile 2008-06-12 13:25:58.000000000 +1000
diff -up Mesa-7.1/src/mesa/drivers/dri/Makefile.dricore Mesa-7.1/src/mesa/drivers/dri/Makefile
--- Mesa-7.1/src/mesa/drivers/dri/Makefile.dricore 2008-08-25 10:46:43.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/dri/Makefile 2008-08-28 14:23:40.000000000 -0400
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
@ -20,12 +20,12 @@ diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.dricore mesa-20080612/src/m
subdirs:
@for dir in $(DRI_DIRS) ; do \
@@ -21,12 +26,14 @@ subdirs:
done
@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
$(pcedit) $< > $@
-install:
+install: $(TOP)/$(LIB_DIR)/libdricore.so
-install: dri.pc
+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
@for dir in $(DRI_DIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE) install) || exit 1 ; \
@ -33,18 +33,19 @@ diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.dricore mesa-20080612/src/m
done
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
@@ -38,4 +45,5 @@ clean:
$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
$(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
@@ -52,5 +59,6 @@ clean:
(cd $$dir && $(MAKE) clean) ; \
fi \
done
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
-rm -f common/*.o
diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080612/src/mesa/drivers/dri/Makefile.template
--- mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore 2008-06-12 12:06:50.000000000 +1000
+++ mesa-20080612/src/mesa/drivers/dri/Makefile.template 2008-06-12 13:15:34.000000000 +1000
-rm -f *.pc
diff -up Mesa-7.1/src/mesa/drivers/dri/Makefile.template.dricore Mesa-7.1/src/mesa/drivers/dri/Makefile.template
--- Mesa-7.1/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-25 10:49:40.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/dri/Makefile.template 2008-08-28 14:24:18.000000000 -0400
@@ -1,6 +1,6 @@
# -*-makefile-*-
@ -53,20 +54,21 @@ diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080
COMMON_SOURCES = \
../common/utils.c \
@@ -69,7 +69,9 @@ default: symlinks depend $(LIBNAME) $(TO
@@ -69,8 +69,9 @@ default: symlinks depend $(LIBNAME) $(TO
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-
+ $(OBJECTS) $(WINOBJ) \
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
+ $(DRI_LIB_DEPS)
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
diff -up mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080612/src/mesa/x86/read_rgba_span_x86.S
--- mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-06-12 12:06:50.000000000 +1000
+++ mesa-20080612/src/mesa/x86/read_rgba_span_x86.S 2008-06-12 13:15:34.000000000 +1000
$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)
diff -up Mesa-7.1/src/mesa/x86/read_rgba_span_x86.S.dricore Mesa-7.1/src/mesa/x86/read_rgba_span_x86.S
--- Mesa-7.1/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-25 10:46:47.000000000 -0400
+++ Mesa-7.1/src/mesa/x86/read_rgba_span_x86.S 2008-08-28 14:22:28.000000000 -0400
@@ -77,7 +77,6 @@
*/

13
mesa-7.1pre-nukeglthread-debug.patch → mesa-7.1-nukeglthread-debug.patch
View File

@ -1,9 +1,8 @@
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 94d499f..2ba596e 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -615,11 +615,6 @@ intel_render_texture(GLcontext * ctx,
}
diff -up Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c
--- Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread 2008-08-25 10:49:40.000000000 -0400
+++ Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c 2008-08-28 14:26:17.000000000 -0400
@@ -633,11 +633,6 @@ intel_render_texture(GLcontext * ctx,
return;
}
- DBG("Begin render texture tid %x tex=%u w=%d h=%d refcount=%d\n",
@ -14,7 +13,7 @@ index 94d499f..2ba596e 100644
/* point the renderbufer's region to the texture image region */
intel_image = intel_texture_image(newImage);
if (irb->region != intel_image->mt->region) {
@@ -656,8 +651,6 @@ intel_finish_render_texture(GLcontext * ctx,
@@ -674,8 +669,6 @@ intel_finish_render_texture(GLcontext *
{
struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer);

21
mesa-7.1-osmesa-version.patch Normal file
View File

@ -0,0 +1,21 @@
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)
$(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 \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)

21
mesa-7.1pre-osmesa-version.patch
View File

@ -1,21 +0,0 @@
diff -up mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080612/src/mesa/drivers/osmesa/Makefile
--- mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa 2008-06-12 12:17:27.000000000 +1000
+++ mesa-20080612/src/mesa/drivers/osmesa/Makefile 2008-06-12 13:14:24.000000000 +1000
@@ -47,7 +47,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
$(TOP)/bin/mklib -o $(OSMESA_LIB) \
-linker "$(CC)" \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) \
$(MKLIB_OPTIONS) \
$(OSMESA_LIB_DEPS) $(OBJECTS)
@@ -60,7 +60,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
osmesa16: $(OBJECTS) $(CORE_MESA)
$(TOP)/bin/mklib -o $(OSMESA_LIB) \
-linker "$(CC)" \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) \
$(MKLIB_OPTIONS) \
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)

23
mesa.spec
View File

@ -15,20 +15,20 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.1
Release: 0.37%{?dist}
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://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-7.1pre.tar.bz2
#Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-7.1pre.tar.bz2
Source0: %{name}-%{gitdate}.tar.bz2
Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
Source1: http://downloads.sf.net/mesa3d/MesaDemos-%{version}.tar.bz2
#Source0: %{name}-%{gitdate}.tar.bz2
Source2: %{manpages}.tar.bz2
Source3: make-git-snapshot.sh
Patch0: mesa-7.1pre-osmesa-version.patch
Patch2: mesa-7.1pre-nukeglthread-debug.patch
Patch0: mesa-7.1-osmesa-version.patch
Patch2: mesa-7.1-nukeglthread-debug.patch
# This doesn't work, disable for now.
Patch4: disable-tex-offset.patch
@ -159,8 +159,8 @@ This package provides some demo applications for testing Mesa.
%prep
#%setup -q -n Mesa-%{version}pre -b1 -b2
%setup -q -n mesa-%{gitdate} -b2
%setup -q -n Mesa-%{version} -b1 -b2
#setup -q -n mesa-%{gitdate} -b2
%patch0 -p1 -b .osmesa
%patch2 -p1 -b .intel-glthread
%patch4 -p1 -b .disable-tex-offset
@ -245,7 +245,7 @@ done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
# strip out undesirable headers
pushd $RPM_BUILD_ROOT%{_includedir}/GL
rm [a-fh-np-wyz]*.h gg*.h glf*.h glut*.h
rm -f [a-fh-np-wyz]*.h gg*.h glf*.h glut*.h
popd
# XXX demos, since they don't install automatically. should fix that.
@ -307,6 +307,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/GL/internal/dri_interface.h
%{_includedir}/GL/internal/dri_sarea.h
%{_libdir}/libGL.so
%{_libdir}/pkgconfig/dri.pc
%{_libdir}/pkgconfig/gl.pc
%{_datadir}/man/man3/gl[^uX]*.3gl*
%{_datadir}/man/man3/glX*.3gl*
@ -353,6 +354,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/cubemap
%{_bindir}/drawpix
%{_bindir}/engine
%{_bindir}/fbo_firecube
%{_bindir}/fire
%{_bindir}/fogcoord
%{_bindir}/fplight
@ -399,6 +401,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mesa-demos-data
%changelog
* Thu Aug 28 2008 Adam Jackson <ajax@redhat.com> 7.1-1
- Mesa 7.1.
* Fri Jun 27 2008 Adam Jackson <ajax@redhat.com> 7.1-0.37
- Drop mesa-source subpackage. Man that feels good.

3
sources
View File

@ -1,2 +1,3 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
a5f03ee286c07885c49d5f3d9cc896b3 mesa-20080627.tar.bz2
abfc9775e1462363af8ec160d1feb01f MesaDemos-7.1.tar.bz2
6bff7f532d16f90f944a400c8bd7074d MesaLib-7.1.tar.bz2