rpms/mesa/devel mesa.spec,1.26,1.27
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 19 09:27:08 UTC 2005
- Previous message (by thread): rpms/mesa/devel mesa-6.4.1-amd64-assyntax-fix.patch, NONE, 1.1 mesa.spec, 1.25, 1.26
- Next message (by thread): rpms/squid/devel squid-2.5.STABLE12-SMB_BadFetch.patch, NONE, 1.1 squid-2.5.STABLE12-fd-config-fix.patch, NONE, 1.1 squid.spec, 1.51, 1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mharris
Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20809
Modified Files:
mesa.spec
Log Message:
Conditionalize libOSMesa inclusion, and default to not including it for now.
Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mesa.spec 19 Dec 2005 09:00:37 -0000 1.26
+++ mesa.spec 19 Dec 2005 09:27:06 -0000 1.27
@@ -31,6 +31,10 @@
%define with_dri 0
%endif
+# FIXME: We dont build libOSMesa by default. Some work is needed to make
+# this build on all architectures if it is enabled.
+%define with_OSMesa 0
+
#-- END DRI Build Configuration ------------------------------------------
Summary: Mesa graphics libraries
@@ -211,11 +215,6 @@
%patch3 -p1 -b .modular
%patch100 -p1 -b .amd64-assyntax-fix
-# FIXME: Builds fail on AMD64 arch without this, however it is fixed in
-# upstream CVS, but in a way that we can't use against 6.4.1. This can
-# probably be dropped however when we move to 6.4.2.
-ln -s src/mesa/x86/assyntax.h src/mesa/x86-64/assyntax.h
-
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source software, so we must remove them.
rm include/GL/uglglutshapes.h
@@ -332,7 +331,8 @@
#%{_libdir}/dri/tdfx_dri.so
#%{_libdir}/dri/trident_dri.so
#%{_libdir}/dri/unichrome_dri.so
-%else
+%endif
+%if %{with_OSMesa}
# NOTE: This is the software rasterizer only. Why it is 1.5.* is not clear
# to me currently, but it is a change from Xorg 6.8.2's Mesa.
#%{_libdir}/libGL.so.1.5.060400
@@ -400,6 +400,7 @@
- Added Obsoletes lines to all the subpackages to have cleaner upgrades.
- Added mesa-6.4.1-amd64-assyntax-fix.patch to work around a build problem on
AMD64, which is fixed in the 6.4 branch of Mesa CVS.
+- Conditionalize libOSMesa inclusion, and default to not including it for now.
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 6.4-5.1
- rebuilt
- Previous message (by thread): rpms/mesa/devel mesa-6.4.1-amd64-assyntax-fix.patch, NONE, 1.1 mesa.spec, 1.25, 1.26
- Next message (by thread): rpms/squid/devel squid-2.5.STABLE12-SMB_BadFetch.patch, NONE, 1.1 squid-2.5.STABLE12-fd-config-fix.patch, NONE, 1.1 squid.spec, 1.51, 1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list