Attachment #50966 for bug #77539

View | Details | Raw Unified | Return to bug 77539
Collapse All | Expand All




#

PORTNAME=	dvdauthor
PORTVERSION=	0.6.11
PORTREVISION=	3
CATEGORIES=	multimedia
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

.endif
.if defined(WITH_ICONV)
USE_ICONV=	yes
CONFIGURE_ENV+=	CFLAGS="-DICONV_CONV=yes"
.endif
.if defined(WITH_IMAGEMAGICK)
LIB_DEPENDS+=	Magick.7:${PORTSDIR}/graphics/ImageMagick

	${MKDIR} ${PREFIX}/share/doc/dvdauthor
	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdauthor
	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/dvdauthor
	${INSTALL_DATA} ${WRKSRC}/lib.txt ${PREFIX}/share/doc/dvdauthor
	${INSTALL_DATA} ${WRKSRC}/menu.txt ${PREFIX}/share/doc/dvdauthor
	for i in dvdauthor ex-title examples index languages manpages spumux; do \
		${INSTALL_DATA} ${WRKSRC}/doc/$$i.html ${PREFIX}/share/doc/dvdauthor; \
	done
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)dvdauthor/distinfo (-2 / +2 lines)
1	MD5 (dvdauthor-0.6.10.tar.gz) = e98243cd2a12bd723680dd49536f7318	1	MD5 (dvdauthor-0.6.11.tar.gz) = d2c45879e4cfb95d410bf603af891e07
2	SIZE (dvdauthor-0.6.10.tar.gz) = 240010	2	SIZE (dvdauthor-0.6.11.tar.gz) = 288452

Lines 1-10 Link Here

(-)dvdauthor/files/patch-Makefile.in (-10 lines)
1	--- Makefile.in.orig Thu Jan 15 20:42:47 2004
2	+++ Makefile.in Tue Jan 20 17:24:46 2004
3	@@ -13,6 +13,7 @@
4	FLEX=flex
5
6	CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\""
7	+LDFLAGS += -L@libdir@
8	LIBS = @LIBS@ @LIBICONV@
9	XML_LIBS = @XML_LIBS@
10	MAGICK_LIBS = @MAGICK_LIBS@

Lines 1-11 Link Here

(-)dvdauthor/files/patch-dvdvob.c (-11 lines)
1	--- src/dvdvob.c.orig Sun Mar 14 22:13:26 2004
2	+++ src/dvdvob.c Wed Aug 11 19:52:52 2004
3	@@ -1148,7 +1148,7 @@
4	printpts(pts1);
5	fprintf(stderr,"\n");
6	ach->audpts[ach->numaudpts-1].pts[1]=pts0;
7	- noshow:
8	+ noshow:;
9	}
10	ach->audpts[ach->numaudpts].pts[0]=pts0;
11	ach->audpts[ach->numaudpts].pts[1]=pts1;




--- src/readxml.c.orig	Fri Mar 12 23:57:39 2004
+++ src/readxml.c	Sun Dec  5 20:19:28 2004
@@ -221,13 +221,13 @@
 char *utf8tolocal(const char *in)
 {
     iconv_t c=get_conv();
-    int inlen=strlen(in);
-    int outlen=inlen*5;
+    size_t inlen=strlen(in);
+    size_t outlen=inlen*5;
     char *r=malloc(outlen+1);
     char *out=r;
-    int v;
+    size_t v;
 
-    v=iconv(c,ICONV_CAST &in,&inlen,&out,&outlen);
+    v=iconv(c,&in,&inlen,&out,&outlen);
     if(v==-1) {
         fprintf(stderr,"ERR:  Cannot convert UTF8 string '%s': %s\n",in,strerror(errno));
         exit(1);


Lines 1-11 Link Here

(-)dvdauthor/files/patch-subgen-image.c (-11 lines)
1	--- src/subgen-image.c.orig Sun Dec 19 22:38:27 2004
2	+++ src/subgen-image.c Sun Dec 19 22:38:44 2004
3	@@ -177,7 +177,7 @@
4	p.r=pdata[x*4];
5	p.g=pdata[x*4+1];
6	p.b=pdata[x*4+2];
7	- p.t=255-pdata[x*4+3];
8	+ p.t=pdata[x*4+3];
9	putpixel(s,y*s->width+x,&p);
10	}
11	}

Return to bug 77539

Lines 6-13 Link Here

(-)dvdauthor/Makefile (-7 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= dvdauthor	8	PORTNAME= dvdauthor
9	PORTVERSION= 0.6.10	9	PORTVERSION= 0.6.11
10	PORTREVISION= 3
11	CATEGORIES= multimedia	10	CATEGORIES= multimedia
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 48-53 Link Here
48	.endif	47	.endif
49	.if defined(WITH_ICONV)	48	.if defined(WITH_ICONV)
50	USE_ICONV= yes	49	USE_ICONV= yes
		50	CONFIGURE_ENV+= CFLAGS="-DICONV_CONV=yes"
51	.endif	51	.endif
52	.if defined(WITH_IMAGEMAGICK)	52	.if defined(WITH_IMAGEMAGICK)
53	LIB_DEPENDS+= Magick.7:${PORTSDIR}/graphics/ImageMagick	53	LIB_DEPENDS+= Magick.7:${PORTSDIR}/graphics/ImageMagick
Lines 78-88 Link Here
78	${MKDIR} ${PREFIX}/share/doc/dvdauthor	78	${MKDIR} ${PREFIX}/share/doc/dvdauthor
79	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdauthor	79	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdauthor
80	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/dvdauthor	80	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/dvdauthor
81	${INSTALL_DATA} ${WRKSRC}/lib.txt ${PREFIX}/share/doc/dvdauthor
82	${INSTALL_DATA} ${WRKSRC}/menu.txt ${PREFIX}/share/doc/dvdauthor
83	for i in dvdauthor ex-title examples index languages manpages spumux; do \
84	${INSTALL_DATA} ${WRKSRC}/doc/$$i.html ${PREFIX}/share/doc/dvdauthor; \
85	done
86	.endif	81	.endif
87		82
88	.include <bsd.port.post.mk>	83	.include <bsd.port.post.mk>

Lines 1-21 Link Here

(-)dvdauthor/files/patch-readxml.c (-21 lines)
1	--- src/readxml.c.orig Fri Mar 12 23:57:39 2004
2	+++ src/readxml.c Sun Dec 5 20:19:28 2004
3	@@ -221,13 +221,13 @@
4	char utf8tolocal(const char in)
5	{
6	iconv_t c=get_conv();
7	- int inlen=strlen(in);
8	- int outlen=inlen*5;
9	+ size_t inlen=strlen(in);
10	+ size_t outlen=inlen*5;
11	char *r=malloc(outlen+1);
12	char *out=r;
13	- int v;
14	+ size_t v;
15
16	- v=iconv(c,ICONV_CAST &in,&inlen,&out,&outlen);
17	+ v=iconv(c,&in,&inlen,&out,&outlen);
18	if(v==-1) {
19	fprintf(stderr,"ERR: Cannot convert UTF8 string '%s': %s\n",in,strerror(errno));
20	exit(1);
21