commit 81a68a6fb3858df070b8e1002d89803946ac347f Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Aug 19 01:56:33 2020 +0100 Revert "Update to 440.100 release" This reverts commit 95ba25ebfcfab2e7a69764255d6e149b8894ebe0. gcc-10.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ nvidia-settings.spec | 7 +++---- sources | 2 +- 3 files changed, 58 insertions(+), 5 deletions(-) --- diff --git a/gcc-10.patch b/gcc-10.patch new file mode 100644 index 0000000..26c5548 --- /dev/null +++ b/gcc-10.patch @@ -0,0 +1,54 @@ +From 292dcc6c02e615e73791f67cdf76b5d191657822 Mon Sep 17 00:00:00 2001 +From: Jeroen Roovers <jer(a)gentoo.org&gt; +Date: Mon, 27 Jan 2020 20:49:20 +0100 +Subject: [PATCH] ctkvdpau: Fix CFLAGS=-fno-common + +GCC 10 will enable -fno-common by default[0], which causes the linker to +fail like this [1], even for older GCC versions for which it is +explicitly enabled: + +``` +/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: +./gtk3/ctkvdpau.o:/home/jer/portage/x11-drivers/nvidia-drivers-440.44-r1/work/nvidia-settings-440.44/src/gtk+-2.x/ctkvdpau.h:70: +multiple definition of `VDPAUDeviceFunctions'; +./gtk3/ctkwindow.o:/home/jer/portage/x11-drivers/nvidia-drivers-440.44-r1/work/nvidia-settings-440.44/src/gtk+-2.x/ctkvdpau.h:70: +first defined here + +``` + +Fix this by declaring VDPAUDeviceFunctions as extern and by defining it +explicitly. + +[0] https://gcc.gnu.org/gcc-10/porting_to.html#common +[1] https://bugs.gentoo.org/706742 +--- + src/gtk+-2.x/ctkvdpau.c | 2 ++ + src/gtk+-2.x/ctkvdpau.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/gtk+-2.x/ctkvdpau.c b/src/gtk+-2.x/ctkvdpau.c +index 2f120f0..315243f 100644 +--- a/src/gtk+-2.x/ctkvdpau.c ++++ b/src/gtk+-2.x/ctkvdpau.c +@@ -103,6 +103,8 @@ const gchar* __video_mixer_parameter_help = + const gchar* __video_mixer_attribute_help = + "This shows the video mixer attributes and any applicable ranges."; + ++struct VDPAUDeviceImpl VDPAUDeviceFunctions; ++ + static int queryOutputSurface(CtkVDPAU *ctk_vdpau, VdpDevice device, + VdpGetProcAddress *getProcAddress); + +diff --git a/src/gtk+-2.x/ctkvdpau.h b/src/gtk+-2.x/ctkvdpau.h +index ec58d36..ffff839 100644 +--- a/src/gtk+-2.x/ctkvdpau.h ++++ b/src/gtk+-2.x/ctkvdpau.h +@@ -46,7 +46,7 @@ G_BEGIN_DECLS + (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_VDPAU, CtkVDPAUClass)) + + +-struct VDPAUDeviceImpl { ++extern struct VDPAUDeviceImpl { + + VdpGetErrorString *GetErrorString; + VdpGetProcAddress *GetProcAddress; diff --git a/nvidia-settings.spec b/nvidia-settings.spec index 00bc7ab..18574ca 100644 --- a/nvidia-settings.spec +++ b/nvidia-settings.spec @@ -1,6 +1,6 @@ Name: nvidia-settings Epoch: 3 -Version: 440.100 +Version: 440.82 Release: 1%{?dist} Summary: Configure the NVIDIA graphics driver @@ -9,6 +9,8 @@ URL: https://download.nvidia.com/XFree86/nvidia-settings/ Source0: %{url}/nvidia-settings-%{version}.tar.bz2 Source1: %{name}-user.desktop Source2: %{name}.appdata.xml +# https://github.com/NVIDIA/nvidia-settings/pull/47 +Patch0: gcc-10.patch ExclusiveArch: x86_64 @@ -122,9 +124,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap %changelog -* Thu Jun 25 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3:440.100-1 -- Update to 440.100 release - * Tue Apr 07 2020 leigh123linux <leigh123linux(a)googlemail.com&gt; - 3:440.82-1 - Update to 440.82 release diff --git a/sources b/sources index 0a3edae..b43c331 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nvidia-settings-440.100.tar.bz2) = 4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818 +SHA512 (nvidia-settings-440.82.tar.bz2) = 8f9b546f65a1bd17f6336df9e62b0d1403581d3f60276793a536ff39bf67038def1c2738545b24b04eb465860f0cb97b5b9688d7dfb759fda567c05b1cc651ff