Update to 0.9, take maintainership. Changes (from NEWS): xzgv now uses GTK 2, with gdk-pixbuf as the image rendering back-end. imlib1 is no longer supported. Gamma, brightness and contrast are not currently supported. I've also included a fix for the "missing preview icons" problem (patch-ad). OK by wiz@.diff -r1.36 -r1.37 pkgsrc/graphics/xzgv/Makefile
(shattered)
| @@ -1,35 +1,30 @@ | @@ -1,35 +1,30 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.36 2008/03/04 15:39:11 jlam Exp $ | 1 | # $NetBSD: Makefile,v 1.37 2009/01/05 16:08:20 shattered Exp $ | |
| 2 | # | |||
| 2 | 3 | |||
| 3 | DISTNAME= xzgv-0.8 | 4 | DISTNAME= xzgv-0.9 | |
| 4 | PKGNAME= xzgv-0.8.0.1 | |||
| 5 | PKGREVISION= 3 | |||
| 6 | CATEGORIES= graphics | 5 | CATEGORIES= graphics | |
| 7 | MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/ | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xzgv/} | |
| 8 | 7 | |||
| 9 | PATCHFILES= xzgv-0.8-integer-overflow-fix.diff | 8 | MAINTAINER= shattered@NetBSD.org | |
| 10 | PATCH_SITES= http://rus.members.beeb.net/ | 9 | HOMEPAGE= http://sourceforge.net/projects/xzgv | |
| 11 | PATCH_DIST_STRIP= -p1 | |||
| 12 | ||||
| 13 | MAINTAINER= pkgsrc-users@NetBSD.org | |||
| 14 | HOMEPAGE= http://rus.members.beeb.net/xzgv.html | |||
| 15 | COMMENT= Image viewer | 10 | COMMENT= Image viewer | |
| 16 | 11 | |||
| 17 | PKG_DESTDIR_SUPPORT= user-destdir | 12 | PKG_DESTDIR_SUPPORT= user-destdir | |
| 18 | 13 | |||
| 19 | USE_X11BASE= yes | 14 | USE_X11BASE= yes | |
| 20 | USE_TOOLS+= gmake makeinfo | 15 | USE_TOOLS+= gmake makeinfo | |
| 21 | INFO_FILES= # PLIST | 16 | INFO_FILES= yes | |
| 22 | INSTALLATION_DIRS= bin ${PKGINFODIR} ${PKGMANDIR}/man1 | 17 | INSTALLATION_DIRS= bin ${PKGINFODIR} ${PKGMANDIR}/man1 | |
| 23 | 18 | |||
| 24 | do-install: | 19 | do-install: | |
| 25 | ${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${DESTDIR}${PREFIX}/bin | 20 | ${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${DESTDIR}${PREFIX}/bin | |
| 26 | ${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1 \ | 21 | ${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1 \ | |
| 27 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | 22 | ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | |
| 28 | @(cd ${WRKSRC}/doc && ${MAKEINFO} xzgv.texi) | 23 | @(cd ${WRKSRC}/doc && ${MAKEINFO} xzgv.texi) | |
| 29 | cd ${WRKSRC}/doc; for f in xzgv xzgv-[0-9]*; do \ | 24 | cd ${WRKSRC}/doc; for f in xzgv xzgv-[0-9]*; do \ | |
| 30 | ${TEST} ! -f "$$f" || \ | 25 | ${TEST} ! -f "$$f" || \ | |
| 31 | ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\ | 26 | ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\ | |
| 32 | done | 27 | done | |
| 33 | 28 | |||
| 34 | .include "../../graphics/imlib/buildlink3.mk" | 29 | .include "../../x11/gtk2/buildlink3.mk" | |
| 35 | .include "../../mk/bsd.pkg.mk" | 30 | .include "../../mk/bsd.pkg.mk" |
| @@ -1,11 +1,7 @@ | @@ -1,11 +1,7 @@ | |||
| 1 | $NetBSD: distinfo,v 1.9 2006/09/23 14:59:34 adrianp Exp $ | 1 | $NetBSD: distinfo,v 1.10 2009/01/05 16:08:20 shattered Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (xzgv-0.8-integer-overflow-fix.diff) = b18dfdaafe295e2c42764f59784b6b6201b489ea | 3 | SHA1 (xzgv-0.9.tar.gz) = 5d8115c87be3836d9ed35dba777cd1dc48541715 | |
| 4 | RMD160 (xzgv-0.8-integer-overflow-fix.diff) = bd75c87cf6f20e4fa2757afe472111e2253cb640 | 4 | RMD160 (xzgv-0.9.tar.gz) = 7c3284eac5a0a368db1be2ed87f882e26d39fab7 | |
| 5 | Size (xzgv-0.8-integer-overflow-fix.diff) = 6374 bytes | 5 | Size (xzgv-0.9.tar.gz) = 235367 bytes | |
| 6 | SHA1 (xzgv-0.8.tar.gz) = 1aa21336e2562849e6f5f984cbbfcb745489df3b | 6 | SHA1 (patch-aa) = fa502e0fc4fc94cfc88c4aa41505ac7563d982a6 | |
| 7 | RMD160 (xzgv-0.8.tar.gz) = e36466a73c27616610fd032b3a92898d95a55a17 | 7 | SHA1 (patch-ad) = 378e0c2e19064c2c276c6e0a3e89bdcbcc2c96c5 | |
| 8 | Size (xzgv-0.8.tar.gz) = 302801 bytes | |||
| 9 | SHA1 (patch-aa) = 7a0d6e6b24d788fb9cf45967e4c3b434c621def3 | |||
| 10 | SHA1 (patch-ab) = cf4c746e3c4b9ac3a5968211a8f2c0b69d43bc99 | |||
| 11 | SHA1 (patch-ac) = 3a67b625b6eabd0c6e2399fb0a59fde4460d3893 |
| @@ -1,33 +1,24 @@ | @@ -1,33 +1,24 @@ | |||
| 1 | $NetBSD: patch-aa,v 1.3 2001/08/23 15:56:41 jlam Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2009/01/05 16:08:20 shattered Exp $ | |
| 2 | 2 | |||
| 3 | --- config.mk.orig Sun Jan 7 23:57:44 2001 | 3 | --- config.mk.orig 2007-08-12 10:14:42.000000000 +0000 | |
| 4 | +++ config.mk | 4 | +++ config.mk | |
| 5 | @@ -6,8 +6,8 @@ | 5 | @@ -6,8 +6,8 @@ | |
| 6 | # Set the C compiler to use, and options for it. | 6 | # Set the C compiler to use, and options for it. | |
| 7 | # This is likely to be what you'll want for most systems: | 7 | # This is likely to be what you'll want for most systems: | |
| 8 | # | 8 | # | |
| 9 | -CC=gcc | 9 | -CC=gcc | |
| 10 | -CFLAGS=-O2 -Wall | 10 | -CFLAGS=-O2 -Wall | |
| 11 | +#CC=gcc | 11 | +#CC=gcc | |
| 12 | +#CFLAGS=-O2 -Wall | 12 | +#CFLAGS=-O2 -Wall | |
| 13 | 13 | |||
| 14 | # Set the awk interpreter to use for a script used while compiling. | 14 | # Set the awk interpreter to use for a script used while compiling. | |
| 15 | # (This should be a `new' awk, such as gawk or mawk.) | 15 | # (This should be a `new' awk, such as gawk or mawk.) | |
| 16 | @@ -27,7 +27,7 @@ | 16 | @@ -24,7 +24,7 @@ AWK=awk | |
| 17 | # On non-x86-based machines (e.g. Alpha, Sparc, PPC), you should | |||
| 18 | # comment it out. | |||
| 19 | # | |||
| 20 | -CFLAGS+=-DINTERP_MMX | |||
| 21 | +#CFLAGS+=-DINTERP_MMX | |||
| 22 | ||||
| 23 | # Set rendering backend to use. Currently only Imlib 1.x is properly | |||
| 24 | # supported, so leave this alone. :-) | |||
| 25 | @@ -45,7 +45,7 @@ | |||
| 26 | # MANDIR to directory for man page. | 17 | # MANDIR to directory for man page. | |
| 27 | # Usually it will be simpler to just set PREFIX. | 18 | # Usually it will be simpler to just set PREFIX. | |
| 28 | # | 19 | # | |
| 29 | -PREFIX=/usr/local | 20 | -PREFIX=/usr/local | |
| 30 | +#PREFIX=/usr/local | 21 | +#PREFIX=/usr/local | |
| 31 | 22 | BINDIR=$(PREFIX)/bin | ||
| 32 | # In theory it would be nice to put the info file and man page under | 23 | INFODIR=$(PREFIX)/share/info | |
| 33 | # /usr/local/share. However, it's not clear if this is widely | 24 | MANDIR=$(PREFIX)/share/man/man1 |
$NetBSD: patch-ad,v 1.1 2009/01/05 16:08:20 shattered Exp $
Proposed fix for "missing preview icons" problem, from
http://sourceforge.net/tracker/index.php?func=detail&aid=1814712&group_id=203093&atid=984206
--- src/main.c.orig 2007-09-09 00:36:21.000000000 +0000
+++ src/main.c
@@ -200,7 +200,7 @@ int orient_state_flip[8] ={2,3,0,1,6,7
/* required prototypes */
void render_pixmap(int reset_pos);
void cb_nextprev_tagged_image(int next,int view);
-void idle_xvpic_load(int *entryp);
+gint idle_xvpic_load(int *entryp);
gint pic_win_resized(GtkWidget *widget,GdkEventConfigure *event);
void cb_scaling_double(void);
void cb_xscaling_double(void);
@@ -2624,7 +2624,7 @@ else
}
-void idle_xvpic_load(int *entryp)
+gint idle_xvpic_load(int *entryp)
{
static char buf[1024];
struct clist_data_tag *datptr;
@@ -2748,6 +2748,7 @@ for(f=0;f<IDLE_XVPIC_NUM_PER_CALL;f++)
*entryp=-1;
}
}
+ return TRUE;
}