| 1 |
commit: 6f8cf8941216354dd5f962c9f56eaeb2a596cd40 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 19:48:14 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 19:55:43 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f8cf894 |
| 7 |
|
| 8 |
x11-drivers/nvidia-drivers: Fix CFLAGS=-fno-common |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
| 11 |
Closes: https://bugs.gentoo.org/706742 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/nvidia-settings-fno-common.patch | 22 ++++++++++++++++++++++ |
| 15 |
.../nvidia-drivers/nvidia-drivers-340.108.ebuild | 9 +++++++++ |
| 16 |
.../nvidia-drivers-390.132-r1.ebuild | 8 ++++++-- |
| 17 |
.../nvidia-drivers/nvidia-drivers-430.64-r1.ebuild | 8 ++++++-- |
| 18 |
.../nvidia-drivers/nvidia-drivers-435.21-r1.ebuild | 8 ++++++-- |
| 19 |
.../nvidia-drivers/nvidia-drivers-440.44-r1.ebuild | 8 ++++++-- |
| 20 |
6 files changed, 55 insertions(+), 8 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch b/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..06e046ff61d |
| 25 |
--- /dev/null |
| 26 |
+++ b/x11-drivers/nvidia-drivers/files/nvidia-settings-fno-common.patch |
| 27 |
@@ -0,0 +1,22 @@ |
| 28 |
+--- a/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.c |
| 29 |
++++ b/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.c |
| 30 |
+@@ -103,6 +103,8 @@ |
| 31 |
+ const gchar* __video_mixer_attribute_help = |
| 32 |
+ "This shows the video mixer attributes and any applicable ranges."; |
| 33 |
+ |
| 34 |
++struct VDPAUDeviceImpl VDPAUDeviceFunctions; |
| 35 |
++ |
| 36 |
+ static int queryOutputSurface(CtkVDPAU *ctk_vdpau, VdpDevice device, |
| 37 |
+ VdpGetProcAddress *getProcAddress); |
| 38 |
+ |
| 39 |
+--- a/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.h |
| 40 |
++++ b/nvidia-settings-@PV@/src/gtk+-2.x/ctkvdpau.h |
| 41 |
+@@ -46,7 +46,7 @@ |
| 42 |
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_VDPAU, CtkVDPAUClass)) |
| 43 |
+ |
| 44 |
+ |
| 45 |
+-struct VDPAUDeviceImpl { |
| 46 |
++extern struct VDPAUDeviceImpl { |
| 47 |
+ |
| 48 |
+ VdpGetErrorString *GetErrorString; |
| 49 |
+ VdpGetProcAddress *GetProcAddress; |
| 50 |
|
| 51 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild |
| 52 |
index eb2eff41ca7..103ebfe12f1 100644 |
| 53 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild |
| 54 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild |
| 55 |
@@ -142,6 +142,15 @@ src_prepare() { |
| 56 |
gunzip $man_file || die |
| 57 |
done |
| 58 |
|
| 59 |
+ if use tools; then |
| 60 |
+ cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die |
| 61 |
+ sed -i \ |
| 62 |
+ -e "s:@PV@:${PV}:g" \ |
| 63 |
+ "${WORKDIR}"/nvidia-settings-fno-common.patch \ |
| 64 |
+ || die |
| 65 |
+ eapply "${WORKDIR}"/nvidia-settings-fno-common.patch |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
# Allow user patches so they can support RC kernels and whatever else |
| 69 |
eapply_user |
| 70 |
} |
| 71 |
|
| 72 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild |
| 73 |
index b47a737853e..4105f905174 100644 |
| 74 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild |
| 75 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild |
| 76 |
@@ -1,4 +1,4 @@ |
| 77 |
-# Copyright 1999-2019 Gentoo Authors |
| 78 |
+# Copyright 1999-2020 Gentoo Authors |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
|
| 81 |
EAPI=7 |
| 82 |
@@ -151,10 +151,14 @@ src_prepare() { |
| 83 |
done |
| 84 |
|
| 85 |
if use tools; then |
| 86 |
+ cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die |
| 87 |
cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die |
| 88 |
sed -i \ |
| 89 |
-e "s:@PV@:${PV}:g" \ |
| 90 |
- "${WORKDIR}"/nvidia-settings-linker.patch || die |
| 91 |
+ "${WORKDIR}"/nvidia-settings-fno-common.patch \ |
| 92 |
+ "${WORKDIR}"/nvidia-settings-linker.patch \ |
| 93 |
+ || die |
| 94 |
+ eapply "${WORKDIR}"/nvidia-settings-fno-common.patch |
| 95 |
eapply "${WORKDIR}"/nvidia-settings-linker.patch |
| 96 |
fi |
| 97 |
|
| 98 |
|
| 99 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild |
| 100 |
index e6e492ff959..3703f7a20d3 100644 |
| 101 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild |
| 102 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild |
| 103 |
@@ -1,4 +1,4 @@ |
| 104 |
-# Copyright 1999-2019 Gentoo Authors |
| 105 |
+# Copyright 1999-2020 Gentoo Authors |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
EAPI=7 |
| 109 |
@@ -149,10 +149,14 @@ src_prepare() { |
| 110 |
done |
| 111 |
|
| 112 |
if use tools; then |
| 113 |
+ cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die |
| 114 |
cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die |
| 115 |
sed -i \ |
| 116 |
-e "s:@PV@:${PV}:g" \ |
| 117 |
- "${WORKDIR}"/nvidia-settings-linker.patch || die |
| 118 |
+ "${WORKDIR}"/nvidia-settings-fno-common.patch \ |
| 119 |
+ "${WORKDIR}"/nvidia-settings-linker.patch \ |
| 120 |
+ || die |
| 121 |
+ eapply "${WORKDIR}"/nvidia-settings-fno-common.patch |
| 122 |
eapply "${WORKDIR}"/nvidia-settings-linker.patch |
| 123 |
fi |
| 124 |
|
| 125 |
|
| 126 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild |
| 127 |
index e8abec24def..33342e4c716 100644 |
| 128 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild |
| 129 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild |
| 130 |
@@ -1,4 +1,4 @@ |
| 131 |
-# Copyright 1999-2019 Gentoo Authors |
| 132 |
+# Copyright 1999-2020 Gentoo Authors |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
|
| 135 |
EAPI=7 |
| 136 |
@@ -153,10 +153,14 @@ src_prepare() { |
| 137 |
done |
| 138 |
|
| 139 |
if use tools; then |
| 140 |
+ cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die |
| 141 |
cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die |
| 142 |
sed -i \ |
| 143 |
-e "s:@PV@:${PV}:g" \ |
| 144 |
- "${WORKDIR}"/nvidia-settings-linker.patch || die |
| 145 |
+ "${WORKDIR}"/nvidia-settings-fno-common.patch \ |
| 146 |
+ "${WORKDIR}"/nvidia-settings-linker.patch \ |
| 147 |
+ || die |
| 148 |
+ eapply "${WORKDIR}"/nvidia-settings-fno-common.patch |
| 149 |
eapply "${WORKDIR}"/nvidia-settings-linker.patch |
| 150 |
fi |
| 151 |
|
| 152 |
|
| 153 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild |
| 154 |
index 6be7d51e602..2951a064fcd 100644 |
| 155 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild |
| 156 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44-r1.ebuild |
| 157 |
@@ -1,4 +1,4 @@ |
| 158 |
-# Copyright 1999-2019 Gentoo Authors |
| 159 |
+# Copyright 1999-2020 Gentoo Authors |
| 160 |
# Distributed under the terms of the GNU General Public License v2 |
| 161 |
|
| 162 |
EAPI=7 |
| 163 |
@@ -156,10 +156,14 @@ src_prepare() { |
| 164 |
done |
| 165 |
|
| 166 |
if use tools; then |
| 167 |
+ cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die |
| 168 |
cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die |
| 169 |
sed -i \ |
| 170 |
-e "s:@PV@:${PV}:g" \ |
| 171 |
- "${WORKDIR}"/nvidia-settings-linker.patch || die |
| 172 |
+ "${WORKDIR}"/nvidia-settings-fno-common.patch \ |
| 173 |
+ "${WORKDIR}"/nvidia-settings-linker.patch \ |
| 174 |
+ || die |
| 175 |
+ eapply "${WORKDIR}"/nvidia-settings-fno-common.patch |
| 176 |
eapply "${WORKDIR}"/nvidia-settings-linker.patch |
| 177 |
fi |
Archives