Author: qboosh Date: Sun Mar 11 16:11:37 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- let glapi be really shared (made -libglapi subpackage, used by EGL/GL/GLES)
---- Files affected:
packages/Mesa:
Mesa.spec (1.312 -> 1.313)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.312 packages/Mesa/Mesa.spec:1.313
--- packages/Mesa/Mesa.spec:1.312 Sun Mar 11 14:03:22 2012
+++ packages/Mesa/Mesa.spec Sun Mar 11 17:11:32 2012
@@ -114,12 +114,13 @@
Summary(pl.UTF-8): Implementacja Mesa biblioteki interfejsu EGL
License: MIT
Group: Libraries
+Requires: %{name}-libglapi = %{version}-%{release}
# 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: %{name}-libOpenVG = %{version}-%{release}
Requires: udev-libs >= 1:150
%endif
Provides: EGL = 1.4
@@ -254,6 +255,7 @@
Summary(pl.UTF-8): Wolnodostępna implementacja Mesa3D biblioteki libGL ze
standardu OpenGL
License: MIT
Group: X11/Libraries
+Requires: %{name}-libglapi = %{version}-%{release}
Requires: libdrm >= %{libdrm_ver}
Provides: OpenGL = 2.1
Provides: OpenGL-GLX = 1.4
@@ -334,8 +336,7 @@
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}
+Requires: %{name}-libglapi = %{version}-%{release}
%description libGLES
This package contains shared libraries of Mesa implementation of GLES
@@ -356,7 +357,7 @@
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>
+# EGL for <KHR/khrplatform.h> always required, <EGL/egl.h> for <GLES/egl.h>
Requires: %{name}-libEGL-devel = %{version}-%{release}
Requires: %{name}-libGLES = %{version}-%{release}
@@ -421,7 +422,6 @@
Summary(pl.UTF-8): Biblioteka OSMesa (renderująca bitmapy w pamięci)
License: MIT
Group: Libraries
-# doesn't require base
%description libOSMesa
OSMesa (off-screen renderer) library.
@@ -465,7 +465,6 @@
Summary(pl.UTF-8): Implementacja Mesa API OpenVG (akceleracji grafiki
wektorowej)
License: MIT
Group: Libraries
-# doesn't require base
%description libOpenVG
This package contains Mesa implementation of OpenVG - cross-platform
@@ -561,11 +560,23 @@
%description libXvMC-softpipe -l pl.UTF-8
Implementacja Mesa softpipe API XvMC.
+%package libglapi
+Summary: Mesa GL API shared library
+Summary(pl.UTF-8): Biblioteka współdzielona Mesa GL API
+Group: Libraries
+
+%description libglapi
+Mesa GL API shared library, common for various APIs (EGL, GL, GLES).
+
+%description libglapi -l pl.UTF-8
+Biblioteka współdzielona Mesa GL API, wspólna dla różnych API (EGL,
+GL, GLES).
+
%package libxatracker
Summary: Xorg Gallium3D accelleration library
Summary(pl.UTF-8): Biblioteka akceleracji Gallium3D dla Xorg
Group: X11/Libraries
-#Requires:
+Requires: libdrm >= %{libdrm_ver}
%description libxatracker
Xorg Gallium3D accelleration library (used by new vmwgfx driver).
@@ -579,7 +590,7 @@
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki akceleracji Gallium3D dla
Xorg
Group: X11/Development/Libraries
Requires: %{name}-libxatracker = %{version}-%{release}
-#Requires:
+Requires: libdrm-devel >= %{libdrm_ver}
%description libxatracker-devel
Header files for Xorg Gallium3D accelleration library.
@@ -898,6 +909,8 @@
%{__rm} $RPM_BUILD_ROOT%{_includedir}/GL/{vms_x_fix,wglext,wmesa}.h
# dlopened by soname
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXvMC*.so
+# not used externally
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libglapi.so
# remove "OS ABI: Linux 2.4.20" tag, so private copies (nvidia or fglrx),
# set up via /etc/ld.so.conf.d/*.conf will be preferred over this
@@ -933,6 +946,9 @@
%post libXvMC-softpipe -p /sbin/ldconfig
%postun libXvMC-softpipe -p /sbin/ldconfig
+%post libglapi -p /sbin/ldconfig
+%postun libglapi -p /sbin/ldconfig
+
%post libxatracker -p /sbin/ldconfig
%postun libxatracker -p /sbin/ldconfig
@@ -941,8 +957,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libEGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libEGL.so.1
-%attr(755,root,root) %{_libdir}/libglapi.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libglapi.so.0
%if %{with gbm}
%attr(755,root,root) %{_libdir}/libgbm.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libgbm.so.1
@@ -959,7 +973,6 @@
%files libEGL-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libEGL.so
-%attr(755,root,root) %{_libdir}/libglapi.so
%dir %{_includedir}/EGL
%{_includedir}/EGL/egl.h
%{_includedir}/EGL/eglext.h
@@ -1127,6 +1140,13 @@
%attr(755,root,root) %ghost %{_libdir}/libXvMCsoftpipe.so.1
%endif
+%files libglapi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libglapi.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglapi.so.0
+# libglapi-devel? nothing seems to need it atm.
+#%attr(755,root,root) %{_libdir}/libglapi.so
+
%if %{with xa}
%files libxatracker
%defattr(644,root,root,755)
@@ -1219,6 +1239,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.313 2012/03/11 16:11:32 qboosh
+- let glapi be really shared (made -libglapi subpackage, used by EGL/GL/GLES)
+
Revision 1.312 2012/03/11 13:03:22 qboosh
- updated static_libs comments
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.312&r2=1.313&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
