# ChangeLog for x11-drivers/xf86-input-virtualbox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.35 2010/05/10 13:31:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.36 2010/05/20 13:11:06 polynomial-c Exp $
+
+*xf86-input-virtualbox-3.2.0 (20 May 2010)
+
+ 20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+ +xf86-input-virtualbox-3.2.0.ebuild:
+ Version bump. Removed old versions.
*xf86-input-virtualbox-3.1.8 (10 May 2010)
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.0.ebuild,v 1.2 2010/04/30 19:46:02 lxnay Exp $
-
-EAPI=2
-
-inherit x-modular eutils multilib
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox input 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="hal"
-
-RDEPEND="x11-base/xorg-server
- hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.5-r1
- >=dev-lang/yasm-0.6.2
- sys-devel/dev86
- sys-power/iasl
- x11-proto/inputproto
- x11-proto/randrproto
- x11-proto/xproto"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-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
-}
-
-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() {
- for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
- /src/VBox/Additions/x11/vboxmouse ; do
- cd "${S}"${each}
- MAKE="kmk" emake TOOL_YASM_AS=yasm \
- KBUILD_PATH="${S}/kBuild" \
- || die "kmk failed"
- done
-}
-
-src_install() {
- cd "${S}/out/linux.${ARCH}/release/bin/additions"
- insinto /usr/$(get_libdir)/xorg/modules/input
-
- # xorg-server-1.7
- if has_version ">=x11-base/xorg-server-1.7" ; then
- newins vboxmouse_drv_17.so vboxmouse_drv.so
- # xorg-server-1.6.x
- elif has_version ">=x11-base/xorg-server-1.6" ; then
- newins vboxmouse_drv_16.so vboxmouse_drv.so
- # xorg-server-1.5.x
- else
- newins vboxmouse_drv_15.so vboxmouse_drv.so
- fi
-
- # install hal information file about the mouse driver
- if use hal; then
- cd "${S}/src/VBox/Additions/linux/installer"
- insinto /usr/share/hal/fdi/information/20thirdparty
- doins 90-vboxguest.fdi
- fi
-}
-
-pkg_postinst() {
- elog "You need to edit the file /etc/X11/xorg.conf and set:"
- elog ""
- elog " Driver \"vboxmouse\""
- elog ""
- elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
- elog ""
- if has_version ">=x11-base/xorg-server-1.5" ; then
- elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection"
- elog "you may install the hal information file about the mouse driver:"
- elog ""
- elog "/usr/share/hal/fdi/information/20thirdparty/90-vboxguest.fdi"
- elog ""
- elog "dropping it into: /etc/hal/fdi/policy/"
- elog ""
- fi
-}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.2.ebuild,v 1.3 2010/05/10 13:31:46 polynomial-c Exp $
-
-EAPI=2
-
-inherit x-modular eutils multilib linux-info
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox input 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="hal"
-
-RDEPEND="x11-base/xorg-server
- hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
- >=dev-util/kbuild-0.1.5-r1
- >=dev-lang/yasm-0.6.2
- sys-devel/dev86
- sys-power/iasl
- x11-proto/inputproto
- x11-proto/randrproto
- x11-proto/xproto"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-src_prepare() {
- if kernel_is -ge 2 6 33 ; then
- # evil patch for new kernels - header moved
- grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:' || die "Failed replacing"
- fi
- # 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
-}
-
-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() {
- for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
- /src/VBox/Additions/x11/vboxmouse ; do
- cd "${S}"${each}
- MAKE="kmk" emake TOOL_YASM_AS=yasm \
- KBUILD_PATH="${S}/kBuild" \
- || die "kmk failed"
- done
-}
-
-src_install() {
- cd "${S}/out/linux.${ARCH}/release/bin/additions"
- insinto /usr/$(get_libdir)/xorg/modules/input
-
- # xorg-server-1.7
- if has_version ">=x11-base/xorg-server-1.7" ; then
- newins vboxmouse_drv_17.so vboxmouse_drv.so
- # xorg-server-1.6.x
- elif has_version ">=x11-base/xorg-server-1.6" ; then
- newins vboxmouse_drv_16.so vboxmouse_drv.so
- # xorg-server-1.5.x
- else
- newins vboxmouse_drv_15.so vboxmouse_drv.so
- fi
-
- # install hal information file about the mouse driver
- if use hal; then
- cd "${S}/src/VBox/Additions/linux/installer"
- insinto /usr/share/hal/fdi/information/20thirdparty
- doins 90-vboxguest.fdi
- fi
-}
-
-pkg_postinst() {
- elog "You need to edit the file /etc/X11/xorg.conf and set:"
- elog ""
- elog " Driver \"vboxmouse\""
- elog ""
- elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
- elog ""
- if has_version ">=x11-base/xorg-server-1.5" ; then
- elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection"
- elog "you may install the hal information file about the mouse driver:"
- elog ""
- elog "/usr/share/hal/fdi/information/20thirdparty/90-vboxguest.fdi"
- elog ""
- elog "dropping it into: /etc/hal/fdi/policy/"
- elog ""
- fi
-}
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.4-r1.ebuild,v 1.3 2010/05/10 13:31:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.0.ebuild,v 1.1 2010/05/20 13:11:06 polynomial-c Exp $
EAPI=2
# ChangeLog for x11-drivers/xf86-video-virtualbox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.36 2010/05/10 13:27:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.37 2010/05/20 13:13:45 polynomial-c Exp $
+
+*xf86-video-virtualbox-3.2.0 (20 May 2010)
+
+ 20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+ +xf86-video-virtualbox-3.2.0.ebuild,
+ +files/xf86-video-virtualbox-3.2.0-mesa-check.patch:
+ Version bump. Removed old versions.
*xf86-video-virtualbox-3.1.8 (10 May 2010)
+++ /dev/null
-# -*- Makefile -*-
-#
-# Overwrite some default kBuild settings
-#
-
-#
-# Copyright (C) 2006-2008 Sun Microsystems, Inc.
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation,
-# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
-# distribution. VirtualBox OSE is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-# don't build testcases to save time, they are not needed for the package
-VBOX_WITH_TESTCASES :=
-VBOX_WITH_TESTSUITE :=
-
-KBUILD_MSG_STYLE := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING := 2
-VBOX_WITH_ORIGIN :=
-VBOX_ONLY_ADDITIONS := 1
-
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release =
-TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS)
+++ /dev/null
---- VirtualBox-3.1.4_OSE.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-+++ VirtualBox-3.1.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c
-@@ -87,7 +87,13 @@ static struct drm_driver driver = {
- .owner = THIS_MODULE,
- .open = drm_open,
- .release = drm_release,
-+ /* This was changed with Linux 2.6.33 but Fedora backported this
-+ * change to their 2.6.32 kernel. */
-+#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33)
-+ .unlocked_ioctl = drm_ioctl,
-+#else
- .ioctl = drm_ioctl,
-+#endif
- .mmap = drm_mmap,
- .poll = drm_poll,
- .fasync = drm_fasync,
--- /dev/null
+--- configure
++++ configure
+@@ -1226,9 +1226,7 @@
+ }
+ EOF
+ [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
+- if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
+- log_success "found"
+- fi
++ test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs
+ }
+
+
+@@ -1382,20 +1380,6 @@
+ #include <GL/glu.h>
+ extern "C" int main(void)
+ {
+- Display *dpy;
+- int major, minor;
+-
+- dpy = XOpenDisplay(NULL);
+- if (dpy)
+- {
+- if (glXQueryVersion(dpy, &major, &minor))
+- {
+- printf("found version %u.%u, OK.\n", major, minor);
+- return 0;
+- }
+- XCloseDisplay(dpy);
+- }
+- printf("found (inactive), OK.\n");
+ return 0;
+ }
+ EOF
+++ /dev/null
-# Copyright 1999-2010 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-3.1.0-r1.ebuild,v 1.1 2010/05/01 00:01:34 lxnay 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.7.x
- if has_version ">=x11-base/xorg-server-1.7" ; then
- newins vboxvideo_drv_17.so vboxvideo_drv.so
- # xorg-server-1.6.x
- elif 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
-}
+++ /dev/null
-# Copyright 1999-2010 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-3.1.2-r1.ebuild,v 1.2 2010/05/10 13:27:52 polynomial-c 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() {
- if kernel_is -ge 2 6 33 ; then
- # evil patch for new kernels - header moved
- grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
- fi
- # 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.7.x
- if has_version ">=x11-base/xorg-server-1.7" ; then
- newins vboxvideo_drv_17.so vboxvideo_drv.so
- # xorg-server-1.6.x
- elif 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
-}
# Copyright 1999-2010 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-3.1.4-r2.ebuild,v 1.2 2010/05/10 13:27:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.0.ebuild,v 1.1 2010/05/20 13:13:45 polynomial-c Exp $
EAPI=2
-inherit x-modular eutils linux-mod multilib
+inherit x-modular eutils linux-mod multilib versionator
MY_P=VirtualBox-${PV}-OSE
DESCRIPTION="VirtualBox video driver"
}
src_prepare() {
-
- # 2.6.33 support, backported patch
- # See http://www.virtualbox.org/ticket/6198
- epatch "${FILESDIR}"/${P}-2.6.33.patch
-
# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
cp -a "${WORKDIR}/${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/drm \
"${WORKDIR}/vboxvideo_drm" || die "cannot copy vboxvideo_drm directory"
cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
"${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile"
- if kernel_is -ge 2 6 33; then
- # evil patch for new kernels - header moved
- grep -lR linux/autoconf.h * | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
- fi
+ # stupid new header references...
+ for vboxheader in {product,version}-generated.h ; do
+ ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+ "${WORKDIR}/vboxvideo_drm/${vboxheader}"
+ done
+
# Remove shipped binaries (kBuild,yasm), see bug #232775
rm -rf kBuild/bin tools
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"
+ epatch "${FILESDIR}/${PN}-3.2.0-mesa-check.patch"
}
src_configure() {
}
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
KBUILD_PATH="${S}/kBuild" \
|| die "kmk failed"
done
+
+ if use dri; then
+ # Now creating the kernel modules. We must do this _after_
+ # we compiled the user-space tools as we need two of the
+ # automatically generated header files. (>=3.2.0)
+ linux-mod_src_compile
+ fi
}
src_install() {
cd "${S}/out/linux.${ARCH}/release/bin/additions"
insinto /usr/$(get_libdir)/xorg/modules/drivers
+ # xorg-server-1.8.x
+ if has_version ">=x11-base/xorg-server-1.8" ; then
+ newins vboxvideo_drv_18.so vboxvideo_drv.so
# xorg-server-1.7.x
- if has_version ">=x11-base/xorg-server-1.7" ; then
+ elif has_version ">=x11-base/xorg-server-1.7" ; then
newins vboxvideo_drv_17.so vboxvideo_drv.so
# xorg-server-1.6.x
elif has_version ">=x11-base/xorg-server-1.6" ; then