Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
Date: Sat, 27 Jun 2020 04:23:04
Message-Id: 1593231762.7e7c112c7d334a19e0048054a9ce888964b50ae3.jer@gentoo
1 commit: 7e7c112c7d334a19e0048054a9ce888964b50ae3
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 27 04:14:36 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 27 04:22:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7c112c
7
8 x11-drivers/nvidia-drivers: Do not use systemd_get_utildir()
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Closes: https://bugs.gentoo.org/689588
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 ...2-r3.ebuild => nvidia-drivers-430.64-r5.ebuild} | 58 +++++++---------------
15 ...2-r3.ebuild => nvidia-drivers-435.21-r5.ebuild} | 14 ++----
16 ...-r3.ebuild => nvidia-drivers-440.100-r1.ebuild} | 9 ++--
17 .../nvidia-drivers/nvidia-drivers-440.82-r3.ebuild | 2 +-
18 ...2-r3.ebuild => nvidia-drivers-440.82-r4.ebuild} | 4 +-
19 ...2-r3.ebuild => nvidia-drivers-450.51-r1.ebuild} | 12 ++---
20 6 files changed, 32 insertions(+), 67 deletions(-)
21
22 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
23 similarity index 91%
24 copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
25 copy to x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
26 index de2d1351e1c..129f697ae87 100644
27 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
28 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
29 @@ -19,11 +19,11 @@ SRC_URI="
30 "
31
32 EMULTILIB_PKG="true"
33 -KEYWORDS="-* amd64"
34 +KEYWORDS="-* ~amd64"
35 LICENSE="GPL-2 NVIDIA-r2"
36 SLOT="0/${PV%.*}"
37
38 -IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
39 +IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
40 REQUIRED_USE="
41 tools? ( X )
42 static-libs? ( tools )
43 @@ -50,11 +50,7 @@ COMMON="
44 x11-libs/pango[X]
45 )
46 X? (
47 - !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
48 - libglvnd? (
49 - media-libs/libglvnd[${MULTILIB_USEDEP}]
50 - !app-eselect/eselect-opengl
51 - )
52 + >=app-eselect/eselect-opengl-1.0.9
53 app-misc/pax-utils
54 )
55 "
56 @@ -78,10 +74,7 @@ RDEPEND="
57 "
58 QA_PREBUILT="opt/* usr/lib*"
59 S=${WORKDIR}/
60 -PATCHES=(
61 - "${FILESDIR}"/${PN}-440.26-locale.patch
62 -)
63 -NV_KV_MAX_PLUS="5.7"
64 +NV_KV_MAX_PLUS="5.5"
65 CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
66
67 pkg_pretend() {
68 @@ -324,9 +317,6 @@ src_install() {
69
70 insinto /etc/vulkan/icd.d
71 doins nvidia_icd.json
72 -
73 - insinto /etc/vulkan/implicit_layer.d
74 - doins nvidia_layers.json
75 fi
76
77 if use kernel_linux; then
78 @@ -390,7 +380,7 @@ src_install() {
79
80 systemd_dounit *.service
81 dobin nvidia-sleep.sh
82 - exeinto $(systemd_get_utildir)/system-sleep
83 + exeinto /lib/systemd/system-sleep
84 doexe nvidia
85
86 if has_multilib_profile && use multilib; then
87 @@ -429,11 +419,7 @@ src_install() {
88
89 src_install-libs() {
90 local inslibdir=$(get_libdir)
91 - if use libglvnd; then
92 - local GL_ROOT="/usr/$(get_libdir)"
93 - else
94 - local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
95 - fi
96 + local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
97 local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
98 local nv_libdir="${NV_OBJ}"
99
100 @@ -443,11 +429,18 @@ src_install-libs() {
101
102 if use X; then
103 NV_GLX_LIBRARIES=(
104 + "libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
105 "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
106 + "libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
107 + "libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
108 "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
109 + "libGLESv2.so.2.1.0 ${GL_ROOT}"
110 "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
111 + "libGLX.so.0 ${GL_ROOT}"
112 "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
113 + "libGLdispatch.so.0 ${GL_ROOT}"
114 "libOpenCL.so.1.0.0 ${CL_ROOT}"
115 + "libOpenGL.so.0 ${GL_ROOT}"
116 "libcuda.so.${NV_SOVER}"
117 "libnvcuvid.so.${NV_SOVER}"
118 "libnvidia-compiler.so.${NV_SOVER}"
119 @@ -463,22 +456,11 @@ src_install-libs() {
120 "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
121 "libvdpau_nvidia.so.${NV_SOVER}"
122 )
123 - if ! use libglvnd; then
124 - NV_GLX_LIBRARIES+=(
125 - "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
126 - "libGL.so.1.7.0 ${GL_ROOT}"
127 - "libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
128 - "libGLESv2.so.2.1.0 ${GL_ROOT}"
129 - "libGLX.so.0 ${GL_ROOT}"
130 - "libGLdispatch.so.0 ${GL_ROOT}"
131 - "libOpenGL.so.0 ${GL_ROOT}"
132 - )
133 - fi
134
135 if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
136 then
137 NV_GLX_LIBRARIES+=(
138 - "libnvidia-egl-wayland.so.1.1.4"
139 + "libnvidia-egl-wayland.so.1.1.2"
140 )
141 fi
142
143 @@ -541,9 +523,7 @@ pkg_postinst() {
144 use driver && use kernel_linux && linux-mod_pkg_postinst
145
146 # Switch to the nvidia implementation
147 - if ! use libglvnd; then
148 - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
149 - fi
150 + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
151
152 readme.gentoo_print_elog
153
154 @@ -575,14 +555,10 @@ pkg_postinst() {
155 }
156
157 pkg_prerm() {
158 - if ! use libglvnd; then
159 - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
160 - fi
161 + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
162 }
163
164 pkg_postrm() {
165 use driver && use kernel_linux && linux-mod_pkg_postrm
166 - if ! use libglvnd; then
167 - use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
168 - fi
169 + use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
170 }
171
172 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
173 similarity index 98%
174 copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
175 copy to x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
176 index de2d1351e1c..9155c921852 100644
177 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
178 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
179 @@ -19,7 +19,7 @@ SRC_URI="
180 "
181
182 EMULTILIB_PKG="true"
183 -KEYWORDS="-* amd64"
184 +KEYWORDS="-* ~amd64"
185 LICENSE="GPL-2 NVIDIA-r2"
186 SLOT="0/${PV%.*}"
187
188 @@ -78,10 +78,7 @@ RDEPEND="
189 "
190 QA_PREBUILT="opt/* usr/lib*"
191 S=${WORKDIR}/
192 -PATCHES=(
193 - "${FILESDIR}"/${PN}-440.26-locale.patch
194 -)
195 -NV_KV_MAX_PLUS="5.7"
196 +NV_KV_MAX_PLUS="5.4"
197 CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
198
199 pkg_pretend() {
200 @@ -324,9 +321,6 @@ src_install() {
201
202 insinto /etc/vulkan/icd.d
203 doins nvidia_icd.json
204 -
205 - insinto /etc/vulkan/implicit_layer.d
206 - doins nvidia_layers.json
207 fi
208
209 if use kernel_linux; then
210 @@ -390,7 +384,7 @@ src_install() {
211
212 systemd_dounit *.service
213 dobin nvidia-sleep.sh
214 - exeinto $(systemd_get_utildir)/system-sleep
215 + exeinto /lib/systemd/system-sleep
216 doexe nvidia
217
218 if has_multilib_profile && use multilib; then
219 @@ -478,7 +472,7 @@ src_install-libs() {
220 if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
221 then
222 NV_GLX_LIBRARIES+=(
223 - "libnvidia-egl-wayland.so.1.1.4"
224 + "libnvidia-egl-wayland.so.1.1.3"
225 )
226 fi
227
228
229 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
230 similarity index 98%
231 copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
232 copy to x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
233 index de2d1351e1c..88ae9cd33c8 100644
234 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
235 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
236 @@ -19,7 +19,7 @@ SRC_URI="
237 "
238
239 EMULTILIB_PKG="true"
240 -KEYWORDS="-* amd64"
241 +KEYWORDS="-* ~amd64"
242 LICENSE="GPL-2 NVIDIA-r2"
243 SLOT="0/${PV%.*}"
244
245 @@ -81,7 +81,7 @@ S=${WORKDIR}/
246 PATCHES=(
247 "${FILESDIR}"/${PN}-440.26-locale.patch
248 )
249 -NV_KV_MAX_PLUS="5.7"
250 +NV_KV_MAX_PLUS="5.8"
251 CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
252
253 pkg_pretend() {
254 @@ -153,14 +153,11 @@ src_prepare() {
255 done
256
257 if use tools; then
258 - cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
259 cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
260 sed -i \
261 -e "s:@PV@:${PV}:g" \
262 - "${WORKDIR}"/nvidia-settings-fno-common.patch \
263 "${WORKDIR}"/nvidia-settings-linker.patch \
264 || die
265 - eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
266 eapply "${WORKDIR}"/nvidia-settings-linker.patch
267 fi
268
269 @@ -390,7 +387,7 @@ src_install() {
270
271 systemd_dounit *.service
272 dobin nvidia-sleep.sh
273 - exeinto $(systemd_get_utildir)/system-sleep
274 + exeinto /lib/systemd/system-sleep
275 doexe nvidia
276
277 if has_multilib_profile && use multilib; then
278
279 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
280 index de2d1351e1c..325a3407e3e 100644
281 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
282 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
283 @@ -390,7 +390,7 @@ src_install() {
284
285 systemd_dounit *.service
286 dobin nvidia-sleep.sh
287 - exeinto $(systemd_get_utildir)/system-sleep
288 + exeinto /lib/systemd/system-sleep
289 doexe nvidia
290
291 if has_multilib_profile && use multilib; then
292
293 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild
294 similarity index 99%
295 copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
296 copy to x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild
297 index de2d1351e1c..64fbf07f8a8 100644
298 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
299 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild
300 @@ -19,7 +19,7 @@ SRC_URI="
301 "
302
303 EMULTILIB_PKG="true"
304 -KEYWORDS="-* amd64"
305 +KEYWORDS="-* ~amd64"
306 LICENSE="GPL-2 NVIDIA-r2"
307 SLOT="0/${PV%.*}"
308
309 @@ -390,7 +390,7 @@ src_install() {
310
311 systemd_dounit *.service
312 dobin nvidia-sleep.sh
313 - exeinto $(systemd_get_utildir)/system-sleep
314 + exeinto /lib/systemd/system-sleep
315 doexe nvidia
316
317 if has_multilib_profile && use multilib; then
318
319 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
320 similarity index 98%
321 copy from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
322 copy to x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
323 index de2d1351e1c..010c81689c7 100644
324 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
325 +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
326 @@ -19,7 +19,7 @@ SRC_URI="
327 "
328
329 EMULTILIB_PKG="true"
330 -KEYWORDS="-* amd64"
331 +KEYWORDS="-* ~amd64"
332 LICENSE="GPL-2 NVIDIA-r2"
333 SLOT="0/${PV%.*}"
334
335 @@ -75,13 +75,14 @@ RDEPEND="
336 >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
337 sys-libs/zlib[${MULTILIB_USEDEP}]
338 )
339 + kernel_linux? ( net-libs/libtirpc )
340 "
341 QA_PREBUILT="opt/* usr/lib*"
342 S=${WORKDIR}/
343 PATCHES=(
344 "${FILESDIR}"/${PN}-440.26-locale.patch
345 )
346 -NV_KV_MAX_PLUS="5.7"
347 +NV_KV_MAX_PLUS="5.8"
348 CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
349
350 pkg_pretend() {
351 @@ -153,14 +154,11 @@ src_prepare() {
352 done
353
354 if use tools; then
355 - cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
356 cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
357 sed -i \
358 -e "s:@PV@:${PV}:g" \
359 - "${WORKDIR}"/nvidia-settings-fno-common.patch \
360 "${WORKDIR}"/nvidia-settings-linker.patch \
361 || die
362 - eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
363 eapply "${WORKDIR}"/nvidia-settings-linker.patch
364 fi
365
366 @@ -390,7 +388,7 @@ src_install() {
367
368 systemd_dounit *.service
369 dobin nvidia-sleep.sh
370 - exeinto $(systemd_get_utildir)/system-sleep
371 + exeinto /lib/systemd/system-sleep
372 doexe nvidia
373
374 if has_multilib_profile && use multilib; then
375 @@ -453,7 +451,6 @@ src_install-libs() {
376 "libnvidia-compiler.so.${NV_SOVER}"
377 "libnvidia-eglcore.so.${NV_SOVER}"
378 "libnvidia-encode.so.${NV_SOVER}"
379 - "libnvidia-fatbinaryloader.so.${NV_SOVER}"
380 "libnvidia-fbc.so.${NV_SOVER}"
381 "libnvidia-glcore.so.${NV_SOVER}"
382 "libnvidia-glsi.so.${NV_SOVER}"
383 @@ -499,6 +496,7 @@ src_install-libs() {
384 then
385 NV_GLX_LIBRARIES+=(
386 "libnvidia-cbl.so.${NV_SOVER}"
387 + "libnvidia-ngx.so.${NV_SOVER}"
388 "libnvidia-rtcore.so.${NV_SOVER}"
389 "libnvoptix.so.${NV_SOVER}"
390 )
Report Message
Find on MARC Find on Google Groups