packages (gallium): Mesa/Mesa.spec - added libOpenVG subpackages - fix and ...

[wiget]

Author: wiget                        Date: Fri Jan 21 21:38:03 2011 GMT
Module: packages                      Tag: gallium
---- Log message:
- added libOpenVG subpackages
- fix and enable by default gallium for intel and radeon cards
- enable gallium for VMware virtual card
- use %__enable_disable macros
- run ldconfig in post(un) for libOSMesa
- package more egl modules

---- Files affected:
packages/Mesa:
   Mesa.spec (1.268 -> 1.268.2.1) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.268 packages/Mesa/Mesa.spec:1.268.2.1
--- packages/Mesa/Mesa.spec:1.268	Sun Jan 16 09:07:37 2011
+++ packages/Mesa/Mesa.spec	Fri Jan 21 22:37:58 2011
@@ -7,8 +7,8 @@
 # Conditional build:
 %bcond_without	egl	# build egl
 %bcond_without	gallium	# don't build gallium
-%bcond_with	gallium_intel	# gallium i915 driver (but doesn't work with AIGLX)
-%bcond_with	gallium_radeon	# gallium radeon driver
+%bcond_without	gallium_intel	# gallium i915 driver (but doesn't work with AIGLX)
+%bcond_without	gallium_radeon	# gallium radeon driver
 %bcond_without	gallium_nouveau	# gallium nouveau driver
 %bcond_without	motif	# build static libGLw without Motif interface
 %bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
@@ -44,7 +44,7 @@
 BuildRequires:	expat-devel
 BuildRequires:	libdrm-devel >= %{libdrm_ver}
 BuildRequires:	libselinux-devel
-BuildRequires:	libstdc++-devel >+ 5:3.3.0
+BuildRequires:	libstdc++-devel >= 5:3.3.0
 BuildRequires:	libtalloc-devel >= 2:2.0.1
 BuildRequires:	libtool >= 2:1.4d
 %{?with_motif:BuildRequires:	motif-devel}
@@ -77,6 +77,8 @@
 %undefine	with_gallium_radeon
 %endif
 
+%define	skip_post_check_so libOpenVG.so.1.0.0
+
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
 that of OpenGL(R). To the extent that Mesa utilizes the OpenGL command
@@ -356,6 +358,34 @@
 %description libOSMesa-static -l pl.UTF-8
 Biblioteka statyczna OSMesa (renderująca bitmapy w pamięci).
 
+%package libOpenVG
+Summary:	OpenVG API implementation
+Summary(pl.UTF-8):	Implementacja API OpenVG
+License:	MIT
+Group:		Libraries
+# doesn't require base
+
+%description libOpenVG
+OpenVG API implementation.
+
+%description libOSMesa -l pl.UTF-8
+Implementacja API OpenVG.
+
+%package libOpenVG-devel
+Summary:	Header file for libOpenVG library
+Summary(pl.UTF-8):	Plik nagłówkowy biblioteki libOpenVG
+License:	MIT
+Group:		Development/Libraries
+# for <KHR/khrplatform.h>
+Requires:	%{name}-libEGL-devel = %{version}-%{release}
+Requires:	%{name}-libOpenVG = %{version}-%{release}
+
+%description libOpenVG-devel
+Header file for libOpenVG library.
+
+%description libOSMesa-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki libOpenVG.
+
 %package utils
 Summary:	OpenGL utilities from Mesa3D
 Summary(pl.UTF-8):	Programy narzędziowe OpenGL z projektu Mesa3D
@@ -679,13 +709,13 @@
 %{__aclocal}
 %{__autoconf}
 
-dri_drivers="i810 i965 mach64 mga r128 \
+dri_drivers="i810 mach64 mga r128 r200 radeon \
 %if %{without gallium_radeon}
-r200 r300 r600 radeon \
+r300 r600 \
 %endif
 savage \
 %if %{without gallium_intel}
-i915 \
+i915 i965 \
 %endif
 %ifarch sparc sparcv9 sparc64
 ffb \
@@ -703,8 +733,7 @@
 	--enable-pic \
 	--enable-glx-tls \
 	--disable-glut \
-	--disable-os-mesa \
-	--%{?with_egl:en}%{!?with_egl:dis}able-egl"
+	%{__enable_disable egl}"
 
 osmesa_common_flags="\
 	--with-driver=osmesa \
@@ -735,14 +764,18 @@
 %configure $common_flags \
 %if %{with gallium}
 	--enable-gallium \
-	--%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
-	--%{?with_gallium_radeon:en}%{!?with_gallium_radeon:dis}able-gallium-radeon \
+	%{__enable_disable gallium_intel gallium-i915} \
+	%{__enable_disable gallium_intel gallium-i965} \
+	%{__enable_disable gallium_radeon gallium-radeon} \
+	%{__enable_disable gallium_radeon gallium-r600} \
+	%{__enable gallium_nouveau gallium-nouveau} \
 	--enable-gallium-svga \
-	%{?with_gallium_nouveau:--enable-gallium-nouveau} \
-	--with-state-trackers=dri,glx \
+	--enable-gallium-swrast \
+	--with-state-trackers=dri,glx,egl,xorg,vega \
 %else
 	--disable-gallium \
 %endif
+	--enable-openvg \
 	--with-driver=dri \
 	--with-dri-drivers=${dri_drivers} \
 	--with-dri-driverdir=%{_libdir}/xorg/modules/dri
@@ -795,6 +828,12 @@
 %post	libGLw -p /sbin/ldconfig
 %postun	libGLw -p /sbin/ldconfig
 
+%post	libOSMesa -p /sbin/ldconfig
+%postun	libOSMesa -p /sbin/ldconfig
+
+%post	libOpenVG -p /sbin/ldconfig
+%postun	libOpenVG -p /sbin/ldconfig
+
 %if %{with egl}
 %files libEGL
 %defattr(644,root,root,755)
@@ -803,6 +842,18 @@
 %dir %{_libdir}/egl
 %attr(755,root,root) %{_libdir}/egl/egl_dri2.so
 %attr(755,root,root) %{_libdir}/egl/egl_glx.so
+%if %{with gallium}
+%attr(755,root,root) %{_libdir}/egl/egl_gallium.so
+%attr(755,root,root) %{_libdir}/egl/pipe_i915.so
+%attr(755,root,root) %{_libdir}/egl/pipe_i965.so
+%attr(755,root,root) %{_libdir}/egl/pipe_nouveau.so
+%attr(755,root,root) %{_libdir}/egl/pipe_r300.so
+%attr(755,root,root) %{_libdir}/egl/pipe_r600.so
+%attr(755,root,root) %{_libdir}/egl/pipe_swrast.so
+%attr(755,root,root) %{_libdir}/egl/pipe_vmwgfx.so
+%attr(755,root,root) %{_libdir}/egl/st_GL.so
+%attr(755,root,root) %{_libdir}/egl/st_OpenVG.so
+%endif
 
 %files libEGL-devel
 %defattr(644,root,root,755)
@@ -918,6 +969,17 @@
 %endif
 %endif
 
+%files libOpenVG
+%defattr(644,root,root,755)
+%attr(755,root,root) %ghost %{_libdir}/libOpenVG.so.1
+%attr(755,root,root) %{_libdir}/libOpenVG.so.1.0.0
+
+%files libOpenVG-devel
+%defattr(644,root,root,755)
+%{_includedir}/VG
+%{_libdir}/libOpenVG.so
+%{_pkgconfigdir}/vg.pc
+
 %files dri-driver-ati-mach64
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/mach64_dri.so
@@ -925,6 +987,10 @@
 %files dri-driver-ati-radeon-R100
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/radeon_dri.so
+#if %{with gallium}
+# this file conflicts with xorg-driver-video-ati
+#attr(755,root,root) %{_libdir}/xorg/modules/drivers/radeon_drv.so
+#endif
 
 %files dri-driver-ati-radeon-R200
 %defattr(644,root,root,755)
@@ -967,6 +1033,9 @@
 %files dri-driver-intel-i965
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/i965_dri.so
+%if %{with gallium}
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/i965g_drv.so
+%endif
 
 %files dri-driver-matrox
 %defattr(644,root,root,755)
@@ -976,7 +1045,7 @@
 %if %{with gallium_nouveau}
 %files dri-driver-nouveau
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/xorg/modules/drivers/modesetting_drv.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/modesetting_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
 %endif
 %endif
@@ -994,7 +1063,9 @@
 %files dri-driver-swrast
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
+%if %{with gallium}
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/swrastg_dri.so
+%endif
 
 %files dri-driver-tdfx
 %defattr(644,root,root,755)
@@ -1008,6 +1079,7 @@
 %files dri-driver-vmwgfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -1016,6 +1088,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.268.2.1  2011/01/21 21:37:58  wiget
+- added libOpenVG subpackages
+- fix and enable by default gallium for intel and radeon cards
+- enable gallium for VMware virtual card
+- use %__enable_disable macros
+- run ldconfig in post(un) for libOSMesa
+- package more egl modules
+
 Revision 1.268  2011/01/16 08:07:37  qboosh
 - updated BRs
 
================================================================

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