summaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-ati/Manifest1
-rw-r--r--x11-drivers/xf86-video-ati/files/enable_DRI3_by_default.patch12
-rw-r--r--x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild50
-rw-r--r--x11-drivers/xf86-video-virtualbox/Manifest1
-rw-r--r--x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch13
-rw-r--r--x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3-vboxvideo_drm.makefile240
-rw-r--r--x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig30
-rw-r--r--x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch52
-rw-r--r--x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch82
-rw-r--r--x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch11
-rw-r--r--x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild185
11 files changed, 0 insertions, 677 deletions
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
deleted file mode 100644
index 8c34d7ac..00000000
--- a/x11-drivers/xf86-video-ati/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xf86-video-ati-7.6.1.tar.bz2 823043 SHA256 2516d9eeb8da8bcd3a01365ed1314919777910fa904ab268af342b5693e1d34c SHA512 b829b1db2088161a2486f396a9b36afd6fbbc765fb495450fb1c2de33951e6270c7ef6665c8275c66dfc6509af71b9882c342d236fc0537ff0dde117683c4891 WHIRLPOOL 91787a77590fbbf30b73fd1c4f7e427ea3eee25b4ba16f52ae2d9d0967b596b33a2bb04bbc8edc83baf48db6cabb459cf81b43da644dd0c1ee415fc650105ffc
diff --git a/x11-drivers/xf86-video-ati/files/enable_DRI3_by_default.patch b/x11-drivers/xf86-video-ati/files/enable_DRI3_by_default.patch
deleted file mode 100644
index 9aad3e05..00000000
--- a/x11-drivers/xf86-video-ati/files/enable_DRI3_by_default.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/src/radeon_kms.c b/src/radeon_kms.c
---- a/src/radeon_kms.c 2015-11-12 02:57:33.000000000 +0000
-+++ b/src/radeon_kms.c 2015-12-28 16:50:05.403313307 +0000
-@@ -1630,7 +1630,7 @@
- }
- #endif
-
-- value = FALSE;
-+ value = TRUE;
- from = X_DEFAULT;
- if (xf86GetOptValBool(info->Options, OPTION_DRI3, &value))
- from = X_CONFIG;
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild
deleted file mode 100644
index 69334aa6..00000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.6.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=always
-inherit linux-info xorg-2
-
-DESCRIPTION="ATI video driver (DRI3 enabled by default)"
-HOMEPAGE="http://www.x.org/wiki/ati/"
-
-KEYWORDS="amd64 x86"
-IUSE="+glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.58[video_cards_radeon]
- >=x11-libs/libpciaccess-0.8.0
- glamor? ( x11-base/xorg-server[glamor] )
- udev? ( virtual/udev )"
-DEPEND="${RDEPEND}
- x11-proto/fontsproto
- x11-proto/randrproto
- x11-proto/renderproto
- x11-proto/videoproto
- x11-proto/xextproto
- x11-proto/xf86driproto
- x11-proto/xproto"
-
-pkg_pretend() {
- if use kernel_linux ; then
- if kernel_is -ge 3 9; then
- CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
- else
- CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
- fi
- fi
- check_extra_config
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/enable_DRI3_by_default.patch
-}
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable glamor)
- $(use_enable udev)
- )
- xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
deleted file mode 100644
index 0e370c01..00000000
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST VirtualBox-5.1.14.tar.bz2 115042132 SHA256 8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a SHA512 ab0646c587fa1b573a9332ca0f1959660adc02f2ecf63ac808f4a7e3ceb9b2c58adab8e309aec4630ff7fa447f47d7487e7e8d0a1f718a42d39ce71e96067fae WHIRLPOOL 915b3ac0d50def86e92b662c7fe32e1390c9dab73efb9fc9595465c45818b86b4380be93a7075d17e33f9b70d92dbbbf6063ce0dad6448c9a592648a10f2409b
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch
deleted file mode 100644
index b0779d42..00000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1955,8 +1955,8 @@
- HEADLESS=1
- WITH_SDL=0
- WITH_SDL_TTF=0
-- WITH_X11=0
-- WITH_OPENGL=0
-+ WITH_X11=1
-+ WITH_OPENGL=1
- WITH_QT4=0
- ;;
- --ose)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3-vboxvideo_drm.makefile b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3-vboxvideo_drm.makefile
deleted file mode 100644
index a09e58c0..00000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3-vboxvideo_drm.makefile
+++ /dev/null
@@ -1,240 +0,0 @@
-#
-# VirtualBox Guest Additions Module Makefile.
-#
-# (For 2.6.x this file must be 'Makefile'!)
-#
-# 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.
-#
-
-## @todo We must make this into a common template *soon*.
-
-#
-# First, figure out which architecture we're targeting and the build type.
-# (We have to support basic cross building (ARCH=i386|x86_64).)
-# While at it, warn about BUILD_* vars found to help with user problems.
-#
-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
- BUILD_TARGET_ARCH_DEF := amd64
-else
- BUILD_TARGET_ARCH_DEF := x86
-endif
-ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
- $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
- BUILD_TARGET_ARCH :=
-endif
-ifeq ($(BUILD_TARGET_ARCH),)
- ifeq ($(ARCH),x86_64)
- BUILD_TARGET_ARCH := amd64
- else
- ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
- else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
- endif
- endif
-else
- ifneq ($(BUILD_TARGET_ARCH),$(BUILD_TARGET_ARCH_DEF))
- $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).)
- endif
-endif
-
-ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
- $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
- BUILD_TYPE :=
-endif
-ifeq ($(BUILD_TYPE),)
- BUILD_TYPE := release
-else
- ifneq ($(BUILD_TYPE),release)
- $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
- endif
-endif
-
-EXTRA_CFLAGS = -fshort-wchar
-
-ifneq ($(MAKECMDGOALS),clean)
-
-ifeq ($(KERNELRELEASE),)
-
- #
- # building from this directory
- #
-
- # kernel base directory
- ifndef KERN_DIR
- KERN_DIR := /lib/modules/$(shell uname -r)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- KERN_DIR := /usr/src/linux
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: unable to find the sources of your current Linux kernel. \
- Specify KERN_DIR=<directory> and run Make again)
- endif
- $(warning Warning: using /usr/src/linux as the source directory of your \
- Linux kernel. If this is not correct, specify \
- KERN_DIR=<directory> and run Make again.)
- endif
- else
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
- $(error Error: KERN_DIR does not point to a directory)
- endif
- endif
-
- # includes
- ifndef KERN_INCL
- KERN_INCL = $(KERN_DIR)/include
- endif
- ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
- $(error Error: unable to find the include directory for your current Linux \
- kernel. Specify KERN_INCL=<directory> and run Make again)
- endif
-
- # module install dir.
- ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
- ifndef MODULE_DIR
- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
- MODULE_DIR := $(MODULE_DIR_TST)/misc
- else
- $(error Unable to find the folder to install the DRM driver to)
- endif
- endif # MODULE_DIR unspecified
- endif
-
- # guess kernel version (24 or 26)
- ifeq ($(shell if grep '"2\.4\.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
- KERN_VERSION := 24
- else
- KERN_VERSION := 26
- endif
-
-else # neq($(KERNELRELEASE),)
-
- #
- # building from kbuild (make -C <kernel_directory> M=`pwd`)
- #
-
- # guess kernel version (24 or 26)
- ifeq ($(shell if echo "$(VERSION).$(PATCHLEVEL)." | grep '2\.4\.' > /dev/null; then echo yes; fi),yes)
- KERN_VERSION := 24
- else
- KERN_VERSION := 26
- endif
-
-endif # neq($(KERNELRELEASE),)
-
-# debug - show guesses.
-ifdef DEBUG
-$(warning dbg: KERN_DIR = $(KERN_DIR))
-$(warning dbg: KERN_INCL = $(KERN_INCL))
-$(warning dbg: MODULE_DIR = $(MODULE_DIR))
-$(warning dbg: KERN_VERSION = $(KERN_VERSION))
-endif
-
-KBUILD_VERBOSE ?= 1
-
-#
-# Compiler options
-#
-ifndef INCL
- INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL))
- ifndef KBUILD_EXTMOD
- KBUILD_EXTMOD := $(shell pwd)
- endif
- INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
- export INCL
-endif
-KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
- -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
- -DIN_GUEST_R0
-ifeq ($(BUILD_TARGET_ARCH),amd64)
- KFLAGS += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
-else
- KFLAGS += -DRT_ARCH_X86
-endif
-ifeq ($(BUILD_TYPE),debug)
-KFLAGS += -DDEBUG
-endif
-
-# override is required by the Debian guys
-override MODULE = vboxvideo
-OBJS = vboxvideo_drm.o
-
-ifeq ($(KERN_VERSION), 24)
-#
-# 2.4
-#
-
-CFLAGS := -O2 -DVBOX_LINUX_2_4 $(INCL) $(KFLAGS) $(KDEBUG)
-MODULE_EXT := o
-
-# 2.4 Module linking
-$(MODULE).o: $(OBJS)
- $(LD) -o $@ -r $(OBJS)
-
-.PHONY: $(MODULE)
-all: $(MODULE)
-$(MODULE): $(MODULE).o
-
-else
-#
-# 2.6 and later
-#
-
-MODULE_EXT := ko
-
-$(MODULE)-y := $(OBJS)
-
-# special hack for Fedora Core 6 2.6.18 (fc6), rhel5 2.6.18 (el5),
-# ClarkConnect 4.3 (cc4) and ClarkConnect 5 (v5)
-ifeq ($(KERNELRELEASE),)
- KFLAGS += $(foreach inc,$(KERN_INCL),\
- $(if $(wildcard $(inc)/linux/utsrelease.h),\
- $(if $(shell grep '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h; \
- grep '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h; \
- grep '"2.6.18.*v5.*"' $(inc)/linux/utsrelease.h; \
- grep '"2.6.18.*cc4.*"' $(inc)/linux/utsrelease.h),\
- -DKERNEL_FC6,),))
-else
- KFLAGS += $(if $(shell echo "$(KERNELRELEASE)"|grep '2.6.18.*fc6.*';\
- echo "$(KERNELRELEASE)"|grep '2.6.18.*el5.*';\
- echo "$(KERNELRELEASE)"|grep '2.6.18.*v5.*';\
- echo "$(KERNELRELEASE)"|grep '2.6.18.*cc4.*'),\
- -DKERNEL_FC6,)
-endif
-
-# build defs
-EXTRA_CFLAGS += $(INCL) $(KFLAGS) $(KDEBUG)
-
-all: $(MODULE)
-
-obj-m += $(MODULE).o
-
-$(MODULE):
- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
-
-endif
-
-install: $(MODULE)
- @mkdir -p $(MODULE_DIR); \
- install -m 0664 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \
- PATH="$(PATH):/bin:/sbin" depmod -ae;
-
-endif # eq($(MAKECMDGOALS),clean)
-
-# important: Don't remove Module.symvers! DKMS does 'make clean' before building ...
-clean:
- for f in . linux r0drv r0drv/linux; do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done
- rm -rf .vboxvideo* .tmp_ver* vboxvideo.* Modules.symvers modules.order
-
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig
deleted file mode 100644
index aee5ec1e..00000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Makefile -*-
-#
-# Overwrite some default kBuild settings
-#
-
-#
-# Copyright (C) 2006-2008 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 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.
-#
-
-# don't build testcases to save time, they are not needed for the package
-VBOX_WITH_TESTCASES :=
-VBOX_WITH_VALIDATIONKIT :=
-
-KBUILD_MSG_STYLE := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING := 2
-VBOX_WITH_ORIGIN :=
-VBOX_ONLY_ADDITIONS := 1
-
-TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release =
-TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_LDFLAGS)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
deleted file mode 100644
index 92f8a182..00000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- VirtualBox-5.0.0_BETA3/configure
-+++ VirtualBox-5.0.0_BETA3/configure
-@@ -1258,10 +1258,7 @@
- XCloseDisplay(dpy);
- }
- 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
- }
-
-
-@@ -1415,21 +1412,6 @@
- #include <GL/glu.h>
- extern "C" int main(void)
- {
-- Display *dpy;
-- int major, minor;
--
-- dpy = XOpenDisplay(NULL);
-- if (dpy)
-- {
-- Bool glx_version = glXQueryVersion(dpy, &major, &minor);
-- XCloseDisplay(dpy);
-- if (glx_version)
-- {
-- printf("found version %u.%u, OK.\n", major, minor);
-- return 0;
-- }
-- }
-- printf("found (inactive), OK.\n");
- return 0;
- }
- EOF
-@@ -2706,7 +2688,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
- fi
-
- # the libraries
-@@ -2774,7 +2755,6 @@
- check_compiler_h
- [ $ONLY_ADDITIONS -eq 0 -a "$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-5.1.10-xorg119.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch
deleted file mode 100644
index 26958fe8..00000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Fix from opensuse:
-https://build.opensuse.org/package/view_file/Virtualization/virtualbox/Fix_for_server_1.19.patch
-
-https://bugs.gentoo.org/602784
-
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-@@ -52,6 +52,10 @@
- #ifndef _VBOXVIDEO_H_
- #define _VBOXVIDEO_H_
-
-+#if XORG_VERSION_CURRENT >= 11900000
-+#include <bits/sigset.h>
-+typedef __sigset_t sigset_t;
-+#endif
- #include <VBox/VBoxVideoGuest.h>
- #include <VBox/VBoxVideo.h>
- #include "version-generated.h"
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/helpers.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
-@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p
-
- property_name = MakeAtom(pszName, strlen(pszName), TRUE);
- VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
-+#if XORG_VERSION_CURRENT >= 11900000
-+ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
-+#else
- ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
-+#endif
- }
-
- void vbvxReprobeCursor(ScrnInfoPtr pScrn)
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
- updateGraphicsCapability(pScrn, TRUE);
-
- /* Register block and wake-up handlers for getting new screen size hints. */
-+#if XORG_VERSION_CURRENT >= 11900000
-+ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
-+#else
- RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
-+#endif
-
- /* software cursor */
- miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
-@@ -15,6 +15,10 @@
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-+#if XORG_VERSION_CURRENT >= 11900000
-+#include <bits/sigset.h>
-+typedef __sigset_t sigset_t;
-+#endif
- #include <VBox/VBoxGuestLib.h>
-
- #ifndef PCIACCESS
-Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
-===================================================================
---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/edid.c
-+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
-@@ -44,6 +44,10 @@
- * Dave Airlie <airlied@redhat.com>
- */
-
-+#if XORG_VERSION_CURRENT >= 11900000
-+#include <bits/sigset.h>
-+typedef __sigset_t sigset_t;
-+#endif
- #include <misc.h>
- #include <xf86DDC.h>
- #include <xf86Crtc.h>
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch
deleted file mode 100644
index f34ac667..00000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/VBox/Additions/linux/drm/Makefile.module.kms
-+++ b/src/VBox/Additions/linux/drm/Makefile.module.kms
-@@ -43,7 +43,7 @@ else
- MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
- endif
- MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING) -fno-pie
--MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
-+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
- # What on earth is this?
- MOD_INCL += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
- MOD_INCL += -Iinclude/drm
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild
deleted file mode 100644
index b2dc776a..00000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-single-r1 versionator toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox X11 video driver for Gentoo guest"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dri"
-
-RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
- =sys-kernel/virtualbox-guest-dkms-${PV}
- x11-libs/libXcomposite"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/yasm-0.6.2
- >=dev-util/kbuild-0.1.9998_pre20131130
- sys-power/iasl
- x11-proto/fontsproto
- x11-proto/randrproto
- x11-proto/renderproto
- x11-proto/resourceproto
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- x11-libs/libXdmcp
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXext
- dri? ( x11-proto/xf86driproto
- >=x11-libs/libdrm-2.4.5 )"
-PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )"
-
-REQUIRED_USE=( "${PYTHON_REQUIRED_USE}" )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # Ugly hack to build the opengl part of the video driver
- "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
- # unset useless/problematic checks in configure
- "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
-
- # xorg-1.19 patch from opensuse (bug #602784)
- "${FILESDIR}/${PN}-5.1.10-xorg119.patch"
-)
-
-QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
-
-pkg_setup() {
- if [ "${MERGE_TYPE}" != "binary" ]; then
- version_is_at_least 4.9 $(gcc-version) || die "Please set gcc 4.9 or higher as active in gcc-config to build ${PN}"
- fi
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Prepare the vboxvideo_drm Makefiles and build dir
- eapply "${FILESDIR}"/${PN}-5.1.4-Makefile.module.kms.patch
-
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -r kBuild/bin tools || die
-
- # Disable things unused or splitted into separate ebuilds
- cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
- # Remove pointless GCC version limitations in check_gcc()
- sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
- -i configure || die
-
- default
-
- # link with lazy on hardened #394757
- sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
- -i Config.kmk || die
-}
-
-src_configure() {
- # build the user-space tools, warnings are harmless
- local cmd=(
- ./configure
- --nofatal
- --disable-xpcom
- --disable-sdl-ttf
- --disable-pulse
- --disable-alsa
- --with-gcc="$(tc-getCC)"
- --with-g++="$(tc-getCXX)"
- --target-arch=${ARCH}
- --with-linux="${KV_OUT_DIR}"
- --build-headless
- )
- echo "${cmd[@]}"
- "${cmd[@]}" || die "configure failed"
- source ./env.sh
- export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
- local each targets=(
- Runtime
- Additions/common/VBoxGuestLib
- GuestHost/OpenGL
- Additions/x11/x11stubs
- Additions/common/crOpenGL
- Additions/x11/vboxvideo
- )
-
- # need to use the upstream build system to create necessary objects properly
- use dri && targets+=( Additions/linux/drm )
-
- for each in ${targets[@]} ; do
- pushd "${S}"/src/VBox/${each} &>/dev/null || die
- MAKE="kmk" \
- emake TOOL_YASM_AS=yasm \
- VBOX_USE_SYSTEM_XORG_HEADERS=1 \
- KBUILD_PATH="${S}/kBuild" \
- KBUILD_VERBOSE=2
- popd &>/dev/null || die
- done
-
- if use dri; then
- local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drm"
- # All of these are expected to be in $(KBUILD_EXTMOD)/ so symlink them into place
- targets=(
- include
- src/VBox/Runtime/r0drv
- src/VBox/Installer/linux/Makefile.include.{head,foot}er
- out/linux.${ARCH}/release/{product,version,revision}-generated.h
- )
- for each in ${targets[@]} ; do
- :
- done
- # see the vboxvideo_drm_SOURCES list in Makefile.kmk for the below,
- # and replace '..' with 'dt'
- targets=(
- dt/dt/common/VBoxVideo/HGSMIBase.o
- dt/dt/common/VBoxVideo/Modesetting.o
- dt/dt/common/VBoxVideo/VBVABase.o
- dt/dt/dt/GuestHost/HGSMI/HGSMICommon.o
- dt/dt/dt/GuestHost/HGSMI/HGSMIMemAlloc.o
- dt/dt/dt/Runtime/common/alloc/heapoffset.o
- )
- for each in ${targets[@]} ; do
- :
- done
- fi
-}
-
-src_install() {
- cd "${S}/out/linux.${ARCH}/release/bin/additions" || die
- insinto /usr/$(get_libdir)/xorg/modules/drivers
- newins vboxvideo_drv_system.so vboxvideo_drv.so
-
- # Guest OpenGL driver
- insinto /usr/$(get_libdir)
- doins -r VBoxOGL*
-
- 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\")"
-}