<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7f8dd80dc009b4fda6ed79957fd46f7a85baac7a">https://github.com/macports/macports-ports/commit/7f8dd80dc009b4fda6ed79957fd46f7a85baac7a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7f8dd80dc00 dvdauthor: use pkgconfig to detect libxml2
</span>7f8dd80dc00 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7f8dd80dc009b4fda6ed79957fd46f7a85baac7a
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Aug 23 12:42:27 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> dvdauthor: use pkgconfig to detect libxml2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * apply upstream PR https://github.com/ldo/dvdauthor/pull/30
</span><span style='display:block; white-space:pre;color:#404040;'> * prevents unnecessary linking with icu
</span><span style='display:block; white-space:pre;color:#404040;'> * supercedes https://github.com/macports/macports-ports/pull/8191
</span>---
multimedia/dvdauthor/Portfile | 7 +-
.../files/use_pkgconfig_to_detect_libxml2.patch | 80 ++++++++++++++++++++++
2 files changed, 86 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/dvdauthor/Portfile b/multimedia/dvdauthor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 162be03c8bf..dd8bc00b3ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/dvdauthor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/dvdauthor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name dvdauthor
version 0.7.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories multimedia
platforms darwin
maintainers {perry.ch:maurice @robbyn}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,4 +40,9 @@ depends_lib port:libdvdread \
</span>
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles use_pkgconfig_to_detect_libxml2.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> installs_libs no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/dvdauthor/files/use_pkgconfig_to_detect_libxml2.patch b/multimedia/dvdauthor/files/use_pkgconfig_to_detect_libxml2.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..10604e59e31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/dvdauthor/files/use_pkgconfig_to_detect_libxml2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,80 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3afbe205d8346f7558b363005351ce95e17bf5f4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Hugh McMaster <hugh.mcmaster@outlook.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Feb 2020 23:44:23 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Use PKG_CHECK_MODULES to detect the libxml2 library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 8 +++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makefile.am | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 7 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1194059..9dd069f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_PROG_INSTALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_PROG_PKG_CONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SYS_LARGEFILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HEADER_STDBOOL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,6 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([freetype not found])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.6.0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_ENABLE([default-video-format],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_HELP_STRING([--enable-default-video-format=format], [specify a default video format, either NTSC or PAL, to be used if no configuration or input setting is given]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,11 +138,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_ICONV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifdef([AM_PATH_XML2],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AM_PATH_XML2(2.6.0, , AC_MSG_ERROR([You must have libxml2 >= 2.6.0 installed]))],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [errprint([You must have libxml2 (>= 2.6.0) installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-])m4_exit(1)AC_MSG_ERROR([You must have libxml2 (>= 2.6.0) installed])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_DECLS(O_BINARY, , , [ #include <fcntl.h> ] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_OUTPUT(Makefile doc/Makefile src/Makefile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/Makefile.am b/src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5ef90c3..5504b8e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -u src/Makefile.am.orig src/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am.orig 2016-10-24 17:26:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am 2020-08-26 17:39:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nodist_bin_SCRIPTS = dvddirdel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @XML2_CFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CFLAGS = -Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,17 +16,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dvdifo.c dvdvob.c dvdpgc.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dvdcli.c readxml.c readxml.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conffile.c conffile.h compat.c compat.h rgb.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dvdauthor_LDADD = $(LIBICONV) $(XML_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dvdauthor_LDADD = $(LIBICONV) $(XML2_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dvdunauthor_SOURCES = dvdunauthor.c dvduncompile.c common.h dvduncompile.h compat.c compat.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dvdunauthor_LDADD = $(XML_LIBS) $(LIBICONV) -ldvdread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dvdunauthor_LDADD = $(XML2_LIBS) $(LIBICONV) -ldvdread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spumux_SOURCES = subgen.c subgen.h rgb.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subgen-parse-xml.c readxml.c readxml.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subgen-encode.c subgen-image.c subglobals.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conffile.c conffile.h compat.c compat.h common.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subrender.c subrender.h subreader.c subreader.h subfont.c subfont.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-spumux_LDADD = $(XML_LIBS) $(MAGICK_LIBS) $(FREETYPE_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++spumux_LDADD = $(XML2_LIBS) $(MAGICK_LIBS) $(FREETYPE_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS) $(LIBICONV) -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spuunmux_SOURCES = spuunmux.c rgb.h compat.c compat.h common.h conffile.h conffile.c
</span></pre><pre style='margin:0'>
</pre>