1 |
commit: 7963b67b7bbee8240d0ce52a7e4b056f7db64b7c |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 12:18:04 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 12:18:04 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7963b67b |
7 |
|
8 |
x11-drivers/nvidia-drivers: Update 358 branch for bug #562910. Clean up 361 branch ebuild. |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
x11-drivers/nvidia-drivers/Manifest | 1 + |
13 |
...8-r2.ebuild => nvidia-drivers-358.16-r2.ebuild} | 162 +++++++++++---------- |
14 |
.../nvidia-drivers/nvidia-drivers-361.18-r2.ebuild | 13 +- |
15 |
3 files changed, 90 insertions(+), 86 deletions(-) |
16 |
|
17 |
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest |
18 |
index 00809e0..39d279a 100644 |
19 |
--- a/x11-drivers/nvidia-drivers/Manifest |
20 |
+++ b/x11-drivers/nvidia-drivers/Manifest |
21 |
@@ -43,4 +43,5 @@ DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbd |
22 |
DIST nvidia-settings-304.131.tar.bz2 1480447 SHA256 d36d2d1ae7c1bb72cd18e713470546d2aa7057624b1f61319daf559a94054d29 SHA512 9269f54f87581e29e6d7cabeaf989c70cb27aa55f6b8f5f1c71b8a14401326d06ea194710722b41283cca56f5808b90a9b1fb12158d48c6332cce15a701c5796 WHIRLPOOL be8e38a09a0bfa40267b9cdae2800a9ef00a89e28e618b743b7acb0cd9ece4b242b74ced32018d735989592300b49b2ee683caa11a1e161bcecf070a58952dfd |
23 |
DIST nvidia-settings-340.96.tar.bz2 1551011 SHA256 af7303b070a4b41e388a7be6dfae17f020a5cc197170d4815b9a291a3a98aaff SHA512 fc6096338e48c347e4e854d06e8f63d8edb6527953996e63f3f70619be59d0436176547b5197ef30d18a82cf5b58dd775dcca4a2624107b63cce1ae589f2b154 WHIRLPOOL e7266ca0395aa1a5666a43bf6e54e258706d4e76bfd15079485e2379b332d2d6ba0c97b32e49f5b041340bb2d3c0e11dace702754ffc952c149557e0ab9d820a |
24 |
DIST nvidia-settings-352.79.tar.bz2 1570988 SHA256 1f103cbfe162281355c484a5c3ef9ac1bb0528acba2d229111da7e58cf18f217 SHA512 d56e20844bf71d55e51aebca38e922a2985fdbd4edab29a07f9a4a8a0b883ca469c3b949f048837ec77464da90e2d485e5efcd314afc2810c44ad7dc497b53fe WHIRLPOOL 51999a744f6b3e36c4d12f841c136a754533de09c1802f60392666392beeccbb0bf1489269cac33b12ccb061554609d3dc8d8ffbf45b4cb860108fd9f86e2139 |
25 |
+DIST nvidia-settings-358.16.tar.bz2 1571104 SHA256 8cd78df738a824e282771755ae9a41d5b194b15f9df96b9fd23fcf3005967d35 SHA512 0438aa2599e98f68a04c9f663f4ef9b05092df512fbca40ad0fe17e25ca4d940d02cc55e9fd44a2551950a2a30782d1e48553c4bebd071bfff280869a6dde556 WHIRLPOOL 60b7e9abba3163ac877a3a9d944cf72352e28d2fd1a3af0996d3b7d40ef48be7f057c1063f9ca61c693cbf1bff57be61704f13d941220bf74a8049954f87154d |
26 |
DIST nvidia-settings-361.18.tar.bz2 1570821 SHA256 5e821bf9c92931da7c4ac2cac4c61a83e7f74641902935232cad747511fab363 SHA512 1a19ebb6773b53564a7996c8f963c161df599ed8ca577f505fbed1181f144a5e53fa970e3fee7fceed16909bd012f74f9af74080314ae9de9356894df9b1be4d WHIRLPOOL 23ff413900fca81427d755ecb5889dbb69033e101cf7c2f3edea4971defd03aedee95f5488779f634c690c05bfabe0763baf3dbf6377de950cabe48ad9c72684 |
27 |
|
28 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild |
29 |
similarity index 81% |
30 |
copy from x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
31 |
copy to x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild |
32 |
index b2f2410..9f0cd78 100644 |
33 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
34 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r2.ebuild |
35 |
@@ -29,7 +29,7 @@ KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" |
36 |
RESTRICT="bindist mirror strip" |
37 |
EMULTILIB_PKG="true" |
38 |
|
39 |
-IUSE="acpi +driver gtk2 gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" |
40 |
+IUSE="acpi multilib kernel_FreeBSD kernel_linux +kms pax_kernel static-libs +tools gtk3 +X uvm" |
41 |
REQUIRED_USE=" |
42 |
tools? ( X ) |
43 |
static-libs? ( tools ) |
44 |
@@ -42,9 +42,7 @@ COMMON=" |
45 |
dev-libs/atk |
46 |
dev-libs/glib:2 |
47 |
dev-libs/jansson |
48 |
- gtk3? ( |
49 |
- x11-libs/gtk+:3 |
50 |
- ) |
51 |
+ gtk3? ( x11-libs/gtk+:3 ) |
52 |
x11-libs/cairo |
53 |
x11-libs/gdk-pixbuf[X] |
54 |
x11-libs/gtk+:2 |
55 |
@@ -57,7 +55,6 @@ COMMON=" |
56 |
) |
57 |
X? ( |
58 |
>=app-eselect/eselect-opengl-1.0.9 |
59 |
- app-misc/pax-utils |
60 |
) |
61 |
" |
62 |
DEPEND=" |
63 |
@@ -89,11 +86,11 @@ pkg_pretend() { |
64 |
die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
65 |
fi |
66 |
|
67 |
- if use kernel_linux && kernel_is ge 4 5; then |
68 |
+ if use kernel_linux && kernel_is ge 4 4; then |
69 |
ewarn "Gentoo supports kernels which are supported by NVIDIA" |
70 |
ewarn "which are limited to the following kernels:" |
71 |
- ewarn "<sys-kernel/gentoo-sources-4.5" |
72 |
- ewarn "<sys-kernel/vanilla-sources-4.5" |
73 |
+ ewarn "<sys-kernel/gentoo-sources-4.4" |
74 |
+ ewarn "<sys-kernel/vanilla-sources-4.4" |
75 |
ewarn "" |
76 |
ewarn "You are free to utilize epatch_user to provide whatever" |
77 |
ewarn "support you feel is appropriate, but will not receive" |
78 |
@@ -122,7 +119,7 @@ pkg_setup() { |
79 |
export DISTCC_DISABLE=1 |
80 |
export CCACHE_DISABLE=1 |
81 |
|
82 |
- if use driver && use kernel_linux; then |
83 |
+ if use kernel_linux; then |
84 |
MODULE_NAMES="nvidia(video:${S}/kernel)" |
85 |
use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)" |
86 |
use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel)" |
87 |
@@ -142,10 +139,6 @@ pkg_setup() { |
88 |
BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')" |
89 |
fi |
90 |
|
91 |
- if use kernel_linux && kernel_is lt 2 6 9; then |
92 |
- eerror "You must build this against 2.6.9 or higher kernels." |
93 |
- fi |
94 |
- |
95 |
# set variables to where files are in the package structure |
96 |
if use kernel_FreeBSD; then |
97 |
use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}" |
98 |
@@ -169,6 +162,17 @@ pkg_setup() { |
99 |
} |
100 |
|
101 |
src_prepare() { |
102 |
+ # Please add a brief description for every added patch |
103 |
+ |
104 |
+ if use kernel_linux; then |
105 |
+ if kernel_is lt 2 6 9; then |
106 |
+ eerror "You must build this against 2.6.9 or higher kernels." |
107 |
+ fi |
108 |
+ |
109 |
+ # If greater than 2.6.5 use M= instead of SUBDIR= |
110 |
+# convert_to_m "${NV_SRC}"/Makefile.kbuild |
111 |
+ fi |
112 |
+ |
113 |
if use pax_kernel; then |
114 |
ewarn "Using PAX patches is not supported. You will be asked to" |
115 |
ewarn "use a standard kernel should you have issues. Should you" |
116 |
@@ -189,7 +193,7 @@ src_compile() { |
117 |
if use kernel_FreeBSD; then |
118 |
MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ |
119 |
LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die |
120 |
- elif use driver && use kernel_linux; then |
121 |
+ elif use kernel_linux; then |
122 |
MAKEOPTS=-j1 |
123 |
linux-mod_src_compile |
124 |
fi |
125 |
@@ -219,42 +223,45 @@ src_compile() { |
126 |
# the second parameter is the provided soversion |
127 |
# the third parameter is the target directory if it is not /usr/lib |
128 |
donvidia() { |
129 |
- # Full path to library |
130 |
- nv_LIB="${1}" |
131 |
+ # Full path to library minus SOVER |
132 |
+ MY_LIB="$1" |
133 |
|
134 |
# SOVER to use |
135 |
- nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})" |
136 |
+ MY_SOVER="$2" |
137 |
|
138 |
# Where to install |
139 |
- nv_DEST="${2}" |
140 |
+ MY_DEST="$3" |
141 |
|
142 |
- # Get just the library name |
143 |
- nv_LIBNAME=$(basename "${nv_LIB}") |
144 |
- |
145 |
- if [[ "${nv_DEST}" ]]; then |
146 |
- exeinto ${nv_DEST} |
147 |
- action="doexe" |
148 |
- else |
149 |
- nv_DEST="/usr/$(get_libdir)" |
150 |
+ if [[ -z "${MY_DEST}" ]]; then |
151 |
+ MY_DEST="/usr/$(get_libdir)" |
152 |
action="dolib.so" |
153 |
+ else |
154 |
+ exeinto ${MY_DEST} |
155 |
+ action="doexe" |
156 |
fi |
157 |
|
158 |
- # Install the library |
159 |
- ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}" |
160 |
+ # Get just the library name |
161 |
+ libname=$(basename $1) |
162 |
+ |
163 |
+ # Install the library with the correct SOVER |
164 |
+ ${action} ${MY_LIB}.${MY_SOVER} || \ |
165 |
+ die "failed to install ${libname}" |
166 |
|
167 |
- # If the library has a SONAME and SONAME does not match the library name, |
168 |
- # then we need to create a symlink |
169 |
- if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then |
170 |
- dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \ |
171 |
- || die "failed to create ${nv_DEST}/${nv_SOVER} symlink" |
172 |
+ # If SOVER wasn't 1, then we need to create a .1 symlink |
173 |
+ if [[ "${MY_SOVER}" != "1" ]]; then |
174 |
+ dosym ${libname}.${MY_SOVER} \ |
175 |
+ ${MY_DEST}/${libname}.1 || \ |
176 |
+ die "failed to create ${libname} symlink" |
177 |
fi |
178 |
|
179 |
- dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \ |
180 |
- || die "failed to create ${nv_LIBNAME/.so*/.so} symlink" |
181 |
+ # Always create the symlink from the raw lib to the .1 |
182 |
+ dosym ${libname}.1 \ |
183 |
+ ${MY_DEST}/${libname} || \ |
184 |
+ die "failed to create ${libname} symlink" |
185 |
} |
186 |
|
187 |
src_install() { |
188 |
- if use driver && use kernel_linux; then |
189 |
+ if use kernel_linux; then |
190 |
linux-mod_src_install |
191 |
|
192 |
# Add the aliases |
193 |
@@ -279,15 +286,15 @@ src_install() { |
194 |
fi |
195 |
|
196 |
# NVIDIA kernel <-> userspace driver config lib |
197 |
- donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER} |
198 |
+ donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER} |
199 |
|
200 |
# NVIDIA framebuffer capture library |
201 |
- donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER} |
202 |
+ donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER} |
203 |
|
204 |
# NVIDIA video encode/decode <-> CUDA |
205 |
if use kernel_linux; then |
206 |
- donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER} |
207 |
- donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER} |
208 |
+ donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER} |
209 |
+ donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER} |
210 |
fi |
211 |
|
212 |
if use X; then |
213 |
@@ -296,7 +303,7 @@ src_install() { |
214 |
doins ${NV_X11}/nvidia_drv.so |
215 |
|
216 |
# Xorg GLX driver |
217 |
- donvidia ${NV_X11}/libglx.so.${NV_SOVER} \ |
218 |
+ donvidia ${NV_X11}/libglx.so ${NV_SOVER} \ |
219 |
/usr/$(get_libdir)/opengl/nvidia/extensions |
220 |
|
221 |
# Xorg nvidia.conf |
222 |
@@ -368,6 +375,9 @@ src_install() { |
223 |
use static-libs && \ |
224 |
dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
225 |
|
226 |
+ insinto /usr/include/NVCtrl |
227 |
+ doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |
228 |
+ |
229 |
insinto /usr/share/nvidia/ |
230 |
doins nvidia-application-profiles-${PV}-key-documentation |
231 |
|
232 |
@@ -375,9 +385,6 @@ src_install() { |
233 |
newins \ |
234 |
nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc |
235 |
|
236 |
- insinto /usr/include/NVCtrl |
237 |
- doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |
238 |
- |
239 |
# There is no icon in the FreeBSD tarball. |
240 |
use kernel_FreeBSD || \ |
241 |
newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png |
242 |
@@ -389,7 +396,6 @@ src_install() { |
243 |
fi |
244 |
|
245 |
dobin ${NV_OBJ}/nvidia-bug-report.sh |
246 |
- #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist |
247 |
|
248 |
if has_multilib_profile && use multilib; then |
249 |
local OABI=${ABI} |
250 |
@@ -419,57 +425,57 @@ src_install-libs() { |
251 |
|
252 |
if use X; then |
253 |
NV_GLX_LIBRARIES=( |
254 |
- "libEGL.so.1 ${GL_ROOT}" |
255 |
- "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}" |
256 |
- "libGL.so.1 ${GL_ROOT}" |
257 |
- "libGLESv1_CM.so.1 ${GL_ROOT}" |
258 |
- "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}" |
259 |
- "libGLESv2.so.2 ${GL_ROOT}" |
260 |
- "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}" |
261 |
- "libGLX.so.0 ${GL_ROOT}" |
262 |
- "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}" |
263 |
- "libGLdispatch.so.0 ${GL_ROOT}" |
264 |
- "libOpenCL.so.1.0.0 ${CL_ROOT}" |
265 |
- "libOpenGL.so.0 ${GL_ROOT}" |
266 |
- "libcuda.so.${NV_SOVER}" |
267 |
- "libnvcuvid.so.${NV_SOVER}" |
268 |
- "libnvidia-compiler.so.${NV_SOVER}" |
269 |
- "libnvidia-eglcore.so.${NV_SOVER}" |
270 |
- "libnvidia-encode.so.${NV_SOVER}" |
271 |
- "libnvidia-fatbinaryloader.so.${NV_SOVER}" |
272 |
- "libnvidia-fbc.so.${NV_SOVER}" |
273 |
- "libnvidia-glcore.so.${NV_SOVER}" |
274 |
- "libnvidia-glsi.so.${NV_SOVER}" |
275 |
- "libnvidia-ifr.so.${NV_SOVER}" |
276 |
- "libnvidia-opencl.so.${NV_SOVER}" |
277 |
- "libnvidia-ptxjitcompiler.so.${NV_SOVER}" |
278 |
- "libvdpau_nvidia.so.${NV_SOVER}" |
279 |
+ "libEGL.so 1 ${GL_ROOT}" |
280 |
+ "libEGL_nvidia.so 0 ${GL_ROOT}" |
281 |
+ "libGL.so ${NV_SOVER} ${GL_ROOT}" |
282 |
+ "libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}" |
283 |
+ "libGLdispatch.so 0 ${GL_ROOT}" |
284 |
+ "libOpenCL.so 1.0.0 ${CL_ROOT}" |
285 |
+ "libOpenGL.so 0 ${GL_ROOT}" |
286 |
+ "libcuda.so ${NV_SOVER}" |
287 |
+ "libnvcuvid.so ${NV_SOVER}" |
288 |
+ "libnvidia-compiler.so ${NV_SOVER}" |
289 |
+ "libnvidia-eglcore.so ${NV_SOVER}" |
290 |
+ "libnvidia-encode.so ${NV_SOVER}" |
291 |
+ "libnvidia-fbc.so ${NV_SOVER}" |
292 |
+ "libnvidia-glcore.so ${NV_SOVER}" |
293 |
+ "libnvidia-glsi.so ${NV_SOVER}" |
294 |
+ "libnvidia-ifr.so ${NV_SOVER}" |
295 |
+ "libnvidia-opencl.so ${NV_SOVER}" |
296 |
+ "libvdpau.so ${NV_SOVER} ${GL_ROOT}" |
297 |
+ "libvdpau_nvidia.so ${NV_SOVER}" |
298 |
+ "libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}" |
299 |
) |
300 |
- |
301 |
if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]]; |
302 |
then |
303 |
- NV_GLX_LIBRARIES+=( "libnvidia-wfb.so.${NV_SOVER}" ) |
304 |
+ NV_GLX_LIBRARIES+=( "libnvidia-wfb.so ${NV_SOVER}" ) |
305 |
fi |
306 |
|
307 |
if use kernel_FreeBSD; then |
308 |
- NV_GLX_LIBRARIES+=( "libnvidia-tls.so.${NV_SOVER}" ) |
309 |
+ NV_GLX_LIBRARIES+=( "libnvidia-tls.so ${NV_SOVER}" ) |
310 |
fi |
311 |
|
312 |
if use kernel_linux; then |
313 |
NV_GLX_LIBRARIES+=( |
314 |
- "libnvidia-ml.so.${NV_SOVER}" |
315 |
- "tls/libnvidia-tls.so.${NV_SOVER}" |
316 |
+ "libnvidia-ml.so ${NV_SOVER}" |
317 |
+ "tls/libnvidia-tls.so ${NV_SOVER}" |
318 |
) |
319 |
fi |
320 |
|
321 |
for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do |
322 |
donvidia ${libdir}/${NV_LIB} |
323 |
done |
324 |
+ |
325 |
+ # GLES v2 library is special |
326 |
+ insinto ${GL_ROOT} |
327 |
+ doexe ${libdir}/libGLESv2.so.${PV} |
328 |
+ dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2 |
329 |
+ dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so |
330 |
fi |
331 |
} |
332 |
|
333 |
pkg_preinst() { |
334 |
- if use driver && use kernel_linux; then |
335 |
+ if use kernel_linux; then |
336 |
linux-mod_pkg_preinst |
337 |
|
338 |
local videogroup="$(egetent group video | cut -d ':' -f 3)" |
339 |
@@ -496,7 +502,7 @@ pkg_preinst() { |
340 |
} |
341 |
|
342 |
pkg_postinst() { |
343 |
- use driver && use kernel_linux && linux-mod_pkg_postinst |
344 |
+ use kernel_linux && linux-mod_pkg_postinst |
345 |
|
346 |
# Switch to the nvidia implementation |
347 |
use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia |
348 |
@@ -527,6 +533,6 @@ pkg_prerm() { |
349 |
} |
350 |
|
351 |
pkg_postrm() { |
352 |
- use driver && use kernel_linux && linux-mod_pkg_postrm |
353 |
+ use kernel_linux && linux-mod_pkg_postrm |
354 |
use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 |
355 |
} |
356 |
|
357 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
358 |
index b2f2410..329f634 100644 |
359 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
360 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
361 |
@@ -29,7 +29,7 @@ KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" |
362 |
RESTRICT="bindist mirror strip" |
363 |
EMULTILIB_PKG="true" |
364 |
|
365 |
-IUSE="acpi +driver gtk2 gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" |
366 |
+IUSE="acpi +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X" |
367 |
REQUIRED_USE=" |
368 |
tools? ( X ) |
369 |
static-libs? ( tools ) |
370 |
@@ -42,9 +42,7 @@ COMMON=" |
371 |
dev-libs/atk |
372 |
dev-libs/glib:2 |
373 |
dev-libs/jansson |
374 |
- gtk3? ( |
375 |
- x11-libs/gtk+:3 |
376 |
- ) |
377 |
+ gtk3? ( x11-libs/gtk+:3 ) |
378 |
x11-libs/cairo |
379 |
x11-libs/gdk-pixbuf[X] |
380 |
x11-libs/gtk+:2 |
381 |
@@ -368,6 +366,9 @@ src_install() { |
382 |
use static-libs && \ |
383 |
dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
384 |
|
385 |
+ insinto /usr/include/NVCtrl |
386 |
+ doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |
387 |
+ |
388 |
insinto /usr/share/nvidia/ |
389 |
doins nvidia-application-profiles-${PV}-key-documentation |
390 |
|
391 |
@@ -375,9 +376,6 @@ src_install() { |
392 |
newins \ |
393 |
nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc |
394 |
|
395 |
- insinto /usr/include/NVCtrl |
396 |
- doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |
397 |
- |
398 |
# There is no icon in the FreeBSD tarball. |
399 |
use kernel_FreeBSD || \ |
400 |
newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png |
401 |
@@ -389,7 +387,6 @@ src_install() { |
402 |
fi |
403 |
|
404 |
dobin ${NV_OBJ}/nvidia-bug-report.sh |
405 |
- #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist |
406 |
|
407 |
if has_multilib_profile && use multilib; then |
408 |
local OABI=${ABI} |