diff options
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/Manifest | 7 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch | 13 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.0.ebuild (renamed from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.1.4.ebuild) | 44 |
4 files changed, 55 insertions, 18 deletions
diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog index 126dfb6..0e5bd4f 100644 --- a/x11-drivers/xf86-video-virtualbox/ChangeLog +++ b/x11-drivers/xf86-video-virtualbox/ChangeLog @@ -2,9 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.8 2009/03/03 07:22:23 patrick Exp $ - 04 Mar 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com> - xf86-video-virtualbox-2.1.4.ebuild: - Update SRC_URI due to upstream change. + 10 Apr 2009; Alessio Cassibba <swapon@gmail.com> + +files/xf86-video-virtualbox-2.2.0-enable-opengl.patch, + -xf86-video-virtualbox-2.1.4.ebuild, + +xf86-video-virtualbox-2.2.0.ebuild: + Version bump; add the new guest opengl driver and update DEPEND; add dri USE + flag *xf86-video-virtualbox-2.1.4 (03 Mar 2009) diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest index 80fa607..1e63366 100644 --- a/x11-drivers/xf86-video-virtualbox/Manifest +++ b/x11-drivers/xf86-video-virtualbox/Manifest @@ -1,5 +1,6 @@ AUX xf86-video-virtualbox-2-localconfig 876 RMD160 db4b06bd8646f237260e8d61c5651a1fb4c22787 SHA1 9ab92582b1e0cc8a6a36cbd2fb52974bc90a5e8d SHA256 a11765d7e2623a081857ede04a650151742ef827bc7675323b4f7b14d06a3d64 -DIST VirtualBox-2.1.4-3-OSE.tar.bz2 47896952 RMD160 b1dcb6fad2d6fb392a1cbb38475f719e64228c5c SHA1 50e5f273d6407c404a8b04d17cad2c2a020eda2c SHA256 c3b4a38c5b18c833cd51ff27cd4e146aa686813cbef910d4dd584569c9e40b22 -EBUILD xf86-video-virtualbox-2.1.4.ebuild 2164 RMD160 5c74eeea910a438590da265cbee27ce866ea6b92 SHA1 5797daa2239df3032c2c1fdad38e98d542b1a620 SHA256 90dfa30205b453504a1c20f798c0d5df0c24d00d16e31a651f58deff63ff3570 -MISC ChangeLog 4748 RMD160 c94cda8c9d8aefe8fcabe3f7a0539a29db56f958 SHA1 c9c9b7763a50647c8bbdc2ff501ae6c3a50cae10 SHA256 16473b808786ba2ee6620731dbca57fc813d41dc7d9d4c7097579a1c32fca1bd +AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 RMD160 c8c8e6a9aaea1ec53f3c0cb285750921287959a6 SHA1 7d68f5529a921f7d9786b232e8ecc7ebe7ba0e1b SHA256 194b7bca875f18e1621f065640d1c1a1364640e17475c493ec3b56f6e7e5ce66 +DIST VirtualBox-2.2.0-OSE.tar.bz2 50432438 RMD160 0c74441fe812c8fd35ae460b847d255b8dadf0aa SHA1 016a159009cd626542302ea31fd500cadb049fb9 SHA256 8bf621cfcb61f2b0a71be53f072e58c3fb4f3183324faa3947346ff973314c71 +EBUILD xf86-video-virtualbox-2.2.0.ebuild 2798 RMD160 1f7f11e8650a79c56d3ad68fbd98eb5ff1e21d99 SHA1 08d60585ac12a0b2297e18758d7230224e4e624a SHA256 121ff770839d6d1882c26dc09cd53cbbdb22512e61c12633eab4898b3e7e3a5d +MISC ChangeLog 4882 RMD160 f8eaad386a141bed77ada3e087767553be59d184 SHA1 09521c8995645f39826626112e31bf25571ab629 SHA256 aabcf5289cd051449d665950d067208c98fb4c1287eaf9cc393f48352fb40eab MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch new file mode 100644 index 0000000..ad66ff2 --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch @@ -0,0 +1,13 @@ +--- configure.orig 2009-04-11 19:30:06.000000000 +0200 ++++ configure 2009-04-11 20:46:05.000000000 +0200 +@@ -1955,8 +1955,8 @@ + HEADLESS=1 + WITH_SDL=0 + WITH_SDL_TTF=0 +- WITH_X11=0 +- WITH_OPENGL=0 ++ WITH_X11=1 ++ WITH_OPENGL=1 + WITH_QT4=0 + ;; + --ose) diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.1.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.0.ebuild index 2297a20..102dc59 100644 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.1.4.ebuild +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.0.ebuild @@ -6,9 +6,7 @@ EAPI=2 inherit x-modular eutils -MY_PV=${PV}-3 -MY_P=VirtualBox-${MY_PV}-OSE - +MY_P=VirtualBox-${PV}-OSE DESCRIPTION="VirtualBox video driver" HOMEPAGE="http://www.virtualbox.org/" SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" @@ -16,11 +14,11 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="dri" RDEPEND="x11-base/xorg-server" DEPEND="${RDEPEND} - >=dev-util/kbuild-0.1.5 + >=dev-util/kbuild-0.1.5-r1 >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl @@ -29,9 +27,17 @@ DEPEND="${RDEPEND} x11-proto/renderproto x11-proto/xextproto x11-proto/xineramaproto - x11-proto/xproto" + x11-proto/xproto + x11-libs/libXdmcp + x11-libs/libXcomposite + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXext + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2.4.5 )" -S=${WORKDIR}/${MY_P/-3-OSE/_OSE} +S=${WORKDIR}/${MY_P/-OSE/_OSE} src_prepare() { # Remove shipped binaries (kBuild,yasm), see bug #232775 @@ -40,9 +46,8 @@ src_prepare() { # Disable things unused or splitted into separate ebuilds cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk - # Fix an upstream typo in Config.kmk - sed -i \ - -e "2511d" Config.kmk || die "Config.kmk sed failed" + # Ugly hack to build the opengl part of the video driver + epatch "${FILESDIR}/${P}-enable-opengl.patch" } src_configure() { @@ -58,7 +63,7 @@ src_configure() { src_compile() { for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \ - /src/VBox/Additions/x11/xgraphics ; do + /src/VBox/GuestHost/OpenGL /src/VBox/Additions/x11/vboxvideo ; do cd "${S}"${each} MAKE="kmk" emake TOOL_YASM_AS=yasm \ KBUILD_PATH="${S}/kBuild" \ @@ -70,14 +75,29 @@ src_install() { cd "${S}/out/linux.${ARCH}/release/bin/additions" insinto /usr/lib/xorg/modules/drivers - if has_version ">=x11-base/xorg-server-1.5" ; then + # xorg-server-1.6.x (currently on the official x11 overlay) + if has_version ">=x11-base/xorg-server-1.6" ; then + newins vboxvideo_drv_16.so vboxvideo_drv.so + # xorg-server-1.5.x + elif has_version ">=x11-base/xorg-server-1.5" \ + && has_version "<x11-base/xorg-server-1.6" ; then newins vboxvideo_drv_15.so vboxvideo_drv.so + # xorg-server-1.4.x elif has_version ">=x11-base/xorg-server-1.4" \ && has_version "<x11-base/xorg-server-1.5" ; then newins vboxvideo_drv_14.so vboxvideo_drv.so + # xorg-server-1.3.x else newins vboxvideo_drv_13.so vboxvideo_drv.so fi + + # Guest OpenGL driver + insinto /usr/lib + doins -r VBoxOGL* || die + + if use dri ; then + dosym /usr/lib/VBoxOGL.so /usr/lib/dri/vboxvideo_dri.so + fi } pkg_postinst() { |