Version bump
authorLars Wendler <polynomial-c@gentoo.org>
Wed, 17 Aug 2011 23:39:33 +0000 (23:39 +0000)
committerLars Wendler <polynomial-c@gentoo.org>
Wed, 17 Aug 2011 23:39:33 +0000 (23:39 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

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

index 49b0cfc2b20ebc7d22f6cf1738e6bb6a90f4d713..4a14ac795f866566529dec034460998a227159f8 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.70 2011/08/09 10:42:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.71 2011/08/17 23:39:33 polynomial-c Exp $
+
+*xf86-input-virtualbox-4.1.2 (17 Aug 2011)
+
+  17 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-input-virtualbox-4.1.2.ebuild:
+  Version bump.
 
   09 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
   -xf86-input-virtualbox-3.2.12.ebuild, -xf86-input-virtualbox-4.0.10.ebuild:
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.2.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.2.ebuild
new file mode 100644 (file)
index 0000000..cc60c7a
--- /dev/null
@@ -0,0 +1,98 @@
+# Copyright 1999-2011 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-4.1.2.ebuild,v 1.1 2011/08/17 23:39:33 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils multilib linux-info
+
+MY_P=VirtualBox-${PV}
+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=""
+
+RDEPEND="x11-base/xorg-server
+       || ( x11-drivers/xf86-input-mouse
+           x11-drivers/xf86-input-evdev )"
+DEPEND="${RDEPEND}
+       >=dev-util/kbuild-0.1.999
+       >=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"
+
+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.10
+               if has_version "=x11-base/xorg-server-1.10*" ; then
+                               newins vboxmouse_drv_110.so vboxmouse_drv.so
+               # xorg-server-1.9
+               else
+                               newins vboxmouse_drv_19.so vboxmouse_drv.so
+               fi
+
+               cd "${S}/src/VBox/Additions/linux/installer" || die
+
+               # install udev information file about the mouse driver
+               insinto /lib/udev/rules.d
+               doins 70-xorg-vboxmouse.rules
+
+               # install X11 information file about the mouse driver
+               insinto /etc/X11/xorg.conf.d
+               doins "${S}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf"
+}
+
+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 ""
+               elog "This is no longer necessary for X.Org Server 1.9 or higher. Use"
+               elog "the server's udev autodetection with such versions."
+}
index 75aa1f4a538821b73c91a050025e8766916bb128..a2e88c64bdeccf4cb5e8b0e35b414955aff1e1b5 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.70 2011/08/09 10:43:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.71 2011/08/17 23:38:57 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.1.2 (17 Aug 2011)
+
+  17 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +xf86-video-virtualbox-4.1.2.ebuild:
+  Version bump.
 
   09 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
   -xf86-video-virtualbox-3.2.12.ebuild, -xf86-video-virtualbox-4.0.10.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.2.ebuild
new file mode 100644 (file)
index 0000000..bc365e6
--- /dev/null
@@ -0,0 +1,156 @@
+# Copyright 1999-2011 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-4.1.2.ebuild,v 1.1 2011/08/17 23:38:57 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod multilib python versionator
+
+MY_P=VirtualBox-${PV}
+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[-minimal]"
+DEPEND="${RDEPEND}
+               >=dev-util/kbuild-0.1.999
+               =dev-lang/python-2*
+               >=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"
+
+QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
+
+pkg_setup() {
+               linux-mod_pkg_setup
+               BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+
+               python_set_active_version 2
+               python_pkg_setup
+}
+
+src_prepare() {
+               # Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+               cp -a "${S}"/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"
+
+               # 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
+
+               # 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 checks in configure
+               epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
+                       "${FILESDIR}/${PN}-4-makeself-check.patch" \
+                       "${FILESDIR}/${PN}-4-mkisofs-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() {
+               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
+
+               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() {
+               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.10.x
+               if has_version ">=x11-base/xorg-server-1.10" ; then
+                               newins vboxvideo_drv_110.so vboxvideo_drv.so
+               # xorg-server-1.9.x
+               else
+                               newins vboxvideo_drv_19.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
+}