Date: Mon, 21 Jan 2019 07:36:45 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490823 - in head: . graphics graphics/electricsheep graphics/electricsheep/files Message-ID: <201901210736.x0L7ajHT067025@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Jan 21 07:36:44 2019 New Revision: 490823 URL: https://svnweb.freebsd.org/changeset/ports/490823 Log: Re-add port: Infinite evolving crowdsourced artwork Added: head/graphics/electricsheep/ - copied from r242387, head/x11/electricsheep/ head/graphics/electricsheep/files/patch-Client_Makefile.am (contents, props changed) head/graphics/electricsheep/files/patch-Client_Player.cpp (contents, props changed) head/graphics/electricsheep/files/patch-ContentDownloader_SheepDownloader.cpp (contents, props changed) head/graphics/electricsheep/files/patch-DisplayOutput_Image.h (contents, props changed) head/graphics/electricsheep/files/patch-DisplayOutput_LoadPNG.cpp (contents, props changed) head/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_FontGL.cpp (contents, props changed) head/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_glx.cpp (contents, props changed) head/graphics/electricsheep/files/patch-Makefile.am (contents, props changed) head/graphics/electricsheep/files/patch-configure.ac (contents, props changed) Deleted: head/graphics/electricsheep/files/patch-mpeg2dec_libvo_video_out_x11.c Modified: head/MOVED head/graphics/Makefile head/graphics/electricsheep/Makefile (contents, props changed) head/graphics/electricsheep/distinfo (contents, props changed) head/graphics/electricsheep/pkg-descr (contents, props changed) head/graphics/electricsheep/pkg-plist (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Mon Jan 21 07:30:55 2019 (r490822) +++ head/MOVED Mon Jan 21 07:36:44 2019 (r490823) @@ -824,7 +824,6 @@ audio/gmpc-autoplaylist||2009-09-24|Unmaintained upstr audio/gmpc-stopbutton||2009-09-24|Unmaintained upstream sysutils/zccron|sysutils/p5-ZConf-Cron|2009-09-27|Please use sysutils/p5-ZConf-Cron devel/p5-Cwd|devel/p5-PathTools|2009-09-30|Please use devel/p5-PathTools -x11/electricsheep||2009-10-02|No source tarball, Unix code unmaintained sysutils/fusefs-gphotofs||2009-10-05|Removed x11/kxgenerator||2009-10-07|Has expired: Project abandoned, master site disappeared hebrew/geresh||2009-10-08|No longer maintained upstream Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Mon Jan 21 07:30:55 2019 (r490822) +++ head/graphics/Makefile Mon Jan 21 07:36:44 2019 (r490823) @@ -155,6 +155,7 @@ SUBDIR += dynamechs SUBDIR += easypaint SUBDIR += edje_viewer + SUBDIR += electricsheep SUBDIR += electrix SUBDIR += embree SUBDIR += enblend Modified: head/graphics/electricsheep/Makefile ============================================================================== --- head/x11/electricsheep/Makefile Fri Oct 2 18:05:29 2009 (r242387) +++ head/graphics/electricsheep/Makefile Mon Jan 21 07:36:44 2019 (r490823) @@ -1,69 +1,46 @@ -# New ports collection makefile for: electricsheep -# Date created: 11 Feb 2002 -# Whom: David Yeske <dyeske@gmail.com> -# +# Created by: David Yeske <dyeske@gmail.com> # $FreeBSD$ -# PORTNAME= electricsheep -PORTVERSION= 2.6.8 -PORTREVISION= 7 +DISTVERSION= 2.7 # configure.ac says that the version is 2.7b33 PORTEPOCH= 1 -CATEGORIES= x11 -MASTER_SITES= http://electricsheep.org/ +CATEGORIES= graphics -MAINTAINER= dougb@FreeBSD.org -COMMENT= A nice distributed screensaver +MAINTAINER= yuri@FreeBSD.org +COMMENT= Infinite evolving crowdsourced artwork -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - jpeg.10:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png -RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \ - xsetbg:${PORTSDIR}/x11/xloadimage \ - curl:${PORTSDIR}/ftp/curl +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= No tarball for new versions, sheep server is gone -EXPIRATION_DATE= 2009-10-01 +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 \ + libpng16.so:graphics/png \ + libtinyxml.so:textproc/tinyxml +RUN_DEPENDS= flam3-animate:graphics/flam3 -MAKE_JOBS_SAFE= yes - -USE_SDL= sdl +USES= autoreconf dos2unix gl gnome libtool localbase:ldflags lua:51 pkgconfig gettext-runtime +USE_GITHUB= yes +GH_ACCOUNT= scottdraves +GH_TAGNAME= 4949c31 +DOS2UNIX_FILES= ContentDownloader/SheepDownloader.cpp DisplayOutput/OpenGL/glx.cpp GNU_CONFIGURE= yes -USE_XORG= x11 xau xdmcp xext xi xrandr xv sm ice +USE_WX= 3.1 +USE_GNOME= glib20 +USE_GL= gl glut +USE_XORG= x11 xrender -MAN1= electricsheep.1 +WRKSRC_SUBDIR= client_generic -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CFLAGS+= -DLINUX_GNU -I${LOCALBASE}/include/GL -I${LOCALBASE}/include/libavcodec -DSHAREDIR='\"${DATADIR}\"' -LIBTOOLFILES= configure mpeg2dec/configure flam3/configure +post-patch: # unbundle GLee + @${RM} ${WRKSRC}/DisplayOutput/OpenGL/GLee.* -.include <bsd.port.pre.mk> +post-install: + @${RM} -r ${STAGEDIR}${DOCSDIR}* ${STAGEDIR}${DATADIR}/icons -post-patch: - @${REINPLACE_CMD} -e \ - 's|/usr/X11R6/lib/xscreensaver/config|${LOCALBASE}/share/xscreensaver/config|' \ - ${WRKSRC}/Makefile.in - - @${REINPLACE_CMD} -e \ - 's|/usr/local/share|${DATADIR}|' \ - ${WRKSRC}/electricsheep.c - - @${REINPLACE_CMD} -e \ - 's|-Wall||; \ - s|CFLAGS=\$$OPT_CFLAGS|#CFLAGS=\$$OPT_CFLAGS|' \ - ${WRKSRC}/mpeg2dec/configure - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/electricsheep-voter ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/flam3/flam3-animate ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/flam3/flam3-convert ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/flam3/flam3-genome ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/flam3/flam3-render ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mpeg2dec/src/mpeg2dec_onroot ${PREFIX}/bin - @${INSTALL} -d -m 0755 ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/*.png ${DATADIR} - @${INSTALL_MAN} ${WRKSRC}/electricsheep.man ${PREFIX}/man/man1/electricsheep.1 - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/electricsheep/distinfo ============================================================================== --- head/x11/electricsheep/distinfo Fri Oct 2 18:05:29 2009 (r242387) +++ head/graphics/electricsheep/distinfo Mon Jan 21 07:36:44 2019 (r490823) @@ -1,3 +1,3 @@ -MD5 (electricsheep-2.6.8.tar.gz) = 5c3535a7c679d67d460c1d9e259a5d38 -SHA256 (electricsheep-2.6.8.tar.gz) = c593e4be3fc6674bfd77277e7e3326d48885b8b105f19221398f97a31d6698ba -SIZE (electricsheep-2.6.8.tar.gz) = 1355274 +TIMESTAMP = 1534644362 +SHA256 (scottdraves-electricsheep-2.7-4949c31_GH0.tar.gz) = 5d3eadf8b00abebc8d8ad7c84e10b12461990216f3f06af70a6748e25c04ff4c +SIZE (scottdraves-electricsheep-2.7-4949c31_GH0.tar.gz) = 10380806 Added: head/graphics/electricsheep/files/patch-Client_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-Client_Makefile.am Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,11 @@ +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 \ Added: head/graphics/electricsheep/files/patch-Client_Player.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-Client_Player.cpp Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,20 @@ +--- 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/"; + Added: head/graphics/electricsheep/files/patch-ContentDownloader_SheepDownloader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-ContentDownloader_SheepDownloader.cpp Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,14 @@ +--- ContentDownloader/SheepDownloader.cpp.orig 2018-05-31 14:38:12 UTC ++++ ContentDownloader/SheepDownloader.cpp +@@ -41,7 +41,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 Added: head/graphics/electricsheep/files/patch-DisplayOutput_Image.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-DisplayOutput_Image.h Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,11 @@ +--- 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__ Added: head/graphics/electricsheep/files/patch-DisplayOutput_LoadPNG.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-DisplayOutput_LoadPNG.cpp Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,11 @@ +--- 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__ Added: head/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_FontGL.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_FontGL.cpp Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,11 @@ +--- 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__ Added: head/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_glx.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-DisplayOutput_OpenGL_glx.cpp Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,24 @@ +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); ++ //} + } + + /* Added: head/graphics/electricsheep/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-Makefile.am Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,22 @@ +--- 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 + Added: head/graphics/electricsheep/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/electricsheep/files/patch-configure.ac Mon Jan 21 07:36:44 2019 (r490823) @@ -0,0 +1,29 @@ +--- 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]) + ]) + Modified: head/graphics/electricsheep/pkg-descr ============================================================================== --- head/x11/electricsheep/pkg-descr Fri Oct 2 18:05:29 2009 (r242387) +++ head/graphics/electricsheep/pkg-descr Mon Jan 21 07:36:44 2019 (r490823) @@ -1,8 +1,8 @@ -Electricsheep is a distributed screensaver. It realizes the +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 +animated 'sheep' appears. Behind the scenes, the screen-saver contacts an internet server and joins the parallel computation of new sheep. -WWW: http://www.electricsheep.org/ +WWW: https://electricsheep.org/ Modified: head/graphics/electricsheep/pkg-plist ============================================================================== --- head/x11/electricsheep/pkg-plist Fri Oct 2 18:05:29 2009 (r242387) +++ head/graphics/electricsheep/pkg-plist Mon Jan 21 07:36:44 2019 (r490823) @@ -1,10 +1,29 @@ bin/electricsheep -bin/electricsheep-voter -bin/mpeg2dec_onroot -bin/flam3-animate -bin/flam3-convert -bin/flam3-genome -bin/flam3-render +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 -@dirrm %%DATADIR%% +share/pixmaps/electricsheep.xpm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901210736.x0L7ajHT067025>