Author: glen Date: Sun May 6 13:23:57 2012 GMT Module: packages Tag: HEAD ---- Log message: - build nv-control utils
---- Files affected: packages/nvidia-settings: nvidia-settings.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: packages/nvidia-settings/nvidia-settings.spec diff -u packages/nvidia-settings/nvidia-settings.spec:1.22 packages/nvidia-settings/nvidia-settings.spec:1.23 --- packages/nvidia-settings/nvidia-settings.spec:1.22 Sun May 6 15:09:31 2012 +++ packages/nvidia-settings/nvidia-settings.spec Sun May 6 15:23:51 2012 @@ -2,6 +2,7 @@ # # Conditional build: %bcond_without nvidia_settings # build the main package +%bcond_without utils # build utils from samples dir %bcond_without libXNVCtrl # build libXNVCtrl for http://websvn.kde.org/trunk/kdenonbeta/nvidia/ Summary: Tool for configuring the NVIDIA driver @@ -89,6 +90,14 @@ X_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" %endif +%if %{with utils} +%{__make} -C samples \ + NV_VERBOSE=1 \ + CC="%{__cc}" \ + OUTPUTDIR=$(pwd)/_out/utils \ + X_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" +%endif + %if %{with nvidia_settings} %{__make} \ NV_VERBOSE=1 \ @@ -118,6 +127,18 @@ cp -p src/libXNVCtrl/libXNVCtrl.a $RPM_BUILD_ROOT%{_libdir} %endif +%if %{with utils} +install -d $RPM_BUILD_ROOT%{_bindir} +for prog in _out/utils/nv-control-*; do + case "$prog" in + *.*) + continue + ;; + esac + install -p $prog $RPM_BUILD_ROOT%{_bindir} +done +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -130,6 +151,17 @@ %{_pixmapsdir}/nvidia-settings.png %endif +%if %{with utils} +%attr(755,root,root) %{_bindir}/nv-control-3dvisionpro +%attr(755,root,root) %{_bindir}/nv-control-dpy +%attr(755,root,root) %{_bindir}/nv-control-dvc +%attr(755,root,root) %{_bindir}/nv-control-events +%attr(755,root,root) %{_bindir}/nv-control-framelock +%attr(755,root,root) %{_bindir}/nv-control-gvi +%attr(755,root,root) %{_bindir}/nv-control-info +%attr(755,root,root) %{_bindir}/nv-control-targets +%endif + %if %{with libXNVCtrl} %files -n libXNVCtrl-devel %defattr(644,root,root,755) @@ -147,6 +179,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2012/05/06 13:23:51 glen +- build nv-control utils + Revision 1.22 2012/05/06 13:09:31 glen - up to 295.40, to match current HEAD@xorg-driver-video-nvidia ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/nvidia-settings/nvidia-settings.spec?r1=1.22&r2=1.23 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
