public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-virtualbox: xf86-video-virtualbox-4.0.0.ebuild ChangeLog
@ 2011-01-06 22:55 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler (polynomial-c) @ 2011-01-06 22:55 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    11/01/06 22:55:40

  Modified:             ChangeLog
  Added:                xf86-video-virtualbox-4.0.0.ebuild
  Log:
  Version bump
  
  (Portage version: 2.2.0_alpha13/cvs/Linux x86_64)

Revision  Changes    Path
1.53                 x11-drivers/xf86-video-virtualbox/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?r1=1.52&r2=1.53

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog	31 Dec 2010 14:44:38 -0000	1.52
+++ ChangeLog	6 Jan 2011 22:55:40 -0000	1.53
@@ -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:



1.1                  x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild?rev=1.1&content-type=text/plain

Index: xf86-video-virtualbox-4.0.0.ebuild
===================================================================
# 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
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-virtualbox: xf86-video-virtualbox-4.0.0.ebuild ChangeLog
@ 2011-01-08 17:22 Lars Wendler (polynomial-c)
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler (polynomial-c) @ 2011-01-08 17:22 UTC (permalink / raw
  To: gentoo-commits

polynomial-c    11/01/08 17:22:26

  Modified:             xf86-video-virtualbox-4.0.0.ebuild ChangeLog
  Log:
  Removed LDFLAGS fix as it breaks compilation
  
  (Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild?r1=1.2&r2=1.3

Index: xf86-video-virtualbox-4.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xf86-video-virtualbox-4.0.0.ebuild	7 Jan 2011 18:50:20 -0000	1.2
+++ xf86-video-virtualbox-4.0.0.ebuild	8 Jan 2011 17:22:26 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.2 2011/01/07 18:50:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.0.ebuild,v 1.3 2011/01/08 17:22:26 polynomial-c Exp $
 
 EAPI=2
 
@@ -76,10 +76,6 @@
 		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch"
 		epatch "${FILESDIR}/${PN}-4-makeself-check.patch"
 		epatch "${FILESDIR}/${PN}-4-mkisofs-check.patch"
-
-		# Respect LDFLAGS
-		sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
-			-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
 }
 
 src_configure() {



1.55                 x11-drivers/xf86-video-virtualbox/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog?r1=1.54&r2=1.55

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog	7 Jan 2011 18:50:20 -0000	1.54
+++ ChangeLog	8 Jan 2011 17:22:26 -0000	1.55
@@ -1,6 +1,10 @@
 # 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.54 2011/01/07 18:50:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.55 2011/01/08 17:22:26 polynomial-c Exp $
+
+  08 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
+  xf86-video-virtualbox-4.0.0.ebuild:
+  Removed LDFLAGS fix as it breaks compilation.
 
   07 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
   xf86-video-virtualbox-4.0.0.ebuild:






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-01-08 17:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-06 22:55 [gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-virtualbox: xf86-video-virtualbox-4.0.0.ebuild ChangeLog Lars Wendler (polynomial-c)
  -- strict thread matches above, loose matches on Subject: below --
2011-01-08 17:22 Lars Wendler (polynomial-c)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox