Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-virtualbox: ChangeLog xf86-video-virtualbox-4.0.10.ebuild xf86-video-virtualbox-4.0.6.ebuild
Date: Tue, 28 Jun 2011 20:49:46
Message-Id: 20110628204934.CA90A20054@flycatcher.gentoo.org
1 polynomial-c 11/06/28 20:49:34
2
3 Modified: ChangeLog
4 Added: xf86-video-virtualbox-4.0.10.ebuild
5 Removed: xf86-video-virtualbox-4.0.6.ebuild
6 Log:
7 Version bump. Removed old
8
9 (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.64 x11-drivers/xf86-video-virtualbox/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?rev=1.64&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?rev=1.64&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?r1=1.63&r2=1.64
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v
21 retrieving revision 1.63
22 retrieving revision 1.64
23 diff -u -r1.63 -r1.64
24 --- ChangeLog 18 May 2011 21:36:43 -0000 1.63
25 +++ ChangeLog 28 Jun 2011 20:49:34 -0000 1.64
26 @@ -1,6 +1,12 @@
27 # ChangeLog for x11-drivers/xf86-video-virtualbox
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.63 2011/05/18 21:36:43 polynomial-c Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.64 2011/06/28 20:49:34 polynomial-c Exp $
31 +
32 +*xf86-video-virtualbox-4.0.10 (28 Jun 2011)
33 +
34 + 28 Jun 2011; Lars Wendler <polynomial-c@g.o>
35 + -xf86-video-virtualbox-4.0.6.ebuild, +xf86-video-virtualbox-4.0.10.ebuild:
36 + Version bump. Removed old.
37
38 *xf86-video-virtualbox-4.0.8 (18 May 2011)
39
40
41
42
43 1.1 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.10.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.10.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.10.ebuild?rev=1.1&content-type=text/plain
47
48 Index: xf86-video-virtualbox-4.0.10.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.10.ebuild,v 1.1 2011/06/28 20:49:34 polynomial-c Exp $
53
54 EAPI=2
55
56 inherit eutils linux-mod multilib python versionator
57
58 MY_P=VirtualBox-${PV}
59 DESCRIPTION="VirtualBox video driver"
60 HOMEPAGE="http://www.virtualbox.org/"
61 SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
62
63 LICENSE="GPL-2"
64 SLOT="0"
65 KEYWORDS="~amd64 ~x86"
66 IUSE="dri"
67
68 RDEPEND="x11-base/xorg-server[-minimal]"
69 DEPEND="${RDEPEND}
70 >=dev-util/kbuild-0.1.5-r1
71 =dev-lang/python-2*
72 >=dev-lang/yasm-0.6.2
73 sys-devel/dev86
74 sys-power/iasl
75 x11-proto/fontsproto
76 x11-proto/randrproto
77 x11-proto/renderproto
78 x11-proto/xextproto
79 x11-proto/xineramaproto
80 x11-proto/xproto
81 x11-libs/libXdmcp
82 x11-libs/libXcomposite
83 x11-libs/libXau
84 x11-libs/libX11
85 x11-libs/libXfixes
86 x11-libs/libXext
87 dri? ( x11-proto/xf86driproto
88 >=x11-libs/libdrm-2.4.5 )"
89
90 BUILD_TARGETS="all"
91 BUILD_TARGET_ARCH="${ARCH}"
92 MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
93
94 S="${WORKDIR}/${MY_P}_OSE"
95
96 QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
97
98 pkg_setup() {
99 linux-mod_pkg_setup
100 BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
101
102 python_set_active_version 2
103 python_pkg_setup
104 }
105
106 src_prepare() {
107 # Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
108 cp -a "${S}"/src/VBox/Additions/linux/drm \
109 "${WORKDIR}/vboxvideo_drm" || die "cannot copy vboxvideo_drm directory"
110 cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
111 "${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile"
112
113 # stupid new header references...
114 for vboxheader in {product,version}-generated.h ; do
115 ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
116 "${WORKDIR}/vboxvideo_drm/${vboxheader}"
117 done
118
119 # Remove shipped binaries (kBuild,yasm), see bug #232775
120 rm -rf kBuild/bin tools
121
122 # Disable things unused or splitted into separate ebuilds
123 cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
124
125 # Ugly hack to build the opengl part of the video driver
126 epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
127
128 # unset useless/problematic checks in configure
129 epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
130 "${FILESDIR}/${PN}-4-makeself-check.patch" \
131 "${FILESDIR}/${PN}-4-mkisofs-check.patch"
132 }
133
134 src_configure() {
135 # build the user-space tools, warnings are harmless
136 ./configure --nofatal \
137 --disable-xpcom \
138 --disable-sdl-ttf \
139 --disable-pulse \
140 --disable-alsa \
141 --build-headless || die "configure failed"
142 source ./env.sh
143 }
144
145 src_compile() {
146 for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
147 /src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
148 /src/VBox/Additions/x11/vboxvideo ; do
149 cd "${S}"${each}
150 MAKE="kmk" emake TOOL_YASM_AS=yasm \
151 KBUILD_PATH="${S}/kBuild" \
152 || die "kmk failed"
153 done
154
155 if use dri; then
156 # Now creating the kernel modules. We must do this _after_
157 # we compiled the user-space tools as we need two of the
158 # automatically generated header files. (>=3.2.0)
159 linux-mod_src_compile
160 fi
161 }
162
163 src_install() {
164 if use dri; then
165 linux-mod_src_install
166 fi
167
168 cd "${S}/out/linux.${ARCH}/release/bin/additions"
169 insinto /usr/$(get_libdir)/xorg/modules/drivers
170
171 # xorg-server-1.10.x
172 if has_version ">=x11-base/xorg-server-1.10" ; then
173 newins vboxvideo_drv_110.so vboxvideo_drv.so
174 # xorg-server-1.9.x
175 else
176 newins vboxvideo_drv_19.so vboxvideo_drv.so
177 fi
178
179 # Guest OpenGL driver
180 insinto /usr/$(get_libdir)
181 doins -r VBoxOGL* || die
182
183 if use dri ; then
184 dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
185 fi
186 }
187
188 pkg_postinst() {
189 elog "You need to edit the file /etc/X11/xorg.conf and set:"
190 elog ""
191 elog " Driver \"vboxvideo\""
192 elog ""
193 elog "in the Graphics device section (Section \"Device\")"
194 elog ""
195 if use dri; then
196 elog "To use the kernel drm video driver, please add:"
197 elog "\"vboxvideo\" to:"
198 if has_version sys-apps/openrc; then
199 elog "/etc/conf.d/modules"
200 else
201 elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
202 fi
203 elog ""
204 fi
205 }