From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- x11-drivers/xf86-video-virtualbox/Manifest | 10 -- ...xf86-video-virtualbox-2.2.0-enable-opengl.patch | 13 -- .../files/xf86-video-virtualbox-5-localconfig | 30 ---- ...o-virtualbox-5.0.0_beta3-configure_checks.patch | 52 ------ .../xf86-video-virtualbox-5.1.10-xorg119.patch | 82 --------- ...deo-virtualbox-5.1.24-Makefile.module.kms.patch | 13 -- x11-drivers/xf86-video-virtualbox/metadata.xml | 9 - .../xf86-video-virtualbox-5.1.36.ebuild | 184 --------------------- .../xf86-video-virtualbox-5.1.38.ebuild | 184 --------------------- 9 files changed, 577 deletions(-) delete mode 100644 x11-drivers/xf86-video-virtualbox/Manifest delete mode 100644 x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch delete mode 100644 x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig delete mode 100644 x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch delete mode 100644 x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch delete mode 100644 x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch delete mode 100644 x11-drivers/xf86-video-virtualbox/metadata.xml delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild (limited to 'x11-drivers/xf86-video-virtualbox') diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest deleted file mode 100644 index ac840276cae5..000000000000 --- a/x11-drivers/xf86-video-virtualbox/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 230 BLAKE2B d70c72c65164d736cc8fb09b5b4ccda4baa3b0ad446ffc11f08b53757d5e57a5cf4e6876dec0a9cc4e5da2574a80ee531831e1c7802e4a48a4cf30c29a002bfb SHA512 a8f4243ef70c72fa4e3dc71a4ab319ee77aac9e077804fa53f53ab338ad44773645af6c658da9d67b45c362632f0ed17edc13887721e013ceda7455bb9a28108 -AUX xf86-video-virtualbox-5-localconfig 996 BLAKE2B 67ce33deaa4073b4d522ec5865670627921d18442b01ef0d6eccffd67ca43cd7b73fda794cc56b9b3bc44a7ee9b99de6b4b1a0346bb5c078163983782d7e4ae7 SHA512 385711818aad370b87992190017d35f9caadb96d8dec387cdf6e70a4f70718107af36b98b2396a7255b2fbbd121644267e81804d397a6246969b5977bd9e94e8 -AUX xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch 1248 BLAKE2B 449981786700fd7c01d1d7346489553afc6959912c882aba750cb062009f773955efb247dc0bfeb4dca298da09393e0cd749c592a580e7509db10a7bea7a3dce SHA512 793a7f937eddf955ae7a2ca48d41675c8a6ec8c34e9f76d3edc8618562c2d0333714d9de7ae5927e16df7bc750e0309a3dd4173f3f9e262aa5c0d80190c98302 -AUX xf86-video-virtualbox-5.1.10-xorg119.patch 3375 BLAKE2B 52b6999cffb8b60ceac7949af1d3bb8452e138a9d6f8d84ac6587a121e1a379f9e69a0b9896c83e63c7ebfec26abe2b46e957a25385d04cc8613aec407483906 SHA512 f84cdbb6b43444eda753f6a31b3fe2514152545a7d75569d88f3b2d22542e5d087dfbd735457155f1463449f4e2138382d6f730978bd8d80280ad609dc826718 -AUX xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch 533 BLAKE2B 3ef40088fb83096c17944609d4fb7c14b7e7bb39ef0bf08d3bcda2795d4ead8801f06e7761804191ca4eec537bc22f45dcd6085407b1e6ef3ed4227a1fd594b0 SHA512 325a7adca76884e40be17d756ebdee3c8e8565d50a872c7cb2e429d046fd91b44acc6b788abb0eb28ab14594687203894ffe0c2d441c38ea5f87a88e76e87997 -DIST VirtualBox-5.1.36.tar.bz2 117244376 BLAKE2B 141048f4fcbb3ce63d236a4127b4bce377e87876c23dc3ff6437b2c0cca5b468bc6a5737899b308bc1ff3252d4e61f7d053ff7574c33c85b56fdd986c31f2af3 SHA512 d1a9322c97c68cc9c21247c3df8ce2084911aded66a63adf5510f9e0f4558b1304dfe924a0c44243adc1ae8f7c45c47782e882baac1bfe995ea6c0a1370fcbd1 -DIST VirtualBox-5.1.38.tar.bz2 117345233 BLAKE2B 15ed86a1f6730c781a0b4b055dcccfb56ff9c829c90dc4d2aa96cc2bb5bcfa8e442bdd471a7c70c5520bef994592e8f1a5b46831df4039efb5358c2e0ab83413 SHA512 6cf8536c24aa3a6e889214ef6133eb18fdbe1e7c371323cad07aa63b0e1f4414ba13d5fa7b63c12dfefe60e2e544488ced107571f678a06eb094a3e19b377ea8 -EBUILD xf86-video-virtualbox-5.1.36.ebuild 4861 BLAKE2B 05cd603650893c24947c2dff997795ed3e21cad2e1807f90da9ac6a07a909036e91b1f2b9ca35aeeeac1a204ae01777ceb6cb9b070882e742418ccd886f4a1ef SHA512 a6c1d53eaecaae808be63ec339b9a1a9e544cd8292a987e8ecd90dae6eba9382251c4545bb94bd8c4e3af419b7df5da5f775015f8396366245756b6d7f8b16cd -EBUILD xf86-video-virtualbox-5.1.38.ebuild 4863 BLAKE2B c4c6a46322d0ea152c28344923cec7cac42b858b1265aacad129b2586b4c5997f0662bd2e18e4c5685b983de9a344a55bb31ae2046ab5a014183e652e2471856 SHA512 4ef1aa96f10b26e9e6ae14d8938303defa3bc25eb29aa8da18a501586161c71610e9a4d3a70ee03c4a96fcae187930bc0566077bbb5a462549ee663bc727527e -MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 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 b0779d42270a..000000000000 --- 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-5-localconfig b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5-localconfig deleted file mode 100644 index aee5ec1ea83a..000000000000 --- 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 92f8a182e34d..000000000000 --- 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 - 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 26958fe8abbe..000000000000 --- 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 -+typedef __sigset_t sigset_t; -+#endif - #include - #include - #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 -+typedef __sigset_t sigset_t; -+#endif - #include - - #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 - */ - -+#if XORG_VERSION_CURRENT >= 11900000 -+#include -+typedef __sigset_t sigset_t; -+#endif - #include - #include - #include diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch deleted file mode 100644 index c5d3c3fc730e..000000000000 --- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix bug #625690 - ---- a/src/VBox/Additions/linux/drm/Makefile.module.kms -+++ b/src/VBox/Additions/linux/drm/Makefile.module.kms -@@ -50,7 +50,7 @@ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie - ifneq ($(KERN_VERSION),24) - MOD_CFLAGS += -include $(MANGLING) - endif --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/metadata.xml b/x11-drivers/xf86-video-virtualbox/metadata.xml deleted file mode 100644 index 8dafc466cde2..000000000000 --- a/x11-drivers/xf86-video-virtualbox/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - polynomial-c@gentoo.org - Lars Wendler - - - diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild deleted file mode 100644 index 22ec6dd17a30..000000000000 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.36.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2018 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="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dri" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=x11-base/xorg-server-1.7:=[-minimal] - x11-libs/libXcomposite - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - >=dev-lang/yasm-0.6.2 - >=dev-util/kbuild-0.1.9998_pre20131130 - sys-power/iasl - x11-base/xorg-proto - x11-libs/libXdmcp - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXext - dri? ( >=x11-libs/libdrm-2.4.5 )" -PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -S="${WORKDIR}/${MY_P}" -MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm" - -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.24-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 check - sed -e '/^check_gcc$/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" - # We need a Makefile, so use Makefile.module.kms - ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die - # 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 - ln -s "${S}"/${each} \ - "${MODULES_SRC_DIR}"/${each##*/} || die - 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 - ln -s "${S}"/${objdir}/${each} \ - "${MODULES_SRC_DIR}" || die - ln -s "${S}"/${objdir}/${each}.dep \ - "${MODULES_SRC_DIR}" || die - 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\")" -} diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild deleted file mode 100644 index 8bf3e1f2873b..000000000000 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.38.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2018 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="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dri" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=x11-base/xorg-server-1.7:=[-minimal] - x11-libs/libXcomposite - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - >=dev-lang/yasm-0.6.2 - >=dev-util/kbuild-0.1.9998_pre20131130 - sys-power/iasl - x11-base/xorg-proto - x11-libs/libXdmcp - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXext - dri? ( >=x11-libs/libdrm-2.4.5 )" -PDEPEND="dri? ( ~app-emulation/virtualbox-guest-additions-${PV} )" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -S="${WORKDIR}/${MY_P}" -MODULES_SRC_DIR="${S}/src/VBox/Additions/linux/drm" - -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.24-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 check - sed -e '/^check_gcc$/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" - # We need a Makefile, so use Makefile.module.kms - ln -s Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die - # 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 - ln -s "${S}"/${each} \ - "${MODULES_SRC_DIR}"/${each##*/} || die - 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 - ln -s "${S}"/${objdir}/${each} \ - "${MODULES_SRC_DIR}" || die - ln -s "${S}"/${objdir}/${each}.dep \ - "${MODULES_SRC_DIR}" || die - 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\")" -} -- cgit v1.2.3