X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nvidia-settings.spec;h=d4f81b4439acad88b747507e15234927f483f873;hb=a827dcb0fd8d71c558ab2da4daa5ab6ed4e2eb25;hp=5eed4846d47c64df042e0346192d09f6ce2098f2;hpb=20678b9bdeb0b711b4bb5d6c45409ae1a6087fa7;p=packages%2Fnvidia-settings.git

diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 5eed484..d4f81b4 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -1,5 +1,6 @@
+#
 # Conditional build:
-%bcond_with	gtk2		# build with gtk2 based gui
+%bcond_without	gtk3		# GTK+ 3.x GUI library for nvidia-settings
 %bcond_without	nvidia_settings	# build the main package
 %bcond_without	utils		# build utils from samples dir
 %bcond_without	libXNVCtrl	# build libXNVCtrl for external packages
@@ -8,35 +9,37 @@ 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:	525.60.11
 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:	952676b8735cf6af9eaf6dd827354c97
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}-autostart.desktop
+Patch0:		wayland.patch
 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
 BuildRequires:	xorg-lib-libXxf86vm-devel
 %if %{with nvidia_settings}
 BuildRequires:	gtk+2-devel >= 2.0
-%if %{without gtk2}
-BuildRequires:	gtk+3-devel
-%endif
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0}
 BuildRequires:	jansson-devel >= 2.2
 BuildRequires:	m4
 BuildRequires:	pkgconfig
+BuildRequires:	wayland-devel
 %endif
+Requires:	%{name}-guilib = %{version}-%{release}
+Requires:	libvdpau >= 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # requires symbols from main binary
-%define skip_post_check_so libnvidia-gtk[23].so.*
+%define		skip_post_check_so	libnvidia-gtk[23].so.*
 
 %description
 The nvidia-settings utility is a tool for configuring the NVIDIA Linux
@@ -70,6 +73,32 @@ wyświetla graficzny interfejs użytkownika (GUI) do konfiguracji
 ustawień. Przy wyłączniu nvidia-settings odczytuje bieżące ustawienia
 z serwera X i zapisuje je do pliku konfiguracyjnego.
 
+%package gtk2
+Summary:	GTK+ 2.x GUI library for nvidia-settings
+Summary(pl.UTF-8):	Biblioteka interfejsu graficznego GTK+ 2.x dla nvidia-settings
+Group:		X11/Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-guilib = %{version}-%{release}
+
+%description gtk2
+GTK+ 2.x GUI library for nvidia-settings.
+
+%description gtk2 -l pl.UTF-8
+Biblioteka interfejsu graficznego GTK+ 2.x dla nvidia-settings.
+
+%package gtk3
+Summary:	GTK+ 3.x GUI library for nvidia-settings
+Summary(pl.UTF-8):	Biblioteka interfejsu graficznego GTK+ 3.x dla nvidia-settings
+Group:		X11/Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-guilib = %{version}-%{release}
+
+%description gtk3
+GTK+ 3.x GUI library for nvidia-settings.
+
+%description gtk3 -l pl.UTF-8
+Biblioteka interfejsu graficznego GTK+ 3.x dla nvidia-settings.
+
 %package -n libXNVCtrl-devel
 Summary:	libXNVCtrl development files
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki libXNVCtrl
@@ -78,7 +107,7 @@ Group:		Development/Libraries
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXext-devel
 Requires:	xorg-lib-libXxf86vm-devel
-Obsoletes:	libXNVCtrl-static
+Obsoletes:	libXNVCtrl-static < 195.36.24
 
 %description -n libXNVCtrl-devel
 Library for accessing NV-CONTROL extension in NVIDIA's latest drivers.
@@ -89,34 +118,34 @@ sterowników NVIDIA.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %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 \
-%if %{without gtk2}
-	BUILD_GTK3LIB=1 \
-%endif
+	%{!?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
@@ -137,9 +166,8 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/xdg/autostart/%{name}.desktop
 
-%if %{without gtk2}
-rm $RPM_BUILD_ROOT%{_libdir}/libnvidia-gtk2.so.%{version}
-%endif
+# let RPM autogenerate deps
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 %endif
 
 %if %{with libXNVCtrl}
@@ -181,6 +209,15 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
+%post	gtk2 -p /sbin/ldconfig
+%postun	gtk2 -p /sbin/ldconfig
+
+%post	gtk3 -p /sbin/ldconfig
+%postun	gtk3 -p /sbin/ldconfig
+
 %if %{with nvidia_settings}
 %files
 %defattr(644,root,root,755)
@@ -191,20 +228,25 @@ 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
 %endif
-%if %{with gtk2}
-%attr(755,root,root) %{_libdir}/libnvidia-gtk2.so.%{version}
-%else
-%attr(755,root,root) %{_libdir}/libnvidia-gtk3.so.%{version}
-%endif
+%attr(755,root,root) %{_libdir}/libnvidia-wayland-client.so.*
 %{_mandir}/man1/nvidia-settings.1*
 %{_desktopdir}/nvidia-settings.desktop
 %{_pixmapsdir}/nvidia-settings.png
 /etc/xdg/autostart/%{name}.desktop
+
+%files gtk2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnvidia-gtk2.so.%{version}
+
+%if %{with gtk3}
+%files gtk3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnvidia-gtk3.so.%{version}
+%endif
 %endif
 
 %if %{with libXNVCtrl}