From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- x11-misc/primus/Manifest | 3 +- .../primus/files/primus-0.2-respect-ldflags.patch | 19 +++++++ x11-misc/primus/primus-0.2-r1.ebuild | 59 -------------------- x11-misc/primus/primus-0.2-r2.ebuild | 62 ++++++++++++++++++++++ 4 files changed, 83 insertions(+), 60 deletions(-) create mode 100644 x11-misc/primus/files/primus-0.2-respect-ldflags.patch delete mode 100644 x11-misc/primus/primus-0.2-r1.ebuild create mode 100644 x11-misc/primus/primus-0.2-r2.ebuild (limited to 'x11-misc/primus') diff --git a/x11-misc/primus/Manifest b/x11-misc/primus/Manifest index 2eec8ba86b75..a1524470a483 100644 --- a/x11-misc/primus/Manifest +++ b/x11-misc/primus/Manifest @@ -1,5 +1,6 @@ AUX primus-0.2-libglvnd-workaround.patch 662 BLAKE2B c2a4af4171487405ca08248c162e7ea38cdf7af0ee32636f19f867741794d18dfbd66490163c7eb38de975f5adf29b69dabb47ec8c6196a5d36781e25be58c24 SHA512 529d62808a488237b0730aee9e83448d0d9910f4b3b1f707012724a571a3a94362d5e19f8f347b94f999ee3c4b7ff9260113718bc8a4d7450264579de8ee7fff +AUX primus-0.2-respect-ldflags.patch 733 BLAKE2B fae740396454d1051f3e4b5714e281edf9cab2b11144cbf5af2edfb6010c1e5adeb501a64289d7093105cfd039928e06c13246c845fc6dabf0a4b23b921a1f1a SHA512 d15fbebb12c5f9d299fcb9b7bf8004e2933d7739b754fc2de45cf13232938000ec187369eee28be85ea4502844b67b991f3c49b7ed31c0036e2da974e72e3248 DIST primus-0.2.tar.gz 26248 BLAKE2B 5e7822e66f3abadc442c30792c03dc731814a084ca2911b9e0333efda1fdfd36ce3c31be612426ae3747d7be0575aca2e7562054ba4ae719812cf800ffc04ff5 SHA512 4108f4e721c9cd8f8dc592a41706230b29bbcfcb8ba49e61d1f07f715c81304471e0d00407bc59a314568b3b42e19f0962ba1dbb8ef1996fe0d4ac13af2e3d2b -EBUILD primus-0.2-r1.ebuild 1576 BLAKE2B 377050ecf80c04894149a9b69ddd8cf51fbb0b080cdcd7cc389d98d81be3a57ec947c1f93d4047c9f6f10f1f21b59af2a54cae679d9773d6497fa8d4de09d41b SHA512 151ec75b8bdc6a673e85d977c771ba0758155027c591129ae86e2c828f6d0e6aa6f2b4c1483153dfc324d9a4eacc478a2a3dda1b8d7009b579c73976751e8a36 +EBUILD primus-0.2-r2.ebuild 1625 BLAKE2B e18eaa7725803456bfbe131a1fca8b74134b3ac9ec79bba11d6d0c7137a311ceade22c5ce309f07d9213942d47d5dbc5c055ffd29b05d752f7ef6dc7a024c74c SHA512 8796ca9ca8a8ab7937266cec1b37bd83d4ab6233fc6507a6820b359e6e672bb187b22fac685ee99c546015e82c998df2e0350485ccc0af79d9340044969dba3a EBUILD primus-0.2.ebuild 919 BLAKE2B b1eb99e7e0b18b69e24a7ade73729228b6829a36da518539072bb7919dd54c338c0c9bedcf8a69a557563bcc85e7a61d716ad851e2ae084ebf767c8fa0827635 SHA512 9c967343163ac52b2ef9e5e061b8ca6be8d3cb0b7be1e51ad0a913c8fd9953ee486fa70a697b41814440d5739eebf39f3d6b84f09d2c3cdbc4082a75ee7debe3 MISC metadata.xml 423 BLAKE2B b55ae11da7b5968ec0b88042f4180c690d818c28690824eaf0511890dd747d64d0bd12510c2389e067e5ad190d295c27ed6a6e8ca43b8fd1abffbc22a3581096 SHA512 7d9a32f2d32a8973f17679e8658ebf461c7c88ba028f85209629767c097f66c4bfd0e3e1c9fd80d7a6b88bd4d6ccc52bd56a5650a61a68f6259278b172aab72d 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 000000000000..5d9804517437 --- /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-r1.ebuild deleted file mode 100644 index b17cd30fb649..000000000000 --- a/x11-misc/primus/primus-0.2-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 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 ~x86" -IUSE="+libglvnd" - -RDEPEND=" - x11-misc/bumblebee - x11-drivers/nvidia-drivers[libglvnd(-)=] -" -DEPEND="virtual/opengl" - -PATCHES=( "${FILESDIR}/primus-0.2-libglvnd-workaround.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 -} diff --git a/x11-misc/primus/primus-0.2-r2.ebuild b/x11-misc/primus/primus-0.2-r2.ebuild new file mode 100644 index 000000000000..a25dcfebb0f8 --- /dev/null +++ b/x11-misc/primus/primus-0.2-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 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 ~x86" +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 +} -- cgit v1.2.3