git: aae39c476f7b - main - graphics/electricsheep: Remove expired port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Rene Ladan <rene_at_FreeBSD.org>
Date: Sat, 15 Jun 2024 16:10:04 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aae39c476f7bd6e01aea2b81cbc7aac1f8c08901

commit aae39c476f7bd6e01aea2b81cbc7aac1f8c08901
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-06-15 16:09:59 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-06-15 16:09:59 +0000

    graphics/electricsheep: Remove expired port
    
    2024-06-14 graphics/electricsheep: Broken for more than 6 months and fails to compile bumping it to latest commit
---
 MOVED                                              |  1 +
 graphics/Makefile                                  |  1 -
 graphics/electricsheep/Makefile                    | 50 ----------------
 graphics/electricsheep/distinfo                    |  3 -
 .../electricsheep/files/patch-Client_Makefile.am   | 11 ----
 .../electricsheep/files/patch-Client_Player.cpp    | 20 -------
 .../patch-ContentDownloader_SheepDownloader.cpp    | 67 ----------------------
 .../files/patch-DisplayOutput_Image.h              | 11 ----
 .../files/patch-DisplayOutput_LoadPNG.cpp          | 11 ----
 .../files/patch-DisplayOutput_OpenGL_FontGL.cpp    | 11 ----
 .../files/patch-DisplayOutput_OpenGL_glx.cpp       | 24 --------
 graphics/electricsheep/files/patch-Makefile.am     | 22 -------
 graphics/electricsheep/files/patch-configure.ac    | 29 ----------
 graphics/electricsheep/pkg-descr                   |  6 --
 graphics/electricsheep/pkg-plist                   | 29 ----------
 15 files changed, 1 insertion(+), 295 deletions(-)

diff --git a/MOVED b/MOVED
index 082a925beb1d..6ddca6c5698b 100644
--- a/MOVED
+++ b/MOVED
@@ -3308,3 +3308,4 @@ multimedia/audacious-qt6|multimedia/audacious|2024-06-13|qt6 flavor is now the d
 multimedia/audacious-plugins-qt6|multimedia/audacious-plugins|2024-06-13|qt6 flavor is now the default flavor, following upstream change
 lang/zig-devel||2024-06-13|Older than lang/zig and no consumers in ports
 www/ctemplate||2024-06-15|Has expired: Abandonware and obsolete, last release in 2008 and never gained any traction
+graphics/electricsheep||2024-06-15|Has expired: Broken for more than 6 months and fails to compile bumping it to latest commit
diff --git a/graphics/Makefile b/graphics/Makefile
index 3cd3a6c311ff..2efe3a4b6b2f 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -162,7 +162,6 @@
     SUBDIR += egl-wayland
     SUBDIR += eglexternalplatform
     SUBDIR += elastix
-    SUBDIR += electricsheep
     SUBDIR += elementary-photos
     SUBDIR += embree
     SUBDIR += enblend
diff --git a/graphics/electricsheep/Makefile b/graphics/electricsheep/Makefile
deleted file mode 100644
index e27a2edada19..000000000000
--- a/graphics/electricsheep/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME=	electricsheep
-DISTVERSION=	3.0.2.20191005 # configure.ac though says that the version is 2.7b33
-PORTREVISION=	12
-PORTEPOCH=	1
-CATEGORIES=	graphics
-
-MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	Infinite evolving crowdsourced artwork
-WWW=		https://electricsheep.org/
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 6 months and fails to compile bumping it to latest commit
-EXPIRATION_DATE=2024-06-14
-
-BUILD_DEPENDS=	flam3-animate:graphics/flam3
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libcurl.so:ftp/curl \
-		libavcodec.so:multimedia/ffmpeg \
-		libGLee.so:graphics/glee \
-		libgtop-2.0.so:devel/libgtop \
-		libpng.so:graphics/png \
-		libtinyxml.so:textproc/tinyxml
-RUN_DEPENDS=	flam3-animate:graphics/flam3
-
-USES=		autoreconf compiler:c++11-lang dos2unix gl gnome libtool \
-		localbase:ldflags lua:51 pkgconfig gettext-runtime xorg
-USE_GITHUB=	yes
-GH_ACCOUNT=	scottdraves
-GH_TAGNAME=	37ba0fd692d6581f8fe009ed11c9650cd8174123
-DOS2UNIX_FILES=	ContentDownloader/SheepDownloader.cpp DisplayOutput/OpenGL/glx.cpp
-GNU_CONFIGURE=	yes
-USE_WX=		3.2
-USE_GNOME=	glib20
-USE_GL=		gl glut
-USE_XORG=	x11 xrender
-
-WRKSRC_SUBDIR=	client_generic
-
-CFLAGS+=	-DLINUX_GNU -I${LOCALBASE}/include/GL -I${LOCALBASE}/include/libavcodec -DSHAREDIR='\"${DATADIR}\"'
-
-post-patch: # unbundle GLee
-	@${RM} ${WRKSRC}/DisplayOutput/OpenGL/GLee.*
-
-post-install:
-	@${RM} -r ${STAGEDIR}${DOCSDIR}* ${STAGEDIR}${DATADIR}/icons
-
-.include <bsd.port.mk>
diff --git a/graphics/electricsheep/distinfo b/graphics/electricsheep/distinfo
deleted file mode 100644
index 819089af9cd6..000000000000
--- a/graphics/electricsheep/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1601677601
-SHA256 (scottdraves-electricsheep-3.0.2.20191005-37ba0fd692d6581f8fe009ed11c9650cd8174123_GH0.tar.gz) = fd085c779408822ff8fa94b1614f916e328fb0d770befaf0314e7fb0f4620d46
-SIZE (scottdraves-electricsheep-3.0.2.20191005-37ba0fd692d6581f8fe009ed11c9650cd8174123_GH0.tar.gz) = 11115290
diff --git a/graphics/electricsheep/files/patch-Client_Makefile.am b/graphics/electricsheep/files/patch-Client_Makefile.am
deleted file mode 100644
index d3e753af0c1b..000000000000
--- a/graphics/electricsheep/files/patch-Client_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-Recommended in https://github.com/scottdraves/electricsheep/issues/72#issuecomment-455900619
---- Client/Makefile.am.orig	2019-01-20 20:50:29 UTC
-+++ Client/Makefile.am
-@@ -12,6 +12,7 @@ endif
- AM_CPPFLAGS = \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
-+	-DGL_GLEXT_PROTOTYPES \
- 	-I $(top_srcdir) \
- 	-iquote ../DisplayOutput/OpenGL \
- 	-I ../Common \
diff --git a/graphics/electricsheep/files/patch-Client_Player.cpp b/graphics/electricsheep/files/patch-Client_Player.cpp
deleted file mode 100644
index c63f376f4ebe..000000000000
--- a/graphics/electricsheep/files/patch-Client_Player.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Client/Player.cpp.orig	2018-07-14 21:10:29 UTC
-+++ Client/Player.cpp
-@@ -14,7 +14,7 @@
- #include	"GLee.h"
- #else
- #include <GLee.h>
--#include <endian.h>
-+#include <sys/endian.h>
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define __LITTLE_ENDIAN__ __LITTLE_ENDIAN
- #undef __BIG_ENDIAN__
-@@ -331,7 +331,7 @@ bool	CPlayer::Startup()
- #ifndef LINUX_GNU
- 	std::string	scriptRoot = g_Settings()->Get( "settings.app.InstallDir", std::string("./") ) + "Scripts";
- #else
--	std::string	scriptRoot = g_Settings()->Get( "settings.app.InstallDir", std::string(SHAREDIR) ) + "Scripts";
-+	std::string	scriptRoot = g_Settings()->Get( "settings.app.InstallDir", std::string(SHAREDIR) ) + "/Scripts";
- #endif
- 	std::string watchFolder = g_Settings()->Get( "settings.content.sheepdir", content ) + "/mpeg/";
- 
diff --git a/graphics/electricsheep/files/patch-ContentDownloader_SheepDownloader.cpp b/graphics/electricsheep/files/patch-ContentDownloader_SheepDownloader.cpp
deleted file mode 100644
index 960015b64b7b..000000000000
--- a/graphics/electricsheep/files/patch-ContentDownloader_SheepDownloader.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
---- ContentDownloader/SheepDownloader.cpp.orig	2020-10-02 21:49:58 UTC
-+++ ContentDownloader/SheepDownloader.cpp
-@@ -41,7 +42,10 @@
- #include <sys/param.h>
- #include <sys/mount.h>
- #endif
--#ifdef LINUX_GNU
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#elif defined(LINUX_GNU)
- #include <sys/statfs.h>
- #include <limits.h>
- #define MAX_PATH PATH_MAX
-@@ -780,7 +784,7 @@ void	SheepDownloader::findSheepToDownload()
- 			//	Make sure we are really deeply settled asleep, avoids lots of timed out frames.
- 			g_Log->Info( "Chilling for %d seconds before trying to download sheeps...", ContentDownloader::INIT_DELAY );
- 			
--			thread::sleep( get_system_time() + posix_time::seconds(ContentDownloader::INIT_DELAY) );
-+			boost::thread::sleep( get_system_time() + posix_time::seconds(ContentDownloader::INIT_DELAY) );
- 		}
- #endif
- 
-@@ -793,7 +797,7 @@ void	SheepDownloader::findSheepToDownload()
- 		while( 1 )
- 		{
- 
--			this_thread::interruption_point();
-+			boost::this_thread::interruption_point();
- 			bool incorrect_folder = false;
- #ifdef WIN32
- 			ULARGE_INTEGER winlpFreeBytesAvailable, winlpTotalNumberOfBytes, winlpRealBytesAvailable;
-@@ -820,14 +824,14 @@ void	SheepDownloader::findSheepToDownload()
- 					const char *err = "Content folder is not working.  Downloading disabled.\n";
- 					Shepherd::addMessageText( err, strlen(err), 180 ); //3 minutes
- 
--					thread::sleep( get_system_time() + posix_time::seconds(TIMEOUT) );
-+					boost::thread::sleep( get_system_time() + posix_time::seconds(TIMEOUT) );
- 				}
- 				else
- 				{
- 					const char *err = "Low disk space.  Downloading disabled.\n";
- 					Shepherd::addMessageText( err, strlen(err), 180 ); //3 minutes
- 
--					thread::sleep( get_system_time() + posix_time::seconds(TIMEOUT) );
-+					boost::thread::sleep( get_system_time() + posix_time::seconds(TIMEOUT) );
- 				
- 					boost::mutex::scoped_lock lockthis( s_DownloaderMutex );
- 
-@@ -938,7 +942,7 @@ void	SheepDownloader::findSheepToDownload()
- 								best_anim_old_url = fServerFlock[ static_cast<size_t>(best_anim_old) ]->URL();
- 							}
- 						}
--						this_thread::interruption_point();
-+						boost::this_thread::interruption_point();
- 					} while (best_anim != -1);
- 
- 					if (best_anim_old == -1)
-@@ -976,7 +980,7 @@ void	SheepDownloader::findSheepToDownload()
- 					badSheepSleepDuration = 10;
- 				}
- 
--				thread::sleep( get_system_time() + posix_time::seconds(failureSleepDuration) );
-+				boost::thread::sleep( get_system_time() + posix_time::seconds(failureSleepDuration) );
- 				
- 				//failureSleepDuration = TIMEOUT;
- 
diff --git a/graphics/electricsheep/files/patch-DisplayOutput_Image.h b/graphics/electricsheep/files/patch-DisplayOutput_Image.h
deleted file mode 100644
index 3f5860cf936a..000000000000
--- a/graphics/electricsheep/files/patch-DisplayOutput_Image.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- DisplayOutput/Image.h.orig	2018-06-21 01:41:46 UTC
-+++ DisplayOutput/Image.h
-@@ -8,7 +8,7 @@
- #include	"AlignedBuffer.h"
- 
- #ifdef LINUX_GNU
--#include <endian.h>
-+#include <sys/endian.h>
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define __LITTLE_ENDIAN__ __LITTLE_ENDIAN
- #undef __BIG_ENDIAN__
diff --git a/graphics/electricsheep/files/patch-DisplayOutput_LoadPNG.cpp b/graphics/electricsheep/files/patch-DisplayOutput_LoadPNG.cpp
deleted file mode 100644
index 1ba532868f60..000000000000
--- a/graphics/electricsheep/files/patch-DisplayOutput_LoadPNG.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- DisplayOutput/LoadPNG.cpp.orig	2018-06-21 01:42:42 UTC
-+++ DisplayOutput/LoadPNG.cpp
-@@ -5,7 +5,7 @@
- #include	"png.h"
- 
- #ifdef LINUX_GNU
--#include <endian.h>
-+#include <sys/endian.h>
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define __LITTLE_ENDIAN__ __LITTLE_ENDIAN
- #undef __BIG_ENDIAN__
diff --git a/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_FontGL.cpp b/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_FontGL.cpp
deleted file mode 100644
index 0144dfdbca8d..000000000000
--- a/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_FontGL.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- DisplayOutput/OpenGL/FontGL.cpp.orig	2018-06-21 01:42:17 UTC
-+++ DisplayOutput/OpenGL/FontGL.cpp
-@@ -5,7 +5,7 @@
- #include	<iostream>
- 
- #ifdef LINUX_GNU
--#include <endian.h>
-+#include <sys/endian.h>
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define __LITTLE_ENDIAN__ __LITTLE_ENDIAN
- #undef __BIG_ENDIAN__
diff --git a/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_glx.cpp b/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_glx.cpp
deleted file mode 100644
index ce22c9827a60..000000000000
--- a/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_glx.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-Recommended in https://github.com/scottdraves/electricsheep/issues/72#issuecomment-455900619
---- DisplayOutput/OpenGL/glx.cpp.orig	2019-01-20 21:32:07 UTC
-+++ DisplayOutput/OpenGL/glx.cpp
-@@ -466,13 +466,13 @@ void CUnixGL::toggleVSync()
- {
-     m_VSync = !m_VSync;
- 
--    if( GLEE_GLX_SGI_swap_control )
--    {
--        if( m_VSync )
--            glXSwapIntervalSGI(1);
--        else
--            glXSwapIntervalSGI(2);
--    }
-+    //if( GLEE_GLX_SGI_swap_control )
-+    //{
-+    //    if( m_VSync )
-+    //        glXSwapIntervalSGI(1);
-+    //    else
-+    //        glXSwapIntervalSGI(2);
-+    //}
- }
- 
- /*
diff --git a/graphics/electricsheep/files/patch-Makefile.am b/graphics/electricsheep/files/patch-Makefile.am
deleted file mode 100644
index 963f69b02a11..000000000000
--- a/graphics/electricsheep/files/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am.orig	2018-07-14 21:10:29 UTC
-+++ Makefile.am
-@@ -10,7 +10,7 @@ SUBDIRS = Client MSVC/SettingsGUI
- docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- sharedir = $(prefix)/share
- 
--gnome_screensaver_dir = /usr/lib/gnome-screensaver
-+gnome_screensaver_dir = $(prefix)/lib/gnome-screensaver
- 
- # add documentation files here
- doc_DATA = AUTHORS README NEWS ChangeLog Runtime/Instructions.rtf Runtime/License.rtf
-@@ -72,8 +72,8 @@ install-data-local:
- 	cp -f $(srcdir)/Runtime/TrebuchetMS-24.glf $(DESTDIR)$(sharedir)/electricsheep/
- 	mkdir -p $(DESTDIR)$(bindir)
- 	cp -f $(srcdir)/electricsheep-saver $(DESTDIR)$(bindir) && chmod a+rx $(DESTDIR)$(bindir)/electricsheep-saver
--	mkdir -p $(DESTDIR)/usr/share/applications/screensavers/
--	cp -f $(srcdir)/menu-entries/electricsheep-saver.desktop $(DESTDIR)/usr/share/applications/screensavers/electricsheep.desktop
-+	mkdir -p $(DESTDIR)$(prefix)/share/applications/screensavers/
-+	cp -f $(srcdir)/menu-entries/electricsheep-saver.desktop $(DESTDIR)$(prefix)/share/applications/screensavers/electricsheep.desktop
- 	mkdir -p $(DESTDIR)$(gnome_screensaver_dir)
- 	cp -f $(srcdir)/electricsheep-saver-gnome $(DESTDIR)$(gnome_screensaver_dir)/electricsheep-saver && chmod a+rx $(DESTDIR)$(gnome_screensaver_dir)/electricsheep-saver
- 
diff --git a/graphics/electricsheep/files/patch-configure.ac b/graphics/electricsheep/files/patch-configure.ac
deleted file mode 100644
index 51c80bf4555f..000000000000
--- a/graphics/electricsheep/files/patch-configure.ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.ac.orig	2018-07-14 21:10:29 UTC
-+++ configure.ac
-@@ -37,7 +37,7 @@ AC_SYS_LARGEFILE
- 
- AM_PROG_AS
- 
--ACX_PTHREAD(PTHREAD_OK=true,PTHREAD_OK=false)
-+PTHREAD_OK=true
- 
- IS_LINUX_GNU="false"
- 
-@@ -74,7 +74,7 @@ changequote([,])dnl
- dnl Check for WXWidgets
- WX_VER_291=""
- 
--AC_PATH_PROGS(WX_CONFIG, [wx-config-2.9 wx-config], no)
-+#AC_PATH_PROGS(WX_CONFIG, [wx-config-2.9 wx-config], no)
- 
- if test x$WX_CONFIG != xno; then
-    WX_VERSION=`$WX_CONFIG --version`
-@@ -164,7 +164,7 @@ AC_SUBST(AVUTIL_LIBS)
- 
- dnl Check for lua
- 
--PKG_CHECK_MODULES([LUA], [lua5.1],, 
-+PKG_CHECK_MODULES([LUA], [lua-5.1],, 
- 	[PKG_CHECK_MODULES([LUA], [lua >= 5.1])
- ])
- 
diff --git a/graphics/electricsheep/pkg-descr b/graphics/electricsheep/pkg-descr
deleted file mode 100644
index 10de1798a6eb..000000000000
--- a/graphics/electricsheep/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Electricsheep is a distributed screensaver. It realizes the
-collective dream of sleeping computers from all over the internet.
-When the screen-saver is activated, the screen goes black and an
-animated 'sheep' appears. Behind the scenes, the screen-saver
-contacts an internet server and joins the parallel computation of
-new sheep.
diff --git a/graphics/electricsheep/pkg-plist b/graphics/electricsheep/pkg-plist
deleted file mode 100644
index 04b75db2cbf2..000000000000
--- a/graphics/electricsheep/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/electricsheep
-bin/electricsheep-preferences
-bin/electricsheep-saver
-lib/gnome-screensaver/electricsheep-saver
-share/applications/ElectricSheep.desktop
-share/applications/screensavers/electricsheep.desktop
-%%DATADIR%%/Scripts/Dictionary/Deutsch.lua
-%%DATADIR%%/Scripts/Dictionary/English.lua
-%%DATADIR%%/Scripts/Dictionary/Portuguese.lua
-%%DATADIR%%/Scripts/Dictionary/Svenska.lua
-%%DATADIR%%/Scripts/class.lua
-%%DATADIR%%/Scripts/curltest.lua
-%%DATADIR%%/Scripts/desc.lua
-%%DATADIR%%/Scripts/histogram.lua
-%%DATADIR%%/Scripts/iup_config.lua
-%%DATADIR%%/Scripts/logging/console.lua
-%%DATADIR%%/Scripts/logging/file.lua
-%%DATADIR%%/Scripts/logging/localized.lua
-%%DATADIR%%/Scripts/logging/logging.lua
-%%DATADIR%%/Scripts/logging/null.lua
-%%DATADIR%%/Scripts/playlist.lua
-%%DATADIR%%/Scripts/pq.lua
-%%DATADIR%%/Scripts/serialize.lua
-%%DATADIR%%/TrebuchetMS-20.glf
-%%DATADIR%%/TrebuchetMS-24.glf
-%%DATADIR%%/electricsheep-attr.png
-%%DATADIR%%/electricsheep-frown.png
-%%DATADIR%%/electricsheep-smile.png
-share/pixmaps/electricsheep.xpm