X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnvidia-settings.git;a=blobdiff_plain;f=nvidia-settings.spec;h=4e856ca39dd806d14eedb5009a63344b0408dd99;hp=9488d1cef30585df5d1319ed118a04aad4b84101;hb=f73ec7f;hpb=7b18b7ce67613c415165ef2cb15e6e28cdc944f4 diff --git a/nvidia-settings.spec b/nvidia-settings.spec index 9488d1c..4e856ca 100644 --- a/nvidia-settings.spec +++ b/nvidia-settings.spec @@ -1,7 +1,6 @@ -# TODO: -# - use system jansson >= 2.6 library # # Conditional build: +%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 @@ -10,29 +9,36 @@ 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: 331.67 +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: 5d6ab3437d6a8fc0a0a30d7d4f43c11d +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 +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 +%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0} +BuildRequires: jansson-devel >= 2.2 BuildRequires: m4 BuildRequires: pkgconfig %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.* + %description The nvidia-settings utility is a tool for configuring the NVIDIA Linux graphics driver. It operates by communicating with the NVIDIA X @@ -65,6 +71,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 @@ -85,30 +117,35 @@ sterowników NVIDIA. %prep %setup -q -%{__rm} src/libXNVCtrl/libXNVCtrl.a - %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} -%{__make} \ +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 %endif %install @@ -116,19 +153,24 @@ rm -rf $RPM_BUILD_ROOT %if %{with nvidia_settings} install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir},%{_pixmapsdir},/etc/xdg/autostart} %{__make} install \ + NV_USE_BUNDLED_LIBJANSSON=0 \ + NV_VERBOSE=1 \ INSTALL="install -p" \ + LIBDIR="$RPM_BUILD_ROOT%{_libdir}" \ PREFIX=%{_prefix} \ DESTDIR=$RPM_BUILD_ROOT 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 + +# let RPM autogenerate deps +chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so* %endif %if %{with libXNVCtrl} install -d $RPM_BUILD_ROOT%{_examplesdir}/libXNVCtrl-%{version} \ $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/NVCtrl} cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/libXNVCtrl-%{version} -rm -r $RPM_BUILD_ROOT%{_examplesdir}/libXNVCtrl-%{version}/_out cp -p src/libXNVCtrl/nv_control.h $RPM_BUILD_ROOT%{_includedir}/NVCtrl cp -p src/libXNVCtrl/NVCtrl.h $RPM_BUILD_ROOT%{_includedir}/NVCtrl cp -p src/libXNVCtrl/NVCtrlLib.h $RPM_BUILD_ROOT%{_includedir}/NVCtrl @@ -164,6 +206,12 @@ done %clean rm -rf $RPM_BUILD_ROOT +%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) @@ -174,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 @@ -183,6 +230,16 @@ rm -rf $RPM_BUILD_ROOT %{_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}