ports/171952: [PATCH] multimedia/dvdauthor: update to 0.7.1, take maintainership, OptionsNG

Tue Sep 25 14:40:01 UTC 2012

>Number:         171952
>Category:       ports
>Synopsis:       [PATCH] multimedia/dvdauthor: update to 0.7.1, take maintainership, OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 14:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed
- OptionsNG
- Clean install Documentation

- Update to 0.7.1
- Take maintainership

Added file(s):
- files/README.FreeBSD.in

Removed file(s):
- files/README.FreeBSD

- files/patch-spuunmux.c
In new Version is included
#include <zlib.h>
if (setjmp(png_jmpbuf(png_ptr)))

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
0 fatal errors and 1 warning found.

Build log RedPorts

https://redports.org/buildarchive/20120925084454-7407/

>Fix:

--- dvdauthor-0.7.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/dvdauthor/Makefile ./Makefile
--- /usr/ports/multimedia/dvdauthor/Makefile	2012-06-01 07:22:27.000000000 +0200
+++ ./Makefile	2012-09-25 16:19:58.000000000 +0200
@@ -6,64 +6,70 @@
 #
 
 PORTNAME=	dvdauthor
-PORTVERSION=	0.7.0
-PORTREVISION=	3
+PORTVERSION=	0.7.1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	nemysis at gmx.ch
 COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
-LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread \
-		fribidi.3:${PORTSDIR}/converters/fribidi \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		freetype.9:${PORTSDIR}/print/freetype2
+LICENSE=	GPLv2
 
-USE_BISON=	build
-USE_GMAKE=	yes
+LIB_DEPENDS=	dvdread:${PORTSDIR}/multimedia/libdvdread \
+		fribidi:${PORTSDIR}/converters/fribidi \
+		iconv:${PORTSDIR}/converters/libiconv \
+		freetype:${PORTSDIR}/print/freetype2 \
+		png15:${PORTSDIR}/graphics/png
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-WRKSRC=		${WRKDIR}/dvdauthor
-MAN1=	dvdauthor.1 dvddirdel.1 dvdunauthor.1 mpeg2desc.1 spumux.1 spuunmux.1
+USE_GMAKE=	yes
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	AUTHORS ChangeLog README TODO
 
-.if exists(${LOCALBASE}/lib/libfreetype.so.9)
-WITH_FREETYPE=		yes
-.endif
-.if exists(${LOCALBASE}/lib/libiconv.so)
-WITH_ICONV=		yes
+DOCSRCDIR2=	${WRKDIR}
+DOC_FILES2=	README.FreeBSD
+
+MAN1=		dvdauthor.1 dvddirdel.1 dvdunauthor.1 mpeg2desc.1 spumux.1 spuunmux.1
+
+OPTIONS_DEFINE=	VIDEO-FORMAT IMAGEMAGICK
+
+OPTIONS_SINGLE=	VIDEO-FORMAT
+OPTIONS_SINGLE_VIDEO-FORMAT=	NTSC PAL
+
+VIDEO-FORMAT_DESC=	Use default video format
+NTSC_DESC=	Default video format NTSC
+PAL_DESC=	Default video format PAL
+
+SUB_FILES=	README.FreeBSD
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNTSC}
+.if ${PORT_OPTIONS:MVIDEO-FORMAT}
+CONFIGURE_ENV+=	--enable-default-video-format=NTSC
 .endif
-.if exists(${LOCALBASE}/lib/libMagickWand.so.5)
-WITH_IMAGEMAGICK=	yes
 .endif
 
-.if defined(WITH_ICONV)
-USE_ICONV=	yes
-CFLAGS+=	-DICONV_CONV=yes
+.if ${PORT_OPTIONS:MPAL}
+.if ${PORT_OPTIONS:MVIDEO-FORMAT}
+CONFIGURE_ENV+=	--enable-default-video-format=PAL
 .endif
-.if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.5:${PORTSDIR}/graphics/ImageMagick
-.else
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .endif
 
-pre-everything::
-.if !defined(WITH_ICONV)
-	@${ECHO_MSG} "You can enable Iconv support by defining WITH_ICONV."
-	@${ECHO_MSG}
-.endif
-.if !defined(WITH_IMAGEMAGICK)
-	@${ECHO_MSG} "You can enable ImageMagick support by defining WITH_IMAGEMAGICK."
-	@${ECHO_MSG}
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
+LIB_DEPENDS+=	Magick:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/dvdauthor
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdauthor
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/dvdauthor
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/multimedia/dvdauthor/distinfo ./distinfo
--- /usr/ports/multimedia/dvdauthor/distinfo	2011-09-16 20:40:27.000000000 +0200
+++ ./distinfo	2012-09-25 00:06:22.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (dvdauthor-0.7.0.tar.gz) = aea6af7b99eba38ffa9dc5ad1521c2cc652e043cea0e7482e239d2a3fc2f34d0
-SIZE (dvdauthor-0.7.0.tar.gz) = 414191
+SHA256 (dvdauthor-0.7.1.tar.gz) = 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9
+SIZE (dvdauthor-0.7.1.tar.gz) = 421324
diff -ruN --exclude=CVS /usr/ports/multimedia/dvdauthor/files/README.FreeBSD ./files/README.FreeBSD
--- /usr/ports/multimedia/dvdauthor/files/README.FreeBSD	2003-10-22 23:20:02.000000000 +0200
+++ ./files/README.FreeBSD	1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-To create mpeg files suitable for a DVD, you can use the
-multimedia/transcode port.
-
-To encode video, use the following:
-	transcode -i .... -y mpeg2enc,null -w 9500 -F '8,-q6 -N -P' -o output
-
-This creates output.m2v, MPEG2 video at 9500Kbps (peak bitrate).
-Please refer to the man page of mpeg2desc for various encoder options
-(to be put after "-F '8,"), and to the MJPEG Tools Howto for useful
-hints.
-
-You can add "-J yuvdenoise" to reduce video noise before encoding,
-this yields very substantial gains in required bit rate.
-
-For audio:
-	transcode -i .... -y null,toolame -E 48000 -b 224 -o output
-This creates output.mp2, MPEG 1 Layer II audio, 48KHz, bitrate 224Kbps.
-
-Then multiplex the streams:
-	mplex -f 8 -o output.mpeg output.m2v output.mp2
-
-You can then use the resulting output.mpeg file with dvdauthor.
-
-Alternatively, you can use the bbmpeg codec which is faster but not
-as good in terms of quality, especially at low birates:
-	transcode -i .... -y mpeg -F d -E 48000 -b 224 -o output
-	tcmplex -i output.m2v -p output.mpa -m d -o output.mpeg
-
-Once your DVD is ready, you can use sysutils/dvd+rw-tools to burn
-it, or burncd(8) if it is a DVD+RW or DVD-RW.
-
-	Pierre Beyssac (pb at freebsd.org)
-
-Recommended reading:
-- mjpegtools home page
-	http://mjpeg.sourceforge.net/
-- mjpegtools howto
-	https://sourceforge.net/docman/display_doc.php?docid=3456&group_id=5776
-- transcode examples
-	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/html/index.html
-- "some thoughts on DVD authoring"
-	http://www.tappin.me.uk/Linux/dvd.html
-
diff -ruN --exclude=CVS /usr/ports/multimedia/dvdauthor/files/README.FreeBSD.in ./files/README.FreeBSD.in
--- /usr/ports/multimedia/dvdauthor/files/README.FreeBSD.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/README.FreeBSD.in	2003-10-22 23:20:02.000000000 +0200
@@ -0,0 +1,43 @@
+To create mpeg files suitable for a DVD, you can use the
+multimedia/transcode port.
+
+To encode video, use the following:
+	transcode -i .... -y mpeg2enc,null -w 9500 -F '8,-q6 -N -P' -o output
+
+This creates output.m2v, MPEG2 video at 9500Kbps (peak bitrate).
+Please refer to the man page of mpeg2desc for various encoder options
+(to be put after "-F '8,"), and to the MJPEG Tools Howto for useful
+hints.
+
+You can add "-J yuvdenoise" to reduce video noise before encoding,
+this yields very substantial gains in required bit rate.
+
+For audio:
+	transcode -i .... -y null,toolame -E 48000 -b 224 -o output
+This creates output.mp2, MPEG 1 Layer II audio, 48KHz, bitrate 224Kbps.
+
+Then multiplex the streams:
+	mplex -f 8 -o output.mpeg output.m2v output.mp2
+
+You can then use the resulting output.mpeg file with dvdauthor.
+
+Alternatively, you can use the bbmpeg codec which is faster but not
+as good in terms of quality, especially at low birates:
+	transcode -i .... -y mpeg -F d -E 48000 -b 224 -o output
+	tcmplex -i output.m2v -p output.mpa -m d -o output.mpeg
+
+Once your DVD is ready, you can use sysutils/dvd+rw-tools to burn
+it, or burncd(8) if it is a DVD+RW or DVD-RW.
+
+	Pierre Beyssac (pb at freebsd.org)
+
+Recommended reading:
+- mjpegtools home page
+	http://mjpeg.sourceforge.net/
+- mjpegtools howto
+	https://sourceforge.net/docman/display_doc.php?docid=3456&group_id=5776
+- transcode examples
+	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/html/index.html
+- "some thoughts on DVD authoring"
+	http://www.tappin.me.uk/Linux/dvd.html
+
diff -ruN --exclude=CVS /usr/ports/multimedia/dvdauthor/files/patch-spuunmux.c ./files/patch-spuunmux.c
--- /usr/ports/multimedia/dvdauthor/files/patch-spuunmux.c	2012-06-01 07:22:27.000000000 +0200
+++ ./files/patch-spuunmux.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
---- src/spuunmux.c.orig	2010-05-10 09:27:55.000000000 +0200
-+++ src/spuunmux.c	2012-04-27 10:44:31.000000000 +0200
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -610,7 +611,7 @@
-         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-         return -1;
-       } /*if*/
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-       {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         fclose(fp);
diff -ruN --exclude=CVS /usr/ports/multimedia/dvdauthor/pkg-plist ./pkg-plist
--- /usr/ports/multimedia/dvdauthor/pkg-plist	2005-12-27 03:14:54.000000000 +0100
+++ ./pkg-plist	2012-09-25 00:06:57.000000000 +0200
@@ -4,9 +4,13 @@
 bin/mpeg2desc
 bin/spumux
 bin/spuunmux
-share/dvdauthor/dvdauthor.xsd
-share/dvdauthor/spumux.xsd
- at dirrm share/dvdauthor
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%DATADIR%%/common.xsd
+%%DATADIR%%/dvdauthor.xsd
+%%DATADIR%%/spumux.xsd
+ at dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- dvdauthor-0.7.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

