Author: qboosh Date: Sun Mar 11 17:44:18 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- added -khrplatform-devel subpackage (like in Fedora; common for
EGL/GLES/OpenVG)
- enable EGL drm platform if gbm is enabled
- OpenVG requires egl to be enabled
---- Files affected:
packages/Mesa:
Mesa.spec (1.314 -> 1.315)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.314 packages/Mesa/Mesa.spec:1.315
--- packages/Mesa/Mesa.spec:1.314 Sun Mar 11 17:54:52 2012
+++ packages/Mesa/Mesa.spec Sun Mar 11 18:44:13 2012
@@ -3,6 +3,7 @@
# TODO:
# - consider:
# --enable-shared-dricore
+# --with-egl-platforms=...,wayland (BR: pkgconfig(wayland-{client,server}))
# - subpackage with non-dri libGL for use with X-servers with missing GLX
extension?
# - resurrect static if it's useful (using plain xorg target? DRI doesn't
support static)
#
@@ -123,6 +124,9 @@
Requires: %{name}-libOpenVG = %{version}-%{release}
Requires: udev-libs >= 1:150
%endif
+%if %{with gbm}
+Requires: %{name}-libgbm = %{version}-%{release}
+%endif
Provides: EGL = 1.4
%description libEGL
@@ -141,6 +145,7 @@
Summary(pl.UTF-8): Pliki nagłówkowe implementacji Mesa biblioteki EGL
License: MIT
Group: Development/Libraries
+Requires: %{name}-khrplatform-devel = %{version}-%{release}
Requires: %{name}-libEGL = %{version}-%{release}
Requires: libdrm-devel >= %{libdrm_ver}
Requires: xorg-lib-libX11-devel
@@ -279,7 +284,8 @@
Summary: Header files for Mesa GLES libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Mesa GLES
Group: Development/Libraries
-# EGL for <KHR/khrplatform.h> always required, <EGL/egl.h> for <GLES/egl.h>
+Requires: %{name}-khrplatform-devel = %{version}-%{release}
+# <EGL/egl.h> for <GLES/egl.h>
Requires: %{name}-libEGL-devel = %{version}-%{release}
Requires: %{name}-libGLES = %{version}-%{release}
@@ -408,8 +414,7 @@
Summary(pl.UTF-8): Plik nagłówkowy biblioteki Mesa OpenVG
License: MIT
Group: Development/Libraries
-# EGL headers for <KHR/khrplatform.h>
-Requires: %{name}-libEGL-devel = %{version}-%{release}
+Requires: %{name}-khrplatform-devel = %{version}-%{release}
Requires: %{name}-libOpenVG = %{version}-%{release}
%description libOpenVG-devel
@@ -619,6 +624,17 @@
%description libxatracker-devel -l pl.UTF-8
Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg.
+%package khrplatform-devel
+Summary: Khronos platform header file
+Summary(pl.UTF-8): Plik nagłówkowy platformy Khronos
+Group: Development/Libraries
+
+%description khrplatform-devel
+Khronos platform header file.
+
+%description khrplatform-devel -l pl.UTF-8
+Plik nagłówkowy platformy Khronos.
+
%package dri-driver-ati-radeon-R100
Summary: X.org DRI driver for ATI R100 card family
Summary(pl.UTF-8): Sterownik X.org DRI dla rodziny kart ATI R100
@@ -896,12 +912,13 @@
--enable-egl \
--enable-gles1 \
--enable-gles2 \
+ --with-egl-platforms=x11%{?with_gbm:,drm} \
%endif
%if %{with gallium}
--enable-gallium-llvm \
%{__enable egl gallium-egl} \
%{__enable gbm gallium-gbm} \
- --enable-openvg \
+ %{?with_egl:--enable-openvg} \
--enable-vdpau \
%{?with_xa:--enable-xa} \
--enable-xvmc \
@@ -994,8 +1011,6 @@
%{_includedir}/EGL/eglext.h
%{_includedir}/EGL/eglmesaext.h
%{_includedir}/EGL/eglplatform.h
-%dir %{_includedir}/KHR
-%{_includedir}/KHR/khrplatform.h
%{_pkgconfigdir}/egl.pc
%if %{with static_libs}
@@ -1088,7 +1103,7 @@
%endif
%endif
-%if %{with gallium}
+%if %{with egl} && %{with gallium}
%files libOpenVG
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libOpenVG.so.*.*.*
@@ -1190,6 +1205,13 @@
%{_pkgconfigdir}/xatracker.pc
%endif
+%if %{with egl}
+%files khrplatform-devel
+%defattr(644,root,root,755)
+%dir %{_includedir}/KHR
+%{_includedir}/KHR/khrplatform.h
+%endif
+
%files dri-driver-ati-radeon-R100
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xorg/modules/dri/radeon_dri.so
@@ -1267,6 +1289,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.315 2012/03/11 17:44:13 qboosh
+- added -khrplatform-devel subpackage (like in Fedora; common for
EGL/GLES/OpenVG)
+- enable EGL drm platform if gbm is enabled
+- OpenVG requires egl to be enabled
+
Revision 1.314 2012/03/11 16:54:52 qboosh
- gbm is not EGL-specific - so added -libgbm{,-devel} subpackages
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.314&r2=1.315&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
