[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: 639b2e2b7df98733299d73e516a341b603e78136 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed May 29 19:10:22 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu May 30 05:55:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639b2e2b x11-misc/primus: EAPI8 bump Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Arthur Zamarin gentoo.org> x11-misc/primus/primus-0.2-r4.ebuild | 62 1 file changed, 62 insertions(+) diff --git a/x11-misc/primus/primus-0.2-r4.ebuild b/x11-misc/primus/primus-0.2-r4.ebuild new file mode 100644 index ..acd44b6182fd --- /dev/null +++ b/x11-misc/primus/primus-0.2-r4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-build + +DESCRIPTION="Faster OpenGL offloading for Bumblebee" +HOMEPAGE="https://github.com/amonakov/primus"; +SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/amonakov/${PN}.git"; + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+libglvnd" + +RDEPEND=" + x11-misc/bumblebee + x11-drivers/nvidia-drivers[libglvnd(+)=] +" +DEPEND="virtual/opengl" + +PATCHES=( + "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" + "${FILESDIR}/primus-0.2-respect-ldflags.patch" +) + +src_prepare() { + default + # Exported values don't always seem to be used. Until source fixed, + # patch primusrun script + if use libglvnd; then + sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/\$LIB\/libGLX_nvidia.so.0'" primusrun || die + sed -i "/libGLd/a export PRIMUS_libGLd='\/usr\/\$LIB\/libGLX.so.0'" primusrun || die + else + sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/$$LIB\/opengl\/nvidia\/lib/libGL.so.1'" primusrun || die + fi +} + +src_compile() { + if use libglvnd; then + export PRIMUS_libGLa='/usr/$$LIB/libGLX_nvidia.so.0' + export PRIMUS_libGLd='/usr/$$LIB/libGLX.so.0' + else + export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1' + fi + mymake() { + emake LIBDIR=$(get_libdir) + } + multilib_parallel_foreach_abi mymake +} + +src_install() { + sed -i -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun || die + dobin primusrun + myinst() { + insinto /usr/$(get_libdir)/primus + doins "${S}"/$(get_libdir)/libGL.so.1 + } + multilib_foreach_abi myinst +}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: 4dade50c47767d93116ce1331535b9cc63193299 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed May 29 19:10:34 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu May 30 05:55:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dade50c x11-misc/primus: remove old Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/36890 Signed-off-by: Arthur Zamarin gentoo.org> x11-misc/primus/primus-0.2-r3.ebuild | 62 1 file changed, 62 deletions(-) diff --git a/x11-misc/primus/primus-0.2-r3.ebuild b/x11-misc/primus/primus-0.2-r3.ebuild deleted file mode 100644 index 3a4c0197ea9a.. --- a/x11-misc/primus/primus-0.2-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib-build - -DESCRIPTION="Faster OpenGL offloading for Bumblebee" -HOMEPAGE="https://github.com/amonakov/primus"; -SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/amonakov/${PN}.git"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+libglvnd" - -RDEPEND=" - x11-misc/bumblebee - x11-drivers/nvidia-drivers[libglvnd(+)=] -" -DEPEND="virtual/opengl" - -PATCHES=( - "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" - "${FILESDIR}/primus-0.2-respect-ldflags.patch" -) - -src_prepare() { - default - # Exported values don't always seem to be used. Until source fixed, - # patch primusrun script - if use libglvnd; then - sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/\$LIB\/libGLX_nvidia.so.0'" primusrun || die - sed -i "/libGLd/a export PRIMUS_libGLd='\/usr\/\$LIB\/libGLX.so.0'" primusrun || die - else - sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/$$LIB\/opengl\/nvidia\/lib/libGL.so.1'" primusrun || die - fi -} - -src_compile() { - if use libglvnd; then - export PRIMUS_libGLa='/usr/$$LIB/libGLX_nvidia.so.0' - export PRIMUS_libGLd='/usr/$$LIB/libGLX.so.0' - else - export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1' - fi - 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 -}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: a66da50735e8552adbdf31b835e30eb99f4b5572 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Mar 30 23:44:38 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Fri Mar 31 00:23:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66da507 x11-misc/primus: unkeyword 0.2-r3 for ~x86 nvidia-drivers is no longer available on x86, or at least unmasked. Could mask this together rather than unkeyworded, but it's very unlikely this works properly with 0/390 given the semi-broken glvnd support. If anything, it may make more sense to last rite this... Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/primus/primus-0.2-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/primus/primus-0.2-r3.ebuild b/x11-misc/primus/primus-0.2-r3.ebuild index b70260a99d7b..3a4c0197ea9a 100644 --- a/x11-misc/primus/primus-0.2-r3.ebuild +++ b/x11-misc/primus/primus-0.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/amonakov/${PN}.git"; LICENSE="ISC" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" IUSE="+libglvnd" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: d40faa721a828b159942045e191e82b9a8525981 Author: Ionen Wolkens gmail com> AuthorDate: Sun Mar 21 15:52:07 2021 + Commit: David Seifert gentoo org> CommitDate: Sun Mar 21 15:52:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40faa72 x11-misc/primus: remove old 0.2 nvidia-drivers[compat] wasn't providing compat libraries anymore making this unusable, and now the flag is being removed. Bug: https://bugs.gentoo.org/774111 Signed-off-by: Ionen Wolkens gmail.com> Signed-off-by: David Seifert gentoo.org> x11-misc/primus/primus-0.2.ebuild | 40 --- 1 file changed, 40 deletions(-) diff --git a/x11-misc/primus/primus-0.2.ebuild b/x11-misc/primus/primus-0.2.ebuild deleted file mode 100644 index 6cd89d1ee18..000 --- a/x11-misc/primus/primus-0.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib-build - -DESCRIPTION="Faster OpenGL offloading for Bumblebee" -HOMEPAGE="https://github.com/amonakov/primus"; -SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/amonakov/${PN}.git"; - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - x11-misc/bumblebee - x11-drivers/nvidia-drivers[compat] -" -DEPEND="virtual/opengl" - -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 -}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: 70fbc99d02dbdc2e009b46f5564c6f9c5e1a1fb2 Author: David Seifert gentoo org> AuthorDate: Sun Feb 14 15:49:03 2021 + Commit: David Seifert gentoo org> CommitDate: Sun Feb 14 15:49:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fbc99d x11-misc/primus: Update libglvnd USEdep on nvidia Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> x11-misc/primus/{primus-0.2-r2.ebuild => primus-0.2-r3.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/primus/primus-0.2-r2.ebuild b/x11-misc/primus/primus-0.2-r3.ebuild similarity index 95% rename from x11-misc/primus/primus-0.2-r2.ebuild rename to x11-misc/primus/primus-0.2-r3.ebuild index a25dcfebb0f..b70260a99d7 100644 --- a/x11-misc/primus/primus-0.2-r2.ebuild +++ b/x11-misc/primus/primus-0.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ IUSE="+libglvnd" RDEPEND=" x11-misc/bumblebee - x11-drivers/nvidia-drivers[libglvnd(-)=] + x11-drivers/nvidia-drivers[libglvnd(+)=] " DEPEND="virtual/opengl"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/, x11-misc/primus/files/
commit: 09d29bd3284b92b6796f901c59c1ed8a80dead70 Author: Adam Feldman gentoo org> AuthorDate: Thu Sep 3 15:22:26 2020 + Commit: Adam Feldman gentoo org> CommitDate: Thu Sep 3 15:23:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d29bd3 x11-misc/primus: Use LDFLAGS Closes: https://bugs.gentoo.org/740198 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Adam Feldman gentoo.org> .../primus/files/primus-0.2-respect-ldflags.patch | 19 +++ .../{primus-0.2-r1.ebuild => primus-0.2-r2.ebuild}| 5 - 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/x11-misc/primus/files/primus-0.2-respect-ldflags.patch b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch new file mode 100644 index 000..5d980451743 --- /dev/null +++ b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch @@ -0,0 +1,19 @@ +From b4663367d16190cf57b632cd59425b1b8b43f2f3 Mon Sep 17 00:00:00 2001 +From: Vincent Cheng +Date: Sat, 25 Jul 2015 21:10:10 -0700 +Subject: [PATCH] build with LDFLAGS defined by environment + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ab37e6e..a83e465 100644 +--- a/Makefile b/Makefile +@@ -30,4 +30,4 @@ CXXFLAGS += -DPRIMUS_libGLd='"$(PRIMUS_libGLd)"' + + $(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-0.2-r1.ebuild b/x11-misc/primus/primus-0.2-r2.ebuild similarity index 93% rename from x11-misc/primus/primus-0.2-r1.ebuild rename to x11-misc/primus/primus-0.2-r2.ebuild index b17cd30fb64..a25dcfebb0f 100644 --- a/x11-misc/primus/primus-0.2-r1.ebuild +++ b/x11-misc/primus/primus-0.2-r2.ebuild @@ -21,7 +21,10 @@ RDEPEND=" " DEPEND="virtual/opengl" -PATCHES=( "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" ) +PATCHES=( + "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" + "${FILESDIR}/primus-0.2-respect-ldflags.patch" +) src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: eee0e68c49fae188cb87ddfea19afa780acfa7a2 Author: Jonas Stein gentoo org> AuthorDate: Tue Oct 3 06:57:41 2017 + Commit: Jonas Stein gentoo org> CommitDate: Tue Oct 3 06:57:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee0e68c x11-misc/primus: Remove proxied maintainer Removed proxied maintainer, because he was added by mistake. This was part of bug 633310. Package-Manager: Portage-2.3.10, Repoman-2.3.3 x11-misc/primus/metadata.xml | 8 1 file changed, 8 deletions(-) diff --git a/x11-misc/primus/metadata.xml b/x11-misc/primus/metadata.xml index 721c730bea9..7eea5579ed4 100644 --- a/x11-misc/primus/metadata.xml +++ b/x11-misc/primus/metadata.xml @@ -5,14 +5,6 @@ zx...@gentoo.org Jason A. Donenfeld - - amona...@ispras.ru - Alexander Monakov - - - proxy-ma...@gentoo.org - Proxy Maintainers - amonakov/primus
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: 01981005a182365cd42468c3d4fd32337763ddf2 Author: David Hicks hicks id au> AuthorDate: Sat Jul 29 15:12:59 2017 + Commit: Michał Górny gentoo org> CommitDate: Sun Jul 30 09:22:51 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01981005 x11-misc/primus: use HTTPS for GitHub Package-Manager: Portage-2.3.6, Repoman-2.3.3 x11-misc/primus/primus-0.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/primus/primus-0.2.ebuild b/x11-misc/primus/primus-0.2.ebuild index 7bbd6f83db7..6cd89d1ee18 100644 --- a/x11-misc/primus/primus-0.2.ebuild +++ b/x11-misc/primus/primus-0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit multilib-build DESCRIPTION="Faster OpenGL offloading for Bumblebee" HOMEPAGE="https://github.com/amonakov/primus"; SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="git://github.com/amonakov/primus.git https://github.com/amonakov/primus.git"; +EGIT_REPO_URI="https://github.com/amonakov/${PN}.git"; LICENSE="ISC" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/primus/
commit: 5f61c4613f58d92bed8670f63745b18606c43a55 Author: Jason A. Donenfeld gentoo org> AuthorDate: Sun Oct 16 21:34:19 2016 + Commit: Jason Donenfeld gentoo org> CommitDate: Sun Oct 16 21:38:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f61c461 x11-misc/primus: import just-released version Package-Manager: portage-2.3.2 x11-misc/primus/Manifest | 1 + x11-misc/primus/metadata.xml | 19 ++ x11-misc/primus/primus-0.2.ebuild | 41 +++ 3 files changed, 61 insertions(+) diff --git a/x11-misc/primus/Manifest b/x11-misc/primus/Manifest new file mode 100644 index ..ba79c4a --- /dev/null +++ b/x11-misc/primus/Manifest @@ -0,0 +1 @@ +DIST primus-0.2.tar.gz 26248 SHA256 beccce83d6e493ecb45589fd02d7b0b0e5b406b136f4ad62d20d4cbac9d54fec SHA512 4108f4e721c9cd8f8dc592a41706230b29bbcfcb8ba49e61d1f07f715c81304471e0d00407bc59a314568b3b42e19f0962ba1dbb8ef1996fe0d4ac13af2e3d2b WHIRLPOOL 13eec30fea2341bb2f35590a2122a406e181726bb2e5ed86078bc0643fe608c70e5d5677b74a301e2af0315f9e208156c3728a94106017f016a7e73ed1ad7eb5 diff --git a/x11-misc/primus/metadata.xml b/x11-misc/primus/metadata.xml new file mode 100644 index ..721c730 --- /dev/null +++ b/x11-misc/primus/metadata.xml @@ -0,0 +1,19 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + zx...@gentoo.org + Jason A. Donenfeld + + + amona...@ispras.ru + Alexander Monakov + + + proxy-ma...@gentoo.org + Proxy Maintainers + + + amonakov/primus + + diff --git a/x11-misc/primus/primus-0.2.ebuild b/x11-misc/primus/primus-0.2.ebuild new file mode 100644 index ..e6b14f2 --- /dev/null +++ b/x11-misc/primus/primus-0.2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=6 + +inherit multilib-build + +DESCRIPTION="Faster OpenGL offloading for Bumblebee" +HOMEPAGE="https://github.com/amonakov/primus"; +SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="git://github.com/amonakov/primus.git https://github.com/amonakov/primus.git"; + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + x11-misc/bumblebee + x11-drivers/nvidia-drivers[compat] +" +DEPEND="virtual/opengl" + +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 +}