1 |
commit: 731131ec436e6f4ca4db21db46ea2502641fe048 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 10:27:53 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 10:29:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=731131ec |
7 |
|
8 |
x11-drivers/nvidia-drivers: Build tools from source (bug #562910 by Christian Strahl). |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
x11-drivers/nvidia-drivers/Manifest | 1 + |
13 |
.../nvidia-drivers-304.131-r1.ebuild | 78 ++++++++++++++-------- |
14 |
.../nvidia-drivers/nvidia-drivers-361.18-r2.ebuild | 17 ++--- |
15 |
3 files changed, 62 insertions(+), 34 deletions(-) |
16 |
|
17 |
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest |
18 |
index 64992d8..24cc8f1 100644 |
19 |
--- a/x11-drivers/nvidia-drivers/Manifest |
20 |
+++ b/x11-drivers/nvidia-drivers/Manifest |
21 |
@@ -40,4 +40,5 @@ DIST NVIDIA-Linux-x86_64-355.11.run 76490009 SHA256 a59b425381add9d9058dc2d987bf |
22 |
DIST NVIDIA-Linux-x86_64-358.16.run 77353969 SHA256 a942cdb29ed715ff1ce25beb06b6c2490126b98ef8bee5d9973967b557596bf2 SHA512 4ae43f5e8c311d6c97eb89b02504bf52e3a947c71662f30641988a78eb9fe083370124aeee3b89db74f8ee50f454338db98dc7abeb35a242ba5729fefccead77 WHIRLPOOL 3dd0dcd4b455fcac12d55f40cfb8db0536af82d90c32b8471528b44a9fa1b3f3706ac26558d7395f82649c37550fded17b48d75d5584b3a41390c94bb1135c48 |
23 |
DIST NVIDIA-Linux-x86_64-361.18.run 86447500 SHA256 94cccc3ff10ee9544f60bf1d32d04dddabc5103880b57895ea60e1167b89a155 SHA512 d307b50226b145761de69892c51af3cd4498b91f9c56b5d5bf7b1f4f00cc073af586008cb060a16c036426240853ed30d244e63d3f727eadf39338736a5c0b02 WHIRLPOOL 87e03bfe694f708d57fb548c01d853bbae1335a696bce225ce997000387189b55c27644922a051e9a50dfa94ec917bda14b6ed4b76f345c8adc8d8f54aebff97 |
24 |
DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb |
25 |
+DIST nvidia-settings-304.131.tar.bz2 1480447 SHA256 d36d2d1ae7c1bb72cd18e713470546d2aa7057624b1f61319daf559a94054d29 SHA512 9269f54f87581e29e6d7cabeaf989c70cb27aa55f6b8f5f1c71b8a14401326d06ea194710722b41283cca56f5808b90a9b1fb12158d48c6332cce15a701c5796 WHIRLPOOL be8e38a09a0bfa40267b9cdae2800a9ef00a89e28e618b743b7acb0cd9ece4b242b74ced32018d735989592300b49b2ee683caa11a1e161bcecf070a58952dfd |
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-304.131-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
29 |
index 3d255f0..50aa106 100644 |
30 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
31 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r1.ebuild |
32 |
@@ -19,27 +19,19 @@ SRC_URI=" |
33 |
amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) |
34 |
x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz ) |
35 |
x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) |
36 |
+ tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 ) |
37 |
" |
38 |
|
39 |
LICENSE="GPL-2 NVIDIA-r1" |
40 |
SLOT="0/${PV%.*}" |
41 |
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" |
42 |
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X" |
43 |
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X" |
44 |
RESTRICT="bindist mirror strip" |
45 |
EMULTILIB_PKG="true" |
46 |
|
47 |
-COMMON="app-eselect/eselect-opencl |
48 |
+COMMON=" |
49 |
+ app-eselect/eselect-opencl |
50 |
kernel_linux? ( >=sys-libs/glibc-2.6.1 ) |
51 |
- X? ( |
52 |
- >=app-eselect/eselect-opengl-1.0.9 |
53 |
- )" |
54 |
-DEPEND="${COMMON} |
55 |
- kernel_linux? ( |
56 |
- virtual/linux-sources |
57 |
- virtual/pkgconfig |
58 |
- )" |
59 |
-RDEPEND="${COMMON} |
60 |
- acpi? ( sys-power/acpid ) |
61 |
tools? ( |
62 |
dev-libs/atk |
63 |
dev-libs/glib:2 |
64 |
@@ -51,6 +43,18 @@ RDEPEND="${COMMON} |
65 |
x11-libs/pangox-compat |
66 |
) |
67 |
X? ( |
68 |
+ >=app-eselect/eselect-opengl-1.0.9 |
69 |
+ ) |
70 |
+" |
71 |
+DEPEND="${COMMON} |
72 |
+ kernel_linux? ( |
73 |
+ virtual/linux-sources |
74 |
+ virtual/pkgconfig |
75 |
+ )" |
76 |
+RDEPEND="${COMMON} |
77 |
+ acpi? ( sys-power/acpid ) |
78 |
+ tools? ( !media-video/nvidia-settings ) |
79 |
+ X? ( |
80 |
<x11-base/xorg-server-1.18.99:= |
81 |
x11-libs/libXvMC |
82 |
multilib? ( |
83 |
@@ -142,15 +146,6 @@ pkg_setup() { |
84 |
fi |
85 |
} |
86 |
|
87 |
-src_unpack() { |
88 |
- if ! use kernel_FreeBSD; then |
89 |
- cd "${S}" |
90 |
- unpack_makeself |
91 |
- else |
92 |
- unpack ${A} |
93 |
- fi |
94 |
-} |
95 |
- |
96 |
src_prepare() { |
97 |
# Please add a brief description for every added patch |
98 |
|
99 |
@@ -191,6 +186,25 @@ src_compile() { |
100 |
elif use kernel_linux; then |
101 |
MAKEOPTS=-j1 linux-mod_src_compile |
102 |
fi |
103 |
+ |
104 |
+ if use tools; then |
105 |
+ emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean |
106 |
+ emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \ |
107 |
+ AR="$(tc-getAR)" \ |
108 |
+ CC="$(tc-getCC)" \ |
109 |
+ RANLIB="$(tc-getRANLIB)" \ |
110 |
+ libXNVCtrl.a |
111 |
+ emake -C "${S}"/nvidia-settings-${PV}/src \ |
112 |
+ AR="$(tc-getAR)" \ |
113 |
+ CC="$(tc-getCC)" \ |
114 |
+ LD="$(tc-getCC)" \ |
115 |
+ LIBDIR="$(get_libdir)" \ |
116 |
+ NVML_ENABLED=0 \ |
117 |
+ NV_USE_BUNDLED_LIBJANSSON=0 \ |
118 |
+ NV_VERBOSE=1 \ |
119 |
+ RANLIB="$(tc-getRANLIB)" \ |
120 |
+ STRIP_CMD=true |
121 |
+ fi |
122 |
} |
123 |
|
124 |
# Install nvidia library: |
125 |
@@ -323,17 +337,29 @@ src_install() { |
126 |
newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi |
127 |
fi |
128 |
|
129 |
- if use tools; then |
130 |
- doexe ${NV_OBJ}/nvidia-settings |
131 |
- fi |
132 |
- |
133 |
dobin ${NV_OBJ}/nvidia-bug-report.sh |
134 |
|
135 |
# Desktop entries for nvidia-settings |
136 |
if use tools ; then |
137 |
+ emake -C "${S}"/nvidia-settings-${PV}/src/ \ |
138 |
+ DESTDIR="${D}" \ |
139 |
+ LIBDIR="${D}/usr/$(get_libdir)" \ |
140 |
+ PREFIX=/usr \ |
141 |
+ NV_USE_BUNDLED_LIBJANSSON=0 \ |
142 |
+ install |
143 |
+ |
144 |
+ use static-libs && \ |
145 |
+ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
146 |
+ |
147 |
+ insinto /usr/include/NVCtrl |
148 |
+ doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |
149 |
+ |
150 |
# There is no icon in the FreeBSD tarball. |
151 |
- use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png |
152 |
+ use kernel_FreeBSD || \ |
153 |
+ newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png |
154 |
+ |
155 |
domenu "${FILESDIR}"/${PN}-settings.desktop |
156 |
+ |
157 |
exeinto /etc/X11/xinit/xinitrc.d |
158 |
doexe "${FILESDIR}"/95-nvidia-settings |
159 |
fi |
160 |
|
161 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
162 |
index e5687ec..e2759ed 100644 |
163 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
164 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18-r2.ebuild |
165 |
@@ -373,25 +373,26 @@ src_install() { |
166 |
doins nvidia-application-profiles-${PV}-key-documentation |
167 |
|
168 |
insinto /etc/nvidia |
169 |
- newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc |
170 |
+ newins \ |
171 |
+ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc |
172 |
|
173 |
- use static-libs && dolib "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
174 |
+ use static-libs && \ |
175 |
+ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a |
176 |
|
177 |
insinto /usr/include/NVCtrl |
178 |
doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h |
179 |
- fi |
180 |
- |
181 |
- dobin ${NV_OBJ}/nvidia-bug-report.sh |
182 |
|
183 |
- # Desktop entries for nvidia-settings |
184 |
- if use tools; then |
185 |
# There is no icon in the FreeBSD tarball. |
186 |
- use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png |
187 |
+ use kernel_FreeBSD || \ |
188 |
+ newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png |
189 |
+ |
190 |
domenu "${FILESDIR}"/${PN}-settings.desktop |
191 |
+ |
192 |
exeinto /etc/X11/xinit/xinitrc.d |
193 |
doexe "${FILESDIR}"/95-nvidia-settings |
194 |
fi |
195 |
|
196 |
+ dobin ${NV_OBJ}/nvidia-bug-report.sh |
197 |
#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist |
198 |
|
199 |
if has_multilib_profile && use multilib; then |