public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: app-misc/electricsheep/
@ 2023-12-14 22:21 David Roman
  0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2023-12-14 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7c69e0da6b0597634645f68339ac7bbab883e6bc
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Dec 14 20:30:38 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Dec 14 20:51:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c69e0da

app-misc/electricsheep: drop 9999

There is no need for a 9999 package when the upstream repo is inactive
anyway and the versioned package downloads the latest commit anyway

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 app-misc/electricsheep/electricsheep-9999.ebuild | 70 ------------------------
 1 file changed, 70 deletions(-)

diff --git a/app-misc/electricsheep/electricsheep-9999.ebuild b/app-misc/electricsheep/electricsheep-9999.ebuild
deleted file mode 100644
index 579feee470..0000000000
--- a/app-misc/electricsheep/electricsheep-9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-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/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scottdraves/electricsheep"
-	S="${WORKDIR}/${P}/client_generic"
-else
-	MY_COMMIT="37ba0fd692d6581f8fe009ed11c9650cd8174123"
-	SRC_URI="https://github.com/scottdraves/electricsheep/archive/${MY_COMMIT}.zip -> ${P}.zip"
-	S="${WORKDIR}/${PN}-${MY_COMMIT}/client_generic"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="video_cards_nvidia"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="dev-lang/lua:5.1
-	dev-libs/boost
-	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
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/wxGTK:${WX_GTK_VER}
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/electricsheep-glext-prototypes.patch"
-	"${FILESDIR}/electricsheep-disable-vsync.patch"
-)
-
-src_prepare() {
-	default
-	setup-wxwidgets
-	eautoreconf
-	rm -f DisplayOutput/OpenGL/{GLee.c,GLee.h}
-}
-
-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"
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: app-misc/electricsheep/
@ 2024-12-24 11:55 David Roman
  0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2024-12-24 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     28ecb587fc5fc4c63bc50a9af03bed5bd34878ef
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Tue Dec 24 08:28:00 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Dec 24 08:28:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=28ecb587

app-misc/electricsheep: add 20191005-r2

fix build against boost-1.85

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 app-misc/electricsheep/Manifest                    |  1 +
 .../electricsheep-3.0.2_p20191005-r2.ebuild        | 73 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/app-misc/electricsheep/Manifest b/app-misc/electricsheep/Manifest
index 0f60110b0..42915f22c 100644
--- a/app-misc/electricsheep/Manifest
+++ b/app-misc/electricsheep/Manifest
@@ -1,2 +1,3 @@
 DIST electricsheep-3.0.2_p20191005.tar.gz 11115290 BLAKE2B d952663864287a0081dd2b65dbe77e09ce8beb3c0693e8605a469244eaa21c441f159c6a74b5d5b1cf20151b9b8fe57ee20f4ef44d0f564c56aa9b84f33062bf SHA512 ef8138466d3f938eaf78e530e804f42947dd05c5d9511a091b67600b6719a9e70917594879668953d252a4cdfafd0f547ecbb2e23fe7dc610b959e2c04ac85e5
+DIST electricsheep-fix-build-boost-185.patch 4062 BLAKE2B 9eeda51d02d93db3c4179d43441436634bd8e5ce6a2912ac9484460a18eb35d25ee04ba82ff9eda0524f551b1e1584b94aef1c932213cb8e3be8997915dffd1d SHA512 d85c6a9161ef90f3ea73908ef2a27683f5caba97f72e5ef8943770fcfe7f069de1b4d2594ff03ffbbce50ed9deb9e773e998127d1e8d90dcaa73c687cb3093bc
 DIST electricsheep-fix-ffmpeg5.patch 48619 BLAKE2B bed22bf7cdd07fd637ad621fc7f653d31e701757ffe2c6a72110076572a2cb1dce1d429ce8181f9af08a4e6d0792945c63937bb2e3a2defe5aacf5aa4cea74c8 SHA512 42ba5d5789e72632cb9ab5600166a45aea6c32b0a56d0da97b62b4298617fc8a7dbe36b6f3b73eb4ba3cb12369e19657f49a94d9f501861a0b6c30a888bec1cf

diff --git a/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r2.ebuild b/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r2.ebuild
new file mode 100644
index 000000000..3987f2886
--- /dev/null
+++ b/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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="37ba0fd692d6581f8fe009ed11c9650cd8174123"
+SRC_URI="
+	https://github.com/scottdraves/electricsheep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/scottdraves/electricsheep/pull/109.patch -> electricsheep-fix-ffmpeg5.patch
+	https://github.com/scottdraves/electricsheep/pull/123.patch -> electricsheep-fix-build-boost-185.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
+	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
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/wxGTK:${WX_GTK_VER}
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/electricsheep-glext-prototypes.patch" # is included in the boost181 patch
+	"${FILESDIR}/electricsheep-disable-vsync.patch"
+)
+
+src_prepare() {
+	default
+	setup-wxwidgets
+	eautoreconf
+	rm -f DisplayOutput/OpenGL/{GLee.c,GLee.h}
+	cd ../
+	eapply "${DISTDIR}/electricsheep-fix-ffmpeg5.patch"
+	eapply "${DISTDIR}/electricsheep-fix-build-boost-185.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"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: app-misc/electricsheep/
@ 2024-12-24 11:55 David Roman
  0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2024-12-24 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     7e69080b1ab668cab06ca77b84685801c1b4a547
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Tue Dec 24 08:16:40 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Dec 24 08:16:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7e69080b

app-misc/electricsheep: drop 3.0.2_p20191005

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>

 app-misc/electricsheep/Manifes                     |  3 -
 app-misc/electricsheep/Manifest                    |  2 +-
 .../electricsheep-3.0.2_p20191005.ebuild           | 72 ----------------------
 3 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/app-misc/electricsheep/Manifes b/app-misc/electricsheep/Manifes
deleted file mode 100644
index ef4b8e282..000000000
--- a/app-misc/electricsheep/Manifes
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST electricsheep-3.0.2_p20191005.tar.gz 11115290 BLAKE2B d952663864287a0081dd2b65dbe77e09ce8beb3c0693e8605a469244eaa21c441f159c6a74b5d5b1cf20151b9b8fe57ee20f4ef44d0f564c56aa9b84f33062bf SHA512 ef8138466d3f938eaf78e530e804f42947dd05c5d9511a091b67600b6719a9e70917594879668953d252a4cdfafd0f547ecbb2e23fe7dc610b959e2c04ac85e5
-DIST electricsheep-fix-boost181.patch 4434 BLAKE2B 2f85c2ff5e3e8f8b16796bd7be9fc2aee6040c3f14caa9a6125ad56cc196b4f9d0253071fa9183a65fc6d95aadcaa4fb45109c1a23cba97f8367fe09cbd7b874 SHA512 a728c6bfa4aff6e46f0b68136d65a59aca112e069f37843a9b4c58240470150df9624b7fe14e2965255599594e85b6ed516d9ac6dda2093753b1924fda8ddb09
-DIST electricsheep-fix-ffmpeg5.patch 48559 BLAKE2B 7d95632f4607c0f229ec907e5bce39bd2006ee73f0f31c43d8ac19c97f69f4ee49b51e340280a709259fc41e7514bc2dfe51579fab52431c6055883ac186dac7 SHA512 950c6e007549e51689f10a9ba2163b60fd97d7b2d6758a3931a05d329f981862058536303529d3daa06e9c061e76e3ea29f3e6ac3ab43919d94523cc760adfa1

diff --git a/app-misc/electricsheep/Manifest b/app-misc/electricsheep/Manifest
index 433f78d2b..0f60110b0 100644
--- a/app-misc/electricsheep/Manifest
+++ b/app-misc/electricsheep/Manifest
@@ -1,2 +1,2 @@
 DIST electricsheep-3.0.2_p20191005.tar.gz 11115290 BLAKE2B d952663864287a0081dd2b65dbe77e09ce8beb3c0693e8605a469244eaa21c441f159c6a74b5d5b1cf20151b9b8fe57ee20f4ef44d0f564c56aa9b84f33062bf SHA512 ef8138466d3f938eaf78e530e804f42947dd05c5d9511a091b67600b6719a9e70917594879668953d252a4cdfafd0f547ecbb2e23fe7dc610b959e2c04ac85e5
-DIST electricsheep-fix-ffmpeg5.patch 48559 BLAKE2B 7d95632f4607c0f229ec907e5bce39bd2006ee73f0f31c43d8ac19c97f69f4ee49b51e340280a709259fc41e7514bc2dfe51579fab52431c6055883ac186dac7 SHA512 950c6e007549e51689f10a9ba2163b60fd97d7b2d6758a3931a05d329f981862058536303529d3daa06e9c061e76e3ea29f3e6ac3ab43919d94523cc760adfa1
+DIST electricsheep-fix-ffmpeg5.patch 48619 BLAKE2B bed22bf7cdd07fd637ad621fc7f653d31e701757ffe2c6a72110076572a2cb1dce1d429ce8181f9af08a4e6d0792945c63937bb2e3a2defe5aacf5aa4cea74c8 SHA512 42ba5d5789e72632cb9ab5600166a45aea6c32b0a56d0da97b62b4298617fc8a7dbe36b6f3b73eb4ba3cb12369e19657f49a94d9f501861a0b6c30a888bec1cf

diff --git a/app-misc/electricsheep/electricsheep-3.0.2_p20191005.ebuild b/app-misc/electricsheep/electricsheep-3.0.2_p20191005.ebuild
deleted file mode 100644
index fbe2e12e0..000000000
--- a/app-misc/electricsheep/electricsheep-3.0.2_p20191005.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-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/"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scottdraves/electricsheep"
-	S="${WORKDIR}/${P}/client_generic"
-else
-	MY_COMMIT="37ba0fd692d6581f8fe009ed11c9650cd8174123"
-	SRC_URI="https://github.com/scottdraves/electricsheep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_COMMIT}/client_generic"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="video_cards_nvidia"
-
-DEPEND="dev-lang/lua:5.1
-	dev-libs/boost
-	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
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/wxGTK:${WX_GTK_VER}
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/electricsheep-glext-prototypes.patch"
-	"${FILESDIR}/electricsheep-disable-vsync.patch"
-)
-
-src_prepare() {
-	default
-	setup-wxwidgets
-	eautoreconf
-	rm -f DisplayOutput/OpenGL/{GLee.c,GLee.h}
-}
-
-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"
-
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-12-24 11:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-24 11:55 [gentoo-commits] repo/proj/guru:master commit in: app-misc/electricsheep/ David Roman
  -- strict thread matches above, loose matches on Subject: below --
2024-12-24 11:55 David Roman
2023-12-14 22:21 David Roman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox