From 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2017 11:17:21 +0000 Subject: gentoo resync : 20.12.2017 --- x11-drivers/Manifest.gz | Bin 11449 -> 11614 bytes x11-drivers/xf86-video-vboxvideo/Manifest | 3 + x11-drivers/xf86-video-vboxvideo/metadata.xml | 8 + .../xf86-video-vboxvideo-1.0.0.ebuild | 25 +++ x11-drivers/xf86-video-virtualbox/Manifest | 2 - .../xf86-video-virtualbox-5.1.28.ebuild | 195 --------------------- 6 files changed, 36 insertions(+), 197 deletions(-) create mode 100644 x11-drivers/xf86-video-vboxvideo/Manifest create mode 100644 x11-drivers/xf86-video-vboxvideo/metadata.xml create mode 100644 x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.28.ebuild (limited to 'x11-drivers') diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz index 3028c97831e3..8325390cbde3 100644 Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ diff --git a/x11-drivers/xf86-video-vboxvideo/Manifest b/x11-drivers/xf86-video-vboxvideo/Manifest new file mode 100644 index 000000000000..40b23d5b7c44 --- /dev/null +++ b/x11-drivers/xf86-video-vboxvideo/Manifest @@ -0,0 +1,3 @@ +DIST xf86-video-vboxvideo-1.0.0.tar.bz2 353342 BLAKE2B 8088e150c8e91dd4872218773c2d57a052935926fe08c18d9f5165b112d6213bf79c80d85fd4d10c1b12bd2ac222983b3dbf241cb97c1cb087f4137314a95ead SHA512 1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc +EBUILD xf86-video-vboxvideo-1.0.0.ebuild 488 BLAKE2B 0d8c6193f5239a65bcdfd141bf644d65f7ccfc4ce2179f8b8706f941ef4a2df5f20fa6c05d27f5534b0b846b2a31859df493975edea4f76d3db6766c860cbce3 SHA512 2c76b73bfc1830343e352c03c24745c078ff3a168eb4384e7a6e0679d9831be4f884fb00523f98dff137bc7bde4e191bc9ff5ef7d4ccb0cccc3ea31786b96189 +MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea diff --git a/x11-drivers/xf86-video-vboxvideo/metadata.xml b/x11-drivers/xf86-video-vboxvideo/metadata.xml new file mode 100644 index 000000000000..c7be278b6458 --- /dev/null +++ b/x11-drivers/xf86-video-vboxvideo/metadata.xml @@ -0,0 +1,8 @@ + + + + + polynomial-c@gentoo.org + Lars Wendler + + diff --git a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild new file mode 100644 index 000000000000..24560bd2dcfd --- /dev/null +++ b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit xorg-2 + +DESCRIPTION="VirtualBox guest video driver" +HOMEPAGE="https://cgit.freedesktop.org/xorg/driver/xf86-video-vbox/" + +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=x11-base/xorg-server-1.8:=[-minimal] + x11-libs/libXcomposite + x11-libs/libpciaccess +" +DEPEND=" + ${RDEPEND} + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/renderproto + x11-proto/xextproto +" diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest index 364dc3fb15df..e8d8718ea6a0 100644 --- a/x11-drivers/xf86-video-virtualbox/Manifest +++ b/x11-drivers/xf86-video-virtualbox/Manifest @@ -6,9 +6,7 @@ AUX xf86-video-virtualbox-5.1.22-sysmacros.patch 334 BLAKE2B 862162989fb6599c5f0 AUX xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch 533 BLAKE2B 3ef40088fb83096c17944609d4fb7c14b7e7bb39ef0bf08d3bcda2795d4ead8801f06e7761804191ca4eec537bc22f45dcd6085407b1e6ef3ed4227a1fd594b0 SHA512 325a7adca76884e40be17d756ebdee3c8e8565d50a872c7cb2e429d046fd91b44acc6b788abb0eb28ab14594687203894ffe0c2d441c38ea5f87a88e76e87997 AUX xf86-video-virtualbox-5.1.30-sysmacros.patch 679 BLAKE2B 6ff7b4973ae1bfdc1f66e5ed3c8e4f0b2c11e3e1bd6b12577703b1d0a8cf4e7c7de52fe5918049f009f8e868d93b5c62966a0a2be0421a08515e94d06f6267a1 SHA512 549073a60e2e56d2463c541d027e7c3c2c9ec22d06943ddd04f7b65ae5213eb67853806de16631da389e3f94c42b8f25c7717efb92aacfcc87062d7d7d3101ea DIST VirtualBox-5.1.26.tar.bz2 115915813 BLAKE2B c770420804fd0bcbe5582fccfefc55b6d69a603a99cc9ba26e72f6c1947a3e2bcbc5e9e1aa0185d544fb37b10db8233aa4c5cd14777138f63c2959a3ca5e6954 SHA512 680e9646a51a0a5923b3ded10007ee1c1e2a41c6d8a961d2b2540db6578bed2847154f4cac87e3cfe1118a62595b47c7df99da854f6c340e173b9eb8cacf2add -DIST VirtualBox-5.1.28.tar.bz2 116427658 BLAKE2B cf18e3677962b5ae5c32dade4a6054e3bc35d5b4a7422ee77529150a9a55893d88b0b5c73504caa9a7fa58d178788a6383ac933e818bc4e8b972d7f4ac6b8522 SHA512 5c21fd535424d7fd9adbb51894ec6d37ecf00a63a850362bd7b61fedca5031e096641814130a97ad839c0bd7089dc3dc465509615aab2af3c5735ff71005670a DIST VirtualBox-5.1.30.tar.bz2 116510730 BLAKE2B fe1d9ea37aa33a6aa6a78aebb469e267b9412e96cadc0a5287c263e8be21fdd0c9035a03e31ca954bef99eb5c05416de2bdfde5a657daa9a61eb795815d33542 SHA512 6c44d9593f4815644a484b306e621fe7eca224002f85d89c00f2470300f2c78dbfe50ffda61d2c2465df14ca77c70a2ab86f1a05116feeee9f5833857eb18dee EBUILD xf86-video-virtualbox-5.1.26.ebuild 5110 BLAKE2B 01ae67eaf8a4b8ff6c089e4cac57c23584fb6be31035b73953d796db6a6a80ff299192ab69958ec7d7859bfa17834b13024ffada01f542b3952fe3cf74f5b1c8 SHA512 3e88079b60657f33380edfecf79b2dced855ff680abd134cff1eb91bd9061b94261baaa2bb50c8f9c7c3da7d3b766576b5d1bd1bac90dcefd0f9d8d2aa0e1ea1 -EBUILD xf86-video-virtualbox-5.1.28.ebuild 5112 BLAKE2B e3785d669fa73f489c34bfe673328f142c3a39e95195964024a05892d83d8529bf78bb906c9512febbf04af552bd4132a0d94d0c51c97a10fa5a60fcd9ce0bd1 SHA512 6d7a3aa7e1fe7acd795ac6151a92463f5f0c35796ae468e3aa0d483f8d6677ba946a02b20f84ae6069540d8431954fdcefd9975bc1e0472cd2e95011885fe3f3 EBUILD xf86-video-virtualbox-5.1.30.ebuild 5112 BLAKE2B ae7aed4a9eeab454a9b20b97cc2c1fbc4f4c9e8896721e0a66e67f22e74c2ea28ef8b9970e2dd579bf2d783ca7567786790feb98cbe210c4de6574f8d23b29aa SHA512 bcac6f3f5d8e601348ef404884100e21383b4696a0066750a4c212cdee0cf9184280331180a0d3f9724894ca0ae9a2864f5a26223e710caaa5e0b4db8bb0f3ef MISC metadata.xml 407 BLAKE2B f1d23bcb66043219615b3aaf7ead87df8b8c12f09e3a1cd0b919268cc5282f0ebadacfce7860d12715a75209219166f39d6b2b89509e9920dc7c5507db146176 SHA512 e28c65e666d3f78cc8752c3f8af0d7e5494b4a2f93fdc98cf71110424aa9a72b68ee40aa299c46a7048d375a1f52bd0f03efd12d5e88226a4934989e7634afc2 diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.28.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.28.ebuild deleted file mode 100644 index 3eb7cfa80d31..000000000000 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.28.ebuild +++ /dev/null @@ -1,195 +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" -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" - - # fix bug #579946 - "${FILESDIR}/${PN}-5.1.22-sysmacros.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