rpms/mesa/devel mesa-7.1-kill-glw.patch, NONE, 1.1 mesa-7.1pre-osmesa-version.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 mesa-7.0-selinux-awareness.patch, 1.1, 1.2 mesa.spec, 1.142, 1.143 sources, 1.16, 1.17 mesa-6.5.2-bindcontext-paranoia.patch, 1.1, NONE mesa-7.0-build-config.patch, 1.1, NONE mesa-7.0-use_master-r300.patch, 1.1, NONE mesa-7.0.1-r200-settexoffset.patch, 1.1, NONE mesa-7.0.1-r300-fix-writemask.patch, 1.1, NONE mesa-7.0.1-stable-branch.patch, 1.3, NONE
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Thu Nov 1 06:56:13 UTC 2007
Author: airlied
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24788
Modified Files:
.cvsignore mesa-7.0-selinux-awareness.patch mesa.spec sources
Added Files:
mesa-7.1-kill-glw.patch mesa-7.1pre-osmesa-version.patch
Removed Files:
mesa-6.5.2-bindcontext-paranoia.patch
mesa-7.0-build-config.patch mesa-7.0-use_master-r300.patch
mesa-7.0.1-r200-settexoffset.patch
mesa-7.0.1-r300-fix-writemask.patch
mesa-7.0.1-stable-branch.patch
Log Message:
* Thu Nov 01 2007 Dave Airlie <airlied at redhat.com> 7.1pre-0
- rebase Mesa to 7.1pre 74ced1e67f286a5e71e9877bc6844b2af5b9ab8d
mesa-7.1-kill-glw.patch:
--- NEW FILE mesa-7.1-kill-glw.patch ---
diff -up Mesa-7.1pre/configs/default.da Mesa-7.1pre/configs/default
--- Mesa-7.1pre/configs/default.da 2007-11-01 16:24:30.000000000 +1000
+++ Mesa-7.1pre/configs/default 2007-11-01 16:24:37.000000000 +1000
@@ -60,7 +60,7 @@ GLW_SOURCES = GLwDrawA.c
# Directories to build
LIB_DIR = lib
-SRC_DIRS = mesa glu glut/glx glw
+SRC_DIRS = mesa glu glut/glx
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
# Which subdirs under $(TOP)/progs/ to enter:
diff -up Mesa-7.1pre/configs/linux-indirect.da Mesa-7.1pre/configs/linux-indirect
--- Mesa-7.1pre/configs/linux-indirect.da 2007-11-01 16:23:32.000000000 +1000
+++ Mesa-7.1pre/configs/linux-indirect 2007-11-01 16:23:39.000000000 +1000
@@ -47,7 +47,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11
# Directories
-SRC_DIRS = glx/x11 glu glut/glx glw
+SRC_DIRS = glx/x11 glu
DRIVER_DIRS =
PROGRAM_DIRS =
WINDOW_SYSTEM=dri
diff -up Mesa-7.1pre/configs/linux-dri.da Mesa-7.1pre/configs/linux-dri
--- Mesa-7.1pre/configs/linux-dri.da 2007-11-01 16:24:00.000000000 +1000
+++ Mesa-7.1pre/configs/linux-dri 2007-11-01 16:24:12.000000000 +1000
@@ -60,10 +60,10 @@ USING_EGL=0
# Directories
ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 mesa glu glut/glx
PROGRAM_DIRS = egl xdemos
else
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = glx/x11 mesa glu glut/glx
PROGRAM_DIRS = xdemos
endif
mesa-7.1pre-osmesa-version.patch:
--- NEW FILE mesa-7.1pre-osmesa-version.patch ---
>From 8a156f47fc6547d5ed0fb8031f332cbf9e16948d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Thu, 1 Nov 2007 16:16:52 +1000
Subject: [PATCH] mesa: keep OSMESA version at 6.5.3
---
src/mesa/Makefile | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 77bb7be..e2a09ed 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -117,17 +117,18 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
# Make the OSMesa library
+# Note: version is kept at 6.5.3 to simplify app/linking issues
$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
- -ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \
- -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -ldflags '$(LDFLAGS)' -major 6 \
+ -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
else \
$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
- -ldflags '$(LDFLAGS)' -major $(MESA_MAJOR) \
- -minor $(MESA_MINOR) -patch $(GL_TINY) \
+ -ldflags '$(LDFLAGS)' -major 6 \
+ -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
fi
--
1.5.3.4
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 14 Aug 2007 05:33:46 -0000 1.17
+++ .cvsignore 1 Nov 2007 06:55:38 -0000 1.18
@@ -1,3 +1,3 @@
-MesaLib-7.0.1.tar.bz2
-MesaDemos-7.0.1.tar.bz2
+MesaLib-7.1pre.tar.bz2
+MesaDemos-7.1pre.tar.bz2
gl-manpages-1.0.1.tar.bz2
mesa-7.0-selinux-awareness.patch:
Index: mesa-7.0-selinux-awareness.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.0-selinux-awareness.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.0-selinux-awareness.patch 14 Aug 2007 05:33:46 -0000 1.1
+++ mesa-7.0-selinux-awareness.patch 1 Nov 2007 06:55:38 -0000 1.2
@@ -132,3 +132,15 @@
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread -ldl \
$(LIBDRM_LIB)
+diff -up Mesa-7.1pre/progs/osdemos/Makefile.da Mesa-7.1pre/progs/osdemos/Makefile
+--- Mesa-7.1pre/progs/osdemos/Makefile.da 2007-11-01 15:59:52.000000000 +1000
++++ Mesa-7.1pre/progs/osdemos/Makefile 2007-11-01 15:59:57.000000000 +1000
+@@ -5,7 +5,7 @@ include $(TOP)/configs/current
+
+ INCDIR = $(TOP)/include
+
+-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS)
++OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) -l selinux
+
+ OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
+
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- mesa.spec 18 Oct 2007 00:10:50 -0000 1.142
+++ mesa.spec 1 Nov 2007 06:55:38 -0000 1.143
@@ -31,31 +31,27 @@
Summary: Mesa graphics libraries
Name: mesa
-Version: 7.0.1
-Release: 7%{?dist}
+Version: 7.1pre
+Release: 0%{?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-%{version}.tar.bz2
-Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
+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
Source2: %{manpages}.tar.bz2
-Patch0: mesa-7.0-build-config.patch
+Patch1: mesa-7.1-kill-glw.patch
+Patch2: mesa-7.1pre-osmesa-version.patch
Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch
Patch18: mesa-7.0-selinux-awareness.patch
-Patch23: mesa-6.5.2-bindcontext-paranoia.patch
Patch25: mesa-7.0-symlinks-before-depend.patch
-Patch26: mesa-7.0.1-stable-branch.patch
-Patch27: mesa-7.0-use_master-r300.patch
-Patch28: mesa-7.0.1-r300-fix-writemask.patch
-Patch29: mesa-7.0.1-r200-settexoffset.patch
BuildRequires: pkgconfig
%if %{with_dri}
-BuildRequires: libdrm-devel >= 2.3.0-1
+BuildRequires: libdrm-devel >= 2.4.0-0
%endif
BuildRequires: libXxf86vm-devel
BuildRequires: expat-devel >= 2.0
@@ -173,16 +169,12 @@
%setup -q -n Mesa-%{version} -b1 -b2
chmod a-x progs/demos/glslnoise.c
-%patch0 -p1 -b .build-config
+%patch1 -p1 -b .kill-glw
+%patch2 -p1 -b .osmesa-version
%patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
%patch5 -p1 -b .xserver-1.1-compat
%patch18 -p1 -b .selinux-awareness
-%patch23 -p1 -b .bindcontext
%patch25 -p1 -b .makej
-%patch26 -p1 -b .stable
-%patch27 -p1 -b .r300
-%patch28 -p1 -b .r300-writemask
-%patch29 -p1 -b .r200-settexoffset
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source/free software, so we remove them.
@@ -364,6 +356,7 @@
%{_bindir}/arbocclude
%{_bindir}/bounce
%{_bindir}/clearspd
+%{_bindir}/copypix
%{_bindir}/cubemap
%{_bindir}/drawpix
%{_bindir}/engine
@@ -412,6 +405,9 @@
%{_libdir}/mesa-demos-data
%changelog
+* Thu Nov 01 2007 Dave Airlie <airlied at redhat.com> 7.1pre-0
+- rebase Mesa to 7.1pre 74ced1e67f286a5e71e9877bc6844b2af5b9ab8d
+
* Thu Oct 18 2007 Dave Airlie <airlied at redhat.com> 7.0.1-7
- mesa-7.0.1-stable-branch.patch - Updated with more fixes from stable
- mesa-7.0.1-r300-fix-writemask.patch - fix r300 fragprog writemask
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 14 Aug 2007 05:33:46 -0000 1.16
+++ sources 1 Nov 2007 06:55:38 -0000 1.17
@@ -1,3 +1,3 @@
-c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2
-3b66b3268df12ca8a6c4e0c4c457912c MesaDemos-7.0.1.tar.bz2
+715651003893bfd3f48d78dde6d45e55 MesaLib-7.1pre.tar.bz2
+68942584edd6f3160129fd341c28a123 MesaDemos-7.1pre.tar.bz2
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
--- mesa-6.5.2-bindcontext-paranoia.patch DELETED ---
--- mesa-7.0-build-config.patch DELETED ---
--- mesa-7.0-use_master-r300.patch DELETED ---
--- mesa-7.0.1-r200-settexoffset.patch DELETED ---
--- mesa-7.0.1-r300-fix-writemask.patch DELETED ---
--- mesa-7.0.1-stable-branch.patch DELETED ---
More information about the fedora-extras-commits
mailing list