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

Gentoo Archives: gentoo-commits

From: "Doug Goldstein (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers: ChangeLog nvidia-drivers-256.52.ebuild nvidia-drivers-256.44-r1.ebuild
Date: Mon, 30 Aug 2010 21:38:11
Message-Id: 20100830213802.06C7B20051@flycatcher.gentoo.org
1 cardoe 10/08/30 21:38:02
2
3 Modified: ChangeLog nvidia-drivers-256.52.ebuild
4 nvidia-drivers-256.44-r1.ebuild
5 Log:
6 Implement installing nvidia-settings when USE=gtk is enabled as discussed in bug #304255
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.249 x11-drivers/nvidia-drivers/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.249&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?rev=1.249&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog?r1=1.248&r2=1.249
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v
19 retrieving revision 1.248
20 retrieving revision 1.249
21 diff -u -r1.248 -r1.249
22 --- ChangeLog 30 Aug 2010 20:36:12 -0000 1.248
23 +++ ChangeLog 30 Aug 2010 21:38:01 -0000 1.249
24 @@ -1,6 +1,11 @@
25 # ChangeLog for x11-drivers/nvidia-drivers
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.248 2010/08/30 20:36:12 cardoe Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.249 2010/08/30 21:38:01 cardoe Exp $
29 +
30 + 30 Aug 2010; Doug Goldstein <cardoe@g.o>
31 + nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild:
32 + Implement installing nvidia-settings when USE=gtk is enabled as discussed
33 + in bug #304255
34
35 30 Aug 2010; Doug Goldstein <cardoe@g.o>
36 nvidia-drivers-256.52.ebuild:
37
38
39
40 1.4 x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild?rev=1.4&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild?rev=1.4&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild?r1=1.3&r2=1.4
45
46 Index: nvidia-drivers-256.52.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild,v
49 retrieving revision 1.3
50 retrieving revision 1.4
51 diff -u -r1.3 -r1.4
52 --- nvidia-drivers-256.52.ebuild 30 Aug 2010 20:36:12 -0000 1.3
53 +++ nvidia-drivers-256.52.ebuild 30 Aug 2010 21:38:01 -0000 1.4
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild,v 1.3 2010/08/30 20:36:12 cardoe Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild,v 1.4 2010/08/30 21:38:01 cardoe Exp $
59
60 EAPI="2"
61
62 @@ -26,7 +26,8 @@
63 COMMON="<x11-base/xorg-server-1.9.99
64 kernel_linux? ( >=sys-libs/glibc-2.6.1 )
65 multilib? ( app-emulation/emul-linux-x86-xlibs )
66 - >=app-admin/eselect-opengl-1.0.9"
67 + >=app-admin/eselect-opengl-1.0.9
68 + !media-video/nvidia-settings"
69 DEPEND="${COMMON}
70 kernel_linux? ( virtual/linux-sources )"
71 RDEPEND="${COMMON}
72 @@ -92,7 +93,8 @@
73 usr/lib64/libOpenCL.so.1.0.0
74 usr/lib64/xorg/modules/drivers/nvidia_drv.so
75 usr/bin/nvidia-smi
76 - usr/bin/nvidia-xconfig"
77 + usr/bin/nvidia-xconfig
78 + usr/bin/nvidia-settings"
79
80 QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV}
81 usr/lib/opengl/nvidia/lib/libGL.so.${PV}
82 @@ -131,7 +133,8 @@
83 usr/lib64/libOpenCL.so.1.0.0
84 usr/lib64/libnvidia-compiler.so.${PV}
85 usr/bin/nvidia-smi
86 - usr/bin/nvidia-xconfig"
87 + usr/bin/nvidia-xconfig
88 + usr/bin/nvidia-settings"
89
90 QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
91 usr/lib/libnvidia-cfg.so.${PV}
92 @@ -145,7 +148,8 @@
93 usr/lib/libOpenCL.so.1.0.0
94 usr/lib/libnvidia-compiler.so.${PV}
95 usr/bin/nvidia-smi
96 - usr/bin/nvidia-xconfig"
97 + usr/bin/nvidia-xconfig
98 + usr/bin/nvidia-settings"
99
100 S="${WORKDIR}/"
101
102 @@ -360,21 +364,38 @@
103 if use x86-fbsd; then
104 dodoc "${NV_DOC}/README"
105 doman "${NV_MAN}/nvidia-xconfig.1"
106 + use gtk && doman "${NV_MAN}/nvidia-settings.1"
107 else
108 # Docs
109 newdoc "${NV_DOC}/README.txt" README
110 dodoc "${NV_DOC}/NVIDIA_Changelog"
111 doman "${NV_MAN}/nvidia-smi.1.gz"
112 doman "${NV_MAN}/nvidia-xconfig.1.gz"
113 + use gtk && doman "${NV_MAN}/nvidia-settings.1.gz"
114 fi
115
116 # Helper Apps
117 dobin ${NV_EXEC}/nvidia-xconfig || die
118 + use gtk && ( dobin ${NV_EXEC}/nvidia-settings || die )
119 dobin ${NV_EXEC}/nvidia-bug-report.sh || die
120 if use kernel_linux; then
121 dobin ${NV_EXEC}/nvidia-smi || die
122 fi
123
124 + # Desktop entries for nvidia-settings
125 + if use gtk; then
126 + dodir /usr/share/applications/
127 + insinto /usr/share/applications/
128 + doins ${NV_EXEC}/nvidia-settings.desktop
129 + sed -e 's:__UTILS_PATH__:/usr/bin:' \
130 + -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
131 + -i "${D}"/usr/share/applications/nvidia-settings.desktop
132 +
133 + dodir /usr/share/pixmaps/
134 + insinto /usr/share/pixmaps/
135 + doins ${NV_EXEC}/nvidia-settings.png
136 + fi
137 +
138 if has_multilib_profile ; then
139 local OABI=${ABI}
140 for ABI in $(get_install_abis) ; do
141
142
143
144 1.3 x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild
145
146 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild?rev=1.3&view=markup
147 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild?rev=1.3&content-type=text/plain
148 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild?r1=1.2&r2=1.3
149
150 Index: nvidia-drivers-256.44-r1.ebuild
151 ===================================================================
152 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild,v
153 retrieving revision 1.2
154 retrieving revision 1.3
155 diff -u -r1.2 -r1.3
156 --- nvidia-drivers-256.44-r1.ebuild 30 Aug 2010 01:53:21 -0000 1.2
157 +++ nvidia-drivers-256.44-r1.ebuild 30 Aug 2010 21:38:01 -0000 1.3
158 @@ -1,6 +1,6 @@
159 # Copyright 1999-2010 Gentoo Foundation
160 # Distributed under the terms of the GNU General Public License v2
161 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild,v 1.2 2010/08/30 01:53:21 cardoe Exp $
162 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild,v 1.3 2010/08/30 21:38:01 cardoe Exp $
163
164 EAPI="2"
165
166 @@ -23,10 +23,11 @@
167 RESTRICT="strip"
168 EMULTILIB_PKG="true"
169
170 -COMMON="<x11-base/xorg-server-1.8.99
171 +COMMON="<x11-base/xorg-server-1.9.99
172 kernel_linux? ( >=sys-libs/glibc-2.6.1 )
173 multilib? ( app-emulation/emul-linux-x86-xlibs )
174 - >=app-admin/eselect-opengl-1.0.9"
175 + >=app-admin/eselect-opengl-1.0.9
176 + !media-video/nvidia-settings"
177 DEPEND="${COMMON}
178 kernel_linux? ( virtual/linux-sources )"
179 RDEPEND="${COMMON}
180 @@ -92,7 +93,8 @@
181 usr/lib64/libOpenCL.so.1.0.0
182 usr/lib64/xorg/modules/drivers/nvidia_drv.so
183 usr/bin/nvidia-smi
184 - usr/bin/nvidia-xconfig"
185 + usr/bin/nvidia-xconfig
186 + usr/bin/nvidia-settings"
187
188 QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV}
189 usr/lib/opengl/nvidia/lib/libGL.so.${PV}
190 @@ -131,7 +133,8 @@
191 usr/lib64/libOpenCL.so.1.0.0
192 usr/lib64/libnvidia-compiler.so.${PV}
193 usr/bin/nvidia-smi
194 - usr/bin/nvidia-xconfig"
195 + usr/bin/nvidia-xconfig
196 + usr/bin/nvidia-settings"
197
198 QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
199 usr/lib/libnvidia-cfg.so.${PV}
200 @@ -145,7 +148,8 @@
201 usr/lib/libOpenCL.so.1.0.0
202 usr/lib/libnvidia-compiler.so.${PV}
203 usr/bin/nvidia-smi
204 - usr/bin/nvidia-xconfig"
205 + usr/bin/nvidia-xconfig
206 + usr/bin/nvidia-settings"
207
208 S="${WORKDIR}/"
209
210 @@ -360,21 +364,38 @@
211 if use x86-fbsd; then
212 dodoc "${NV_DOC}/README"
213 doman "${NV_MAN}/nvidia-xconfig.1"
214 + use gtk && doman "${NV_MAN}/nvidia-settings.1"
215 else
216 # Docs
217 newdoc "${NV_DOC}/README.txt" README
218 dodoc "${NV_DOC}/NVIDIA_Changelog"
219 doman "${NV_MAN}/nvidia-smi.1.gz"
220 doman "${NV_MAN}/nvidia-xconfig.1.gz"
221 + use gtk && doman "${NV_MAN}/nvidia-settings.1.gz"
222 fi
223
224 # Helper Apps
225 dobin ${NV_EXEC}/nvidia-xconfig || die
226 + use gtk && ( dobin ${NV_EXEC}/nvidia-settings || die )
227 dobin ${NV_EXEC}/nvidia-bug-report.sh || die
228 if use kernel_linux; then
229 dobin ${NV_EXEC}/nvidia-smi || die
230 fi
231
232 + # Desktop entries for nvidia-settings
233 + if use gtk; then
234 + dodir /usr/share/applications/
235 + insinto /usr/share/applications/
236 + doins ${NV_EXEC}/nvidia-settings.desktop
237 + sed -e 's:__UTILS_PATH__:/usr/bin:' \
238 + -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
239 + -i "${D}"/usr/share/applications/nvidia-settings.desktop
240 +
241 + dodir /usr/share/pixmaps/
242 + insinto /usr/share/pixmaps/
243 + doins ${NV_EXEC}/nvidia-settings.png
244 + fi
245 +
246 if has_multilib_profile ; then
247 local OABI=${ABI}
248 for ABI in $(get_install_abis) ; do
Report Message
Find on MARC Find on Google Groups