From eb2f17b1bf2431e1180cdde6318d9e7403f4b617 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:44:37 +0100 Subject: [PATCH] fix make arguments: use make KERNEL_SOURCES=... instead of make -C [release 352.09-3mamba;Wed Oct 28 2015] --- nvidia.spec | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/nvidia.spec b/nvidia.spec index 88ce4dd..b3ba100 100644 --- a/nvidia.spec +++ b/nvidia.spec @@ -1,9 +1,9 @@ %define nvidia_current_ver %version %define nvidia_current_libver %version Name: nvidia -Version: 346.47 +Version: 352.09 Epoch: 1 -Release: 1mamba +Release: 3mamba Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel Group: System/Kernel and Hardware Vendor: openmamba @@ -137,8 +137,8 @@ cat > %{buildroot}%{_prefix}/src/%{name}-%{version}/dkms.conf << _EOF PACKAGE_NAME=%{name} PACKAGE_VERSION=%{version} MAKE="ln -sf /usr/src/\${PACKAGE_NAME}-\${PACKAGE_VERSION}/nv-kernel.o \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build/;\ -make -C \${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build modules" -CLEAN="make -C \${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean" +make KERNEL_SOURCES=\${kernel_source_dir} -C \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build" +CLEAN="make KERNEL_SOURCES=\${kernel_source_dir} -C \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean" BUILT_MODULE_NAME=\${PACKAGE_NAME} BUILT_MODULE_LOCATION=./ DEST_MODULE_LOCATION=/kernel/drivers/video @@ -230,6 +230,13 @@ install -D -m 644 nvidia-settings.desktop \ install -D -m 644 nvidia-settings.png \ %{buildroot}%{_datadir}/pixmaps/nvidia-settings.png +# Clutter workaround (http://blog.sukimashita.com/2015/04/13/gnome-3-16-and-nvidia-binary-driver-crash-with-totem-gnome-maps-cheese-and-others/) +mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ +cat > %{buildroot}%{_sysconfdir}/profile.d/nvidia-clutter.sh << _EOF +export CLUTTER_BACKEND=x11 +_EOF +chmod +x %{buildroot}%{_sysconfdir}/profile.d/nvidia-clutter.sh + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -348,6 +355,7 @@ exit 0 %files -n xorg-drv-video-nvidia %defattr(-,root,root) +%{_sysconfdir}/profile.d/nvidia-clutter.sh %dir %{_prefix}/src/%{name}-%{version} %{_prefix}/src/%{name}-%{version}/* %attr(0755,root,root) %{_sbindir}/update-alternatives-set-nvidia @@ -393,6 +401,21 @@ exit 0 %doc current/{LICENSE,NVIDIA_Changelog,README.txt} current/html %changelog +* Wed Oct 28 2015 Silvan Calarco 352.09-3mamba +- fix make arguments: use make KERNEL_SOURCES=... instead of make -C + +* Thu May 28 2015 Silvan Calarco 352.09-2mamba +- CLUTTER_BACKEND workaround to fix Gnome >= 3.16 apps + +* Tue May 19 2015 Automatic Build System 352.09-1mamba +- automatic version update by autodist + +* Wed Apr 22 2015 Automatic Build System 349.16-1mamba +- automatic version update by autodist + +* Wed Apr 08 2015 Automatic Build System 346.59-1mamba +- automatic version update by autodist + * Wed Feb 25 2015 Automatic Build System 346.47-1mamba - automatic version update by autodist - source edit (next build): don't call nvidia-autoselect-driver