packages: Mesa/Mesa.spec - new bconds with egl, without osmesa

cactus cactus at pld-linux.org
Tue Oct 20 17:00:27 CEST 2009


Author: cactus                       Date: Tue Oct 20 15:00:27 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new bconds with egl, without osmesa

---- Files affected:
packages/Mesa:
   Mesa.spec (1.222 -> 1.223) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.222 packages/Mesa/Mesa.spec:1.223
--- packages/Mesa/Mesa.spec:1.222	Thu Oct  8 20:30:07 2009
+++ packages/Mesa/Mesa.spec	Tue Oct 20 17:00:21 2009
@@ -3,13 +3,16 @@
 # TODO:
 # - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
 # - resurrect static if it's useful
+# - subpackage egl?
 #
 # Conditional build:
 %bcond_without	demos	# don't build demos
-%bcond_without	motif	# build static libGLw without Motif interface
-%bcond_without	gallium
+%bcond_with	egl	# don't build egl
+%bcond_without	gallium	# don't build gallium
 %bcond_with	gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
+%bcond_without	motif	# build static libGLw without Motif interface
 %bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
+%bcond_without	osmesa	# don't build osmesa
 %bcond_with	static
 #
 # minimal supported xserver version
@@ -643,9 +646,10 @@
 	--enable-selinux \
 	--enable-pic \
 	--enable-glx-tls \
-	--disable-egl \
+	--%{?with_egl:en}%{!?with_egl:dis}able-egl \
 	--with%{!?with_demos:out}-demos"
 
+%if %{with osmesa}
 # osmesa variants
 %configure $common_flags \
 	--with-driver=osmesa \
@@ -673,6 +677,7 @@
 	SRC_DIRS=mesa
 mv %{_lib} osmesa32
 %{__make} clean
+%endif
 
 %configure $common_flags \
 	--enable-glu \
@@ -714,7 +719,9 @@
 	DESTDIR=$RPM_BUILD_ROOT
 cd ..
 
+%if %{with osmesa}
 install osmesa*/* $RPM_BUILD_ROOT%{_libdir}
+%endif
 
 install progs/xdemos/{glxgears,glxinfo} $RPM_BUILD_ROOT%{_bindir}
 # work on copy to keep -bi --short-circuit working
@@ -840,6 +847,7 @@
 %{_libdir}/libGLw.a
 %endif
 
+%if %{with osmesa}
 %files libOSMesa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOSMesa*.so.*.*
@@ -855,6 +863,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/libOSMesa*.a
 %endif
+%endif
 
 %files utils
 %defattr(644,root,root,755)
@@ -959,6 +968,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.223  2009/10/20 15:00:21  cactus
+- new bconds with egl, without osmesa
+
 Revision 1.222  2009/10/08 18:30:07  arekm
 - rel 2; fixes from git
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.222&r2=1.223&f=u



More information about the pld-cvs-commit mailing list