5 files changed, 287 insertions, 0 deletions
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 7f2f259e3a15..04719e3801c7 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 5fa80abc0f42..d141c348c80f 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,7 +1,9 @@
 DIST xf86-video-intel-2.99.917_p20170216.tar.xz 945436 BLAKE2B 14e74941b6c0a5e97bebbe5eee0f07f4cf72a958c78aa5ad5e4fbc2ffcfb0245e7a393e0a7942a7c3910470f681c6ecf451df4f9b92382ee14d0afd464c39b85 SHA512 75d1f76238c4452cf6cd04df4e6cb4b0b17a33e759409f87bbfcdef80d79908e984e2adb2adfd6f98df34e49782c8f77d5ed645dd31e83045e4c687affefffbf
 DIST xf86-video-intel-2.99.917_p20170313.tar.xz 945604 BLAKE2B 45f206db10ffdeae8734571b115915904eeabe4564e1127a7889e51c2f7dab2502d0918c0351267a945aed8e087e62bdea2de13971fd7bc5e2445c7e837ea958 SHA512 c3cb91c9ce843fee4ba45c41fa2c69dae4d193ce778e0988ffb0ef3c77e4da40b8879cfc7333adb97084c179502cd4b5233181b5c825de619d839cc045181740
 DIST xf86-video-intel-2.99.917_p20171018.tar.xz 947052 BLAKE2B d1c54f54b1c3f1cc714b9093b537a582128232393cc2a77dec264a6ca4a32c4b02cb69bf163bc9bd0c27849ada44f81a32453647badab2403b191b40db900236 SHA512 50aff2c6807e1d3dcc857a21501e37ab3d04598f03cde0d788aac5876feb54f5c4892ad7c34a6adda696405bfa3135a14ebd4fe41b359b34cc7ac2df1618dd88
+DIST xf86-video-intel-2.99.917_p20180214.tar.xz 951544 BLAKE2B 57df523168c6bf650ddf6ca27bbc799a8a9d183c9a6a4d2e232288124b57bfff7bb36a8fcc55e2845c4ece2653d39c0830c4ea2ecef4f1968a3ee7413506bae3 SHA512 afc8a4db550aa5567fa6f5eb9b480fac7c3e496eb62ae62a6a7b7e317515e24d21bf78bf1b03ba90cfd909dd37a5f65247c7aa2314234aec3d575e53db825912
 EBUILD xf86-video-intel-2.99.917_p20170216.ebuild 2026 BLAKE2B 05fd1e40a10b0e19b18daa1179b04f81c123a2ce2ddd2c29a50353b6567126d16f23041a74b45a9120a0c4cee6e40c5f6671b1e7ef7a54fa877797fd35912118 SHA512 abb8b5d657adec5fecfbe755653e6db8fad74326559167fef6be298ea180b16a7e3c67c6b318828a0be28d01eab22de5dda214549828edd07428cac6ca6f6b9e
 EBUILD xf86-video-intel-2.99.917_p20170313.ebuild 2026 BLAKE2B cf9f383a6b7235ae3789e5d6c0b509b34d4ed4bbe9697494c1e34f2dffc7fcc0bd85f4d639ff99ae40a9ba8b78cdf2c0abe6116c242c55532f67f295fb891669 SHA512 07bd71490a5a1a09d455e7d5016a06804a43f9c4fe8919a21c71853f20ba80069909db6b807682e2dcf20f6043df4c3dab3ab58ab8c84d06e177c2516abb80dc
 EBUILD xf86-video-intel-2.99.917_p20171018.ebuild 2028 BLAKE2B f2dc7438a200e02f219ee743ad9df3b5344e5825abd0564762b6c5e23444972dfb47b5e61428b000a9ab0592fd97de2731646dd595a842d2f38869b5a05300a3 SHA512 ff658165596783eff221a42a2eb7ced6afd085ad4787585c2ceb5e55d973299b9ddd19343ec61fbc093d134cbd2433889395c705779dde9d13cd2315fc93ca46
+EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2045 BLAKE2B 2063759a3f33d1633a5fa9bcff1b660a4d5cbd51bd7698fe6347bf3b5bcb04d4d9feb620f16bc00a106b35be4195fb1493f415fb139e15635400f8f9c8415d8f SHA512 8a3d50af03ec31dd6dce5444240abb1388a7a4880691563223189a8e5d14038ba933e6b8a1fdbdc9575c6d8bf93578e71adf0be7b6fbef974796a6f9a33da54b
 MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
new file mode 100644
index 000000000000..78b5b23c9cc6
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DRI=dri
+XORG_EAUTORECONF=yes
+inherit linux-info xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dri3 +sna tools +udev uxa xvmc"
+COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616"
+SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+
+S=${WORKDIR}/${COMMIT_ID}
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+RDEPEND="
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXScrnSaver
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.52[video_cards_intel]
+	dri3? (
+		>=x11-base/xorg-server-1.18
+		!<=media-libs/mesa-12.0.4
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	tools? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+src_configure() {
+	replace-flags -Os -O2
+	XORG_CONFIGURE_OPTIONS=(
+		--disable-dri1
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable dri dri3)
+		$(usex dri3 "--with-default-dri=3")
+		$(use_enable sna)
+		$(use_enable tools)
+		$(use_enable udev)
+		$(use_enable uxa)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists && \
+		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 53c44b25c9f6..507abe696eaf 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -4,5 +4,7 @@ AUX xf86-video-virtualbox-5.0.0_beta3-configure_checks.patch 1248 BLAKE2B 449981
 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.32.tar.bz2 117268301 BLAKE2B 336df054e3407d7e701d6719258cfcba9beec1439cbe94f137570cfcbdea02df3e34374ac36d3b4387c47ebafd17a0f05c2fb710eb4f140d8200117b505aba98 SHA512 052ac1672515a36c4138e2d52672a466d4c768f219f52eefe98e747a292ebebe04e7de35547eae6803654be5dc937b8e6f4d358a65fd4f49a8333eac8862d138
+DIST VirtualBox-5.1.34.tar.bz2 117291269 BLAKE2B 0eb9b3f778f2d677ac3635fa59dfa6861d0fec3c0331582e5961b78ab55b5ab26bbf286de05a3e87e8a64e2b54861613a8d2c93f70736a07c551dca834786abd SHA512 0f828e58d68678a0a94a39c12313425105f9255ca207d40dd04065d0072857cdc4fc886f944b852c3fb63fed04d70a3449aecd2aab9e27af7f13b506143a4b6f
 EBUILD xf86-video-virtualbox-5.1.32.ebuild 5048 BLAKE2B e6214b4d223bd87556921fe320b1603de3cd80256254f9db6e8a60a3773b0212b68e5a5a25fe655fadc32e42b906a0f830e12c64c6a43978bee06e14a7b965f6 SHA512 4ed0f341ca74f86b7a41714d3ffeb7e6871a8362f83fe0a5fa6cb27c827fe88a2fa416d74a155fd05f92e10b79d9f8a0cbd7476e0fcaf7cb87a7b5de3d1813e3
+EBUILD xf86-video-virtualbox-5.1.34.ebuild 5050 BLAKE2B 6c3eb6c9b9004e66b338241fc7155e49765353a9989463e08d5fcbc44a9ea5e8b56f29d52e65681cb0421382d198bdb0eda0cab72350dfc390c49eb18135e29f SHA512 5744ff815d05aa550092d7f877f60a3de571bde0ca4d17433a92b2925d524166768542dc126c60116a7726d0fd69f9d10e57d56f42e57f63ef431af2a6cc7406
 MISC metadata.xml 343 BLAKE2B 9e18764cb3f6a1df7858366112557de847f14dd2d7415612da0ebe28895a92a7714d0295f3551ddc62711bf84d5be253ddda3146f6121d52c4f86c05a20ad835 SHA512 88eabdec952f2eee2490f23050b39127f500765f6f93adecb9cfdb62776d73e9dddcdb56756b41041ed4727375ffb0e5f729c219a7de5620344bbee10bbc06c9
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.34.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.34.ebuild
new file mode 100644
index 000000000000..932d9378fad9
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.34.ebuild
@@ -0,0 +1,192 @@
+# 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-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} )"
+
+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\")"
+}