[nvidia-settings/el7] (6 commits) ...Merge branch 'f32' into el7
by Leigh Scott
Summary of changes:
24574c1... Update to 450.51 beta (*)
6852e6e... Update to 450.57 release (*)
8dfe959... Update to 450.66 release (*)
81a68a6... Revert "Update to 440.100 release" (*)
ec774fa... Merge branch 'master' into f32 (*)
a224c83... Merge branch 'f32' into el7
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[nvidia-settings/f31] (5 commits) ...Merge branch 'master' into f32
by Leigh Scott
Summary of changes:
24574c1... Update to 450.51 beta (*)
6852e6e... Update to 450.57 release (*)
8dfe959... Update to 450.66 release (*)
81a68a6... Revert "Update to 440.100 release" (*)
ec774fa... Merge branch 'master' into f32 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[nvidia-settings/f32: 5/5] Merge branch 'master' into f32
by Leigh Scott
commit ec774fa450449f91a3ae528ad5235fff69c223d9
Merge: 81a68a6 8dfe959
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 19 01:56:47 2020 +0100
Merge branch 'master' into f32
gcc-10.patch | 54 ----------------------------------------------------
nvidia-settings.spec | 13 ++++++++++---
sources | 2 +-
3 files changed, 11 insertions(+), 58 deletions(-)
---
4 years, 3 months
[nvidia-settings/f32: 4/5] Revert "Update to 440.100 release"
by Leigh Scott
commit 81a68a6fb3858df070b8e1002d89803946ac347f
Author: Leigh Scott <leigh123linux(a)gmail.com>
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>
+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> - 3:440.100-1
-- Update to 440.100 release
-
* Tue Apr 07 2020 leigh123linux <leigh123linux(a)googlemail.com> - 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
4 years, 3 months
[nvidia-settings/f32] (5 commits) ...Merge branch 'master' into f32
by Leigh Scott
Summary of changes:
24574c1... Update to 450.51 beta (*)
6852e6e... Update to 450.57 release (*)
8dfe959... Update to 450.66 release (*)
81a68a6... Revert "Update to 440.100 release"
ec774fa... Merge branch 'master' into f32
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[nvidia-settings] Update to 450.66 release
by Leigh Scott
commit 8dfe959f0f12f72b1618b93b9e14520618037713
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 19 01:56:00 2020 +0100
Update to 450.66 release
nvidia-settings.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index b9af73c..3ff9fff 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -1,6 +1,6 @@
Name: nvidia-settings
Epoch: 3
-Version: 450.57
+Version: 450.66
Release: 1%{?dist}
Summary: Configure the NVIDIA graphics driver
@@ -122,6 +122,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
%changelog
+* Wed Aug 19 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3:450.66-1
+- Update to 450.66 release
+
* Thu Jul 09 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3:450.57-1
- Update to 450.57 release
diff --git a/sources b/sources
index 3e5413a..2b63e4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvidia-settings-450.57.tar.bz2) = 996c7759ce900984447956f08b17f979ae434a65ec21be382d08c63a227e3f7da600d906cff3370b7a0e41f6fb0b88e54b43a26faed264a3e804fd7721b4491d
+SHA512 (nvidia-settings-450.66.tar.bz2) = 82d20b479e5d11862b304dfa0b15e724b1f63692765237cb3d0fc4e5cd6f6d954a36f2c6872d0ccb2d29cfcd31b0c207f1172112a623b79a0e49b276223c7785
4 years, 3 months
[nvidia-persistenced/el8] (5 commits) ...Merge branch 'master' into f32
by Leigh Scott
Summary of changes:
3004ea2... Update to 450.51 beta (*)
175ea36... Update to 450.57 release (*)
951593a... Update to 450.66 release (*)
8e026dc... Revert "Update to 440.100 release" (*)
10c0265... Merge branch 'master' into f32 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[nvidia-persistenced/el7: 6/6] Merge branch 'f32' into el7
by Leigh Scott
commit bc6ce1e7c023193d2ae151aad72fff306937bd05
Merge: 8e26ebc 10c0265
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 19 01:53:03 2020 +0100
Merge branch 'f32' into el7
.gitignore | 4 +++-
nvidia-persistenced.spec | 12 +++++++++---
sources | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
---
4 years, 3 months
[nvidia-persistenced/el7] (6 commits) ...Merge branch 'f32' into el7
by Leigh Scott
Summary of changes:
3004ea2... Update to 450.51 beta (*)
175ea36... Update to 450.57 release (*)
951593a... Update to 450.66 release (*)
8e026dc... Revert "Update to 440.100 release" (*)
10c0265... Merge branch 'master' into f32 (*)
bc6ce1e... Merge branch 'f32' into el7
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months
[nvidia-persistenced/f31] (5 commits) ...Merge branch 'master' into f32
by Leigh Scott
Summary of changes:
3004ea2... Update to 450.51 beta (*)
175ea36... Update to 450.57 release (*)
951593a... Update to 450.66 release (*)
8e026dc... Revert "Update to 440.100 release" (*)
10c0265... Merge branch 'master' into f32 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 3 months