From 82ec8dddacc8f912283be03c8f90ca9935b45230 Mon Sep 17 00:00:00 2001 From: x-drum Date: Mon, 30 Nov 2009 23:11:42 +0000 Subject: Version bump svn path=/trunk/; revision=758 --- x11-drivers/xf86-video-virtualbox/ChangeLog | 27 +++- x11-drivers/xf86-video-virtualbox/Manifest | 6 +- .../xf86-video-virtualbox-3.0.12.ebuild | 145 --------------------- .../xf86-video-virtualbox-3.1.0.ebuild | 145 +++++++++++++++++++++ 4 files changed, 170 insertions(+), 153 deletions(-) delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.12.ebuild create mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog index 707dad2..1af6a19 100644 --- a/x11-drivers/xf86-video-virtualbox/ChangeLog +++ b/x11-drivers/xf86-video-virtualbox/ChangeLog @@ -1,13 +1,30 @@ # 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.24 2009/11/10 01:51:17 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.28 2009/11/30 16:13:40 patrick Exp $ - 18 Nov 2009; Alessio Cassibba (X-Drum) - -files/xf86-video-virtualbox-2-localconfig, - -xf86-video-virtualbox-3.0.10.ebuild, + 30 Nov 2009; Patrick Lauer + -xf86-video-virtualbox-3.0.8.ebuild, -xf86-video-virtualbox-3.0.10.ebuild: + Remove old + + 30 Nov 2009; Markus Meier + xf86-video-virtualbox-3.0.12.ebuild: + amd64 stable, bug #294678 + + 27 Nov 2009; Christian Faulhammer + xf86-video-virtualbox-3.0.12.ebuild: + stable x86, security bug 294678 + + 19 Nov 2009; Patrick Lauer + +xf86-video-virtualbox-3.0.12.ebuild, + +files/xf86-video-virtualbox-3-localconfig: + Bump, closes #293556 + +*xf86-video-virtualbox-3.0.12 (18 Nov 2009) + + 18 Nov 2009; Patrick Lauer +xf86-video-virtualbox-3.0.12.ebuild, +files/xf86-video-virtualbox-3-localconfig: - Version bump + Bump 10 Nov 2009; Patrick Lauer -xf86-video-virtualbox-1.6.6.ebuild, -xf86-video-virtualbox-3.0.6.ebuild: diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest index 3d8257f..d8e9e2b 100644 --- a/x11-drivers/xf86-video-virtualbox/Manifest +++ b/x11-drivers/xf86-video-virtualbox/Manifest @@ -2,7 +2,7 @@ AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 RMD160 c8c8e6a9aaea1ec53 AUX xf86-video-virtualbox-3-localconfig 996 RMD160 4e986699d9484a3b7d9b11eb1bb30ca9d3a33fb3 SHA1 52d13e385d75d55aac64697eb715421df856c728 SHA256 ff777086ae7d0337e59066b4f7d6538823ca1804b57906e07cd562c8a48e054f 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.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2 -EBUILD xf86-video-virtualbox-3.0.12.ebuild 3687 RMD160 73cc00fc953bbcc54072e0b568087d12015e1def SHA1 b50a344b15be28c6c517954acaa669acce28f48e SHA256 4540b1627fdb311359ee2eb10fc629400f4a6f0e50e617bbd5a8b66b55beb55d -MISC ChangeLog 7906 RMD160 341e063e0559d07d59211075e5bd9a44382253f3 SHA1 e4051f2c0a1191828af7c27ab789ebe46bbdb9e5 SHA256 a97cbcb7623ff4b3bb1d3023dcf77e4d6c3a08f5a37b95e75a01d8291267ba71 +DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639 +EBUILD xf86-video-virtualbox-3.1.0.ebuild 3687 RMD160 73cc00fc953bbcc54072e0b568087d12015e1def SHA1 b50a344b15be28c6c517954acaa669acce28f48e SHA256 4540b1627fdb311359ee2eb10fc629400f4a6f0e50e617bbd5a8b66b55beb55d +MISC ChangeLog 8393 RMD160 3db12264a68ed03d43431a6b84a632f36e7d48c9 SHA1 45372072c8334672ab5a99edce45ec545149688e SHA256 a1111ce60663f9bbaf1d4cfc2d9fcde81e2ac3795e3f9440d5aef9d565067bcd MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.12.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.12.ebuild deleted file mode 100644 index c01335b..0000000 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.12.ebuild +++ /dev/null @@ -1,145 +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} - -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}-3-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 -} diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild new file mode 100644 index 0000000..c01335b --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.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}-3-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