pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
electricsheep-svn: Rename to electricsheep-git
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Sep 24 13:17:01 2016 +0200
Changeset: 7cbd0a3fc49e4c905da4b6ed02b1d94fe4f7f1f4
Modified Files:
Makefile
Added Files:
electricsheep-git/DESCR
electricsheep-git/Makefile
electricsheep-git/PLIST
electricsheep-git/distinfo
electricsheep-git/patches/patch-aa
Removed Files:
electricsheep-svn/DESCR
electricsheep-svn/Makefile
electricsheep-svn/PLIST
electricsheep-svn/distinfo
electricsheep-svn/patches/patch-aa
Log Message:
electricsheep-svn: Rename to electricsheep-git
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7cbd0a3fc49e4c905da4b6ed02b1d94fe4f7f1f4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
electricsheep-git/DESCR | 6 +++++
electricsheep-git/Makefile | 51 ++++++++++++++++++++++++++++++++++++++
electricsheep-git/PLIST | 7 ++++++
electricsheep-git/distinfo | 2 ++
electricsheep-git/patches/patch-aa | 43 ++++++++++++++++++++++++++++++++
electricsheep-svn/DESCR | 6 -----
electricsheep-svn/Makefile | 51 --------------------------------------
electricsheep-svn/PLIST | 7 ------
electricsheep-svn/distinfo | 2 --
electricsheep-svn/patches/patch-aa | 43 --------------------------------
11 files changed, 110 insertions(+), 110 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 525ad6d..7b6092f 100644
--- a/Makefile
+++ b/Makefile
@@ -615,7 +615,7 @@ SUBDIR+= eio
SUBDIR+= ekg2
SUBDIR+= ekiga
SUBDIR+= electricsheep
-SUBDIR+= electricsheep-svn
+SUBDIR+= electricsheep-git
SUBDIR+= electrum
SUBDIR+= elegent
SUBDIR+= elementary17
diff --git a/electricsheep-git/DESCR b/electricsheep-git/DESCR
new file mode 100644
index 0000000..16675be
--- /dev/null
+++ b/electricsheep-git/DESCR
@@ -0,0 +1,6 @@
+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/electricsheep-git/Makefile b/electricsheep-git/Makefile
new file mode 100644
index 0000000..80fafa4
--- /dev/null
+++ b/electricsheep-git/Makefile
@@ -0,0 +1,51 @@
+# $NetBSD: Makefile,v 1.6 2013/08/21 09:37:53 rhialto Exp $
+
+PKGNAME= electricsheep-2.7
+DISTNAME= electricsheep
+CATEGORIES= x11
+MASTER_SITES= http://electricsheep.org/
+
+MAINTAINER= rhialto%falu.nl@localhost
+HOMEPAGE= http://electricsheep.org/
+COMMENT= Distributed fractal flame screensaver
+
+DEPENDS+= curl>=7.12.1:../../www/curl
+DEPENDS+= mplayer-[0-9]*:../../multimedia/mplayer
+# If included install target is used, the next depencency is required.
+# (It is amazing how much junk that dependency pulls in.)
+# However, it doesn't respect $DESTDIR, and tries to use some undefined
+# command "update-gconf-defaults".
+#DEPENDS+= gnome-screensaver-[0-9]*:../../x11/gnome-screensaver
+
+USE_X11BASE= YES
+GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config gmake
+
+GIT_REPOSITORIES= client
+GIT_REPO.client= git%github.com@localhost:scottdraves/electricsheep.git
+
+WRKSRC= ${WRKDIR}/client
+
+SHARE_DIR= ${DESTDIR}/${PREFIX}/share/electricsheep
+
+do-install:
+ ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_MAN} ${WRKSRC}/electricsheep.man ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/electricsheep.1
+ ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${DESTDIR}/${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/electricsheep-preferences ${DESTDIR}/${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/electricsheep-saver ${DESTDIR}/${PREFIX}/bin
+ ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/share/electricsheep
+ ${INSTALL_DATA} ${WRKSRC}/electricsheep-preferences.glade ${SHARE_DIR}
+ ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
+ ${INSTALL_DATA} ${WRKSRC}/electricsheep.xml ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
+
+# for libavformat:
+.include "../../multimedia/ffmpeg010/buildlink3.mk"
+# Order for correct runtime loading:
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+#.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../wip/flam3-svn/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/electricsheep-git/PLIST b/electricsheep-git/PLIST
new file mode 100644
index 0000000..13ca59c
--- /dev/null
+++ b/electricsheep-git/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/31 17:27:49 rhialto Exp $
+bin/electricsheep
+bin/electricsheep-preferences
+bin/electricsheep-saver
+libexec/xscreensaver/config/electricsheep.xml
+man/man1/electricsheep.1
+share/electricsheep/electricsheep-preferences.glade
diff --git a/electricsheep-git/distinfo b/electricsheep-git/distinfo
new file mode 100644
index 0000000..fedffc5
--- /dev/null
+++ b/electricsheep-git/distinfo
@@ -0,0 +1,2 @@
+$NetBSD: distinfo,v 1.2 2012/10/21 09:54:14 noud4 Exp $
+SHA1 (patch-aa) = af29ab4642bc679dbd6512c7870693f89fb9b963
diff --git a/electricsheep-git/patches/patch-aa b/electricsheep-git/patches/patch-aa
new file mode 100644
index 0000000..43a1baf
--- /dev/null
+++ b/electricsheep-git/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1 2012/10/21 09:54:14 noud4 Exp $
+
+for libav>=0.7.1 conform
+http://patches.ubuntu.com/e/electricsheep/electricsheep_2.7~b12+svn20091224-1ubuntu3.patch
+
+--- electricsheep.c.orig 2012-10-21 09:26:28.000000000 +0000
++++ electricsheep.c 2012-10-21 09:51:53.000000000 +0000
+@@ -670,7 +670,7 @@
+ input_stream_index = -1;
+ for (j = 0; j < ictx->nb_streams; j++) {
+ AVCodecContext *enc = ictx->streams[j]->codec;
+- if (CODEC_TYPE_VIDEO == enc->codec_type) {
++ if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
+ input_stream_index = j;
+ break;
+ }
+@@ -696,7 +696,7 @@
+
+ output_ctx = avformat_alloc_context();
+
+- ofmt = guess_format(NULL, fname, NULL);
++ ofmt = av_guess_format(NULL, fname, NULL);
+ if (!ofmt) {
+ fprintf(logout, "could not determine format from %s.\n", fname);
+ exit(1);
+@@ -738,7 +738,7 @@
+ av_init_packet(&opkt);
+ if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
+ &opkt.data, &opkt.size, ipkt.data, ipkt.size,
+- ipkt.flags & PKT_FLAG_KEY))
++ ipkt.flags & AV_PKT_FLAG_KEY))
+ opkt.destruct= av_destruct_packet;
+
+ if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
+@@ -748,7 +748,7 @@
+ av_free_packet(&opkt);
+ av_free_packet(&ipkt);
+ }
+- av_close_input_file(ictx);
++ avformat_close_input(&ictx);
+ }
+
+ time_t search_time;
diff --git a/electricsheep-svn/DESCR b/electricsheep-svn/DESCR
deleted file mode 100644
index 16675be..0000000
--- a/electricsheep-svn/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/electricsheep-svn/Makefile b/electricsheep-svn/Makefile
deleted file mode 100644
index 80fafa4..0000000
--- a/electricsheep-svn/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2013/08/21 09:37:53 rhialto Exp $
-
-PKGNAME= electricsheep-2.7
-DISTNAME= electricsheep
-CATEGORIES= x11
-MASTER_SITES= http://electricsheep.org/
-
-MAINTAINER= rhialto%falu.nl@localhost
-HOMEPAGE= http://electricsheep.org/
-COMMENT= Distributed fractal flame screensaver
-
-DEPENDS+= curl>=7.12.1:../../www/curl
-DEPENDS+= mplayer-[0-9]*:../../multimedia/mplayer
-# If included install target is used, the next depencency is required.
-# (It is amazing how much junk that dependency pulls in.)
-# However, it doesn't respect $DESTDIR, and tries to use some undefined
-# command "update-gconf-defaults".
-#DEPENDS+= gnome-screensaver-[0-9]*:../../x11/gnome-screensaver
-
-USE_X11BASE= YES
-GNU_CONFIGURE= YES
-USE_TOOLS+= pkg-config gmake
-
-GIT_REPOSITORIES= client
-GIT_REPO.client= git%github.com@localhost:scottdraves/electricsheep.git
-
-WRKSRC= ${WRKDIR}/client
-
-SHARE_DIR= ${DESTDIR}/${PREFIX}/share/electricsheep
-
-do-install:
- ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_MAN} ${WRKSRC}/electricsheep.man ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/electricsheep.1
- ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${DESTDIR}/${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/electricsheep-preferences ${DESTDIR}/${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/electricsheep-saver ${DESTDIR}/${PREFIX}/bin
- ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/share/electricsheep
- ${INSTALL_DATA} ${WRKSRC}/electricsheep-preferences.glade ${SHARE_DIR}
- ${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
- ${INSTALL_DATA} ${WRKSRC}/electricsheep.xml ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
-
-# for libavformat:
-.include "../../multimedia/ffmpeg010/buildlink3.mk"
-# Order for correct runtime loading:
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-#.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../wip/flam3-svn/buildlink3.mk"
-.include "../../wip/mk/git-package.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/electricsheep-svn/PLIST b/electricsheep-svn/PLIST
deleted file mode 100644
index 13ca59c..0000000
--- a/electricsheep-svn/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/31 17:27:49 rhialto Exp $
-bin/electricsheep
-bin/electricsheep-preferences
-bin/electricsheep-saver
-libexec/xscreensaver/config/electricsheep.xml
-man/man1/electricsheep.1
-share/electricsheep/electricsheep-preferences.glade
diff --git a/electricsheep-svn/distinfo b/electricsheep-svn/distinfo
deleted file mode 100644
index fedffc5..0000000
--- a/electricsheep-svn/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-$NetBSD: distinfo,v 1.2 2012/10/21 09:54:14 noud4 Exp $
-SHA1 (patch-aa) = af29ab4642bc679dbd6512c7870693f89fb9b963
diff --git a/electricsheep-svn/patches/patch-aa b/electricsheep-svn/patches/patch-aa
deleted file mode 100644
index 43a1baf..0000000
--- a/electricsheep-svn/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/10/21 09:54:14 noud4 Exp $
-
-for libav>=0.7.1 conform
-http://patches.ubuntu.com/e/electricsheep/electricsheep_2.7~b12+svn20091224-1ubuntu3.patch
-
---- electricsheep.c.orig 2012-10-21 09:26:28.000000000 +0000
-+++ electricsheep.c 2012-10-21 09:51:53.000000000 +0000
-@@ -670,7 +670,7 @@
- input_stream_index = -1;
- for (j = 0; j < ictx->nb_streams; j++) {
- AVCodecContext *enc = ictx->streams[j]->codec;
-- if (CODEC_TYPE_VIDEO == enc->codec_type) {
-+ if (AVMEDIA_TYPE_VIDEO == enc->codec_type) {
- input_stream_index = j;
- break;
- }
-@@ -696,7 +696,7 @@
-
- output_ctx = avformat_alloc_context();
-
-- ofmt = guess_format(NULL, fname, NULL);
-+ ofmt = av_guess_format(NULL, fname, NULL);
- if (!ofmt) {
- fprintf(logout, "could not determine format from %s.\n", fname);
- exit(1);
-@@ -738,7 +738,7 @@
- av_init_packet(&opkt);
- if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec,
- &opkt.data, &opkt.size, ipkt.data, ipkt.size,
-- ipkt.flags & PKT_FLAG_KEY))
-+ ipkt.flags & AV_PKT_FLAG_KEY))
- opkt.destruct= av_destruct_packet;
-
- if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) {
-@@ -748,7 +748,7 @@
- av_free_packet(&opkt);
- av_free_packet(&ipkt);
- }
-- av_close_input_file(ictx);
-+ avformat_close_input(&ictx);
- }
-
- time_t search_time;
Home |
Main Index |
Thread Index |
Old Index