From 7135af6732e400a5171f0262093cc10337dacd3f Mon Sep 17 00:00:00 2001 From: lisu Date: Mon, 6 Feb 2012 09:52:48 +0000 Subject: [PATCH] - merge from HEAD: added OpenCL icd registration file (path is hardcoded in libOpenCL) Changed files: xorg-driver-video-nvidia.spec -> 1.212.2.29 --- xorg-driver-video-nvidia.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 1627f77..0907f08 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -252,7 +252,8 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ - $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} + $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ + $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors %if %{with multigl} install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d} %endif @@ -262,6 +263,7 @@ cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh +install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors for f in \ libGL.so.%{version} \ @@ -372,6 +374,9 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %files libs %defattr(644,root,root,755) +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%{_sysconfdir}/OpenCL/vendors/nvidia.icd %if %{with multigl} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf %dir %{_libdir}/nvidia -- 2.44.0