Bump
authorPatrick Lauer <patrick@gentoo.org>
Sun, 28 Mar 2010 13:45:40 +0000 (13:45 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Sun, 28 Mar 2010 13:45:40 +0000 (13:45 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

x11-drivers/xf86-input-virtualbox/ChangeLog
x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild [new file with mode: 0644]
x11-drivers/xf86-video-virtualbox/ChangeLog
x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild [new file with mode: 0644]

index cf53f698d44ef008c10b1fe3e05059f65f92dbfd..4902527454b76b123fe9f4ff6382d1a30c58abd0 100644 (file)
@@ -1,6 +1,12 @@
 # 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.32 2010/03/18 14:32:09 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.33 2010/03/28 13:45:17 patrick Exp $
+
+*xf86-input-virtualbox-3.1.6 (28 Mar 2010)
+
+  28 Mar 2010; Patrick Lauer <patrick@gentoo.org>
+  +xf86-input-virtualbox-3.1.6.ebuild:
+  Bump
 
 *xf86-input-virtualbox-3.1.4-r1 (18 Mar 2010)
 
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild
new file mode 100644 (file)
index 0000000..4e1612b
--- /dev/null
@@ -0,0 +1,97 @@
+# 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.6.ebuild,v 1.1 2010/03/28 13:45:17 patrick 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.6.x
+               if 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 /etc/hal/fdi/policy
+                       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 "This ebuild provides a working default which has been installed into:"
+                       elog "    /etc/hal/fdi/policy/90-vboxguest.fdi"
+               fi
+}
index 49540318ceb0f9c435b0201bc3d65966d9aeb26a..0efea5290deb7533d456c26e827d3d7da3fbecc6 100644 (file)
@@ -1,6 +1,12 @@
 # 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.32 2010/03/11 12:49:22 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.33 2010/03/28 13:45:40 patrick Exp $
+
+*xf86-video-virtualbox-3.1.6 (28 Mar 2010)
+
+  28 Mar 2010; Patrick Lauer <patrick@gentoo.org>
+  +xf86-video-virtualbox-3.1.6.ebuild:
+  Bump
 
 *xf86-video-virtualbox-3.1.4-r1 (11 Mar 2010)
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild
new file mode 100644 (file)
index 0000000..846e4d8
--- /dev/null
@@ -0,0 +1,145 @@
+# 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.6.ebuild,v 1.1 2010/03/28 13:45:40 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_prepare() {
+               # 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
+               # 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
+}