1 |
pacho 12/04/21 14:52:27 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: bumblebee-3.0-r1.ebuild |
5 |
Log: |
6 |
Use same conf.d file for nouveau and nvidia, allowing both supports to co-exist. |
7 |
|
8 |
(Portage version: 2.1.10.56/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 x11-misc/bumblebee/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bumblebee/ChangeLog?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bumblebee/ChangeLog?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bumblebee/ChangeLog?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- ChangeLog 21 Apr 2012 13:26:18 -0000 1.1 |
24 |
+++ ChangeLog 21 Apr 2012 14:52:27 -0000 1.2 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for x11-misc/bumblebee |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.1 2012/04/21 13:26:18 pacho Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.2 2012/04/21 14:52:27 pacho Exp $ |
30 |
+ |
31 |
+*bumblebee-3.0-r1 (21 Apr 2012) |
32 |
+ |
33 |
+ 21 Apr 2012; Pacho Ramos <pacho@g.o> +bumblebee-3.0-r1.ebuild: |
34 |
+ Use same conf.d file for nouveau and nvidia, allowing both supports to co- |
35 |
+ exist. |
36 |
|
37 |
*bumblebee-3.0 (21 Apr 2012) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 x11-misc/bumblebee/bumblebee-3.0-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: bumblebee-3.0-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2012 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0-r1.ebuild,v 1.1 2012/04/21 14:52:27 pacho Exp $ |
52 |
|
53 |
EAPI="4" |
54 |
|
55 |
inherit multilib eutils |
56 |
|
57 |
DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets" |
58 |
HOMEPAGE="https://github.com/Bumblebee-Project/Bumblebee" |
59 |
SRC_URI="https://github.com/downloads/Bumblebee-Project/${PN/bu/Bu}/${P/bu/Bu}.tar.gz" |
60 |
|
61 |
SLOT="0" |
62 |
LICENSE="GPL-3" |
63 |
KEYWORDS="~amd64 ~x86" |
64 |
|
65 |
IUSE="+bbswitch video_cards_nouveau video_cards_nvidia" |
66 |
|
67 |
RDEPEND="x11-misc/virtualgl |
68 |
bbswitch? ( sys-power/bbswitch ) |
69 |
virtual/opengl |
70 |
x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]" |
71 |
DEPEND=">=sys-devel/autoconf-2.68 |
72 |
sys-devel/automake |
73 |
sys-devel/gcc |
74 |
dev-util/pkgconfig |
75 |
dev-libs/glib:2 |
76 |
x11-libs/libX11 |
77 |
dev-libs/libbsd |
78 |
sys-apps/help2man" |
79 |
|
80 |
REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )" |
81 |
|
82 |
src_configure() { |
83 |
if use video_cards_nvidia ; then |
84 |
# Get paths to GL libs for all ABIs |
85 |
local nvlib="" |
86 |
for i in $(get_all_libdirs) ; do |
87 |
nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib" |
88 |
done |
89 |
|
90 |
local nvpref="/usr/$(get_libdir)/opengl/nvidia" |
91 |
local xorgpref="/usr/$(get_libdir)/xorg/modules" |
92 |
ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \ |
93 |
CONF_LDPATH_NVIDIA=${nvlib#:} \ |
94 |
CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}" |
95 |
fi |
96 |
|
97 |
econf ${ECONF_PARAMS} |
98 |
} |
99 |
|
100 |
src_install() { |
101 |
newconfd "${FILESDIR}"/bumblebee.nouveau-confd bumblebee # The same conf.d file can be used for nvidia also |
102 |
newinitd "${FILESDIR}"/bumblebee.initd bumblebee |
103 |
default |
104 |
} |
105 |
|
106 |
pkg_preinst() { |
107 |
! use video_cards_nvidia && rm "${ED}"/etc/bumblebee/xorg.conf.nvidia |
108 |
! use video_cards_nouveau && rm "${ED}"/etc/bumblebee/xorg.conf.nouveau |
109 |
|
110 |
enewgroup bumblebee |
111 |
} |
112 |
|
113 |
pkg_postinst() { |
114 |
ewarn "This is *NOT* all! Bumblebee still *NOT* ready to use." |
115 |
ewarn "You may need to setup your /etc/bumblebee/bumblebee.conf!" |
116 |
ewarn "For example, default config suggests you have bbswitch installed." |
117 |
ewarn "Also you should add your user to 'bumblebee' group." |
118 |
} |