packages: Mesa/Mesa.spec - revised inter-package deps - package osmesa.pc

Sat Aug 6 19:13:41 CEST 2011

Author: qboosh                       Date: Sat Aug  6 17:13:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revised inter-package deps
- package osmesa.pc

---- Files affected:
packages/Mesa:
   Mesa.spec (1.287 -> 1.288) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.287 packages/Mesa/Mesa.spec:1.288

--- packages/Mesa/Mesa.spec:1.287	Fri Aug  5 20:59:29 2011
+++ packages/Mesa/Mesa.spec	Sat Aug  6 19:13:36 2011
@@ -1,6 +1,9 @@
 # $Revision$, $Date$
 #
 # TODO:
+# - consider:
+#   --enable-shared-glapi (for libGL; required if the same app uses GL and GLES)
+#   --enable-shared-dricore
 # - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
 # - resurrect static if it's useful
 #
@@ -84,7 +87,7 @@
 %undefine	with_gallium_radeon
 %endif
 
-# unresolved symbol _glapi_tls_Dispatch
+# _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)
 %define		skip_post_check_so	libGLESv1_CM.so.1.* libGLESv2.so.2.*
 
 %description
@@ -107,8 +110,14 @@
 Summary(pl.UTF-8):	Implementacja Mesa biblioteki interfejsu EGL
 License:	MIT
 Group:		Libraries
+# glx driver in libEGL dlopens libGL.so
 Requires:	OpenGL >= 1.2
+Requires:	libdrm >= %{libdrm_ver}
+%if %{with gallium}
+# for egl_gallium.so
+Requires:	Mesa-libOpenVG = %{version}-%{release}
 Requires:	udev-libs >= 150
+%endif
 Provides:	EGL = 1.4
 
 %description libEGL
@@ -128,8 +137,14 @@
 License:	MIT
 Group:		Development/Libraries
 Requires:	%{name}-libEGL = %{version}-%{release}
-Requires:	OpenGL-devel >= 1.2
-Requires:	libstdc++-devel
+Requires:	libdrm-devel >= %{libdrm_ver}
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXdamage-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXfixes-devel
+Requires:	xorg-lib-libXxf86vm-devel
+Requires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
+Requires:	xorg-proto-glproto-devel >= %{glproto_ver}
 Provides:	EGL-devel = 1.4
 
 %description libEGL-devel
@@ -237,6 +252,8 @@
 Summary:	Mesa implementation of GLES (OpenGL ES) libraries
 Summary(pl.UTF-8):	Implementacja Mesa bibliotek GLES (OpenGL ES)
 Group:		Libraries
+# only for libglapi.so.0
+Requires:	%{name}-libEGL = %{version}-%{release}
 
 %description libGLES
 This package contains shared libraries of Mesa implementation of GLES
@@ -257,6 +274,8 @@
 Summary:	Header files for Mesa GLES libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Mesa GLES
 Group:		Development/Libraries
+# EGL for libglapi.so, <KHR/khrplatform.h> always required, <EGL/egl.h> for <GLES/egl.h>
+Requires:	%{name}-libEGL-devel = %{version}-%{release}
 Requires:	%{name}-libGLES = %{version}-%{release}
 
 %description libGLES-devel
@@ -337,6 +356,8 @@
 Group:		Development/Libraries
 Requires:	%{name}-libGLw = %{version}-%{release}
 Requires:	OpenGL-devel >= 1.2
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXt-devel
 Provides:	OpenGL-GLw-devel
 
 %description libGLw-devel
@@ -380,6 +401,7 @@
 Requires:	%{name}-libOSMesa = %{version}-%{release}
 # for <GL/gl.h> only
 Requires:	OpenGL-devel
+Requires:	libselinux-devel
 
 %description libOSMesa-devel
 Header file for OSMesa (off-screen renderer) library.
@@ -429,7 +451,7 @@
 Summary(pl.UTF-8):	Plik nagłówkowy biblioteki Mesa OpenVG
 License:	MIT
 Group:		Development/Libraries
-# for <KHR/khrplatform.h>
+# EGL headers for <KHR/khrplatform.h>
 Requires:	%{name}-libEGL-devel = %{version}-%{release}
 Requires:	%{name}-libOpenVG = %{version}-%{release}
 
@@ -439,19 +461,6 @@
 %description libOpenVG-devel -l pl.UTF-8
 Plik nagłówkowy biblioteki Mesa OpenVG.
 
-%package utils
-Summary:	OpenGL utilities from Mesa3D
-Summary(pl.UTF-8):	Programy narzędziowe OpenGL z projektu Mesa3D
-License:	MIT
-Group:		X11/Applications/Graphics
-# loose deps on libGL/libGLU
-
-%description utils
-OpenGL utilities from Mesa3D: glxgears and glxinfo.
-
-%description utils -l pl.UTF-8
-Programy narzędziowe OpenGL z projektu Mesa3D: glxgears i glxinfo.
-
 %package dri-driver-ati-mach64
 Summary:	X.org DRI driver for ATI Mach64 card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart ATI Mach64
@@ -807,14 +816,16 @@
 osmesa_common_flags="\
 	--with-driver=osmesa \
 	--disable-asm \
-	--disable-glu \
-	--disable-egl"
+	--disable-egl \
+	--disable-glu"
 
 %if %{with osmesa}
 %configure $common_flags $osmesa_common_flags \
 	--with-osmesa-bits=8
 %{__make}
+%{__make} -C src/mesa osmesa.pc
 mv %{_lib} osmesa8
+cp -p src/mesa/osmesa.pc osmesa8
 %{__make} clean
 %endif
 
@@ -845,7 +856,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with osmesa}
-cp -Pp osmesa*/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
+cp -p osmesa8/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
+cp -p osmesa8/osmesa.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 %endif
 
 # strip out undesirable headers
@@ -941,7 +953,7 @@
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libGL.so.1
 # symlink for binary apps which fail to conform Linux OpenGL ABI
-# (and dlopen libGL.so instead of libGL.so.1)
+# (and dlopen libGL.so instead of libGL.so.1; the same does Mesa libEGL)
 %attr(755,root,root) %{_libdir}/libGL.so
 %endif
 
@@ -1033,6 +1045,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOSMesa.so
 %{_includedir}/GL/osmesa.h
+%{_pkgconfigdir}/osmesa.pc
 
 %if %{with static_libs}
 %files libOSMesa-static
@@ -1151,6 +1164,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.288  2011/08/06 17:13:36  qboosh
+- revised inter-package deps
+- package osmesa.pc
+
 Revision 1.287  2011/08/05 18:59:29  qboosh
 - renamed static bcond to static_libs
 - simplified gallium_nouveau bcond handling
================================================================

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

