1 |
commit: 2686aee327716ccc1768f41cde0979a9441c4ad0 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 11:47:05 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 11:47:05 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2686aee3 |
7 |
|
8 |
x11-drivers/nvidia-drivers: USE=static-libs requires USE=tools. Update 352 branch for bug #562910. |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
x11-drivers/nvidia-drivers/Manifest | 1 + |
13 |
.../nvidia-drivers-304.131-r1.ebuild | 5 +- |
14 |
...1-r1.ebuild => nvidia-drivers-352.79-r1.ebuild} | 148 +++++++++++++-------- |
15 |
.../nvidia-drivers/nvidia-drivers-361.18-r2.ebuild | 14 +- |
16 |
4 files changed, 105 insertions(+), 63 deletions(-) |
17 |
|
18 |
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest |
19 |
index 13b7ae7..00809e0 100644 |
20 |
--- a/x11-drivers/nvidia-drivers/Manifest |
21 |
+++ b/x11-drivers/nvidia-drivers/Manifest |
22 |
@@ -42,4 +42,5 @@ DIST NVIDIA-Linux-x86_64-361.18.run 86447500 SHA256 94cccc3ff10ee9544f60bf1d32d0 |
23 |
DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb |
24 |
DIST nvidia-settings-304.131.tar.bz2 1480447 SHA256 d36d2d1ae7c1bb72cd18e713470546d2aa7057624b1f61319daf559a94054d29 SHA512 9269f54f87581e29e6d7cabeaf989c70cb27aa55f6b8f5f1c71b8a14401326d06ea194710722b41283cca56f5808b90a9b1fb12158d48c6332cce15a701c5796 WHIRLPOOL be8e38a09a0bfa40267b9cdae2800a9ef00a89e28e618b743b7acb0cd9ece4b242b74ced32018d735989592300b49b2ee683caa11a1e161bcecf070a58952dfd |
25 |
DIST nvidia-settings-340.96.tar.bz2 1551011 SHA256 af7303b070a4b41e388a7be6dfae17f020a5cc197170d4815b9a291a3a98aaff SHA512 fc6096338e48c347e4e854d06e8f63d8edb6527953996e63f3f70619be59d0436176547b5197ef30d18a82cf5b58dd775dcca4a2624107b63cce1ae589f2b154 WHIRLPOOL e7266ca0395aa1a5666a43bf6e54e258706d4e76bfd15079485e2379b332d2d6ba0c97b32e49f5b041340bb2d3c0e11dace702754ffc952c149557e0ab9d820a |
26 |
+DIST nvidia-settings-352.79.tar.bz2 1570988 SHA256 1f103cbfe162281355c484a5c3ef9ac1bb0528acba2d229111da7e58cf18f217 SHA512 d56e20844bf71d55e51aebca38e922a2985fdbd4edab29a07f9a4a8a0b883ca469c3b949f048837ec77464da90e2d485e5efcd314afc2810c44ad7dc497b53fe WHIRLPOOL 51999a744f6b3e36c4d12f841c136a754533de09c1802f60392666392beeccbb0bf1489269cac33b12ccb061554609d3dc8d8ffbf45b4cb860108fd9f86e2139 |
27 |
DIST nvidia-settings-361.18.tar.bz2 1570821 SHA256 5e821bf9c92931da7c4ac2cac4c61a83e7f74641902935232cad747511fab363 SHA512 1a19ebb6773b53564a7996c8f963c161df599ed8ca577f505fbed1181f144a5e53fa970e3fee7fceed16909bd012f74f9af74080314ae9de9356894df9b1be4d WHIRLPOOL 23ff413900fca81427d755ecb5889dbb69033e101cf7c2f3edea4971defd03aedee95f5488779f634c690c05bfabe0763baf3dbf6377de950cabe48ad9c72684 |
28 |
|
29 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
30 |
index 50aa106..4de38e1 100644 |
31 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
32 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
33 |
@@ -65,7 +65,10 @@ RDEPEND="${COMMON} |
34 |
" |
35 |
PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )" |
36 |
|
37 |
-REQUIRED_USE="tools? ( X )" |
38 |
+REQUIRED_USE=" |
39 |
+ tools? ( X ) |
40 |
+ static-libs? ( tools ) |
41 |
+" |
42 |
|
43 |
QA_PREBUILT="opt/* usr/lib*" |
44 |
|
45 |
|
46 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild |
47 |
similarity index 79% |
48 |
copy from x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
49 |
copy to x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild |
50 |
index 50aa106..2435263 100644 |
51 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
52 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r1.ebuild |
53 |
@@ -3,8 +3,9 @@ |
54 |
# $Id$ |
55 |
|
56 |
EAPI=5 |
57 |
+ |
58 |
inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \ |
59 |
- portability toolchain-funcs unpacker user versionator udev |
60 |
+ portability toolchain-funcs unpacker user udev |
61 |
|
62 |
NV_URI="http://us.download.nvidia.com/XFree86/" |
63 |
X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" |
64 |
@@ -22,57 +23,65 @@ SRC_URI=" |
65 |
tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 ) |
66 |
" |
67 |
|
68 |
-LICENSE="GPL-2 NVIDIA-r1" |
69 |
+LICENSE="GPL-2 NVIDIA-r2" |
70 |
SLOT="0/${PV%.*}" |
71 |
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" |
72 |
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X" |
73 |
RESTRICT="bindist mirror strip" |
74 |
EMULTILIB_PKG="true" |
75 |
|
76 |
+IUSE="acpi gtk3 multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X uvm" |
77 |
+REQUIRED_USE=" |
78 |
+ tools? ( X ) |
79 |
+ static-libs? ( tools ) |
80 |
+" |
81 |
+ |
82 |
COMMON=" |
83 |
app-eselect/eselect-opencl |
84 |
kernel_linux? ( >=sys-libs/glibc-2.6.1 ) |
85 |
tools? ( |
86 |
dev-libs/atk |
87 |
dev-libs/glib:2 |
88 |
- x11-libs/gdk-pixbuf |
89 |
+ dev-libs/jansson |
90 |
+ gtk3? ( |
91 |
+ x11-libs/gtk+:3 |
92 |
+ ) |
93 |
+ x11-libs/cairo |
94 |
+ x11-libs/gdk-pixbuf[X] |
95 |
x11-libs/gtk+:2 |
96 |
x11-libs/libX11 |
97 |
x11-libs/libXext |
98 |
+ x11-libs/libXrandr |
99 |
+ x11-libs/libXv |
100 |
+ x11-libs/libXxf86vm |
101 |
x11-libs/pango[X] |
102 |
- x11-libs/pangox-compat |
103 |
) |
104 |
X? ( |
105 |
>=app-eselect/eselect-opengl-1.0.9 |
106 |
) |
107 |
" |
108 |
-DEPEND="${COMMON} |
109 |
- kernel_linux? ( |
110 |
- virtual/linux-sources |
111 |
- virtual/pkgconfig |
112 |
- )" |
113 |
-RDEPEND="${COMMON} |
114 |
+DEPEND=" |
115 |
+ ${COMMON} |
116 |
+ kernel_linux? ( virtual/linux-sources ) |
117 |
+" |
118 |
+RDEPEND=" |
119 |
+ ${COMMON} |
120 |
acpi? ( sys-power/acpid ) |
121 |
tools? ( !media-video/nvidia-settings ) |
122 |
X? ( |
123 |
<x11-base/xorg-server-1.18.99:= |
124 |
- x11-libs/libXvMC |
125 |
+ >=x11-libs/libvdpau-0.3-r1 |
126 |
multilib? ( |
127 |
>=x11-libs/libX11-1.6.2[abi_x86_32] |
128 |
>=x11-libs/libXext-1.3.2[abi_x86_32] |
129 |
) |
130 |
) |
131 |
" |
132 |
-PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )" |
133 |
- |
134 |
-REQUIRED_USE="tools? ( X )" |
135 |
|
136 |
QA_PREBUILT="opt/* usr/lib*" |
137 |
|
138 |
S=${WORKDIR}/ |
139 |
|
140 |
pkg_pretend() { |
141 |
- |
142 |
if use amd64 && has_multilib_profile && \ |
143 |
[ "${DEFAULT_ABI}" != "amd64" ]; then |
144 |
eerror "This ebuild doesn't currently support changing your default ABI" |
145 |
@@ -113,10 +122,17 @@ pkg_setup() { |
146 |
export CCACHE_DISABLE=1 |
147 |
|
148 |
if use kernel_linux; then |
149 |
- linux-mod_pkg_setup |
150 |
MODULE_NAMES="nvidia(video:${S}/kernel)" |
151 |
+ use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)" |
152 |
+ |
153 |
+ # This needs to run after MODULE_NAMES (so that the eclass checks |
154 |
+ # whether the kernel supports loadable modules) but before BUILD_PARAMS |
155 |
+ # is set (so that KV_DIR is populated). |
156 |
+ linux-mod_pkg_setup |
157 |
+ |
158 |
BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ |
159 |
SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" |
160 |
+ |
161 |
# linux-mod_src_compile calls set_arch_to_kernel, which |
162 |
# sets the ARCH to x86 but NVIDIA's wrapping Makefile |
163 |
# expects x86_64 or i386 and then converts it to x86 |
164 |
@@ -155,21 +171,17 @@ src_prepare() { |
165 |
fi |
166 |
|
167 |
# If greater than 2.6.5 use M= instead of SUBDIR= |
168 |
- convert_to_m "${NV_SRC}"/Makefile.kbuild |
169 |
+# convert_to_m "${NV_SRC}"/Makefile.kbuild |
170 |
fi |
171 |
|
172 |
if use pax_kernel; then |
173 |
ewarn "Using PAX patches is not supported. You will be asked to" |
174 |
ewarn "use a standard kernel should you have issues. Should you" |
175 |
ewarn "need support with these patches, contact the PaX team." |
176 |
- epatch "${FILESDIR}"/${PN}-pax-const.patch |
177 |
- epatch "${FILESDIR}"/${PN}-pax-usercopy.patch |
178 |
+ epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch |
179 |
+ epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch |
180 |
fi |
181 |
|
182 |
- cat <<- EOF > "${S}"/nvidia.icd |
183 |
- /usr/$(get_libdir)/libnvidia-opencl.so |
184 |
- EOF |
185 |
- |
186 |
# Allow user patches so they can support RC kernels and whatever else |
187 |
epatch_user |
188 |
} |
189 |
@@ -184,25 +196,26 @@ src_compile() { |
190 |
MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ |
191 |
LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die |
192 |
elif use kernel_linux; then |
193 |
- MAKEOPTS=-j1 linux-mod_src_compile |
194 |
+ MAKEOPTS=-j1 |
195 |
+ linux-mod_src_compile |
196 |
fi |
197 |
|
198 |
if use tools; then |
199 |
- emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean |
200 |
- emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \ |
201 |
+ emake -C "${S}"/nvidia-settings-${PV}/src \ |
202 |
AR="$(tc-getAR)" \ |
203 |
CC="$(tc-getCC)" \ |
204 |
+ LIBDIR="$(get_libdir)" \ |
205 |
RANLIB="$(tc-getRANLIB)" \ |
206 |
- libXNVCtrl.a |
207 |
+ build-xnvctrl |
208 |
+ |
209 |
emake -C "${S}"/nvidia-settings-${PV}/src \ |
210 |
- AR="$(tc-getAR)" \ |
211 |
CC="$(tc-getCC)" \ |
212 |
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \ |
213 |
LD="$(tc-getCC)" \ |
214 |
LIBDIR="$(get_libdir)" \ |
215 |
NVML_ENABLED=0 \ |
216 |
NV_USE_BUNDLED_LIBJANSSON=0 \ |
217 |
NV_VERBOSE=1 \ |
218 |
- RANLIB="$(tc-getRANLIB)" \ |
219 |
STRIP_CMD=true |
220 |
fi |
221 |
} |
222 |
@@ -258,6 +271,7 @@ src_install() { |
223 |
# pkg_preinst, see bug #491414 |
224 |
insinto /etc/modprobe.d |
225 |
newins "${FILESDIR}"/nvidia-169.07 nvidia.conf |
226 |
+ use uvm && doins "${FILESDIR}"/nvidia-uvm.conf |
227 |
|
228 |
# Ensures that our device nodes are created when not using X |
229 |
exeinto "$(get_udevdir)" |
230 |
@@ -276,9 +290,13 @@ src_install() { |
231 |
# NVIDIA kernel <-> userspace driver config lib |
232 |
donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER} |
233 |
|
234 |
+ # NVIDIA framebuffer capture library |
235 |
+ donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER} |
236 |
+ |
237 |
+ # NVIDIA video encode/decode <-> CUDA |
238 |
if use kernel_linux; then |
239 |
- # NVIDIA video decode <-> CUDA |
240 |
donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER} |
241 |
+ donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER} |
242 |
fi |
243 |
|
244 |
if use X; then |
245 |
@@ -290,20 +308,17 @@ src_install() { |
246 |
donvidia ${NV_X11}/libglx.so ${NV_SOVER} \ |
247 |
/usr/$(get_libdir)/opengl/nvidia/extensions |
248 |
|
249 |
- # XvMC driver |
250 |
- dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ |
251 |
- die "failed to install libXvMCNVIDIA.so" |
252 |
- donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER} |
253 |
- dosym libXvMCNVIDIA.so.${NV_SOVER} \ |
254 |
- /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \ |
255 |
- die "failed to create libXvMCNVIDIA_dynamic.so symlink" |
256 |
+ # Xorg nvidia.conf |
257 |
+ if has_version '>=x11-base/xorg-server-1.16'; then |
258 |
+ insinto /usr/share/X11/xorg.conf.d |
259 |
+ newins {,50-}nvidia-drm-outputclass.conf |
260 |
+ fi |
261 |
fi |
262 |
|
263 |
# OpenCL ICD for NVIDIA |
264 |
if use kernel_linux; then |
265 |
insinto /etc/OpenCL/vendors |
266 |
- doins nvidia.icd |
267 |
- donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER} |
268 |
+ doins ${NV_OBJ}/nvidia.icd |
269 |
fi |
270 |
|
271 |
# Documentation |
272 |
@@ -319,7 +334,7 @@ src_install() { |
273 |
doman "${NV_MAN}/nvidia-smi.1.gz" |
274 |
use X && doman "${NV_MAN}/nvidia-xconfig.1.gz" |
275 |
use tools && doman "${NV_MAN}/nvidia-settings.1.gz" |
276 |
- doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz" |
277 |
+ doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz" |
278 |
fi |
279 |
|
280 |
# Helper Apps |
281 |
@@ -330,19 +345,30 @@ src_install() { |
282 |
fi |
283 |
|
284 |
if use kernel_linux ; then |
285 |
+ doexe ${NV_OBJ}/nvidia-cuda-mps-control |
286 |
+ doexe ${NV_OBJ}/nvidia-cuda-mps-server |
287 |
doexe ${NV_OBJ}/nvidia-debugdump |
288 |
- doexe ${NV_OBJ}/nvidia-cuda-proxy-control |
289 |
- doexe ${NV_OBJ}/nvidia-cuda-proxy-server |
290 |
+ doexe ${NV_OBJ}/nvidia-persistenced |
291 |
doexe ${NV_OBJ}/nvidia-smi |
292 |
+ |
293 |
+ # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092) |
294 |
+ doexe ${NV_OBJ}/nvidia-modprobe |
295 |
+ fowners root:video /opt/bin/nvidia-modprobe |
296 |
+ fperms 4710 /opt/bin/nvidia-modprobe |
297 |
+ dosym /{opt,usr}/bin/nvidia-modprobe |
298 |
+ |
299 |
+ doman nvidia-cuda-mps-control.1.gz |
300 |
+ doman nvidia-modprobe.1.gz |
301 |
+ doman nvidia-persistenced.1.gz |
302 |
newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi |
303 |
+ newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced |
304 |
+ newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced |
305 |
fi |
306 |
|
307 |
- dobin ${NV_OBJ}/nvidia-bug-report.sh |
308 |
- |
309 |
- # Desktop entries for nvidia-settings |
310 |
- if use tools ; then |
311 |
+ if use tools; then |
312 |
emake -C "${S}"/nvidia-settings-${PV}/src/ \ |
313 |
DESTDIR="${D}" \ |
314 |
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \ |
315 |
LIBDIR="${D}/usr/$(get_libdir)" \ |
316 |
PREFIX=/usr \ |
317 |
NV_USE_BUNDLED_LIBJANSSON=0 \ |
318 |
@@ -351,8 +377,12 @@ src_install() { |
319 |
use static-libs && \ |
320 |
dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
321 |
|
322 |
- insinto /usr/include/NVCtrl |
323 |
- doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |
324 |
+ insinto /usr/share/nvidia/ |
325 |
+ doins nvidia-application-profiles-${PV}-key-documentation |
326 |
+ |
327 |
+ insinto /etc/nvidia |
328 |
+ newins \ |
329 |
+ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc |
330 |
|
331 |
# There is no icon in the FreeBSD tarball. |
332 |
use kernel_FreeBSD || \ |
333 |
@@ -364,7 +394,7 @@ src_install() { |
334 |
doexe "${FILESDIR}"/95-nvidia-settings |
335 |
fi |
336 |
|
337 |
- #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist |
338 |
+ dobin ${NV_OBJ}/nvidia-bug-report.sh |
339 |
|
340 |
if has_multilib_profile && use multilib ; then |
341 |
local OABI=${ABI} |
342 |
@@ -395,16 +425,27 @@ src_install-libs() { |
343 |
|
344 |
if use X; then |
345 |
# The GLX libraries |
346 |
+ donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT} |
347 |
donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT} |
348 |
+ donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT} |
349 |
+ donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER} |
350 |
donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER} |
351 |
+ donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER} |
352 |
+ donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER} |
353 |
if use kernel_FreeBSD; then |
354 |
- donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT} |
355 |
+ donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} |
356 |
else |
357 |
- donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT} |
358 |
+ donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} |
359 |
fi |
360 |
|
361 |
# VDPAU |
362 |
donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER} |
363 |
+ |
364 |
+ # GLES v2 libraries |
365 |
+ insinto ${GL_ROOT} |
366 |
+ doexe ${libdir}/libGLESv2.so.${PV} |
367 |
+ dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2 |
368 |
+ dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so |
369 |
fi |
370 |
|
371 |
# NVIDIA monitoring library |
372 |
@@ -417,6 +458,7 @@ src_install-libs() { |
373 |
donvidia ${libdir}/libcuda.so ${NV_SOVER} |
374 |
donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER} |
375 |
donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT} |
376 |
+ donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER} |
377 |
fi |
378 |
} |
379 |
|
380 |
@@ -458,7 +500,7 @@ pkg_postinst() { |
381 |
|
382 |
if ! use X; then |
383 |
elog "You have elected to not install the X.org driver. Along with" |
384 |
- elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not" |
385 |
+ elog "this the OpenGL libraries and VDPAU libraries were not" |
386 |
elog "installed. Additionally, once the driver is loaded your card" |
387 |
elog "and fan will run at max speed which may not be desirable." |
388 |
elog "Use the 'nvidia-smi' init script to have your card and fan" |
389 |
|
390 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
391 |
index e2759ed..b2f2410 100644 |
392 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
393 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
394 |
@@ -31,23 +31,20 @@ EMULTILIB_PKG="true" |
395 |
|
396 |
IUSE="acpi +driver gtk2 gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" |
397 |
REQUIRED_USE=" |
398 |
- tools? ( X || ( gtk2 gtk3 ) ) |
399 |
+ tools? ( X ) |
400 |
+ static-libs? ( tools ) |
401 |
" |
402 |
|
403 |
COMMON=" |
404 |
app-eselect/eselect-opencl |
405 |
kernel_linux? ( >=sys-libs/glibc-2.6.1 ) |
406 |
tools? ( |
407 |
- >=x11-libs/libvdpau-1.0 |
408 |
dev-libs/atk |
409 |
dev-libs/glib:2 |
410 |
dev-libs/jansson |
411 |
- gtk2? ( >=x11-libs/gtk+-2.4:2 ) |
412 |
gtk3? ( |
413 |
- x11-libs/cairo |
414 |
x11-libs/gtk+:3 |
415 |
) |
416 |
- media-libs/mesa |
417 |
x11-libs/cairo |
418 |
x11-libs/gdk-pixbuf[X] |
419 |
x11-libs/gtk+:2 |
420 |
@@ -65,7 +62,6 @@ COMMON=" |
421 |
" |
422 |
DEPEND=" |
423 |
${COMMON} |
424 |
- app-arch/xz-utils |
425 |
kernel_linux? ( virtual/linux-sources ) |
426 |
" |
427 |
RDEPEND=" |
428 |
@@ -369,6 +365,9 @@ src_install() { |
429 |
NV_USE_BUNDLED_LIBJANSSON=0 \ |
430 |
install |
431 |
|
432 |
+ use static-libs && \ |
433 |
+ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
434 |
+ |
435 |
insinto /usr/share/nvidia/ |
436 |
doins nvidia-application-profiles-${PV}-key-documentation |
437 |
|
438 |
@@ -376,9 +375,6 @@ src_install() { |
439 |
newins \ |
440 |
nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc |
441 |
|
442 |
- use static-libs && \ |
443 |
- dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
444 |
- |
445 |
insinto /usr/include/NVCtrl |
446 |
doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |