From 8da4bc73f657301e358b8008006723fbf4cde4fe Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 20 Sep 2016 20:56:11 +0100 Subject: actually, we only need bbswitch loaded to detect optimus, because nvidia may not be loaded yet, or someone may use nouveau --- app-emulation/steam/files/kogaion-steam | 2 +- app-emulation/steam/steam-1.0.0.45-r6.ebuild | 49 ---------------------------- app-emulation/steam/steam-1.0.0.45-r7.ebuild | 49 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 app-emulation/steam/steam-1.0.0.45-r6.ebuild create mode 100644 app-emulation/steam/steam-1.0.0.45-r7.ebuild (limited to 'app-emulation') diff --git a/app-emulation/steam/files/kogaion-steam b/app-emulation/steam/files/kogaion-steam index 02e5f2a9..f83f5115 100755 --- a/app-emulation/steam/files/kogaion-steam +++ b/app-emulation/steam/files/kogaion-steam @@ -21,7 +21,7 @@ preload_some_system_libs () { # steam must be told where nvidia opengl libs live on gentoo systems # but this will break optimus, so check if we detect bbswitch in here # if we do, we do not preload nvidia opengl, as it will break steam - if [[ "$(lsmod|grep nvidia)" && "$(lsmod|grep bbswitch)" ]] ; then + if [[ "$(lsmod|grep bbswitch)" ]] ; then echo "" echo "nvidia optimus detected, we will not preload nvidia libs" echo "" diff --git a/app-emulation/steam/steam-1.0.0.45-r6.ebuild b/app-emulation/steam/steam-1.0.0.45-r6.ebuild deleted file mode 100644 index 5d2ebc9d..00000000 --- a/app-emulation/steam/steam-1.0.0.45-r6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - - -EAPI=5 - -inherit eutils - -DESCRIPTION="Digital distribution client bootstrap package" -HOMEPAGE="http://steampowered.com/" -SRC_URI="http://repo.steampowered.com/${PN}/pool/${PN}/s/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="custom" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - virtual/ttf-fonts - dev-util/desktop-file-utils - x11-themes/hicolor-icon-theme - net-misc/curl - sys-apps/dbus - media-libs/freetype - x11-libs/gdk-pixbuf - gnome-extra/zenity - amd64? ( - >=media-libs/alsa-lib-1.0.28[abi_x86_32(-)] - >=media-libs/mesa-10.0.4[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - ) - x86? ( - media-libs/alsa-lib - media-libs/mesa - x11-libs/libX11 - )" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/kogaion-${PN}.patch -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - exeinto /usr/bin || die - doexe ${FILESDIR}/kogaion-steam || die - rm -rf "${D}"/usr/bin/steamdeps || die - dosym /bin/true /usr/bin/steamdeps || die -} diff --git a/app-emulation/steam/steam-1.0.0.45-r7.ebuild b/app-emulation/steam/steam-1.0.0.45-r7.ebuild new file mode 100644 index 00000000..5d2ebc9d --- /dev/null +++ b/app-emulation/steam/steam-1.0.0.45-r7.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + + +EAPI=5 + +inherit eutils + +DESCRIPTION="Digital distribution client bootstrap package" +HOMEPAGE="http://steampowered.com/" +SRC_URI="http://repo.steampowered.com/${PN}/pool/${PN}/s/${PN}/${PN}_${PV}.tar.gz" + +LICENSE="custom" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + virtual/ttf-fonts + dev-util/desktop-file-utils + x11-themes/hicolor-icon-theme + net-misc/curl + sys-apps/dbus + media-libs/freetype + x11-libs/gdk-pixbuf + gnome-extra/zenity + amd64? ( + >=media-libs/alsa-lib-1.0.28[abi_x86_32(-)] + >=media-libs/mesa-10.0.4[abi_x86_32(-)] + >=x11-libs/libX11-1.6.2[abi_x86_32(-)] + ) + x86? ( + media-libs/alsa-lib + media-libs/mesa + x11-libs/libX11 + )" + +S=${WORKDIR}/${PN} + +src_prepare() { + epatch "${FILESDIR}"/kogaion-${PN}.patch +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + exeinto /usr/bin || die + doexe ${FILESDIR}/kogaion-steam || die + rm -rf "${D}"/usr/bin/steamdeps || die + dosym /bin/true /usr/bin/steamdeps || die +} -- cgit v1.2.3