From 17fc06af59aa3c5a76d1fe6cdf23397a7b3d07ca Mon Sep 17 00:00:00 2001 From: x-drum Date: Tue, 6 Oct 2009 18:15:49 +0000 Subject: Version bump svn path=/trunk/; revision=730 --- x11-drivers/xf86-video-virtualbox/ChangeLog | 31 ++++- x11-drivers/xf86-video-virtualbox/Manifest | 10 +- .../xf86-video-virtualbox-3.0.2-r1.ebuild | 151 -------------------- .../xf86-video-virtualbox-3.0.4-r1.ebuild | 153 --------------------- .../xf86-video-virtualbox-3.0.6.ebuild | 145 ------------------- .../xf86-video-virtualbox-3.0.8.ebuild | 145 +++++++++++++++++++ 6 files changed, 173 insertions(+), 462 deletions(-) delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.2-r1.ebuild delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.4-r1.ebuild delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.6.ebuild create mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.8.ebuild diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog index 219419f..c122500 100644 --- a/x11-drivers/xf86-video-virtualbox/ChangeLog +++ b/x11-drivers/xf86-video-virtualbox/ChangeLog @@ -1,14 +1,33 @@ # ChangeLog for x11-drivers/xf86-video-virtualbox # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.14 2009/08/17 14:32:29 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.18 2009/09/21 23:58:46 fauli Exp $ - 10 Sep 2009; Alessio Cassibba (X-Drum) + 06 Oct 2009; Alessio Cassibba (X-Drum) + -xf86-video-virtualbox-3.0.2-r1.ebuild, + -xf86-video-virtualbox-3.0.4-r1.ebuild, + -xf86-video-virtualbox-3.0.6.ebuild, +xf86-video-virtualbox-3.0.8.ebuild: + Version bump + + 21 Sep 2009; Christian Faulhammer + xf86-video-virtualbox-3.0.6.ebuild: + stable x86, bug 285451 + + 15 Sep 2009; Patrick Lauer + xf86-video-virtualbox-3.0.6.ebuild: + Adding mesa to deps, thanks to Gerd Troeger for reporting. + + 12 Sep 2009; Patrick Lauer + -xf86-video-virtualbox-2.1.4.ebuild, -xf86-video-virtualbox-2.2.0.ebuild, + -xf86-video-virtualbox-2.2.2.ebuild, -xf86-video-virtualbox-2.2.4.ebuild, + -xf86-video-virtualbox-3.0.2.ebuild, -xf86-video-virtualbox-3.0.4.ebuild: + Remove old + +*xf86-video-virtualbox-3.0.6 (10 Sep 2009) + + 10 Sep 2009; Patrick Lauer files/xf86-video-virtualbox-2-localconfig, - -xf86-video-virtualbox-3.0.4.ebuild, - +xf86-video-virtualbox-3.0.4-r1.ebuild, +xf86-video-virtualbox-3.0.6.ebuild: - Version bump; drop support for pre-1.5 X servers wrt #259150; qa: avoid - pre-stripped files thanks to Maciej Mrozowski wrt bug #274323, mark texrel + Bump to 3.0.6, thanks to Alessio Cassiba. Fixes #284407 *xf86-video-virtualbox-3.0.4 (17 Aug 2009) diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest index 73456f5..5526cb6 100644 --- a/x11-drivers/xf86-video-virtualbox/Manifest +++ b/x11-drivers/xf86-video-virtualbox/Manifest @@ -2,11 +2,7 @@ AUX xf86-video-virtualbox-2-localconfig 996 RMD160 4e986699d9484a3b7d9b11eb1bb30 AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 RMD160 c8c8e6a9aaea1ec53f3c0cb285750921287959a6 SHA1 7d68f5529a921f7d9786b232e8ecc7ebe7ba0e1b SHA256 194b7bca875f18e1621f065640d1c1a1364640e17475c493ec3b56f6e7e5ce66 AUX xf86-video-virtualbox-3-vboxvideo_drm.makefile 6810 RMD160 55758e73adef9924a9bcea5da465fc93a1ea03df SHA1 fce332db7b3f9fd337b26e2165441aaeb2193b48 SHA256 ccf3eaaa8e1ed4a9c816a9a944c3ce6f289d002f03ce72d796500d209e26ae7e AUX xf86-video-virtualbox-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8 -DIST VirtualBox-3.0.2-OSE.tar.bz2 51322139 RMD160 9d33f82cf0ef2ca001fd61b9b26583ca2ad32a5a SHA1 442206e7dfcf6719b7ee452f9f042563acd6f0eb SHA256 41ee0fc47103aeeae8301f7b75d358662ff0f05e5874b9775641d6a9b9e39fe8 -DIST VirtualBox-3.0.4-OSE.tar.bz2 51381059 RMD160 7addc9d840ef751d95356a342c6a51f2c87a855b SHA1 454f4fbd46a3c7bfa0f6e48eaa37bb578446aca5 SHA256 006a25df51a209262ee93b8cf3f155e1883fa872b4b8c5d77f042675a0f302e1 -DIST VirtualBox-3.0.6-OSE.tar.bz2 51994159 RMD160 480e7997bd9ed44b41209bfa82627217b37c49a3 SHA1 403d23fcb8c0f209e6ea8ab9233f8607b923afdf SHA256 5f52961c2b318076f5ec5f3dccecb09233a8f31d821ae2cea9481c5453cd31ef -EBUILD xf86-video-virtualbox-3.0.2-r1.ebuild 4033 RMD160 ccee9c9764d08aea1e0fbbe178f880d57ebcdf18 SHA1 64cab8c1ac6ac5b9982aea323bbeccc55b6307d6 SHA256 b4eecb60b09d9bc284a3e1f508ace82a364495c23d20b241d59becf9c4f8ab05 -EBUILD xf86-video-virtualbox-3.0.4-r1.ebuild 4071 RMD160 10a2c6ddc2c455dbbf89e6c46666d88bccd65028 SHA1 f4ae92bc8348a27f96dee59927601bde740a760a SHA256 0bfb88d6c310ff801b306c70f6e953ad6ca841a21ca072da62d746b0c3123f3b -EBUILD xf86-video-virtualbox-3.0.6.ebuild 3687 RMD160 06c70aa452580e77dc91f22913b613d500970124 SHA1 bf288dec0261f9848eabde3733a67a019a93f60d SHA256 98b62a423e8e020d25f8ded08ae756ecb8d24dba741c729452d37d5574499fe0 -MISC ChangeLog 6408 RMD160 5535823061eb447bdc343669486bd304599e69be SHA1 cb73f223ba2d62094ffe8a4db0d003a297579d44 SHA256 6b28b714161634689f19f1938fb70914a3b527c842bc7a88c8183ca5dd03b8d2 +DIST VirtualBox-3.0.8-OSE.tar.bz2 52058158 RMD160 0565592f81e787ceb18a3eea1271d95bfed804cc SHA1 07c16657046f1b5a5562ad2b9041f982ad9dded7 SHA256 6472df6ec77cbc3c742f56db6b7e3f49323620f688ac7c52227aebe4f4a18be1 +EBUILD xf86-video-virtualbox-3.0.8.ebuild 3687 RMD160 06c70aa452580e77dc91f22913b613d500970124 SHA1 bf288dec0261f9848eabde3733a67a019a93f60d SHA256 98b62a423e8e020d25f8ded08ae756ecb8d24dba741c729452d37d5574499fe0 +MISC ChangeLog 7063 RMD160 8ec56bec653aa34e5b92f2862eb65b983e312d4a SHA1 5c78898f313377ddb2acb18c022ee10e31b8caab SHA256 edb5239d264e6fba4e79dbdca83ad03752e72af6054cbb3ace428fe3c26f82ac MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.2-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.2-r1.ebuild deleted file mode 100644 index 276f552..0000000 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.2-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.4.ebuild,v 1.1 2009/06/01 00:26:48 patrick Exp $ - -EAPI=2 - -inherit x-modular eutils linux-mod multilib - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dri" - -RDEPEND="x11-base/xorg-server" -DEPEND="${RDEPEND} - >=dev-util/kbuild-0.1.5-r1 - >=dev-lang/yasm-0.6.2 - sys-devel/dev86 - sys-power/iasl - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xineramaproto - 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 )" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)" - -S=${WORKDIR}/${MY_P/-OSE/_OSE} - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" -} - -src_unpack() { - unpack ${A} - - # Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR} - cp -a "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/drm \ - "${WORKDIR}/vboxvideo_drm" - cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \ - "${WORKDIR}/vboxvideo_drm/Makefile" -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -rf kBuild/bin tools - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk - - # Ugly hack to build the opengl part of the video driver - epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch" - - # unset useless/problematic mesa checks in configure - epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch" -} - -src_configure() { - # build the user-space tools, warnings are harmless - ./configure --nofatal \ - --disable-xpcom \ - --disable-sdl-ttf \ - --disable-pulse \ - --disable-alsa \ - --build-headless || die "configure failed" - source ./env.sh -} - -src_compile() { - if use dri; then - linux-mod_src_compile - fi - - for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \ - /src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \ - /src/VBox/Additions/x11/vboxvideo ; do - cd "${S}"${each} - MAKE="kmk" emake TOOL_YASM_AS=yasm \ - KBUILD_PATH="${S}/kBuild" \ - || die "kmk failed" - done -} - -src_install() { - if use dri; then - linux-mod_src_install - fi - - cd "${S}/out/linux.${ARCH}/release/bin/additions" - insinto /usr/$(get_libdir)/xorg/modules/drivers - - # 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.4" \ - && 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.4" \ - && has_version "=x11-base/xorg-server-1.6" ; then - newins vboxvideo_drv_16.so vboxvideo_drv.so - # xorg-server-1.5.x - else - newins vboxvideo_drv_15.so vboxvideo_drv.so - fi - - # Guest OpenGL driver - insinto /usr/$(get_libdir) - doins -r VBoxOGL* || die - - if use dri ; then - dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so - fi -} - -pkg_postinst() { - elog "You need to edit the file /etc/X11/xorg.conf and set:" - elog "" - elog " Driver \"vboxvideo\"" - elog "" - elog "in the Graphics device section (Section \"Device\")" - elog "" - if use dri; then - elog "To use the kernel drm video driver, please add:" - elog "\"vboxvideo\" to:" - if has_version sys-apps/openrc; then - elog "/etc/conf.d/modules" - else - elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}" - fi - elog "" - fi -} diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.8.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.8.ebuild new file mode 100644 index 0000000..aa5e239 --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.8.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.4.ebuild,v 1.1 2009/06/01 00:26:48 patrick Exp $ + +EAPI=2 + +inherit x-modular eutils linux-mod multilib + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dri" + +RDEPEND="x11-base/xorg-server" +DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.5-r1 + >=dev-lang/yasm-0.6.2 + sys-devel/dev86 + sys-power/iasl + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/renderproto + x11-proto/xextproto + x11-proto/xineramaproto + 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 )" + +BUILD_TARGETS="all" +BUILD_TARGET_ARCH="${ARCH}" +MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)" + +S=${WORKDIR}/${MY_P/-OSE/_OSE} + +QA_TEXTRELS_x86="usr/lib/VBoxOGL.so" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" +} + +src_unpack() { + unpack ${A} + + # Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR} + cp -a "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/drm \ + "${WORKDIR}/vboxvideo_drm" + cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \ + "${WORKDIR}/vboxvideo_drm/Makefile" +} + +src_prepare() { + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -rf kBuild/bin tools + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk + + # Ugly hack to build the opengl part of the video driver + epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch" + + # unset useless/problematic mesa checks in configure + epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch" +} + +src_configure() { + # build the user-space tools, warnings are harmless + ./configure --nofatal \ + --disable-xpcom \ + --disable-sdl-ttf \ + --disable-pulse \ + --disable-alsa \ + --build-headless || die "configure failed" + source ./env.sh +} + +src_compile() { + if use dri; then + linux-mod_src_compile + fi + + for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \ + /src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \ + /src/VBox/Additions/x11/vboxvideo ; do + cd "${S}"${each} + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk failed" + done +} + +src_install() { + if use dri; then + linux-mod_src_install + fi + + cd "${S}/out/linux.${ARCH}/release/bin/additions" + insinto /usr/$(get_libdir)/xorg/modules/drivers + + # xorg-server-1.6.x + if has_version ">=x11-base/xorg-server-1.6" ; then + newins vboxvideo_drv_16.so vboxvideo_drv.so + # xorg-server-1.5.x + else + newins vboxvideo_drv_15.so vboxvideo_drv.so + fi + + # Guest OpenGL driver + insinto /usr/$(get_libdir) + doins -r VBoxOGL* || die + + if use dri ; then + dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so + fi +} + +pkg_postinst() { + elog "You need to edit the file /etc/X11/xorg.conf and set:" + elog "" + elog " Driver \"vboxvideo\"" + elog "" + elog "in the Graphics device section (Section \"Device\")" + elog "" + if use dri; then + elog "To use the kernel drm video driver, please add:" + elog "\"vboxvideo\" to:" + if has_version sys-apps/openrc; then + elog "/etc/conf.d/modules" + else + elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}" + fi + elog "" + fi +} -- cgit v1.2.3-65-gdbad