FreeBSD Bugzilla – Attachment 221363 Details for
Bug 240270
multimedia/dvdauthor: Fails to build if GraphicsMagick is installed (and IMAGEMAGICK=OFF)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update to last commit on github - fixed build with GraphicsMagick/ImageMagick (v5)
dvdauthor_v5.diff (text/plain), 4.46 KB, created by
Vladimir Druzenko
on 2021-01-07 18:42:51 UTC
(
hide
)
Description:
update to last commit on github - fixed build with GraphicsMagick/ImageMagick (v5)
Filename:
MIME Type:
Creator:
Vladimir Druzenko
Created:
2021-01-07 18:42:51 UTC
Size:
4.46 KB
patch
obsolete
>diff -ur multimedia/dvdauthor.orig/Makefile multimedia/dvdauthor/Makefile >--- multimedia/dvdauthor.orig/Makefile >+++ multimedia/dvdauthor/Makefile >@@ -2,10 +2,8 @@ > # $FreeBSD: head/multimedia/dvdauthor/Makefile 529240 2020-03-27 11:23:42Z martymac $ > > PORTNAME= dvdauthor >-PORTVERSION= 0.7.2 >-PORTREVISION= 2 >+PORTVERSION= 0.7.2.20190419 > CATEGORIES= multimedia >-MASTER_SITES= SF/${PORTNAME} > > MAINTAINER= ports@FreeBSD.org > COMMENT= Makes a DVD file structure from one or more MPEG2 streams >@@ -20,9 +18,13 @@ > 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 @@ > > 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> >diff -ur multimedia/dvdauthor.orig/distinfo multimedia/dvdauthor/distinfo >--- multimedia/dvdauthor.orig/distinfo >+++ multimedia/dvdauthor/distinfo >@@ -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 >diff -ur multimedia/dvdauthor.orig/pkg-descr multimedia/dvdauthor/pkg-descr >--- multimedia/dvdauthor.orig/pkg-descr >+++ multimedia/dvdauthor/pkg-descr >@@ -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 >diff -ur multimedia/dvdauthor.orig/pkg-plist multimedia/dvdauthor/pkg-plist >--- multimedia/dvdauthor.orig/pkg-plist >+++ multimedia/dvdauthor/pkg-plist >@@ -4,13 +4,13 @@ > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
vvd
:
maintainer-approval?
Actions:
View
|
Diff
Attachments on
bug 240270
:
207094
|
207189
|
207190
|
218457
|
218473
|
221267
|
221291
|
221313
|
221356
| 221363