commit: 67e17e3963860ddec661aef6dda7799581c033d6 Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de> AuthorDate: Thu Feb 12 15:31:12 2026 +0000 Commit: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de> CommitDate: Thu Feb 12 15:34:42 2026 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=67e17e39
app-misc/electricsheep: fix boost-1.89 and ffmpeg8 build Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de> app-misc/electricsheep/Manifest | 1 + .../electricsheep-3.0.4_p20240213-r1.ebuild | 74 ++++++++++++++++++++++ .../files/electricsheep-boost-system-r1.patch | 40 ++++++++++++ 3 files changed, 115 insertions(+) diff --git a/app-misc/electricsheep/Manifest b/app-misc/electricsheep/Manifest index d276268513..eacf08c3e7 100644 --- a/app-misc/electricsheep/Manifest +++ b/app-misc/electricsheep/Manifest @@ -1,2 +1,3 @@ DIST electricsheep-3.0.4_p20240213.tar.gz 24606079 BLAKE2B 60b13b5ad0efdfe980905a1df049c81c74c55ff6823a754bf4d0245f008ed932154e298bdde305098a95508852049e9c7a93f63b0839aeaa6c382ed75bd599f0 SHA512 5a32761d2b4a103105930c8ed0beb3bbf63d84bcf844b176570828984885cde072e1627b9b9e2282767e4b8de1901d77ae2fbeb2be91911f32c04177a7df8945 +DIST electricsheep-ffmpeg-8.patch 827 BLAKE2B c92a71275abde069754b08214334c5b4f1358ba6a69cabe59451160ed89e8af123551d898ee4dc75eb0983d85ace4f8e551e00eb43cdfaed32d86ed74bf93154 SHA512 010ea58c3250bd026c48fad9dc05946728bf1242dc2d2fed470c8d97b77041db7e1d95e9902c93617ebf33fe27c6bc2780b8bb403717bebf77681e0b5257f0ef DIST electricsheep-remove-convenience.patch 3210 BLAKE2B 0b66b29fce9d32de66bded2485cd9ac6e66275029e3c564ee2829ddb83a967946085e507eb9d5ca9127b0c9ff27515ed831218b6d8f8462504b607c7441e18b1 SHA512 e8e4883b3fe711dd446dc0d60c787e34aa0aa6cbd53c242d1fe7dd0efeb25ad9c26628a88897a358042d2f3b6520d9fbdca4d6c32dd983efb2b18af9eb8211a4 diff --git a/app-misc/electricsheep/electricsheep-3.0.4_p20240213-r1.ebuild b/app-misc/electricsheep/electricsheep-3.0.4_p20240213-r1.ebuild new file mode 100644 index 0000000000..5f34b2427c --- /dev/null +++ b/app-misc/electricsheep/electricsheep-3.0.4_p20240213-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit autotools wxwidgets desktop flag-o-matic + +DESCRIPTION="Realize the collective dream of sleeping computers from all over the internet" +HOMEPAGE="https://electricsheep.org/"; +MY_COMMIT="5fbbb684752be06ccbea41639968aa7f1cc678dd" +SRC_URI=" + https://github.com/scottdraves/electricsheep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz + https://github.com/scottdraves/electricsheep/pull/126.patch -> electricsheep-remove-convenience.patch + https://github.com/scottdraves/electricsheep/commit/f3417c7a5b6bf5bc56d2cb5572ebfad3661dc740.patch -> electricsheep-ffmpeg-8.patch +" + +S="${WORKDIR}/${PN}-${MY_COMMIT}/client_generic" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="video_cards_nvidia" + +DEPEND="dev-lang/lua:5.1 + dev-libs/boost:0= + dev-libs/expat + dev-libs/tinyxml + gnome-base/libgtop + media-gfx/flam3 + media-libs/freeglut + media-libs/glee + media-libs/libpng:* + media-video/ffmpeg:0 + net-misc/curl + virtual/zlib:= + x11-libs/libX11 + x11-libs/libXrender + x11-libs/wxGTK:${WX_GTK_VER} + virtual/opengl" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/electricsheep-disable-vsync.patch" + "${FILESDIR}/electricsheep-boost-system-r1.patch" +) + +src_prepare() { + default + setup-wxwidgets + eautoreconf + rm -f DisplayOutput/OpenGL/{GLee.c,GLee.h} + cd ../ + eapply "${DISTDIR}/electricsheep-remove-convenience.patch" + eapply "${DISTDIR}/electricsheep-ffmpeg-8.patch" +} + +src_configure() { + # "eselect opengl" doesn't seem to affect link-time paths, so we need to resolve that here + use video_cards_nvidia && append-ldflags -L/usr/$(get_libdir)/opengl/nvidia/lib + append-ldflags -lpthread + econf + # get rid of the RUNPATH that interferes with hardware accelerated OpenGL drivers + sed -i -e '/^hardcode_libdir_flag_spec/d' libtool +} + +src_install() { + default + mv "${ED}/usr/share/doc/electricsheep-2.7b33-svn" "${ED}/usr/share/${PF}" || die + sed -i "$ a OnlyShowIn=" "${ED}/usr/share/applications/screensavers/electricsheep.desktop" + domenu "${FILESDIR}/ElectricSheep.desktop" +} diff --git a/app-misc/electricsheep/files/electricsheep-boost-system-r1.patch b/app-misc/electricsheep/files/electricsheep-boost-system-r1.patch new file mode 100644 index 0000000000..da73f17bac --- /dev/null +++ b/app-misc/electricsheep/files/electricsheep-boost-system-r1.patch @@ -0,0 +1,40 @@ +Boost 1.89 removed boost_system + +See also: +https://github.com/boostorg/system/commit/7a495bb46d7ccd808e4be2a6589260839b0fd3a3 +https://github.com/scottdraves/electricsheep/issues/131 +https://github.com/stefantalpalaru/gentoo-overlay/issues/182 + +Pascal Jaeger <[email protected]> (2026-02-06) + +diff '--color=auto' -ur client_generic.orig/Client/Makefile.am client_generic/Client/Makefile.am +--- client_generic/Client/Makefile.am 2024-02-13 15:55:46.000000000 +0100 ++++ client_generic/Client/Makefile.am 2026-02-01 14:14:47.781773546 +0100 +@@ -75,7 +75,7 @@ + + + +-electricsheep_LDADD = -lboost_system -lboost_thread -lboost_filesystem -lglut \ ++electricsheep_LDADD = -lboost_thread -lboost_filesystem -lglut \ + $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(SWSCALE_LIBS) $(AVUTIL_LIBS) $(LUA_LIBS) $(GLU_LIBS) $(GLEE_LIBS) $(BOOST_LDADD) \ + $(CURL_LIBS) $(PNG_LIBS) $(XRENDER_LIBS) $(LIBGTOP_LIBS) $(XRENDER_LIBS) + +diff '--color=auto' -ur client_generic.orig/configure.ac client_generic/configure.ac +--- client_generic/configure.ac 2026-02-01 14:13:46.216373226 +0100 ++++ client_generic/configure.ac 2026-02-01 14:14:31.813684871 +0100 +@@ -278,15 +278,11 @@ + [AC_MSG_ERROR([you must install libboost-system to compile electricsheep.]) + ]) + +-AC_CHECK_LIB([boost_system],[main],, +- [AC_MSG_ERROR([you must install libboost-system to compile electricsheep.]) +-]) + + AC_LANG_POP([C++]) + + + +-BOOST_LDADD="-lboost_system" + + AC_SUBST(BOOST_LDADD) +
