diff options
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/bumblebee/ChangeLog | 15 | ||||
| -rw-r--r-- | x11-misc/bumblebee/bumblebee-9999-r4.ebuild | 91 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee.confd | 3 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee.envd | 9 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee.initd | 23 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/nvidia-uvm-support.patch | 39 | ||||
| -rw-r--r-- | x11-misc/bumblebee/metadata.xml | 21 | ||||
| -rw-r--r-- | x11-misc/primus/files/primus-add-libglvnd-workaround.patch | 11 | ||||
| -rw-r--r-- | x11-misc/primus/files/primus-support-user-LDFLAGS.patch | 8 | ||||
| -rw-r--r-- | x11-misc/primus/primus-9999-r1.ebuild | 47 |
10 files changed, 0 insertions, 267 deletions
diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog deleted file mode 100644 index 4823dae..0000000 --- a/x11-misc/bumblebee/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for x11-misc/bumblebee -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*x11-misc/bumblebee-9999-r2 (12 Dec 2014) - - 12 Dec 2014; Sven Eden <yamakuzure@gmx.net> +bumblebee-9999-r2 - -bumblebee-9999-r1 - Added a patch to directly support nvidia_uvm - -*x11-misc/bumblebee-9999-r1 (11 Dec 2014) - - 11 Dec 2014; Sven Eden <yamakuzure@gmx.net> +bumblebee-9999-r1 - - Use git-r3 - - Use develop branch instead of the (long inactive) master diff --git a/x11-misc/bumblebee/bumblebee-9999-r4.ebuild b/x11-misc/bumblebee/bumblebee-9999-r4.ebuild deleted file mode 100644 index 8d7131f..0000000 --- a/x11-misc/bumblebee/bumblebee-9999-r4.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools git-r3 multilib readme.gentoo-r1 systemd user - -DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets" -HOMEPAGE="http://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee" - -EGIT_MIN_CLONE_TYPE="shallow" -EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN/bu/Bu}.git" -EGIT_BRANCH="develop" -SRC_URI="" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="" - -IUSE="+bbswitch video_cards_nouveau video_cards_nvidia" - -COMMON_DEPEND=" - dev-libs/glib:2 - dev-libs/libbsd - sys-apps/kmod - x11-libs/libX11 -" - -RDEPEND="${COMMON_DEPEND} - virtual/opengl - x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] - bbswitch? ( sys-power/bbswitch ) -" - -DEPEND="${COMMON_DEPEND} - sys-apps/help2man - virtual/pkgconfig -" - -PDEPEND=" - || ( - x11-misc/primus - x11-misc/virtualgl - ) -" - -REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )" - -PATCHES=( - "${FILESDIR}"/nvidia-uvm-support.patch -) - -pkg_setup() { - enewgroup bumblebee -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - if use video_cards_nvidia ; then - # Get paths to GL libs for all ABIs - local i nvlib="" - for i in $(get_all_libdirs) ; do - nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib" - done - - local nvpref="/usr/$(get_libdir)/opengl/nvidia" - local xorgpref="/usr/$(get_libdir)/xorg/modules" - ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia-uvm \ - CONF_LDPATH_NVIDIA=${nvlib#:} \ - CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}" - fi - - econf \ - ${ECONF_PARAMS} -} - -src_install() { - default - - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newenvd "${FILESDIR}"/${PN}.envd 99${PN} - systemd_dounit scripts/systemd/bumblebeed.service - - local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group. - You may need to setup your /etc/bumblebee/bumblebee.conf" - readme.gentoo_create_doc -} diff --git a/x11-misc/bumblebee/files/bumblebee.confd b/x11-misc/bumblebee/files/bumblebee.confd deleted file mode 100644 index 1c70206..0000000 --- a/x11-misc/bumblebee/files/bumblebee.confd +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/conf.d/bumblebee - -BUMBLEBEE_EXTRA_OPTS="--use-syslog"
\ No newline at end of file diff --git a/x11-misc/bumblebee/files/bumblebee.envd b/x11-misc/bumblebee/files/bumblebee.envd deleted file mode 100644 index 59dfe1d..0000000 --- a/x11-misc/bumblebee/files/bumblebee.envd +++ /dev/null @@ -1,9 +0,0 @@ -# Comment this out if you are using VirtualGL also for other purposes and this -# slows down things for you. -VGL_READBACK="pbo" - -# Workaround for Bumblebee no longer working with current mesa. -# (See: https://github.com/amonakov/primus/issues/201 -# https://bugs.archlinux.org/task/58933 -# ) But only if the TearFree thing does not work... -PRIMUS_UPLOAD=1 diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd deleted file mode 100644 index 58f6d8b..0000000 --- a/x11-misc/bumblebee/files/bumblebee.initd +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need localmount -} - -PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}" - -start() { - ebegin "Starting BumbleBee Daemon" - start-stop-daemon -S -p "${PIDFILE}" -x /usr/sbin/bumblebeed -- -D ${BUMBLEBEE_EXTRA_OPTS} --pidfile "${PIDFILE}" - eend $? -} - -stop() { - - ebegin "Stopping BumbleBee Daemon" - start-stop-daemon -K -p "${PIDFILE}" -R SIGTERM/10 - eend $? -} diff --git a/x11-misc/bumblebee/files/nvidia-uvm-support.patch b/x11-misc/bumblebee/files/nvidia-uvm-support.patch deleted file mode 100644 index f0c92cb..0000000 --- a/x11-misc/bumblebee/files/nvidia-uvm-support.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/src/bbsecondary.c 2019-01-01 14:54:00.322574712 +0100 -+++ b/src/bbsecondary.c 2019-01-01 14:56:06.237570395 +0100 -@@ -119,6 +119,23 @@ - if (!module_load(module_name, driver_name)) { - set_bb_error("Could not load GPU driver"); - return false; -+ } else { -+ /* XXX NVIDIA UVM support */ -+ if (strstr(module_name, "nvidia")) { /* We are using NVIDIA's proprietary driver */ -+ char uvm_module_name[1024]; -+ sprintf(uvm_module_name, "%s-uvm", module_name); -+ if (!module_load(uvm_module_name, "nvidia_uvm")) { -+ char log_string[1024]; -+ sprintf(log_string, "Cannot load UVM module: %s\n", uvm_module_name); -+ bb_log(LOG_ERR, log_string); -+ /* Let's try the new nvidia-modeset if they have no uvm module installed: */ -+ sprintf(uvm_module_name, "%s-modeset", module_name); -+ if (!module_load(uvm_module_name, "nvidia_uvm")) { -+ sprintf(log_string, "Cannot load MODESET module either: %s\n", uvm_module_name); -+ bb_log(LOG_ERR, log_string); -+ } -+ } -+ } - } - } - return true; -@@ -244,6 +261,12 @@ - if (unload_driver || bb_config.force_driver_unload) { - /* unload the driver loaded by the graphica card */ - if (pci_get_driver(driver, pci_bus_id_discrete, sizeof driver)) { -+ /* XXX NVIDIA UVM support */ -+ if (strstr(driver, "nvidia")) { -+ module_unload("nvidia_drm"); -+ module_unload("nvidia_modeset"); -+ module_unload("nvidia_uvm"); -+ } - module_unload(driver); - } - } diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml deleted file mode 100644 index 18bdb97..0000000 --- a/x11-misc/bumblebee/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mva@mva.name</email> - <description> - If you have any issues with Bumblebee on Gentoo, please contact me. - </description> - <name>Vadim A. Misbakh-Soloviov</name> - </maintainer> - <longdescription> - A rewrite of the original Bumblebee service, providing an elegant and stable - means of managing Optimus hybrid graphics chipsets. A primary goal of this - project is to not only enable use of the discrete GPU for rendering, but - also to enable smart power management of the dGPU when it's not in use. - </longdescription> - <use> - <flag name="bbswitch">Add dependency on <pkg>sys-kernel/bbswitch</pkg> for - PM feature</flag> - </use> -</pkgmetadata> diff --git a/x11-misc/primus/files/primus-add-libglvnd-workaround.patch b/x11-misc/primus/files/primus-add-libglvnd-workaround.patch deleted file mode 100644 index 4283420..0000000 --- a/x11-misc/primus/files/primus-add-libglvnd-workaround.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/primusrun 2017-06-06 12:27:52.946659513 +0200 -+++ b/primusrun 2017-06-06 12:28:20.257660333 +0200 -@@ -1,5 +1,8 @@ - #!/bin/bash - -+# primus needs this variable workaround for libglvnd enabled mesa -+export __GLVND_DISALLOW_PATCHING=1 -+ - # Readback-display synchronization method - # 0: no sync, 1: D lags behind one frame, 2: fully synced - # export PRIMUS_SYNC=${PRIMUS_SYNC:-0} diff --git a/x11-misc/primus/files/primus-support-user-LDFLAGS.patch b/x11-misc/primus/files/primus-support-user-LDFLAGS.patch deleted file mode 100644 index b0ea0ce..0000000 --- a/x11-misc/primus/files/primus-support-user-LDFLAGS.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/Makefile 2017-06-06 12:32:31.777667885 +0200 -+++ b/Makefile 2017-06-06 12:32:58.071668674 +0200 -@@ -30,4 +30,4 @@ - - $(LIBDIR)/libGL.so.1: libglfork.cpp - mkdir -p $(LIBDIR) -- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< -lX11 -lpthread -lrt -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< $(LDFLAGS) -lX11 -lpthread -lrt diff --git a/x11-misc/primus/primus-9999-r1.ebuild b/x11-misc/primus/primus-9999-r1.ebuild deleted file mode 100644 index 5e3dbd2..0000000 --- a/x11-misc/primus/primus-9999-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=6 - -inherit multilib-build git-r3 - -DESCRIPTION="Faster OpenGL offloading for Bumblebee" -HOMEPAGE="https://github.com/amonakov/primus" -SRC_URI="" -EGIT_REPO_URI="git://github.com/amonakov/primus.git https://github.com/amonakov/primus.git" -EGIT_BRANCH="master" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND=" - x11-misc/bumblebee[video_cards_nvidia] - x11-drivers/nvidia-drivers[compat] -" -DEPEND="virtual/opengl" - -PATCHES=( - "${FILESDIR}"/${PN}-support-user-LDFLAGS.patch - "${FILESDIR}"/${PN}-add-libglvnd-workaround.patch -) - -src_compile() { - export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1' - mymake() { - emake LIBDIR=$(get_libdir) - } - multilib_parallel_foreach_abi mymake -} - -src_install() { - sed -i -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun - dobin primusrun - myinst() { - insinto /usr/$(get_libdir)/primus - doins ${S}/$(get_libdir)/libGL.so.1 - } - multilib_foreach_abi myinst -} |