Version bump

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

5 files changed, 186 insertions, 36 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index e6c36fac9207..63e0e6390cef 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,15 @@
 # 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.52 2010/12/31 14:44:38 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.53 2011/01/06 22:55:40 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.0.0 (06 Jan 2011)
+
+  06 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -files/xf86-video-virtualbox-3.2.0-mesa-check.patch,
+  +xf86-video-virtualbox-4.0.0.ebuild,
+  +files/xf86-video-virtualbox-4-makeself-check.patch,
+  +files/xf86-video-virtualbox-4-mkisofs-check.patch:
+  Version bump.
 
   31 Dec 2010; Markos Chandras <hwoarang@gentoo.org>
   xf86-video-virtualbox-3.2.12.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.2.0-mesa-check.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.2.0-mesa-check.patch
deleted file mode 100644
index f2cf9817455a..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.2.0-mesa-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4-makeself-check.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4-makeself-check.patch
new file mode 100644
index 000000000000..e1fcb8c2f471
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4-makeself-check.patch
@@ -0,0 +1,10 @@
+--- VirtualBox-4.0.0_OSE/configure
++++ VirtualBox-4.0.0_OSE/configure
+@@ -2527,7 +2527,6 @@
+   check_compiler_h
+   [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+   # tools/common/makeself*
+-  [ $OSE -ge 1 ] && check_makeself
+ fi
+ 
+ [ -n "$SETUP_WINE" ] && setup_wine
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4-mkisofs-check.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4-mkisofs-check.patch
new file mode 100644
index 000000000000..8b0d59123f54
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4-mkisofs-check.patch
@@ -0,0 +1,10 @@
+--- VirtualBox-4.0.0_OSE/configure
++++ VirtualBox-4.0.0_OSE/configure
+@@ -2499,7 +2499,6 @@
+ # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
+ # [ "$OS" != "darwin" ] && check_yasm
+ [ "$OS" != "darwin"  ] && check_xsltproc
+-[ "$OS" != "darwin"  ] && check_mkisofs
+ 
+ # the libraries
+ [ "$OS" != "darwin"  ] && check_pthread
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild
new file mode 100644
index 000000000000..f34e7f9cffa5
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild
@@ -0,0 +1,155 @@
+# 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.0.0.ebuild,v 1.1 2011/01/06 22:55:40 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod multilib 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.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"
+
+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 "${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"
+		epatch "${FILESDIR}/${PN}-4-makeself-check.patch"
+		epatch "${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.9.x
+		if has_version ">=x11-base/xorg-server-1.9" ; then
+				newins vboxvideo_drv_19.so vboxvideo_drv.so
+		# xorg-server-1.8.x
+		elif has_version ">=x11-base/xorg-server-1.8" ; then
+				newins vboxvideo_drv_18.so vboxvideo_drv.so
+		# xorg-server-1.7.x
+		else
+				newins vboxvideo_drv_17.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
+}