diff options
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/ChangeLog | 21 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch | 66 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2-localconfig (renamed from x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.0.2-localconfig) | 0 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild | 4 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4.ebuild (renamed from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild) | 23 |
5 files changed, 38 insertions, 76 deletions
diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog index 2cc95d181e68..3b81fd2161c0 100644 --- a/x11-drivers/xf86-video-virtualbox/ChangeLog +++ b/x11-drivers/xf86-video-virtualbox/ChangeLog @@ -1,6 +1,25 @@ # ChangeLog for x11-drivers/xf86-video-virtualbox # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.4 2008/09/15 19:47:16 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.5 2008/10/27 18:21:13 jokey Exp $ + +*xf86-video-virtualbox-2.0.4 (27 Oct 2008) + + 27 Oct 2008; Markus Ullmann <jokey@gentoo.org> + -files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch, + -files/xf86-video-virtualbox-2.0.2-localconfig, + +files/xf86-video-virtualbox-2-localconfig, + -xf86-video-virtualbox-1.6.4-r1.ebuild, + xf86-video-virtualbox-2.0.2.ebuild, +xf86-video-virtualbox-2.0.4.ebuild: + (Proxy commit) Version bump + + 26 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com> + -xf86-video-virtualbox-1.6.4-r1.ebuild, + -files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch, + xf86-video-virtualbox-2.0.2.ebuild, + -files/xf86-video-virtualbox-2.0.2-localconfig, + +xf86-video-virtualbox-2.0.4.ebuild, + +files/xf86-video-virtualbox-2-localconfig: + Version Bump; drop version 1.6.4 *xf86-video-virtualbox-2.0.2 (15 Sep 2008) diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch deleted file mode 100644 index 27fffb6a9130..000000000000 --- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- src/apps/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100 -+++ src/apps/Makefile.kmk 2008-08-02 16:06:11.358197514 +0200 -@@ -0,0 +1,28 @@ -+# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/15 19:47:19 jokey Exp $ -+## @file -+# Sub-Makefile for the external apps. -+# -+ -+# -+# Copyright (C) 2006-2007 Sun Microsystems, Inc. -+# -+# Sun Microsystems, Inc. confidential -+# All rights reserved -+# -+ -+DEPTH = ../.. -+include $(KBUILD_PATH)/subheader.kmk -+ -+ifdef VBOX_WITH_KCHMVIEWER -+ ifneq ($(wildcard $(PATH_SUB_CURRENT)/kchmviewer-2.6),) -+ include $(PATH_SUB_CURRENT)/kchmviewer-2.6/Makefile.kmk -+ endif -+endif -+ifneq ($(wildcard $(PATH_SUB_CURRENT)/tunctl),) -+ ifeq ($(KBUILD_TARGET),linux) -+ include $(PATH_SUB_CURRENT)/tunctl/Makefile.kmk -+ endif -+endif -+ -+include $(KBUILD_PATH)/subfooter.kmk -+ ---- src/apps/tunctl/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100 -+++ src/apps/tunctl/Makefile.kmk 2008-08-02 16:06:37.447936207 +0200 -@@ -0,0 +1,32 @@ -+# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/15 19:47:19 jokey Exp $ -+## @file -+# Sub-Makefile for VBoxTunctl -+# -+# VBoxTunctl is identical to tunctl from Usermode Linux except for the name. -+# -+ -+# -+# Copyright (C) 2006-2007 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 (GPL) 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. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa -+# Clara, CA 95054 USA or visit http://www.sun.com if you need -+# additional information or have any questions. -+# -+ -+DEPTH = ../../.. -+include $(KBUILD_PATH)/subheader.kmk -+ -+PROGRAMS.linux += VBoxTunctl -+VBoxTunctl_TEMPLATE = VBOXR3EXE -+VBoxTunctl_SOURCES = tunctl.c -+ -+include $(KBUILD_PATH)/subfooter.kmk -+ diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.0.2-localconfig b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2-localconfig index 3e1f7d8cbb32..3e1f7d8cbb32 100644 --- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.0.2-localconfig +++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2-localconfig diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild index 2036527e8138..6df93d4c6c41 100644 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-2.0.2.ebuild,v 1.1 2008/09/15 19:47:16 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild,v 1.2 2008/10/27 18:21:13 jokey Exp $ inherit x-modular eutils @@ -37,7 +37,7 @@ src_unpack() { rm -rf kBuild/bin tools # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${P}-localconfig" LocalConfig.kmk + cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk } src_compile() { diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4.ebuild index 5f5f50179bec..e9cf207e50c9 100644 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-1.6.4-r1.ebuild,v 1.2 2008/09/15 19:47:16 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4.ebuild,v 1.1 2008/10/27 18:21:13 jokey Exp $ inherit x-modular eutils @@ -16,6 +16,8 @@ IUSE="" RDEPEND="x11-base/xorg-server" DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.4 + >=dev-lang/yasm-0.6.2 sys-devel/dev86 sys-power/iasl x11-proto/fontsproto @@ -31,8 +33,11 @@ src_unpack() { unpack ${A} cd "${S}" - # Fix missing makefiles - epatch "${FILESDIR}/${P}-fix-missing-makefiles.patch" + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -rf kBuild/bin tools + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk } src_compile() { @@ -47,7 +52,9 @@ src_compile() { for each in src/VBox/{Runtime,Additions/common/VBoxGuestLib} \ src/VBox/Additions/x11/xgraphics ; do - MAKE="kmk" emake || die "kmk failed" + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk failed" done } @@ -55,10 +62,12 @@ src_install() { cd "${S}/out/linux.${ARCH}/release/bin/additions" insinto /usr/lib/xorg/modules/drivers - if has_version "<x11-base/xorg-server-1.4" ; then - newins vboxvideo_drv_13.so vboxvideo_drv.so - else + if has_version "=x11-base/xorg-server-1.5" ; then + newins vboxvideo_drv_15.so vboxvideo_drv.so + elif has_version "=x11-base/xorg-server-1.4" ; then newins vboxvideo_drv_14.so vboxvideo_drv.so + else + newins vboxvideo_drv_13.so vboxvideo_drv.so fi } |