X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnvidia-settings.git;a=blobdiff_plain;f=nvidia-settings.spec;h=4e856ca39dd806d14eedb5009a63344b0408dd99;hp=1af2002429c02b3e079855566c097eaa867cc70d;hb=f73ec7f;hpb=836c5156a70d4a301cbe4230580040a95ebb41a4

diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 1af2002..4e856ca 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -9,18 +9,18 @@ Summary:	Tool for configuring the NVIDIA driver
 Summary(pl.UTF-8):	Narzędzie do konfigurowania sterownika NVIDIA
 Name:		nvidia-settings
 # keep the version in sync with xorg-driver-video-nvidia.spec
-Version:	346.35
+Version:	510.54
 Release:	1
 License:	GPL v2 (with MIT parts)
 Group:		X11/Applications
-Source0:	ftp://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.bz2
-# Source0-md5:	443894714195e60cf674ace2df78bc3e
+Source0:	https://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.bz2
+# Source0-md5:	c5f2575d0b9f538a588e0f9ba4caea4b
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}-autostart.desktop
 URL:		ftp://download.nvidia.com/XFree86/nvidia-settings/
 BuildRequires:	OpenGL-devel
-BuildRequires:	libvdpau-devel >= 0.9
+BuildRequires:	libvdpau-devel >= 1.0
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXv-devel
@@ -33,7 +33,7 @@ BuildRequires:	m4
 BuildRequires:	pkgconfig
 %endif
 Requires:	%{name}-guilib = %{version}-%{release}
-Requires:	libvdpau >= 0.9
+Requires:	libvdpau >= 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # requires symbols from main binary
@@ -119,29 +119,30 @@ sterowników NVIDIA.
 
 %build
 %if %{with libXNVCtrl}
+CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" \
 %{__make} -C src/libXNVCtrl \
 	NV_VERBOSE=1 \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC"
+	OUTPUTDIR=.
 %endif
 
 %if %{with utils}
+CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" \
 %{__make} -C samples \
 	NV_VERBOSE=1 \
 	CC="%{__cc}" \
 	OUTPUTDIR=$(pwd)/_out/utils \
-	X_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC"
 %endif
 
 %if %{with nvidia_settings}
+CFLAGS="%{rpmcppflags} %{rpmcflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} -C src \
 	%{!?with_gtk3:BUILD_GTK3LIB=} \
 	NV_USE_BUNDLED_LIBJANSSON=0 \
 	NV_VERBOSE=1 \
 	STRIP_CMD=: \
-	CC="%{__cc}" \
-	X_CFLAGS="%{rpmcppflags} %{rpmcflags}" \
-	X_LDFLAGS="%{rpmldflags}"
+	CC="%{__cc}"
 
 %{__make} -C doc \
 	NV_VERBOSE=1
@@ -221,7 +222,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %attr(755,root,root) %{_bindir}/nv-control-warpblend