[packages/xorg-driver-video-nvidia] do not package libEGL when built with system libglvnd

atler atler at pld-linux.org
Tue Jan 2 00:07:42 CET 2018


commit c2ff5cb2507ec7ca5e3170a669656758f327e434
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jan 1 23:50:26 2018 +0100

    do not package libEGL when built with system libglvnd

 xorg-driver-video-nvidia.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 522e139..efd57b7 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -315,9 +315,9 @@ for f in \
 	libGLdispatch.so.0			\
 	libGLESv1_CM.so.1			\
 	libGLESv2.so.2				\
+	libEGL.so.1				\
 %endif
 	libGLX_nvidia.so.%{version}		\
-	libEGL.so.1				\
 	libEGL_nvidia.so.%{version}		\
 	libGLESv1_CM_nvidia.so.%{version}	\
 	libGLESv2_nvidia.so.%{version}		\
@@ -377,10 +377,10 @@ ln -sf libGLX.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX.so
 ln -sf libOpenGL.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenGL.so
 ln -sf libGLESv1_CM.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so
 ln -sf libGLESv2.so.2 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.so
+ln -sf libEGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so
 %endif
 ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_nvidia.so.0
 ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_indirect.so.0
-ln -sf libEGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so
 ln -sf libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL_nvidia.so.0
 ln -sf libGLESv1_CM_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1
 ln -sf libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2_nvidia.so.2
@@ -456,8 +456,8 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libGLdispatch.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so.2
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1
+%endif
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libEGL_nvidia.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libEGL_nvidia.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1
@@ -515,8 +515,8 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so
-%endif
 %attr(755,root,root) %{_libdir}/nvidia/libEGL.so
+%endif
 %else
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/7c831f98fc347c95699e7007db6abf17975e878a



More information about the pld-cvs-commit mailing list