packages: xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec - rel 7 - ...
baggins
baggins at pld-linux.org
Fri Mar 25 12:32:03 CET 2011
Author: baggins Date: Fri Mar 25 11:32:03 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 7
- install only libGL into separate directory for multigl builds
- added missing, new libraries
---- Files affected:
packages/xorg-driver-video-nvidia:
xorg-driver-video-nvidia.spec (1.315 -> 1.316)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec
diff -u packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.315 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.316
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.315 Thu Mar 24 11:53:30 2011
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec Fri Mar 25 12:31:58 2011
@@ -26,7 +26,7 @@
%define no_install_post_check_so 1
%define pname xorg-driver-video-nvidia
-%define rel 6%{?with_multigl:.mgl}
+%define rel 7%{?with_multigl:.mgl}
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -266,21 +266,24 @@
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
install -p nvidia.icd $RPM_BUILD_ROOT/etc/OpenCL/vendors
+%if %{without multigl}
+install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+%else
+install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia
+%endif
+
for f in \
- libGL.so.%{version} \
libOpenCL.so.1.0.0 \
libXvMCNVIDIA.so.%{version} \
libcuda.so.%{version} \
+ libnvcuvid.so.%{version} \
libnvidia-cfg.so.%{version} \
+ libnvidia-compiler.so.%{version} \
libnvidia-glcore.so.%{version} \
libnvidia-ml.so.%{version} \
tls/libnvidia-tls.so.%{version} \
; do
-%if %{without multigl}
install -p $f $RPM_BUILD_ROOT%{_libdir}
-%else
- install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia
-%endif
done
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
@@ -307,19 +310,11 @@
# OpenGL ABI for Linux compatibility
ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
-
-ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so.1
-ln -sf nvidia/libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so
-
-ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
-ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
-
-ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
-ln -sf nvidia/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.%{version}
%else
# OpenGL ABI for Linux compatibility
ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
+%endif
ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so.1
ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so
@@ -330,7 +325,6 @@
ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1
ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so
%endif
-%endif
%if %{with kernel}
%install_kernel_modules -m kernel/nvidia -d misc
@@ -398,26 +392,13 @@
%dir %{_libdir}/nvidia
%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
-%attr(755,root,root) %{_libdir}/libOpenCL.so
-%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1
-%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
-%attr(755,root,root) %{_libdir}/libcuda.so
-%attr(755,root,root) %ghost %{_libdir}/libcuda.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
%else
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
# symlink for binary apps which fail to conform Linux OpenGL ABI
# (and dlopen libGL.so instead of libGL.so.1)
%attr(755,root,root) %{_libdir}/libGL.so
+%endif
%attr(755,root,root) %{_libdir}/libOpenCL.so
%attr(755,root,root) %{_libdir}/libOpenCL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libOpenCL.so.1
@@ -433,7 +414,6 @@
%attr(755,root,root) %{_libdir}/libnvidia-ml.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1
%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
-%endif
%attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
%attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1
@@ -481,6 +461,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.316 2011/03/25 11:31:58 baggins
+- rel 7
+- install only libGL into separate directory for multigl builds
+- added missing, new libraries
+
Revision 1.315 2011/03/24 10:53:30 baggins
- rel 6
- added OpenCL icd registration file (path is hardcoded in libOpenCL)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec?r1=1.315&r2=1.316&f=u
More information about the pld-cvs-commit
mailing list