[packages/xorg-driver-video-nvidia] drop "glvnd" bcond (glvnd-less libs no longer provided)
atler
atler at pld-linux.org
Thu Aug 29 22:07:47 CEST 2019
commit 1011cf4adca5ea447e182101852748c1a5e0d1c0
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Aug 29 22:06:39 2019 +0200
drop "glvnd" bcond (glvnd-less libs no longer provided)
xorg-driver-video-nvidia.spec | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 6c58567..10eebac 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -4,7 +4,6 @@
# - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm
#
# Conditional build:
-%bcond_without glvnd # without GL vendor neutral libs
%bcond_with system_libglvnd # do not use system libglvnd
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
@@ -20,12 +19,6 @@
exit 1
%endif
-%if %{with glvnd}
-%define vulkan_lib libGLX_nvidia.so.0
-%else
-%define vulkan_lib libGL.so.1
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
@@ -116,7 +109,7 @@ Summary: OpenGL (GL and GLX) Nvidia libraries
Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia
Group: X11/Development/Libraries
Requires(post,postun): /sbin/ldconfig
-%if %{with glvnd} && %{with system_libglvnd}
+%if %{with system_libglvnd}
Requires: libglvnd
Requires: libglvnd-libGL
Requires: libglvnd-libGLES
@@ -306,7 +299,6 @@ install -p nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/
%endif
for f in \
-%if %{with glvnd}
%if %{without system_libglvnd}
%{srcdir}/libGL.so.1.7.0 \
%{srcdir}/libGLX.so.0 \
@@ -323,9 +315,6 @@ for f in \
%ifarch %{x8664}
%{srcdir}/libnvidia-egl-wayland.so.1.1.3 \
%{srcdir}/libnvidia-eglcore.so.%{version} \
-%endif
-%else
- %{srcdir}/libGL.so.%{version} \
%endif
%{srcdir}/libcuda.so.%{version} \
%{srcdir}/libnvcuvid.so.%{version} \
@@ -374,7 +363,6 @@ echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
%endif
# OpenGL ABI for Linux compatibility
-%if %{with glvnd}
%if %{without system_libglvnd}
ln -sf libGL.so.1.7.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so
@@ -396,10 +384,6 @@ ln -sf libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2
%ifarch %{x8664}
install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d
%endif
-%else
-ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
-ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so
-%endif
ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so
ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so
@@ -462,7 +446,6 @@ EOF
%endif}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf
%dir %{_libdir}/nvidia
-%if %{with glvnd}
%if %{without system_libglvnd}
%attr(755,root,root) %{_libdir}/nvidia/libGL.so.1.7.0
%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
@@ -490,10 +473,6 @@ EOF
%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.*
%endif
-%else
-%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
-%endif
%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
%attr(755,root,root) %ghost %{_libdir}/nvidia/libcuda.so.1
%attr(755,root,root) %{_libdir}/nvidia/libcuda.so
@@ -529,15 +508,12 @@ EOF
%attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
%attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1
%ifarch %{x8664}
-%if %{with glvnd}
%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
-%endif
%{_datadir}/vulkan/icd.d/nvidia_icd.json
%endif
%files devel
%defattr(644,root,root,755)
-%if %{with glvnd}
%if %{without system_libglvnd}
%attr(755,root,root) %{_libdir}/nvidia/libGL.so
%attr(755,root,root) %{_libdir}/nvidia/libGLX.so
@@ -546,9 +522,6 @@ EOF
%attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so
%attr(755,root,root) %{_libdir}/nvidia/libEGL.so
%endif
-%else
-%attr(755,root,root) %{_libdir}/nvidia/libGL.so
-%endif
%{_pkgconfigdir}/gl.pc
%files doc
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/1011cf4adca5ea447e182101852748c1a5e0d1c0
More information about the pld-cvs-commit
mailing list