svn commit: r560847 - head/multimedia/dvdauthor

Tobias C. Berner tcberner at FreeBSD.org
Sat Jan 9 10:49:28 UTC 2021 

Author: tcberner
Date: Sat Jan  9 10:49:27 2021
New Revision: 560847
URL: https://svnweb.freebsd.org/changeset/ports/560847

Log:
  multimedia/dvdauthor: Fails to build if GraphicsMagick is installed
  
  Switch to using latest commit from github. The handling of the image magic dependency has been
  improved in [1] in 2017, but the software has not seen a release since.
  
  [1] https://github.com/ldo/dvdauthor/commit/a0d57bebb3a5d7259a0508a07a898cfe044155a1
  
  PR:		240270
  Submitted by:	VVD <vvd at unislabs.com>
  Reported by:	Ting-Wei Lan <lantw44 at gmail.com>

Modified:
  head/multimedia/dvdauthor/Makefile
  head/multimedia/dvdauthor/distinfo
  head/multimedia/dvdauthor/pkg-descr
  head/multimedia/dvdauthor/pkg-plist

Modified: head/multimedia/dvdauthor/Makefile
==============================================================================
--- head/multimedia/dvdauthor/Makefile	Sat Jan  9 10:36:03 2021	(r560846)
+++ head/multimedia/dvdauthor/Makefile	Sat Jan  9 10:49:27 2021	(r560847)
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	dvdauthor
-PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTVERSION=	0.7.2.20190419
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
@@ -20,9 +18,13 @@ LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_GITHUB=	yes
+GH_ACCOUNT=	ldo
+GH_TAGNAME=	d5bb0b
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
 
-USES=		gmake gnome iconv localbase pkgconfig
+USES=		autoreconf:build bison:alias gettext-tools \
+		gmake gnome iconv localbase pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 
@@ -30,27 +32,40 @@ SUB_FILES=	README.FreeBSD
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS IMAGEMAGICK
-OPTIONS_RADIO=	VIDEO-FORMAT
+OPTIONS_DEFINE=			DOCS MANPAGES
+OPTIONS_RADIO=			IMAGEMAGICK VIDEO-FORMAT
+OPTIONS_RADIO_IMAGEMAGICK=	GRAPHICSMAGICK IMAGEMAGICK6
 OPTIONS_RADIO_VIDEO-FORMAT=	NTSC PAL
+OPTIONS_SUB=			yes
 
-VIDEO-FORMAT_DESC=	Use default video format
-NTSC_DESC=	Default video format NTSC
-PAL_DESC=	Default video format PAL
+GRAPHICSMAGICK_DESC=		GraphicsMagick image processing support
+IMAGEMAGICK6_DESC=		ImageMagick 6.x image processing support
+NTSC_DESC=			Default video format NTSC
+PAL_DESC=			Default video format PAL
+VIDEO-FORMAT_DESC=		Use default video format
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
+GRAPHICSMAGICK_CONFIGURE_WITH=	graphicsmagick
+GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
+IMAGEMAGICK6_CONFIGURE_WITH=	imagemagick
+IMAGEMAGICK6_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick6
+MANPAGES_BUILD_DEPENDS=		docbook2man:textproc/docbook-utils
+NTSC_CONFIGURE_ON=		--enable-default-video-format=NTSC
+PAL_CONFIGURE_ON=		--enable-default-video-format=PAL
 
-NTSC_CONFIGURE_ON=	--enable-default-video-format=NTSC
-PAL_CONFIGURE_ON=	--enable-default-video-format=PAL
+pre-configure-MANPAGES-off:
+	@(${MV} ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.am.bak && \
+	 ${GREP} '^dist_pkgdata_DATA' \
+		${WRKSRC}/doc/Makefile.am.bak > ${WRKSRC}/doc/Makefile.am)
 
-pre-configure-IMAGEMAGICK-off:
-	@${REINPLACE_CMD} 's|usemagick=1|usemagick=0|g' \
-		${WRKSRC}/configure
+pre-configure:
+	@(cd ${WRKSRC} && ${MKDIR} autotools/ && \
+	 ${CP} ${LOCALBASE}/share/gettext/config.rpath autotools/ && \
+	 ${LOCALBASE}/bin/autoreconf -i)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} \
 		${WRKSRC}/AUTHORS ${WRKSRC}/ChangeLog ${WRKSRC}/README \
-		${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
+		${WRKSRC}/TODO ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/multimedia/dvdauthor/distinfo
==============================================================================
--- head/multimedia/dvdauthor/distinfo	Sat Jan  9 10:36:03 2021	(r560846)
+++ head/multimedia/dvdauthor/distinfo	Sat Jan  9 10:49:27 2021	(r560847)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494876457
-SHA256 (dvdauthor-0.7.2.tar.gz) = 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7
-SIZE (dvdauthor-0.7.2.tar.gz) = 648305
+TIMESTAMP = 1609892901
+SHA256 (ldo-dvdauthor-0.7.2.20190419-d5bb0b_GH0.tar.gz) = 50e8d117669dbc1b4d0cae4930ebae18973bd1ea9a5c6502487f38d80ef6bbab
+SIZE (ldo-dvdauthor-0.7.2.20190419-d5bb0b_GH0.tar.gz) = 252411

Modified: head/multimedia/dvdauthor/pkg-descr
==============================================================================
--- head/multimedia/dvdauthor/pkg-descr	Sat Jan  9 10:36:03 2021	(r560846)
+++ head/multimedia/dvdauthor/pkg-descr	Sat Jan  9 10:49:27 2021	(r560847)
@@ -1,4 +1,4 @@
 dvdauthor is a program that will generate a DVD movie from a valid
 mpeg2 stream that should play when you put it in a DVD player.
 
-WWW: http://dvdauthor.sourceforge.net/
+WWW: https://dvdauthor.sourceforge.net/ https://github.com/ldo/dvdauthor

Modified: head/multimedia/dvdauthor/pkg-plist
==============================================================================
--- head/multimedia/dvdauthor/pkg-plist	Sat Jan  9 10:36:03 2021	(r560846)
+++ head/multimedia/dvdauthor/pkg-plist	Sat Jan  9 10:49:27 2021	(r560847)
@@ -4,13 +4,13 @@ bin/dvdunauthor
 bin/mpeg2desc
 bin/spumux
 bin/spuunmux
-man/man1/dvdauthor.1.gz
-man/man1/dvddirdel.1.gz
-man/man1/dvdunauthor.1.gz
-man/man1/mpeg2desc.1.gz
-man/man1/spumux.1.gz
-man/man1/spuunmux.1.gz
-man/man7/video_format.7.gz
+%%MANPAGES%%man/man1/dvdauthor.1.gz
+%%MANPAGES%%man/man1/dvddirdel.1.gz
+%%MANPAGES%%man/man1/dvdunauthor.1.gz
+%%MANPAGES%%man/man1/mpeg2desc.1.gz
+%%MANPAGES%%man/man1/spumux.1.gz
+%%MANPAGES%%man/man1/spuunmux.1.gz
+%%MANPAGES%%man/man7/video_format.7.gz
 %%DATADIR%%/common.xsd
 %%DATADIR%%/dvdauthor.xsd
 %%DATADIR%%/spumux.xsd

More information about the svn-ports-head mailing list