pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

hasciicam: Update wip/hasciicam to 1.3 and modernize it.



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Nov 7 23:36:43 2015 +0100
Changeset:	2c12cff671cd6ee9ab0a5e8284172eaedb584616

Modified Files:
	hasciicam/Makefile
	hasciicam/distinfo
Added Files:
	hasciicam/PLIST
	hasciicam/TODO
	hasciicam/patches/patch-src_hasciicam.c

Log Message:
hasciicam: Update wip/hasciicam to 1.3 and modernize it.

pkgsrc changes:
 o Modernize the package and clean it up... Add PLIST, port it to NetBSD
 (probably it will work also on OpenBSD and other operating system that have
 <sys/videoio.h>).

Changes:
 No changes unfortunately are available and neither ChangeLog nor NEWS contain
 useful information apart ``arg. i never kept a ChangeLog of this software''
 and ``NO NEWS MEANS GOOD NEWS''. sigh.

TODO: it does not work with "-driver curses", only with "-driver x11".

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2c12cff671cd6ee9ab0a5e8284172eaedb584616

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 hasciicam/Makefile                      | 15 +++++++--------
 hasciicam/PLIST                         |  6 ++++++
 hasciicam/TODO                          |  2 ++
 hasciicam/distinfo                      |  7 +++++--
 hasciicam/patches/patch-src_hasciicam.c | 32 ++++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 10 deletions(-)

diffs:
diff --git a/hasciicam/Makefile b/hasciicam/Makefile
index 7b91539..3914037 100644
--- a/hasciicam/Makefile
+++ b/hasciicam/Makefile
@@ -1,22 +1,21 @@
 # $NetBSD: Makefile,v 1.8 2012/09/29 17:05:53 asau Exp $
 #
 
-DISTNAME=		hasciicam-0.9
+DISTNAME=		hasciicam_1.3
+PKGNAME=		${DISTNAME:S/_/-/}
 CATEGORIES=		graphics net
-MASTER_SITES=		http://ascii.dyne.org/ \
-			http://www.autistici.org/dyne/hasciicam/ \
-			http://freesoftware.fsf.org/download/hasciicam/
+MASTER_SITES=		https://files.dyne.org/hasciicam/
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://ascii.dyne.org/
 COMMENT=		Live ascii video on the web
+LICENSE=		gnu-gpl-v3
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 
-ONLY_FOR_PLATFORM=	Linux-*-*
-
-PKG_DESTDIR_SUPPORT=	none
+ONLY_FOR_PLATFORM=	Linux-*-* NetBSD-*-*
 
 .include "../../graphics/aalib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/hasciicam/PLIST b/hasciicam/PLIST
new file mode 100644
index 0000000..3ff57c2
--- /dev/null
+++ b/hasciicam/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD$
+bin/hasciicam
+man/man1/hasciicam.1
+share/applications/hasciicam.desktop
+share/icons/hasciicam.png
+share/menu/hasciicam
diff --git a/hasciicam/TODO b/hasciicam/TODO
new file mode 100644
index 0000000..089ee12
--- /dev/null
+++ b/hasciicam/TODO
@@ -0,0 +1,2 @@
+o hasciicam crashes if called (Memory fault (core dumped)) via "-driver curses"
+  options. Should be investigated further.
diff --git a/hasciicam/distinfo b/hasciicam/distinfo
index 163d23a..e970a11 100644
--- a/hasciicam/distinfo
+++ b/hasciicam/distinfo
@@ -1,4 +1,7 @@
 $NetBSD: distinfo,v 1.1.1.1 2003/06/03 14:30:19 poppnk Exp $
 
-SHA1 (hasciicam-0.9.tar.gz) = 75e31867074aa2c991b6ded5aa5caeebf6f51b3f
-Size (hasciicam-0.9.tar.gz) = 72134 bytes
+SHA1 (hasciicam_1.3.tar.gz) = 8eece108955afde6a364c0a3ab287c618e8333a4
+RMD160 (hasciicam_1.3.tar.gz) = 2917ff9a71bdd60ea2711bf9a65f3ee4720f3445
+SHA512 (hasciicam_1.3.tar.gz) = f500bbeb9d41cb1721956cca597b03a2012459596926ced3717fbfa9cb9f26b07bc5b653cf04956cfe668327a082fc9c0b8995eff39225a86394fbace2eb7a93
+Size (hasciicam_1.3.tar.gz) = 395117 bytes
+SHA1 (patch-src_hasciicam.c) = e91ce6760c9ebd216d61007e3f0115c12115a3e4
diff --git a/hasciicam/patches/patch-src_hasciicam.c b/hasciicam/patches/patch-src_hasciicam.c
new file mode 100644
index 0000000..c660a04
--- /dev/null
+++ b/hasciicam/patches/patch-src_hasciicam.c
@@ -0,0 +1,32 @@
+$NetBSD$
+
+o Avoid Linux-isms in order to support more operating systems that has
+<sys/videoio.h>.
+o Silent the warning:
+
+ hasciicam.c:183:1: warning: initialization from incompatible pointer type [enabled by default]
+  };
+  ^
+ hasciicam.c:183:1: warning: (near initialization for 'hascii_format.conversions') [enabled by default]
+
+--- src/hasciicam.c.orig	2014-09-16 13:34:57.000000000 +0000
++++ src/hasciicam.c
+@@ -42,8 +42,7 @@
+ #include <pwd.h>
+ #include <signal.h>
+ 
+-#include <linux/types.h>
+-#include <linux/videodev2.h>
++#include <sys/videoio.h>
+ 
+ #include <aalib.h>
+ 
+@@ -162,7 +161,7 @@ struct aa_savedata ascii_save;
+ 
+ char hascii_header[1024];
+ 
+-char *html_escapes[] =
++const char *html_escapes[] =
+   { "<", "&lt;", ">", "&gt;", "&", "&amp;", NULL };
+ 
+ struct aa_format hascii_format = {


Home | Main Index | Thread Index | Old Index