diff options
| -rw-r--r-- | x11-misc/bumblebee/Manifest | 1 | ||||
| -rw-r--r-- | x11-misc/bumblebee/bumblebee-3.2.1-r6.ebuild | 91 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bbswitch-setup | 19 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch | 15 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee.confd | 3 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee.envd | 3 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee.initd | 23 | ||||
| -rw-r--r-- | x11-misc/bumblebee/metadata.xml | 26 | ||||
| -rw-r--r-- | x11-misc/primus/ChangeLog | 19 | ||||
| -rw-r--r-- | x11-misc/primus/primus-9999.ebuild | 40 |
10 files changed, 0 insertions, 240 deletions
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest deleted file mode 100644 index 5ed344c1..00000000 --- a/x11-misc/bumblebee/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bumblebee-3.2.1.tar.gz 143110 BLAKE2B 537fe96e061f229c4c1e7748aef89e4eec040536d7a3161b449a34752c19078d3b4da6703f1c11268b4bb0e6590f94168bab5917fceac0eb73825b3c233548f0 SHA512 6f016f75d199577215ff00c059e196829e9d3efeb0fb6eebe6c3fad6176e330332e1ef25875a22ac9892895683d95899ea44f1ec1f85d31300ad83cb1fe0310a diff --git a/x11-misc/bumblebee/bumblebee-3.2.1-r6.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1-r6.ebuild deleted file mode 100644 index d5c6f940..00000000 --- a/x11-misc/bumblebee/bumblebee-3.2.1-r6.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib readme.gentoo 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" -SRC_URI="http://bumblebee-project.org/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="amd64 x86" - -IUSE="+bbswitch +primus video_cards_nouveau video_cards_nvidia" - -RDEPEND=" - virtual/opengl - x11-misc/virtualgl:= - primus? ( x11-misc/primus ) - bbswitch? ( sys-power/bbswitch ) -" -DEPEND="${RDEPEND} - dev-libs/glib:2 - dev-libs/libbsd - sys-apps/help2man - virtual/pkgconfig - x11-libs/libX11 -" - -src_prepare() { - # Dirty fix for issue https://github.com/Bumblebee-Project/Bumblebee/issues/699 - # cherry picked from https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56 - epatch "${FILESDIR}/${P}-handle-nvidia-modeset-and-nvidia-drm.patch" -} - -src_configure() { - DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group. - You may need to setup your /etc/bumblebee/bumblebee.conf" - - if use video_cards_nvidia ; then - # Get paths to GL libs for all ABIs - local 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 \ - CONF_LDPATH_NVIDIA=${nvlib#:} \ - CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}" - fi - - econf \ - --docdir=/usr/share/doc/"${PF}" \ - ${ECONF_PARAMS} -} - -src_install() { - newconfd "${FILESDIR}"/bumblebee.confd bumblebee - newinitd "${FILESDIR}"/bumblebee.initd bumblebee - newenvd "${FILESDIR}"/bumblebee.envd 99bumblebee - systemd_dounit scripts/systemd/bumblebeed.service - - # Kogaion: tweak default settings - sed -i "s:TurnCardOffAtExit=.*:TurnCardOffAtExit=true:g" \ - "${S}/conf/bumblebee.conf" || die - - readme.gentoo_create_doc - - default - - if use bbswitch; then - # This is much better than the udev rule below - doinitd "${FILESDIR}/bbswitch-setup" - fi - # Downstream says: this is just plain wrong, how about - # the situation in where the user has bumblebee installed - # but they are not actually on an Optimus system? This - # disables the nvidia driver forever. - ## - rm "${ED}/lib/udev/rules.d/99-bumblebee-nvidia-dev.rules" || die -} - -pkg_preinst() { - use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia - use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau - - enewgroup bumblebee -} diff --git a/x11-misc/bumblebee/files/bbswitch-setup b/x11-misc/bumblebee/files/bbswitch-setup deleted file mode 100644 index ab00ae03..00000000 --- a/x11-misc/bumblebee/files/bbswitch-setup +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -start() { - # workaround the fact that udev may have loaded nvidia or nouveau - # and bbswitch refuses to turn off the card. - ebegin "Setting up bbswitch" - # make sure that the nvidia and nouveau modules are - # removed, then reload bbswitch. - for mod in nvidia nvidia_drm nvidia_modeset nouveau; do - modprobe -r ${mod} 2> /dev/null # best effort - done - # reload bbswitch now - modprobe -r bbswitch - modprobe bbswitch # this inherits the options - eend 0 -} - diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch deleted file mode 100644 index 736658c1..00000000 --- a/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nur a/src/module.c b/src/module.c ---- a/src/module.c 2013-04-26 16:49:03.022174178 +0100 -+++ b/src/module.c 2016-10-23 18:21:39.053969992 +0100 -@@ -96,7 +96,10 @@ - int retries = 30; - bb_log(LOG_INFO, "Unloading %s driver\n", driver); - char *mod_argv[] = { -- "rmmod", -+ "modprobe", -+ "-r", -+ "nvidia_drm", -+ "nvidia_modeset", - driver, - NULL - }; diff --git a/x11-misc/bumblebee/files/bumblebee.confd b/x11-misc/bumblebee/files/bumblebee.confd deleted file mode 100644 index 1c70206d..00000000 --- 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 e19cc56a..00000000 --- a/x11-misc/bumblebee/files/bumblebee.envd +++ /dev/null @@ -1,3 +0,0 @@ -# Comment this out if you are using VirtualGL also for other purposes and this -# slows down things for you. -VGL_READBACK="pbo" diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd deleted file mode 100644 index 0d639842..00000000 --- a/x11-misc/bumblebee/files/bumblebee.initd +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need bbswitch-setup - before xdm -} - -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/metadata.xml b/x11-misc/bumblebee/metadata.xml deleted file mode 100644 index 633263d8..00000000 --- a/x11-misc/bumblebee/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer> - <email>pacho@gentoo.org</email> - <name>Pacho Ramos</name> -</maintainer> -<maintainer> - <email>mva@mva.name</email> - <name>Vadim A. Misbakh-Soloviev</name> -</maintainer> -<maintainer> - <email>rei4dan@gmail.com</email> - <name>My Th</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/ChangeLog b/x11-misc/primus/ChangeLog deleted file mode 100644 index 4f30967d..00000000 --- a/x11-misc/primus/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -# ChangeLog for x11-misc/primus -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 23 Oct 2012; Vadim A. Misbakh-Soloviov <mva@mva.name> primus-9999.ebuild: - bumblebee,virtualgl] some build fixes - - Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name> - - 23 Oct 2012; Vadim A. Misbakh-Soloviov <mva@mva.name> primus-9999.ebuild: - fix 32bit build - - Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name> - -*primus-9999 (20 Oct 2012) - - 20 Oct 2012; Alexander Monakov <amonakov@ispras.ru> +primus-9999.ebuild: - Draft ebuild for primus - diff --git a/x11-misc/primus/primus-9999.ebuild b/x11-misc/primus/primus-9999.ebuild deleted file mode 100644 index cd967475..00000000 --- a/x11-misc/primus/primus-9999.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit multilib-build git-2 - -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" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="" -IUSE="" -KEYWORDS="~amd64 ~x86" - -DEPEND="virtual/opengl" -RDEPEND="${DEPEND}" - - -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 -} |