packages (DEVEL): Mesa/Mesa.spec - build OpenVG - more BRs with egl and gal...

wiget wiget at pld-linux.org
Sun Mar 13 21:56:02 CET 2011 

Author: wiget                        Date: Sun Mar 13 20:56:02 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- build OpenVG
- more BRs with egl and gallium bconds
- allways build r200 and radeon drivers
- build gallium i965 driver
- build xorg and vega state trackers

---- Files affected:
packages/Mesa:
   Mesa.spec (1.263.2.9 -> 1.263.2.10) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.263.2.9 packages/Mesa/Mesa.spec:1.263.2.10
--- packages/Mesa/Mesa.spec:1.263.2.9	Sun Mar 13 15:16:05 2011
+++ packages/Mesa/Mesa.spec	Sun Mar 13 21:55:56 2011
@@ -70,6 +70,14 @@
 BuildRequires:	xorg-proto-glproto-devel >= %{glproto_ver}
 BuildRequires:	xorg-util-makedepend
 BuildRequires:	xorg-xserver-server-devel
+%if %{with egl}
+BuildRequires:	libxcb-devel
+BuildRequires:	udev-devel >= 150
+%endif
+%if %{with gallium}
+BuildRequires:	xorg-proto-xextproto-devel >= 7.0.99.1
+BuildRequires:	xorg-xserver-server-devel >= 1.6.0
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{without gallium}
@@ -77,6 +85,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
@@ -377,6 +387,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 libOpenVG -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 libOpenVG-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
@@ -700,15 +738,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 \
-%else
-r200 radeon \
+r300 r600 \
 %endif
 savage \
 %if %{without gallium_intel}
-i915 \
+i915 i965 \
 %endif
 %ifarch sparc sparcv9 sparc64
 ffb \
@@ -754,17 +790,19 @@
 	--enable-gallium-i915 \
 	--enable-gallium-i965 \
 %endif
-%if %{with_gallium_radeon}
+%if %{with gallium_radeon}
 	--enable-gallium-radeon \
 	--enable-gallium-r600 \
 %endif
 	--enable-gallium-svga \
 	--enable-gallium-egl \
+	--enable-gallium-swrast \
 	%{?with_gallium_nouveau:--enable-gallium-nouveau} \
-	--with-state-trackers=dri,glx,egl \
+	--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
@@ -825,6 +863,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)
@@ -835,13 +879,17 @@
 %dir %{_libdir}/egl
 %if %{with gallium}
 %attr(755,root,root) %{_libdir}/egl/egl_gallium.so
-%if %{with_gallium_nouveau}
+%if %{with gallium_nouveau}
 %attr(755,root,root) %{_libdir}/egl/pipe_nouveau.so
 %endif
-%if %{with_gallium_radeon}
+%if %{with gallium_radeon}
 %attr(755,root,root) %{_libdir}/egl/pipe_r300.so
 %attr(755,root,root) %{_libdir}/egl/pipe_r600.so
 %endif
+%if %{with gallium_intel}
+%attr(755,root,root) %{_libdir}/egl/pipe_i915.so
+%attr(755,root,root) %{_libdir}/egl/pipe_i965.so
+%endif
 %else
 %attr(755,root,root) %{_libdir}/egl/egl_dri2.so
 %attr(755,root,root) %{_libdir}/egl/egl_glx.so
@@ -849,6 +897,7 @@
 %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
 
 %files libEGL-devel
 %defattr(644,root,root,755)
@@ -977,6 +1026,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
@@ -984,6 +1044,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)
@@ -1026,6 +1090,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_intel}
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/i965g_drv.so
+%endif
 
 %files dri-driver-matrox
 %defattr(644,root,root,755)
@@ -1035,7 +1102,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
@@ -1066,6 +1133,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"`)
@@ -1074,6 +1142,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263.2.10  2011/03/13 20:55:56  wiget
+- build OpenVG
+- more BRs with egl and gallium bconds
+- allways build r200 and radeon drivers
+- build gallium i965 driver
+- build xorg and vega state trackers
+
 Revision 1.263.2.9  2011/03/13 14:16:05  pluto
 - build classic radeon/r200 dri for gallium-enabled build (gallium supports r300+).
 - pack some EGL gallium files.
================================================================

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

More information about the pld-cvs-commit mailing list