From 1150e73aaf02a8b7b6f16f70da948b0a9dd3d12a Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Sun, 10 Aug 2008 14:45:34 +0000 Subject: Add version bump wrt bug #233683 Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo i686 --- x11-drivers/xf86-input-virtualbox/ChangeLog | 9 ++- ...ut-virtualbox-1.6.4-fix-missing-makefiles.patch | 66 +++++++++++++++++++++ .../xf86-input-virtualbox-1.6.4.ebuild | 65 ++++++++++++++++++++ x11-drivers/xf86-video-virtualbox/ChangeLog | 9 ++- ...eo-virtualbox-1.6.4-fix-missing-makefiles.patch | 66 +++++++++++++++++++++ .../xf86-video-virtualbox-1.6.4.ebuild | 69 ++++++++++++++++++++++ 6 files changed, 282 insertions(+), 2 deletions(-) create mode 100644 x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch create mode 100644 x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4.ebuild create mode 100644 x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch create mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild (limited to 'x11-drivers') diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog index 2d9037b33bf9..ba87679588b0 100644 --- a/x11-drivers/xf86-input-virtualbox/ChangeLog +++ b/x11-drivers/xf86-input-virtualbox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-input-virtualbox # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.1 2008/03/18 22:04:03 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.2 2008/08/10 14:44:21 jokey Exp $ + +*xf86-input-virtualbox-1.6.4 (10 Aug 2008) + + 10 Aug 2008; Markus Ullmann + +files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch, + +xf86-input-virtualbox-1.6.4.ebuild: + Add version bump wrt bug #233683 *xf86-input-virtualbox-1.5.6 (18 Mar 2008) diff --git a/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch b/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch new file mode 100644 index 000000000000..e3d2805b63ae --- /dev/null +++ b/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch @@ -0,0 +1,66 @@ +--- 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-input-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.1 2008/08/10 14:44:22 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-input-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.1 2008/08/10 14:44:22 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-input-virtualbox/xf86-input-virtualbox-1.6.4.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4.ebuild new file mode 100644 index 000000000000..2f37f639d32e --- /dev/null +++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2008 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-1.6.4.ebuild,v 1.1 2008/08/10 14:44:21 jokey Exp $ + +inherit x-modular eutils + +MY_P=VirtualBox-${PV}-OSE +DESCRIPTION="VirtualBox input driver" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="x11-base/xorg-server" +DEPEND="${RDEPEND} + x11-proto/inputproto + x11-proto/randrproto + x11-proto/xproto" + +S=${WORKDIR}/${MY_P/-OSE/} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Fix missing makefiles + epatch "${FILESDIR}/${P}-fix-missing-makefiles.patch" +} + +src_compile() { + # 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 + + cd "${S}/src/VBox/Additions/linux/xmouse" + MAKE="kmk" emake || die "kmk failed" +} + +src_install() { + cd "${S}/out/linux.${ARCH}/release/bin/additions" + insinto /usr/lib/xorg/modules/input + + if has_version " + +files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch, + +xf86-video-virtualbox-1.6.4.ebuild: + Add version bump wrt bug #233683 *xf86-video-virtualbox-1.5.6 (18 Mar 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 new file mode 100644 index 000000000000..7a0b90b24a15 --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch @@ -0,0 +1,66 @@ +--- 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.1 2008/08/10 14:45:34 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.1 2008/08/10 14:45:34 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/xf86-video-virtualbox-1.6.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild new file mode 100644 index 000000000000..ed4fd49a6f9e --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild @@ -0,0 +1,69 @@ +# 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.ebuild,v 1.1 2008/08/10 14:45:33 jokey Exp $ + +inherit x-modular eutils + +MY_P=VirtualBox-${PV}-OSE +DESCRIPTION="VirtualBox video driver" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="x11-base/xorg-server" +DEPEND="${RDEPEND} + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/renderproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto" + +S=${WORKDIR}/${MY_P/-OSE/} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Fix missing makefiles + epatch "${FILESDIR}/${P}-fix-missing-makefiles.patch" +} + +src_compile() { + # 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 + + cd "${S}/src/VBox/Additions/linux/xgraphics" + + MAKE="kmk" emake || die "kmk failed" +} + +src_install() { + cd "${S}/out/linux.${ARCH}/release/bin/additions" + insinto /usr/lib/xorg/modules/drivers + + if has_version "