<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[153443] trunk/dports/multimedia/audacious-core</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/153443">153443</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2016-09-30 04:15:18 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>multimedia/audacious-core: update to 3.8 including patchset.
Changes:
- Renamed patches to drop the file name and add a description of what they
do.
- Refreshed patches.
- Dropped the patch switching from -std=gnu++11 to -std=c++11 on OS X.
Enabling GNU extensions shouldn't Hurd.
- The Qt5 interface will now be regarded as a fully-qualified member,
as it matured quite a lot.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaaudaciouscorePortfile">trunk/dports/multimedia/audacious-core/Portfile</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchgtk3diff">trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchdroplibcdiff">trunk/dports/multimedia/audacious-core/files/patch-drop-libc++.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchupdatebuildsysandmakeverbosediff">trunk/dports/multimedia/audacious-core/files/patch-update-buildsys-and-make-verbose.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchacincludem4droplibcswitchfromgnu11toc11diff">trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchbuildsysdiff">trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaaudaciouscorePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/Portfile (153442 => 153443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/Portfile 2016-09-30 11:14:48 UTC (rev 153442)
+++ trunk/dports/multimedia/audacious-core/Portfile 2016-09-30 11:15:18 UTC (rev 153443)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> set real_name audacious
</span><span class="cx">
</span><span class="cx"> # Please keep audacious, audacious-core and audacious-plugins synchronized.
</span><del>-version 3.7.2
</del><ins>+version 3.8
</ins><span class="cx"> revision 0
</span><span class="cx">
</span><span class="cx"> license BSD
</span><span class="lines">@@ -32,15 +32,15 @@
</span><span class="cx"> master_sites http://distfiles.audacious-media-player.org
</span><span class="cx"> distname ${real_name}-${version}
</span><span class="cx"> use_bzip2 yes
</span><del>-checksums rmd160 83faedd98deea056f319bf7723d3e8cc7383ede5 \
- sha256 04f9eaba4522ce9674e6ed8afc7bd6b5fa9a1e240f8090589fc1874f6659f340
</del><ins>+checksums rmd160 63abcb3536a1bc88a8c3b9674d9d46b7519ec48c \
+ sha256 ffe8c0661dcb999598887e8ee05cd24faa7939086f5a8183fdba6210a95c4a71
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> conflicts_build ${name}
</span><span class="cx">
</span><del>-patchfiles patch-buildsys.diff \
- patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff
</del><ins>+patchfiles patch-update-buildsys-and-make-verbose.diff \
+ patch-drop-libc++.diff
</ins><span class="cx">
</span><span class="cx"> depends_build path:bin/pkg-config:pkgconfig \
</span><span class="cx"> path:bin/aclocal:automake \
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> --enable-qt
</span><span class="cx">
</span><span class="cx"> notes-append {
</span><del>- Qt5 support is optional and untested.
- If it breaks, you've got to keep the pieces.\
</del><ins>+ The Qt5 interface is known to crash upon exit, \
+ but should otherwise be functional.\
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchacincludem4droplibcswitchfromgnu11toc11diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff (153442 => 153443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff 2016-09-30 11:14:48 UTC (rev 153442)
+++ trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff 2016-09-30 11:15:18 UTC (rev 153443)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>---- acinclude.m4.orig
-+++ acinclude.m4
-@@ -83,8 +83,8 @@ AC_REQUIRE([AC_SYS_LARGEFILE])
- if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
- if test "x$HAVE_DARWIN" = "xyes"; then
-- CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
-- LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
-+ CXXFLAGS="$CXXFLAGS -std=c++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
-+ LDFLAGS="$LDFLAGS"
- else
- CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe -Wno-deprecated-declarations"
- fi
-@@ -101,7 +101,7 @@ if test "x$HAVE_DARWIN" = "xyes"; then
- AC_PROG_OBJCXX
- AC_PROG_OBJCXXCPP
-
-- OBJCXXFLAGS="$OBJCXXFLAGS -stdlib=libc++ -std=c++11"
-+ OBJCXXFLAGS="$OBJCXXFLAGS -std=c++11"
- fi
-
- dnl Enable "-Wl,-z,defs" only on Linux
</del></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchbuildsysdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff (153442 => 153443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff 2016-09-30 11:14:48 UTC (rev 153442)
+++ trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff 2016-09-30 11:15:18 UTC (rev 153443)
</span><span class="lines">@@ -1,670 +0,0 @@
</span><del>---- buildsys.mk.in.orig
-+++ buildsys.mk.in
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
-+# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- # Jonathan Schleifer <js@webkeks.org>
- #
- # https://webkeks.org/git/?p=buildsys.git
-@@ -45,6 +45,7 @@ OBJCFLAGS = @OBJCFLAGS@
- OBJCXXFLAGS = @OBJCXXFLAGS@
- LDFLAGS = @LDFLAGS@
- LDFLAGS_RPATH = @LDFLAGS_RPATH@
-+LDFLAGS_INSTALL_NAME = @LDFLAGS_INSTALL_NAME@
- LIBS = @LIBS@
- PYTHON_FLAGS = @PYTHON_FLAGS@
- PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@
-@@ -107,19 +108,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
-
- MO_FILES = ${LOCALES:.po=.mo}
-
--.SILENT:
- .SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
--.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
-+.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER}
-
- all:
-+ ${MAKE} pre-all
- ${MAKE} ${MFLAGS} subdirs
- ${MAKE} ${MFLAGS} depend
- ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
-+ ${MAKE} ${MFLAGS} subdirs-after
-+ ${MAKE} post-all
-+
-+pre-all post-all:
-
- subdirs: ${SUBDIRS}
-+subdirs-after: ${SUBDIRS_AFTER}
-
--${SUBDIRS}:
-+${SUBDIRS} ${SUBDIRS_AFTER}:
- for i in $@; do \
- ${DIR_ENTER}; \
- ${MAKE} ${MFLAGS} || exit $$?; \
-@@ -205,6 +211,7 @@ pre-depend:
-
- ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
- ${LINK_STATUS}
-+ out="$@"; \
- if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
- ${LINK_OK}; \
- else \
-@@ -228,7 +235,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
- fi
-
- ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
-- ${LINK_STATUS}; \
-+ ${LINK_STATUS}
-+ out="$@"; \
- objs=""; \
- ars=""; \
- for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
-@@ -252,7 +260,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
- done; \
- cd ..; \
- done; \
-- if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
-+ if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; then \
- ${LINK_OK}; \
- else \
- ${LINK_FAILED}; \
-@@ -264,6 +272,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
-
- ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
- ${LINK_STATUS}
-+ out="$@"; \
- objs=""; \
- ars=""; \
- for i in ${PLUGIN_OBJS}; do \
-@@ -300,6 +309,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
- ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
- ${LINK_STATUS}
- rm -f $@
-+ out="$@"; \
- objs=""; \
- ars=""; \
- for i in ${OBJS} ${OBJS_EXTRA}; do \
-@@ -337,6 +347,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
- ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
- ${LINK_STATUS}
- rm -f $@
-+ out="$@"; \
- objs=""; \
- ars=""; \
- for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
-@@ -375,21 +386,27 @@ locales: ${MO_FILES}
-
- .c.o:
- ${COMPILE_STATUS}
-- if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
- ${COMPILE_FAILED}; \
- fi
- .c.lib.o:
- ${COMPILE_LIB_STATUS}
-- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_LIB_OK}; \
- else \
- ${COMPILE_LIB_FAILED}; \
- fi
- .c.plugin.o:
- ${COMPILE_PLUGIN_STATUS}
-- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_PLUGIN_OK}; \
- else \
- ${COMPILE_PLUGIN_FAILED}; \
-@@ -397,21 +414,27 @@ locales: ${MO_FILES}
-
- .cc.o .cxx.o:
- ${COMPILE_STATUS}
-- if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
- ${COMPILE_FAILED}; \
- fi
- .cc.lib.o .cxx.lib.o:
- ${COMPILE_LIB_STATUS}
-- if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_LIB_OK}; \
- else \
- ${COMPILE_LIB_FAILED}; \
- fi
- .cc.plugin.o .cxx.plugin.o:
- ${COMPILE_PLUGIN_STATUS}
-- if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_PLUGIN_OK}; \
- else \
- ${COMPILE_PLUGIN_FAILED}; \
-@@ -419,6 +442,8 @@ locales: ${MO_FILES}
-
- .d.o:
- ${COMPILE_STATUS}
-+ in="$<"; \
-+ out="$@"; \
- if test x"$(basename ${DC})" = x"dmd"; then \
- if ${DC} ${DFLAGS} -c -of$@ $<; then \
- ${COMPILE_OK}; \
-@@ -435,6 +460,8 @@ locales: ${MO_FILES}
-
- .erl.beam:
- ${COMPILE_STATUS}
-+ in="$<"; \
-+ out="$@"; \
- if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
-@@ -443,6 +470,8 @@ locales: ${MO_FILES}
-
- .java.class:
- ${COMPILE_STATUS}
-+ in="$<"; \
-+ out="$@"; \
- if ${JAVAC} ${JAVACFLAGS} $<; then \
- ${COMPILE_OK}; \
- else \
-@@ -451,21 +480,27 @@ locales: ${MO_FILES}
-
- .m.o:
- ${COMPILE_STATUS}
-- if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
- ${COMPILE_FAILED}; \
- fi
- .m.lib.o:
- ${COMPILE_LIB_STATUS}
-- if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_LIB_OK}; \
- else \
- ${COMPILE_LIB_FAILED}; \
- fi
- .m.plugin.o:
- ${COMPILE_PLUGIN_STATUS}
-- if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_PLUGIN_OK}; \
- else \
- ${COMPILE_PLUGIN_FAILED}; \
-@@ -473,21 +508,27 @@ locales: ${MO_FILES}
-
- .mm.o:
- ${COMPILE_STATUS}
-- if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
- ${COMPILE_FAILED}; \
- fi
- .mm.lib.o:
- ${COMPILE_LIB_STATUS}
-- if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_LIB_OK}; \
- else \
- ${COMPILE_LIB_FAILED}; \
- fi
- .mm.plugin.o:
- ${COMPILE_PLUGIN_STATUS}
-- if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_PLUGIN_OK}; \
- else \
- ${COMPILE_PLUGIN_FAILED}; \
-@@ -495,6 +536,8 @@ locales: ${MO_FILES}
-
- .po.mo:
- ${COMPILE_STATUS}
-+ in="$<"; \
-+ out="$@"; \
- if ${MSGFMT} -c -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
-@@ -503,6 +546,8 @@ locales: ${MO_FILES}
-
- .py.pyc:
- ${COMPILE_STATUS}
-+ in="$<"; \
-+ out="$@"; \
- if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
- ${COMPILE_OK}; \
- else \
-@@ -511,7 +556,9 @@ locales: ${MO_FILES}
-
- .rc.o .rc.lib.o .rc.plugin.o:
- ${COMPILE_STATUS}
-- if ${WINDRES} -J rc -O coff -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
- ${COMPILE_FAILED}; \
-@@ -519,21 +566,27 @@ locales: ${MO_FILES}
-
- .S.o:
- ${COMPILE_STATUS}
-- if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${AS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
- ${COMPILE_FAILED}; \
- fi
- .S.lib.o:
- ${COMPILE_LIB_STATUS}
-- if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_LIB_OK}; \
- else \
- ${COMPILE_LIB_FAILED}; \
- fi
- .S.plugin.o:
- ${COMPILE_PLUGIN_STATUS}
-- if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
- ${COMPILE_PLUGIN_OK}; \
- else \
- ${COMPILE_PLUGIN_FAILED}; \
-@@ -541,28 +594,34 @@ locales: ${MO_FILES}
-
- .xpm.o:
- ${COMPILE_STATUS}
-- if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
- ${COMPILE_OK}; \
- else \
- ${COMPILE_FAILED}; \
- fi
- .xpm.lib.o:
- ${COMPILE_LIB_STATUS}
-- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
- ${COMPILE_LIB_OK}; \
- else \
- ${COMPILE_LIB_FAILED}; \
- fi
- .xpm.plugin.o:
- ${COMPILE_PLUGIN_STATUS}
-- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
-+ in="$<"; \
-+ out="$@"; \
-+ if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
- ${COMPILE_PLUGIN_OK}; \
- else \
- ${COMPILE_PLUGIN_FAILED}; \
- fi
-
--install: install-extra
-- for i in ${SUBDIRS}; do \
-+install: all install-extra
-+ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
- ${DIR_ENTER}; \
- ${MAKE} ${MFLAGS} install || exit $$?; \
- ${DIR_LEAVE}; \
-@@ -643,7 +702,7 @@ install: install-extra
- install-extra:
-
- uninstall: uninstall-extra
-- for i in ${SUBDIRS}; do \
-+ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
- ${DIR_ENTER}; \
- ${MAKE} ${MFLAGS} uninstall || exit $$?; \
- ${DIR_LEAVE}; \
-@@ -736,7 +795,7 @@ uninstall: uninstall-extra
- uninstall-extra:
-
- clean:
-- for i in ${SUBDIRS}; do \
-+ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
- ${DIR_ENTER}; \
- ${MAKE} ${MFLAGS} clean || exit $$?; \
- ${DIR_LEAVE}; \
-@@ -753,7 +812,7 @@ clean:
- done
-
- distclean: clean
-- for i in ${SUBDIRS}; do \
-+ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
- ${DIR_ENTER}; \
- ${MAKE} ${MFLAGS} distclean || exit $$?; \
- ${DIR_LEAVE}; \
-@@ -769,27 +828,39 @@ distclean: clean
- fi \
- done
-
--DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
--DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
-+print-hierarchy:
-+ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
-+ echo ${PRINT_HIERARCHY_PREFIX}$$i; \
-+ cd $$i || exit $$?; \
-+ ${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
-+ cd .. || exit $$?; \
-+ done
-+
-+print-var:
-+ printf '%s\n' '${${VAR}}'
-+
-+DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
-+DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
- DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
- DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n"
- DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
--COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
--COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
--COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r"
--COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n"
--COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
--COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
--COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
--COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
-+COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<"
-+COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<"
-+COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
-+COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<"
-+COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<"
-+COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
-+COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<"
-+COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<"
-+COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
- LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
- LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
- LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
--INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
--INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
--DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--
--include .deps
-+INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i"
-+INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i"
-+INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
-+DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i"
-+DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
-+
-+.CURDIR ?= .
-+include ${.CURDIR}/.deps
---- configure.ac.old
-+++ configure.ac
-@@ -8,6 +8,8 @@ AC_PREREQ([2.59])
- AC_INIT([audacious], [3.7.2])
- AC_COPYRIGHT([Copyright (C) 2001-2016 Audacious developers and others])
-
-+BUILDSYS_INIT
-+
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [Version number of package])
- AC_DEFINE_UNQUOTED(COPYRIGHT, "Copyright © 2001-2016 Audacious developers and others", [Copyright])
---- m4/buildsys.m4.orig
-+++ m4/buildsys.m4
-@@ -1,5 +1,5 @@
- dnl
--dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
-+dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- dnl Jonathan Schleifer <js@webkeks.org>
- dnl
- dnl https://webkeks.org/git/?p=buildsys.git
-@@ -21,65 +21,76 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- dnl POSSIBILITY OF SUCH DAMAGE.
- dnl
-
--AC_CONFIG_COMMANDS_PRE([
-- AC_SUBST(CC_DEPENDS, $GCC)
-- AC_SUBST(CXX_DEPENDS, $GXX)
-- AC_SUBST(OBJC_DEPENDS, $GOBJC)
-- AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
-+AC_DEFUN([BUILDSYS_INIT], [
-+ AC_CONFIG_COMMANDS_PRE([
-+ AC_SUBST(CC_DEPENDS, $GCC)
-+ AC_SUBST(CXX_DEPENDS, $GXX)
-+ AC_SUBST(OBJC_DEPENDS, $GOBJC)
-+ AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
-
-- AC_PATH_PROG(TPUT, tput)
-+ AC_PATH_PROG(TPUT, tput)
-
-- AS_IF([test x"$TPUT" != x""], [
-- if x=$($TPUT el 2>/dev/null); then
-- AC_SUBST(TERM_EL, "$x")
-- else
-- AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
-- fi
-+ AS_IF([test x"$TPUT" != x""], [
-+ if x=$($TPUT el 2>/dev/null); then
-+ AC_SUBST(TERM_EL, "$x")
-+ else
-+ AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
-+ fi
-
-- if x=$($TPUT sgr0 2>/dev/null); then
-- AC_SUBST(TERM_SGR0, "$x")
-- else
-- AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
-- fi
-+ if x=$($TPUT sgr0 2>/dev/null); then
-+ AC_SUBST(TERM_SGR0, "$x")
-+ else
-+ AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
-+ fi
-
-- if x=$($TPUT bold 2>/dev/null); then
-- AC_SUBST(TERM_BOLD, "$x")
-- else
-- AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
-- fi
-+ if x=$($TPUT bold 2>/dev/null); then
-+ AC_SUBST(TERM_BOLD, "$x")
-+ else
-+ AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
-+ fi
-
-- if x=$($TPUT setaf 1 2>/dev/null); then
-- AC_SUBST(TERM_SETAF1, "$x")
-- AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2 2>/dev/null)")
-- AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3 2>/dev/null)")
-- AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4 2>/dev/null)")
-- AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6 2>/dev/null)")
-- else
-- AC_SUBST(TERM_SETAF1, "$($TPUT AF 1 2>/dev/null)")
-- AC_SUBST(TERM_SETAF2, "$($TPUT AF 2 2>/dev/null)")
-- AC_SUBST(TERM_SETAF3, "$($TPUT AF 3 2>/dev/null)")
-- AC_SUBST(TERM_SETAF4, "$($TPUT AF 4 2>/dev/null)")
-- AC_SUBST(TERM_SETAF6, "$($TPUT AF 6 2>/dev/null)")
-- fi
-- ], [
-- AC_SUBST(TERM_EL, '\033\133K')
-- AC_SUBST(TERM_SGR0, '\033\133m')
-- AC_SUBST(TERM_BOLD, '\033\1331m')
-- AC_SUBST(TERM_SETAF1, '\033\13331m')
-- AC_SUBST(TERM_SETAF2, '\033\13332m')
-- AC_SUBST(TERM_SETAF3, '\033\13333m')
-- AC_SUBST(TERM_SETAF4, '\033\13334m')
-- AC_SUBST(TERM_SETAF6, '\033\13336m')
-+ if x=$($TPUT setaf 1 2>/dev/null); then
-+ AC_SUBST(TERM_SETAF1, "$x")
-+ AC_SUBST(TERM_SETAF2,
-+ "$($TPUT setaf 2 2>/dev/null)")
-+ AC_SUBST(TERM_SETAF3,
-+ "$($TPUT setaf 3 2>/dev/null)")
-+ AC_SUBST(TERM_SETAF4,
-+ "$($TPUT setaf 4 2>/dev/null)")
-+ AC_SUBST(TERM_SETAF6,
-+ "$($TPUT setaf 6 2>/dev/null)")
-+ else
-+ AC_SUBST(TERM_SETAF1,
-+ "$($TPUT AF 1 2>/dev/null)")
-+ AC_SUBST(TERM_SETAF2,
-+ "$($TPUT AF 2 2>/dev/null)")
-+ AC_SUBST(TERM_SETAF3,
-+ "$($TPUT AF 3 2>/dev/null)")
-+ AC_SUBST(TERM_SETAF4,
-+ "$($TPUT AF 4 2>/dev/null)")
-+ AC_SUBST(TERM_SETAF6,
-+ "$($TPUT AF 6 2>/dev/null)")
-+ fi
-+ ], [
-+ AC_SUBST(TERM_EL, '\033\133K')
-+ AC_SUBST(TERM_SGR0, '\033\133m')
-+ AC_SUBST(TERM_BOLD, '\033\1331m')
-+ AC_SUBST(TERM_SETAF1, '\033\13331m')
-+ AC_SUBST(TERM_SETAF2, '\033\13332m')
-+ AC_SUBST(TERM_SETAF3, '\033\13333m')
-+ AC_SUBST(TERM_SETAF4, '\033\13334m')
-+ AC_SUBST(TERM_SETAF6, '\033\13336m')
-+ ])
- ])
--])
-
--AC_CONFIG_COMMANDS_POST([
-- ${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
-- for i in $(find . -name Makefile); do
-- DEPSFILE="$(dirname $i)/.deps"
-- test -f "$DEPSFILE" && rm "$DEPSFILE"
-- touch -t 0001010000 "$DEPSFILE"
-- done
-+ AC_CONFIG_COMMANDS_POST([
-+ ${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
-+ for i in $(find . -name Makefile); do
-+ DEPSFILE="$(dirname $i)/.deps"
-+ test -f "$DEPSFILE" && rm "$DEPSFILE"
-+ touch -t 0001010000 "$DEPSFILE"
-+ done
-+ ])
- ])
-
- AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
-@@ -108,31 +119,32 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
- case "$host_os" in
- darwin*)
- AC_MSG_RESULT(Darwin)
-- LIB_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
-- LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -mmacosx-version-min=10.7 -install_name "${libdir}/$$(i=${SHARED_LIB}; echo $${i%${LIB_SUFFIX}}).${LIB_MAJOR}${LIB_SUFFIX}"'
-+ LIB_CFLAGS='-fPIC -DPIC'
-+ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
- LIB_PREFIX='lib'
- LIB_SUFFIX='.dylib'
- LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-- PLUGIN_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
-- PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup -mmacosx-version-min=10.7'
-+ LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
-+ PLUGIN_CFLAGS='-fPIC -DPIC'
-+ PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
- PLUGIN_SUFFIX='.bundle'
- INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
- UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
- CLEAN_LIB=''
- ;;
-- solaris*)
-- AC_MSG_RESULT(Solaris)
-- LIB_CFLAGS='-fPIC -DPIC'
-- LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
-+ mingw* | cygwin*)
-+ AC_MSG_RESULT(MinGW / Cygwin)
-+ LIB_CFLAGS=''
-+ LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
- LIB_PREFIX='lib'
-- LIB_SUFFIX='.so'
-+ LIB_SUFFIX='.dll'
- LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-- PLUGIN_CFLAGS='-fPIC -DPIC'
-+ PLUGIN_CFLAGS=''
- PLUGIN_LDFLAGS='-shared'
-- PLUGIN_SUFFIX='.so'
-- INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
-- UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-- CLEAN_LIB=''
-+ PLUGIN_SUFFIX='.dll'
-+ INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
-+ UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
-+ CLEAN_LIB='${SHARED_LIB}.a'
- ;;
- openbsd* | mirbsd*)
- AC_MSG_RESULT(OpenBSD)
-@@ -148,22 +160,22 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
- UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
- CLEAN_LIB=''
- ;;
-- cygwin* | mingw*)
-- AC_MSG_RESULT(Win32)
-- LIB_CFLAGS=''
-- LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
-+ solaris*)
-+ AC_MSG_RESULT(Solaris)
-+ LIB_CFLAGS='-fPIC -DPIC'
-+ LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
- LIB_PREFIX='lib'
-- LIB_SUFFIX='.dll'
-+ LIB_SUFFIX='.so'
- LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-- PLUGIN_CFLAGS=''
-+ PLUGIN_CFLAGS='-fPIC -DPIC'
- PLUGIN_LDFLAGS='-shared'
-- PLUGIN_SUFFIX='.dll'
-- INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
-- UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
-- CLEAN_LIB='${SHARED_LIB}.a'
-+ PLUGIN_SUFFIX='.so'
-+ INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
-+ UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-+ CLEAN_LIB=''
- ;;
- *)
-- AC_MSG_RESULT(GNU)
-+ AC_MSG_RESULT(ELF)
- LIB_CFLAGS='-fPIC -DPIC'
- LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
- LIB_PREFIX='lib'
-@@ -183,6 +195,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
- AC_SUBST(LIB_PREFIX)
- AC_SUBST(LIB_SUFFIX)
- AC_SUBST(LDFLAGS_RPATH)
-+ AC_SUBST(LDFLAGS_INSTALL_NAME)
- AC_SUBST(PLUGIN_CFLAGS)
- AC_SUBST(PLUGIN_LDFLAGS)
- AC_SUBST(PLUGIN_SUFFIX)
</del></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchdroplibcdifffromrev153442trunkdportsmultimediaaudaciouscorefilespatchacincludem4droplibcswitchfromgnu11toc11diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/audacious-core/files/patch-drop-libc++.diff (from rev 153442, trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff) (0 => 153443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-drop-libc++.diff (rev 0)
+++ trunk/dports/multimedia/audacious-core/files/patch-drop-libc++.diff 2016-09-30 11:15:18 UTC (rev 153443)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+--- acinclude.m4.old
++++ acinclude.m4
+@@ -83,8 +83,8 @@ AC_REQUIRE([AC_SYS_LARGEFILE])
+ if test "x$GCC" = "xyes"; then
+ CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
+ if test "x$HAVE_DARWIN" = "xyes"; then
+- CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
+- LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
++ CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
++ LDFLAGS="$LDFLAGS"
+ else
+ CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
+ fi
+@@ -101,7 +101,7 @@ if test "x$HAVE_DARWIN" = "xyes"; then
+ AC_PROG_OBJCXX
+ AC_PROG_OBJCXXCPP
+
+- OBJCXXFLAGS="$OBJCXXFLAGS -stdlib=libc++ -std=c++11"
++ OBJCXXFLAGS="$OBJCXXFLAGS -std=c++11"
+ fi
+
+ dnl Enable "-Wl,-z,defs" only on Linux
</ins></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchgtk3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff (153442 => 153443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff 2016-09-30 11:14:48 UTC (rev 153442)
+++ trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff 2016-09-30 11:15:18 UTC (rev 153443)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> --- src/libaudgui/eq-preset.cc.old
</span><span class="cx"> +++ src/libaudgui/eq-preset.cc
</span><del>-@@ -241,16 +241,16 @@ static GtkWidget * create_eq_preset_window ()
</del><ins>+@@ -240,16 +240,16 @@ static GtkWidget * create_eq_preset_window ()
</ins><span class="cx">
</span><span class="cx"> g_signal_connect (window, "destroy", (GCallback) cleanup_eq_preset_window, nullptr);
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 0);
</span><span class="cx">
</span><span class="cx"> entry = gtk_entry_new ();
</span><del>-@@ -275,7 +275,7 @@ static GtkWidget * create_eq_preset_window ()
</del><ins>+@@ -274,7 +274,7 @@ static GtkWidget * create_eq_preset_window ()
</ins><span class="cx"> audgui_list_add_column (list, nullptr, 0, G_TYPE_STRING, -1);
</span><span class="cx"> gtk_container_add ((GtkContainer *) scrolled, list);
</span><span class="cx">
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) window, vbox);
</span><span class="cx">
</span><span class="cx"> GtkWidget * chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
</span><del>-@@ -110,17 +109,24 @@ static GtkWidget * create_filebrowser (gboolean open)
</del><ins>+@@ -111,17 +110,24 @@ static GtkWidget * create_filebrowser (gboolean open)
</ins><span class="cx"> if (path[0])
</span><span class="cx"> gtk_file_chooser_set_current_folder ((GtkFileChooser *) chooser, path);
</span><span class="cx">
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> }
</span><span class="cx"> --- src/libaudgui/infowin.cc.old
</span><span class="cx"> +++ src/libaudgui/infowin.cc
</span><del>-@@ -133,7 +133,7 @@ static GtkWidget * small_label_new (const char * text)
</del><ins>+@@ -134,7 +134,7 @@ static GtkWidget * small_label_new (const char * text)
</ins><span class="cx">
</span><span class="cx"> GtkWidget * label = gtk_label_new (text);
</span><span class="cx"> gtk_label_set_attributes ((GtkLabel *) label, attrs);
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> return label;
</span><span class="cx"> }
</span><del>-@@ -287,10 +287,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
</del><ins>+@@ -286,10 +286,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
</ins><span class="cx"> {
</span><span class="cx"> GtkWidget * label = small_label_new (title);
</span><span class="cx">
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> g_signal_connect (entry, "changed", (GCallback) entry_changed, nullptr);
</span><span class="cx"> }
</span><del>-@@ -305,44 +306,41 @@ static void create_infowin ()
</del><ins>+@@ -304,44 +305,41 @@ static void create_infowin ()
</ins><span class="cx"> gtk_window_set_type_hint ((GtkWindow *) infowin,
</span><span class="cx"> GDK_WINDOW_TYPE_HINT_DIALOG);
</span><span class="cx">
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> widgets.title = gtk_entry_new ();
</span><span class="cx"> gtk_widget_set_size_request (widgets.title, 3 * dpi, -1);
</span><del>-@@ -370,9 +368,8 @@ static void create_infowin ()
</del><ins>+@@ -369,9 +367,8 @@ static void create_infowin ()
</ins><span class="cx"> widgets.track = gtk_entry_new ();
</span><span class="cx"> add_entry (grid, _("Track Number"), widgets.track, 1, 12, 1);
</span><span class="cx">
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> GtkWidget * toggle = gtk_check_button_new_with_mnemonic (_("C_lose on jump"));
</span><span class="cx"> --- src/libaudgui/list.cc.old
</span><span class="cx"> +++ src/libaudgui/list.cc
</span><del>-@@ -385,7 +385,7 @@ static void autoscroll (void * widget)
</del><ins>+@@ -389,7 +389,7 @@ static void autoscroll (void * widget)
</ins><span class="cx"> ListModel * model = (ListModel *) gtk_tree_view_get_model
</span><span class="cx"> ((GtkTreeView *) widget);
</span><span class="cx">
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> g_return_if_fail (adj);
</span><span class="cx">
</span><span class="cx"> int pos, end;
</span><del>-@@ -402,7 +402,7 @@ static void autoscroll (void * widget)
</del><ins>+@@ -406,7 +406,7 @@ static void autoscroll (void * widget)
</ins><span class="cx">
</span><span class="cx"> static void start_autoscroll (ListModel * model, GtkWidget * widget, int speed)
</span><span class="cx"> {
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> g_return_if_fail (adj);
</span><span class="cx">
</span><span class="cx"> int pos, end;
</span><del>-@@ -532,6 +532,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
</del><ins>+@@ -534,6 +534,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
</ins><span class="cx">
</span><span class="cx"> static void destroy_cb (GtkWidget * list, ListModel * model)
</span><span class="cx"> {
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> static void widget_changed (GtkWidget * widget, const PreferencesWidget * w)
</span><span class="cx"> {
</span><span class="cx"> switch (w->type)
</span><del>-@@ -181,7 +185,7 @@ static void create_label (const PreferencesWidget * widget, GtkWidget * * label,
</del><ins>+@@ -200,7 +204,7 @@ static void create_label (const PreferencesWidget * widget, GtkWidget * * label,
</ins><span class="cx"> * label = gtk_label_new_with_mnemonic (dgettext (domain, widget->label));
</span><span class="cx"> gtk_label_set_use_markup ((GtkLabel *) * label, true);
</span><span class="cx"> gtk_label_set_line_wrap ((GtkLabel *) * label, true);
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* WIDGET_SPIN_BTN */
</span><del>-@@ -193,7 +197,7 @@ static void create_spin_button (const PreferencesWidget * widget,
</del><ins>+@@ -212,7 +216,7 @@ static void create_spin_button (const PreferencesWidget * widget,
</ins><span class="cx"> if (widget->label)
</span><span class="cx"> {
</span><span class="cx"> * label_pre = gtk_label_new (dgettext (domain, widget->label));
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> * spin_btn = gtk_spin_button_new_with_range (widget->data.spin_btn.min,
</span><del>-@@ -202,7 +206,7 @@ static void create_spin_button (const PreferencesWidget * widget,
</del><ins>+@@ -221,7 +225,7 @@ static void create_spin_button (const PreferencesWidget * widget,
</ins><span class="cx"> if (widget->data.spin_btn.right_label)
</span><span class="cx"> {
</span><span class="cx"> * label_past = gtk_label_new (dgettext (domain, widget->data.spin_btn.right_label));
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> widget_init (* spin_btn, widget);
</span><del>-@@ -214,13 +218,14 @@ void create_font_btn (const PreferencesWidget * widget, GtkWidget * * label,
</del><ins>+@@ -233,13 +237,14 @@ void create_font_btn (const PreferencesWidget * widget, GtkWidget * * label,
</ins><span class="cx"> GtkWidget * * font_btn, const char * domain)
</span><span class="cx"> {
</span><span class="cx"> * font_btn = gtk_font_button_new ();
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (widget->data.font_btn.title)
</span><del>-@@ -236,12 +241,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
</del><ins>+@@ -255,12 +260,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
</ins><span class="cx"> GtkWidget * * entry, const char * domain)
</span><span class="cx"> {
</span><span class="cx"> * entry = gtk_entry_new ();
</span><span class="lines">@@ -587,8 +587,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> widget_init (* entry, widget);
</span><del>-@@ -259,8 +265,7 @@ static void combobox_update (GtkWidget * combobox, const PreferencesWidget * wid
</del><ins>+@@ -282,10 +288,12 @@ static void create_file_entry (const PreferencesWidget * widget,
+ break;
+ }
</ins><span class="cx">
</span><ins>++ gtk_widget_set_hexpand (* entry, true);
++
+ if (widget->label)
+ {
+ * label = gtk_label_new (dgettext (domain, widget->label));
+- gtk_misc_set_alignment ((GtkMisc *) * label, 1, 0.5);
++ gtk_widget_set_halign (* label, GTK_ALIGN_END);
+ }
+
+ widget_init (* entry, widget);
+@@ -303,8 +311,7 @@ static void combobox_update (GtkWidget * combobox, const PreferencesWidget * wid
+
</ins><span class="cx"> g_object_set_data ((GObject *) combobox, "comboitems", (void *) items.data);
</span><span class="cx">
</span><span class="cx"> - /* no gtk_combo_box_text_clear()? */
</span><span class="lines">@@ -597,7 +611,7 @@
</span><span class="cx">
</span><span class="cx"> for (const ComboItem & item : items)
</span><span class="cx"> gtk_combo_box_text_append_text ((GtkComboBoxText *) combobox,
</span><del>-@@ -302,7 +307,7 @@ static void create_cbox (const PreferencesWidget * widget, GtkWidget * * label,
</del><ins>+@@ -346,7 +353,7 @@ static void create_cbox (const PreferencesWidget * widget, GtkWidget * * label,
</ins><span class="cx"> if (widget->label)
</span><span class="cx"> {
</span><span class="cx"> * label = gtk_label_new (dgettext (domain, widget->label));
</span><span class="lines">@@ -606,7 +620,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> g_object_set_data ((GObject *) * combobox, "combodomain", (void *) domain);
</span><del>-@@ -317,7 +322,6 @@ static void fill_table (GtkWidget * table,
</del><ins>+@@ -361,7 +368,6 @@ static void fill_table (GtkWidget * table,
</ins><span class="cx"> for (const PreferencesWidget & w : widgets)
</span><span class="cx"> {
</span><span class="cx"> GtkWidget * widget_left = nullptr, * widget_middle = nullptr, * widget_right = nullptr;
</span><span class="lines">@@ -614,15 +628,20 @@
</span><span class="cx">
</span><span class="cx"> switch (w.type)
</span><span class="cx"> {
</span><del>-@@ -336,7 +340,6 @@ static void fill_table (GtkWidget * table,
</del><ins>+@@ -380,12 +386,10 @@ static void fill_table (GtkWidget * table,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::Entry:
</span><span class="cx"> create_entry (& w, & widget_left, & widget_middle, domain);
</span><span class="cx"> - middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case PreferencesWidget::FileEntry:
+ create_file_entry (& w, & widget_left, & widget_middle, domain);
+- middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
+ break;
+
</ins><span class="cx"> case PreferencesWidget::ComboBox:
</span><del>-@@ -350,16 +353,13 @@ static void fill_table (GtkWidget * table,
</del><ins>+@@ -399,16 +403,13 @@ static void fill_table (GtkWidget * table,
</ins><span class="cx"> int i = & w - widgets.data;
</span><span class="cx">
</span><span class="cx"> if (widget_left)
</span><span class="lines">@@ -642,7 +661,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@@ -384,13 +384,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -433,13 +434,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> {
</span><span class="cx"> if (! child_box)
</span><span class="cx"> {
</span><span class="lines">@@ -659,7 +678,7 @@
</span><span class="cx">
</span><span class="cx"> if (disable_child)
</span><span class="cx"> gtk_widget_set_sensitive (child_box, false);
</span><del>-@@ -399,16 +397,15 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -448,10 +447,6 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> else
</span><span class="cx"> child_box = nullptr;
</span><span class="cx">
</span><span class="lines">@@ -670,8 +689,9 @@
</span><span class="cx"> widget = nullptr;
</span><span class="cx"> disable_child = false;
</span><span class="cx">
</span><del>- if (radio_btn_group && w.type != PreferencesWidget::RadioButton)
- radio_btn_group = nullptr;
</del><ins>+@@ -461,6 +456,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+ if (! w.child)
+ radio_btn_group[true] = nullptr;
</ins><span class="cx">
</span><span class="cx"> + int pad_left = indent;
</span><span class="cx"> + int pad_top = spacing;
</span><span class="lines">@@ -679,7 +699,7 @@
</span><span class="cx"> switch (w.type)
</span><span class="cx"> {
</span><span class="cx"> case PreferencesWidget::Button:
</span><del>-@@ -427,7 +424,8 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -479,7 +477,8 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> if (strstr (w.label, "<b>"))
</span><span class="cx"> {
</span><span class="cx"> /* headings get double spacing and no indent */
</span><span class="lines">@@ -689,7 +709,7 @@
</span><span class="cx">
</span><span class="cx"> /* set indent for items below the heading */
</span><span class="cx"> indent = 12;
</span><del>-@@ -438,7 +436,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -490,7 +489,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> if (icon)
</span><span class="cx"> {
</span><span class="lines">@@ -698,7 +718,7 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) widget, icon, false, false, 0);
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) widget, label, false, false, 0);
</span><span class="cx"> }
</span><del>-@@ -457,7 +455,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -510,7 +509,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::SpinButton:
</span><span class="cx"> {
</span><span class="lines">@@ -707,7 +727,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * label_pre = nullptr, * spin_btn = nullptr, * label_past = nullptr;
</span><span class="cx"> create_spin_button (& w, & label_pre, & spin_btn, & label_past, domain);
</span><del>-@@ -480,7 +478,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -533,7 +532,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::FontButton:
</span><span class="cx"> {
</span><span class="lines">@@ -716,7 +736,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * font_btn = nullptr;
</span><span class="cx"> create_font_btn (& w, & label, & font_btn, domain);
</span><del>-@@ -494,9 +492,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -547,9 +546,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case PreferencesWidget::Table:
</span><span class="lines">@@ -729,17 +749,17 @@
</span><span class="cx">
</span><span class="cx"> fill_table (widget, w.data.table.widgets, domain);
</span><span class="cx">
</span><del>-@@ -504,7 +502,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
-
</del><ins>+@@ -558,7 +557,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> case PreferencesWidget::Entry:
</span><ins>+ case PreferencesWidget::FileEntry:
</ins><span class="cx"> {
</span><span class="cx"> - widget = gtk_hbox_new (false, 6);
</span><span class="cx"> + widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
</span><span class="cx">
</span><span class="cx"> GtkWidget * entry = nullptr;
</span><del>- create_entry (& w, & label, & entry, domain);
-@@ -519,7 +517,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><span class="cx">
</span><ins>+@@ -577,7 +576,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+
</ins><span class="cx"> case PreferencesWidget::ComboBox:
</span><span class="cx"> {
</span><span class="cx"> - widget = gtk_hbox_new (false, 6);
</span><span class="lines">@@ -747,7 +767,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * combo = nullptr;
</span><span class="cx"> create_cbox (& w, & label, & combo, domain);
</span><del>-@@ -534,9 +532,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -592,9 +591,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx">
</span><span class="cx"> case PreferencesWidget::Box:
</span><span class="cx"> if (w.data.box.horizontal)
</span><span class="lines">@@ -759,7 +779,7 @@
</span><span class="cx">
</span><span class="cx"> audgui_create_widgets_with_domain (widget, w.data.box.widgets, domain);
</span><span class="cx">
</span><del>-@@ -550,13 +548,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -608,13 +607,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case PreferencesWidget::Notebook:
</span><span class="lines">@@ -774,7 +794,7 @@
</span><span class="cx"> gtk_container_set_border_width ((GtkContainer *) vbox, 6);
</span><span class="cx">
</span><span class="cx"> audgui_create_widgets_with_domain (vbox, tab.widgets, domain);
</span><del>-@@ -565,11 +561,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -623,11 +620,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> gtk_label_new (dgettext (domain, tab.name)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -790,7 +810,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>-@@ -577,7 +575,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</del><ins>+@@ -635,7 +634,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (widget)
</span><span class="lines">@@ -805,7 +825,7 @@
</span><span class="cx"> if (gtk_orientable_get_orientation ((GtkOrientable *) box) == GTK_ORIENTATION_VERTICAL)
</span><span class="cx"> --- src/libaudgui/prefs-window.cc.old
</span><span class="cx"> +++ src/libaudgui/prefs-window.cc
</span><del>-@@ -516,29 +516,32 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
</del><ins>+@@ -528,29 +528,31 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
</ins><span class="cx">
</span><span class="cx"> static void * create_titlestring_table ()
</span><span class="cx"> {
</span><span class="lines">@@ -841,7 +861,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * titlestring_help_button = gtk_button_new ();
</span><span class="cx"> gtk_widget_set_can_focus (titlestring_help_button, false);
</span><del>- gtk_button_set_focus_on_click ((GtkButton *) titlestring_help_button, false);
</del><ins>+- gtk_button_set_focus_on_click ((GtkButton *) titlestring_help_button, false);
</ins><span class="cx"> gtk_button_set_relief ((GtkButton *) titlestring_help_button, GTK_RELIEF_HALF);
</span><span class="cx"> - gtk_table_attach ((GtkTable *) grid, titlestring_help_button, 2, 3, 1, 2,
</span><span class="cx"> - GTK_FILL, GTK_FILL, 0, 0);
</span><span class="lines">@@ -849,7 +869,7 @@
</span><span class="cx">
</span><span class="cx"> GtkWidget * titlestring_tag_menu = create_titlestring_tag_menu ();
</span><span class="cx">
</span><del>-@@ -553,14 +556,14 @@ static void * create_titlestring_table ()
</del><ins>+@@ -565,14 +567,14 @@ static void * create_titlestring_table ()
</ins><span class="cx">
</span><span class="cx"> static void create_playlist_category ()
</span><span class="cx"> {
</span><span class="lines">@@ -866,7 +886,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) category_notebook, vbox);
</span><span class="cx"> audgui_create_widgets (vbox, song_info_page_widgets);
</span><span class="cx"> }
</span><del>-@@ -603,14 +606,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
</del><ins>+@@ -615,14 +617,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
</ins><span class="cx">
</span><span class="cx"> static void * iface_create_prefs_box ()
</span><span class="cx"> {
</span><span class="lines">@@ -883,7 +903,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) category_notebook, vbox);
</span><span class="cx"> audgui_create_widgets (vbox, appearance_page_widgets);
</span><span class="cx"> }
</span><del>-@@ -734,17 +737,17 @@ static void record_update (void * = nullptr, void * = nullptr)
</del><ins>+@@ -753,17 +755,17 @@ static void record_update (void * = nullptr, void * = nullptr)
</ins><span class="cx">
</span><span class="cx"> static void create_audio_category ()
</span><span class="cx"> {
</span><span class="lines">@@ -904,7 +924,7 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) connectivity_page_vbox, vbox, true, true, 0);
</span><span class="cx">
</span><span class="cx"> audgui_create_widgets (vbox, connectivity_page_widgets);
</span><del>-@@ -753,6 +756,7 @@ static void create_connectivity_category ()
</del><ins>+@@ -772,6 +774,7 @@ static void create_connectivity_category ()
</ins><span class="cx"> static void create_plugin_category ()
</span><span class="cx"> {
</span><span class="cx"> plugin_notebook = gtk_notebook_new ();
</span><span class="lines">@@ -912,7 +932,7 @@
</span><span class="cx"> gtk_container_add ((GtkContainer *) category_notebook, plugin_notebook);
</span><span class="cx">
</span><span class="cx"> for (const PluginCategory & category : plugin_categories)
</span><del>-@@ -780,10 +784,10 @@ static void create_prefs_window ()
</del><ins>+@@ -799,10 +802,10 @@ static void create_prefs_window ()
</ins><span class="cx"> gtk_container_set_border_width ((GtkContainer *) prefswin, 12);
</span><span class="cx"> gtk_window_set_title ((GtkWindow *) prefswin, _("Audacious Settings"));
</span><span class="cx">
</span><span class="lines">@@ -925,7 +945,7 @@
</span><span class="cx"> gtk_box_pack_start ((GtkBox *) vbox, hbox, true, true, 0);
</span><span class="cx">
</span><span class="cx"> GtkWidget * scrolledwindow = gtk_scrolled_window_new (nullptr, nullptr);
</span><del>-@@ -813,17 +817,17 @@ static void create_prefs_window ()
</del><ins>+@@ -832,17 +835,17 @@ static void create_prefs_window ()
</ins><span class="cx"> create_song_info_category ();
</span><span class="cx"> create_plugin_category ();
</span><span class="cx">
</span><span class="lines">@@ -979,7 +999,7 @@
</span><span class="cx"> progress_label = gtk_label_new (nullptr);
</span><span class="cx"> --- src/libaudgui/util.cc.old
</span><span class="cx"> +++ src/libaudgui/util.cc
</span><del>-@@ -66,12 +66,27 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
</del><ins>+@@ -88,12 +88,40 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
</ins><span class="cx">
</span><span class="cx"> EXPORT void audgui_get_mouse_coords (GtkWidget * widget, int * x, int * y)
</span><span class="cx"> {
</span><span class="lines">@@ -989,8 +1009,14 @@
</span><span class="cx"> +
</span><span class="cx"> + GdkWindow * window = gtk_widget_get_window (widget);
</span><span class="cx"> + GdkDisplay * display = gdk_window_get_display (window);
</span><ins>++
++#if GTK_CHECK_VERSION (3, 20, 0)
++ GdkSeat * seat = gdk_display_get_default_seat (display);
++ GdkDevice * device = gdk_seat_get_pointer (seat);
++#else
</ins><span class="cx"> + GdkDeviceManager * manager = gdk_display_get_device_manager (display);
</span><span class="cx"> + GdkDevice * device = gdk_device_manager_get_client_pointer (manager);
</span><ins>++#endif
</ins><span class="cx"> +
</span><span class="cx"> + gdk_window_get_device_position (window, device, & xwin, & ywin, nullptr);
</span><span class="cx"> + gtk_widget_get_allocation (widget, & alloc);
</span><span class="lines">@@ -1003,14 +1029,21 @@
</span><span class="cx"> {
</span><span class="cx"> - gdk_display_get_pointer (gdk_screen_get_display (screen), nullptr, x, y, nullptr);
</span><span class="cx"> + GdkDisplay * display = gdk_screen_get_display (screen);
</span><ins>++
++#if GTK_CHECK_VERSION (3, 20, 0)
++ GdkSeat * seat = gdk_display_get_default_seat (display);
++ GdkDevice * device = gdk_seat_get_pointer (seat);
++#else
</ins><span class="cx"> + GdkDeviceManager * manager = gdk_display_get_device_manager (display);
</span><span class="cx"> + GdkDevice * device = gdk_device_manager_get_client_pointer (manager);
</span><ins>++#endif
++
</ins><span class="cx"> + gdk_device_get_position (device, nullptr, x, y);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EXPORT void audgui_get_monitor_geometry (GdkScreen * screen, int x, int y, GdkRectangle * geom)
</span><del>-@@ -125,6 +140,22 @@ EXPORT GtkWidget * audgui_button_new (const char * text, const char * icon,
- return button;
</del><ins>+@@ -227,6 +255,22 @@ EXPORT void audgui_file_entry_set_uri (GtkWidget * entry, const char * uri)
+ gtk_editable_set_position ((GtkEditable *) entry, -1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> +static const char * icon_for_message_type (GtkMessageType type)
</span><span class="lines">@@ -1032,7 +1065,7 @@
</span><span class="cx"> EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</span><span class="cx"> const char * text, GtkWidget * button1, GtkWidget * button2)
</span><span class="cx"> {
</span><del>-@@ -132,6 +163,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</del><ins>+@@ -234,6 +278,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</ins><span class="cx"> GTK_BUTTONS_NONE, "%s", text);
</span><span class="cx"> gtk_window_set_title ((GtkWindow *) dialog, title);
</span><span class="cx">
</span><span class="lines">@@ -1046,7 +1079,7 @@
</span><span class="cx"> if (button2)
</span><span class="cx"> {
</span><span class="cx"> gtk_dialog_add_action_widget ((GtkDialog *) dialog, button2, GTK_RESPONSE_NONE);
</span><del>-@@ -147,6 +185,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</del><ins>+@@ -249,6 +300,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
</ins><span class="cx"> return dialog;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchupdatebuildsysandmakeverbosedifffromrev153442trunkdportsmultimediaaudaciouscorefilespatchbuildsysdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/audacious-core/files/patch-update-buildsys-and-make-verbose.diff (from rev 153442, trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff) (0 => 153443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-update-buildsys-and-make-verbose.diff (rev 0)
+++ trunk/dports/multimedia/audacious-core/files/patch-update-buildsys-and-make-verbose.diff 2016-09-30 11:15:18 UTC (rev 153443)
</span><span class="lines">@@ -0,0 +1,721 @@
</span><ins>+--- buildsys.mk.in.old
++++ buildsys.mk.in
+@@ -1,8 +1,8 @@
+ #
+-# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
+-# Jonathan Schleifer <js@webkeks.org>
++# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
++# Jonathan Schleifer <js@heap.zone>
+ #
+-# https://webkeks.org/git/?p=buildsys.git
++# https://heap.zone/git/?p=buildsys.git
+ #
+ # Permission to use, copy, modify, and/or distribute this software for any
+ # purpose with or without fee is hereby granted, provided that the above
+@@ -45,6 +45,7 @@ OBJCFLAGS = @OBJCFLAGS@
+ OBJCXXFLAGS = @OBJCXXFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LDFLAGS_RPATH = @LDFLAGS_RPATH@
++LDFLAGS_INSTALL_NAME = @LDFLAGS_INSTALL_NAME@
+ LIBS = @LIBS@
+ PYTHON_FLAGS = @PYTHON_FLAGS@
+ PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@
+@@ -107,22 +108,27 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+
+ MO_FILES = ${LOCALES:.po=.mo}
+
+-.SILENT:
+ .SUFFIXES:
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
+-.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
++.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER}
+
+ all:
+- ${MAKE} ${MFLAGS} subdirs
+- ${MAKE} ${MFLAGS} depend
++ ${MAKE} pre-all
++ ${MAKE} subdirs
++ ${MAKE} depend
+ ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
++ ${MAKE} subdirs-after
++ ${MAKE} post-all
++
++pre-all post-all:
+
+ subdirs: ${SUBDIRS}
++subdirs-after: ${SUBDIRS_AFTER}
+
+-${SUBDIRS}:
++${SUBDIRS} ${SUBDIRS_AFTER}:
+ for i in $@; do \
+ ${DIR_ENTER}; \
+- ${MAKE} ${MFLAGS} || exit $$?; \
++ ${MAKE} || exit $$?; \
+ ${DIR_LEAVE}; \
+ done
+
+@@ -166,7 +172,7 @@ depend: pre-depend ${SRCS}
+ done; \
+ if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
+ ${DEPEND_STATUS}; \
+- if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
++ if ${MAKE} $$deps && cat $$deps >.deps; then \
+ rm -f $$deps; \
+ ${DEPEND_OK}; \
+ else \
+@@ -205,6 +211,7 @@ pre-depend:
+
+ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ ${LINK_STATUS}
++ out="$@"; \
+ if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
+ ${LINK_OK}; \
+ else \
+@@ -228,7 +235,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
+ fi
+
+ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+- ${LINK_STATUS}; \
++ ${LINK_STATUS}
++ out="$@"; \
+ objs=""; \
+ ars=""; \
+ for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
+@@ -252,7 +260,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+ done; \
+ cd ..; \
+ done; \
+- if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
++ if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; then \
+ ${LINK_OK}; \
+ else \
+ ${LINK_FAILED}; \
+@@ -264,6 +272,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+
+ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+ ${LINK_STATUS}
++ out="$@"; \
+ objs=""; \
+ ars=""; \
+ for i in ${PLUGIN_OBJS}; do \
+@@ -300,6 +309,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ ${LINK_STATUS}
+ rm -f $@
++ out="$@"; \
+ objs=""; \
+ ars=""; \
+ for i in ${OBJS} ${OBJS_EXTRA}; do \
+@@ -337,6 +347,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+ ${LINK_STATUS}
+ rm -f $@
++ out="$@"; \
+ objs=""; \
+ ars=""; \
+ for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
+@@ -375,21 +386,27 @@ locales: ${MO_FILES}
+
+ .c.o:
+ ${COMPILE_STATUS}
+- if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+ ${COMPILE_FAILED}; \
+ fi
+ .c.lib.o:
+ ${COMPILE_LIB_STATUS}
+- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_LIB_OK}; \
+ else \
+ ${COMPILE_LIB_FAILED}; \
+ fi
+ .c.plugin.o:
+ ${COMPILE_PLUGIN_STATUS}
+- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_PLUGIN_OK}; \
+ else \
+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -397,21 +414,27 @@ locales: ${MO_FILES}
+
+ .cc.o .cxx.o:
+ ${COMPILE_STATUS}
+- if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+ ${COMPILE_FAILED}; \
+ fi
+ .cc.lib.o .cxx.lib.o:
+ ${COMPILE_LIB_STATUS}
+- if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_LIB_OK}; \
+ else \
+ ${COMPILE_LIB_FAILED}; \
+ fi
+ .cc.plugin.o .cxx.plugin.o:
+ ${COMPILE_PLUGIN_STATUS}
+- if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_PLUGIN_OK}; \
+ else \
+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -419,6 +442,8 @@ locales: ${MO_FILES}
+
+ .d.o:
+ ${COMPILE_STATUS}
++ in="$<"; \
++ out="$@"; \
+ if test x"$(basename ${DC})" = x"dmd"; then \
+ if ${DC} ${DFLAGS} -c -of$@ $<; then \
+ ${COMPILE_OK}; \
+@@ -435,6 +460,8 @@ locales: ${MO_FILES}
+
+ .erl.beam:
+ ${COMPILE_STATUS}
++ in="$<"; \
++ out="$@"; \
+ if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+@@ -443,6 +470,8 @@ locales: ${MO_FILES}
+
+ .java.class:
+ ${COMPILE_STATUS}
++ in="$<"; \
++ out="$@"; \
+ if ${JAVAC} ${JAVACFLAGS} $<; then \
+ ${COMPILE_OK}; \
+ else \
+@@ -451,21 +480,27 @@ locales: ${MO_FILES}
+
+ .m.o:
+ ${COMPILE_STATUS}
+- if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+ ${COMPILE_FAILED}; \
+ fi
+ .m.lib.o:
+ ${COMPILE_LIB_STATUS}
+- if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_LIB_OK}; \
+ else \
+ ${COMPILE_LIB_FAILED}; \
+ fi
+ .m.plugin.o:
+ ${COMPILE_PLUGIN_STATUS}
+- if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_PLUGIN_OK}; \
+ else \
+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -473,21 +508,27 @@ locales: ${MO_FILES}
+
+ .mm.o:
+ ${COMPILE_STATUS}
+- if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+ ${COMPILE_FAILED}; \
+ fi
+ .mm.lib.o:
+ ${COMPILE_LIB_STATUS}
+- if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_LIB_OK}; \
+ else \
+ ${COMPILE_LIB_FAILED}; \
+ fi
+ .mm.plugin.o:
+ ${COMPILE_PLUGIN_STATUS}
+- if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_PLUGIN_OK}; \
+ else \
+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -495,6 +536,8 @@ locales: ${MO_FILES}
+
+ .po.mo:
+ ${COMPILE_STATUS}
++ in="$<"; \
++ out="$@"; \
+ if ${MSGFMT} -c -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+@@ -503,6 +546,8 @@ locales: ${MO_FILES}
+
+ .py.pyc:
+ ${COMPILE_STATUS}
++ in="$<"; \
++ out="$@"; \
+ if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
+ ${COMPILE_OK}; \
+ else \
+@@ -511,7 +556,9 @@ locales: ${MO_FILES}
+
+ .rc.o .rc.lib.o .rc.plugin.o:
+ ${COMPILE_STATUS}
+- if ${WINDRES} -J rc -O coff -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+ ${COMPILE_FAILED}; \
+@@ -519,21 +566,27 @@ locales: ${MO_FILES}
+
+ .S.o:
+ ${COMPILE_STATUS}
+- if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${AS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+ ${COMPILE_FAILED}; \
+ fi
+ .S.lib.o:
+ ${COMPILE_LIB_STATUS}
+- if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_LIB_OK}; \
+ else \
+ ${COMPILE_LIB_FAILED}; \
+ fi
+ .S.plugin.o:
+ ${COMPILE_PLUGIN_STATUS}
+- if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \
+ ${COMPILE_PLUGIN_OK}; \
+ else \
+ ${COMPILE_PLUGIN_FAILED}; \
+@@ -541,30 +594,36 @@ locales: ${MO_FILES}
+
+ .xpm.o:
+ ${COMPILE_STATUS}
+- if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
+ ${COMPILE_OK}; \
+ else \
+ ${COMPILE_FAILED}; \
+ fi
+ .xpm.lib.o:
+ ${COMPILE_LIB_STATUS}
+- if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
+ ${COMPILE_LIB_OK}; \
+ else \
+ ${COMPILE_LIB_FAILED}; \
+ fi
+ .xpm.plugin.o:
+ ${COMPILE_PLUGIN_STATUS}
+- if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
++ in="$<"; \
++ out="$@"; \
++ if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \
+ ${COMPILE_PLUGIN_OK}; \
+ else \
+ ${COMPILE_PLUGIN_FAILED}; \
+ fi
+
+-install: install-extra
+- for i in ${SUBDIRS}; do \
++install: all install-extra
++ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ ${DIR_ENTER}; \
+- ${MAKE} ${MFLAGS} install || exit $$?; \
++ ${MAKE} install || exit $$?; \
+ ${DIR_LEAVE}; \
+ done
+
+@@ -643,9 +702,9 @@ install: install-extra
+ install-extra:
+
+ uninstall: uninstall-extra
+- for i in ${SUBDIRS}; do \
++ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ ${DIR_ENTER}; \
+- ${MAKE} ${MFLAGS} uninstall || exit $$?; \
++ ${MAKE} uninstall || exit $$?; \
+ ${DIR_LEAVE}; \
+ done
+
+@@ -736,9 +795,9 @@ uninstall: uninstall-extra
+ uninstall-extra:
+
+ clean:
+- for i in ${SUBDIRS}; do \
++ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ ${DIR_ENTER}; \
+- ${MAKE} ${MFLAGS} clean || exit $$?; \
++ ${MAKE} clean || exit $$?; \
+ ${DIR_LEAVE}; \
+ done
+
+@@ -753,9 +812,9 @@ clean:
+ done
+
+ distclean: clean
+- for i in ${SUBDIRS}; do \
++ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ ${DIR_ENTER}; \
+- ${MAKE} ${MFLAGS} distclean || exit $$?; \
++ ${MAKE} distclean || exit $$?; \
+ ${DIR_LEAVE}; \
+ done
+
+@@ -769,27 +828,39 @@ distclean: clean
+ fi \
+ done
+
+-DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
+-DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
++print-hierarchy:
++ for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
++ echo ${PRINT_HIERARCHY_PREFIX}$$i; \
++ cd $$i || exit $$?; \
++ ${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
++ cd .. || exit $$?; \
++ done
++
++print-var:
++ printf '%s\n' '${${VAR}}'
++
++DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
++DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
+ DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
+ DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n"
+ DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
+-COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+-COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+-COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r"
+-COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n"
+-COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
+-COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
+-COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
+-COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
++COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<"
++COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<"
++COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<"
++COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<"
++COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<"
++COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<"
++COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
+ LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+ LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+ LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+-INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+-INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
+-DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-
+-include .deps
++INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i"
++INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i"
++INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
++DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i"
++DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
++
++.CURDIR ?= .
++include ${.CURDIR}/.deps
+--- configure.ac.old
++++ configure.ac
+@@ -16,6 +16,8 @@ COPYRIGHT="Copyright (C) 2001-2016 Audacious developers and others"
+ AC_DEFINE_UNQUOTED(COPYRIGHT, "$COPYRIGHT", [Copyright])
+ AC_SUBST(COPYRIGHT)
+
++BUILDSYS_INIT
++
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+--- m4/buildsys.m4.old
++++ m4/buildsys.m4
+@@ -1,8 +1,8 @@
+ dnl
+-dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
+-dnl Jonathan Schleifer <js@webkeks.org>
++dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016
++dnl Jonathan Schleifer <js@heap.zone>
+ dnl
+-dnl https://webkeks.org/git/?p=buildsys.git
++dnl https://heap.zone/git/?p=buildsys.git
+ dnl
+ dnl Permission to use, copy, modify, and/or distribute this software for any
+ dnl purpose with or without fee is hereby granted, provided that the above
+@@ -21,65 +21,76 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ dnl POSSIBILITY OF SUCH DAMAGE.
+ dnl
+
+-AC_CONFIG_COMMANDS_PRE([
+- AC_SUBST(CC_DEPENDS, $GCC)
+- AC_SUBST(CXX_DEPENDS, $GXX)
+- AC_SUBST(OBJC_DEPENDS, $GOBJC)
+- AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
++AC_DEFUN([BUILDSYS_INIT], [
++ AC_CONFIG_COMMANDS_PRE([
++ AC_SUBST(CC_DEPENDS, $GCC)
++ AC_SUBST(CXX_DEPENDS, $GXX)
++ AC_SUBST(OBJC_DEPENDS, $GOBJC)
++ AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
+
+- AC_PATH_PROG(TPUT, tput)
++ AC_PATH_PROG(TPUT, tput)
+
+- AS_IF([test x"$TPUT" != x""], [
+- if x=$($TPUT el 2>/dev/null); then
+- AC_SUBST(TERM_EL, "$x")
+- else
+- AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
+- fi
++ AS_IF([test x"$TPUT" != x""], [
++ if x=$($TPUT el 2>/dev/null); then
++ AC_SUBST(TERM_EL, "$x")
++ else
++ AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
++ fi
+
+- if x=$($TPUT sgr0 2>/dev/null); then
+- AC_SUBST(TERM_SGR0, "$x")
+- else
+- AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
+- fi
++ if x=$($TPUT sgr0 2>/dev/null); then
++ AC_SUBST(TERM_SGR0, "$x")
++ else
++ AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
++ fi
+
+- if x=$($TPUT bold 2>/dev/null); then
+- AC_SUBST(TERM_BOLD, "$x")
+- else
+- AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
+- fi
++ if x=$($TPUT bold 2>/dev/null); then
++ AC_SUBST(TERM_BOLD, "$x")
++ else
++ AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
++ fi
+
+- if x=$($TPUT setaf 1 2>/dev/null); then
+- AC_SUBST(TERM_SETAF1, "$x")
+- AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2 2>/dev/null)")
+- AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3 2>/dev/null)")
+- AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4 2>/dev/null)")
+- AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6 2>/dev/null)")
+- else
+- AC_SUBST(TERM_SETAF1, "$($TPUT AF 1 2>/dev/null)")
+- AC_SUBST(TERM_SETAF2, "$($TPUT AF 2 2>/dev/null)")
+- AC_SUBST(TERM_SETAF3, "$($TPUT AF 3 2>/dev/null)")
+- AC_SUBST(TERM_SETAF4, "$($TPUT AF 4 2>/dev/null)")
+- AC_SUBST(TERM_SETAF6, "$($TPUT AF 6 2>/dev/null)")
+- fi
+- ], [
+- AC_SUBST(TERM_EL, '\033\133K')
+- AC_SUBST(TERM_SGR0, '\033\133m')
+- AC_SUBST(TERM_BOLD, '\033\1331m')
+- AC_SUBST(TERM_SETAF1, '\033\13331m')
+- AC_SUBST(TERM_SETAF2, '\033\13332m')
+- AC_SUBST(TERM_SETAF3, '\033\13333m')
+- AC_SUBST(TERM_SETAF4, '\033\13334m')
+- AC_SUBST(TERM_SETAF6, '\033\13336m')
++ if x=$($TPUT setaf 1 2>/dev/null); then
++ AC_SUBST(TERM_SETAF1, "$x")
++ AC_SUBST(TERM_SETAF2,
++ "$($TPUT setaf 2 2>/dev/null)")
++ AC_SUBST(TERM_SETAF3,
++ "$($TPUT setaf 3 2>/dev/null)")
++ AC_SUBST(TERM_SETAF4,
++ "$($TPUT setaf 4 2>/dev/null)")
++ AC_SUBST(TERM_SETAF6,
++ "$($TPUT setaf 6 2>/dev/null)")
++ else
++ AC_SUBST(TERM_SETAF1,
++ "$($TPUT AF 1 2>/dev/null)")
++ AC_SUBST(TERM_SETAF2,
++ "$($TPUT AF 2 2>/dev/null)")
++ AC_SUBST(TERM_SETAF3,
++ "$($TPUT AF 3 2>/dev/null)")
++ AC_SUBST(TERM_SETAF4,
++ "$($TPUT AF 4 2>/dev/null)")
++ AC_SUBST(TERM_SETAF6,
++ "$($TPUT AF 6 2>/dev/null)")
++ fi
++ ], [
++ AC_SUBST(TERM_EL, '\033\133K')
++ AC_SUBST(TERM_SGR0, '\033\133m')
++ AC_SUBST(TERM_BOLD, '\033\1331m')
++ AC_SUBST(TERM_SETAF1, '\033\13331m')
++ AC_SUBST(TERM_SETAF2, '\033\13332m')
++ AC_SUBST(TERM_SETAF3, '\033\13333m')
++ AC_SUBST(TERM_SETAF4, '\033\13334m')
++ AC_SUBST(TERM_SETAF6, '\033\13336m')
++ ])
+ ])
+-])
+
+-AC_CONFIG_COMMANDS_POST([
+- ${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
+- for i in $(find . -name Makefile); do
+- DEPSFILE="$(dirname $i)/.deps"
+- test -f "$DEPSFILE" && rm "$DEPSFILE"
+- touch -t 0001010000 "$DEPSFILE"
+- done
++ AC_CONFIG_COMMANDS_POST([
++ ${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
++ for i in $(find . -name Makefile); do
++ DEPSFILE="$(dirname $i)/.deps"
++ test -f "$DEPSFILE" && rm "$DEPSFILE"
++ touch -t 0001010000 "$DEPSFILE"
++ done
++ ])
+ ])
+
+ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
+@@ -108,31 +119,32 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+ case "$host_os" in
+ darwin*)
+ AC_MSG_RESULT(Darwin)
+- LIB_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
+- LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -mmacosx-version-min=10.7 -install_name "${libdir}/$$(i=${SHARED_LIB}; echo $${i%${LIB_SUFFIX}}).${LIB_MAJOR}${LIB_SUFFIX}"'
++ LIB_CFLAGS='-fPIC -DPIC'
++ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+ LIB_PREFIX='lib'
+ LIB_SUFFIX='.dylib'
+ LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+- PLUGIN_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
+- PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup -mmacosx-version-min=10.7'
++ LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
++ PLUGIN_CFLAGS='-fPIC -DPIC'
++ PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
+ PLUGIN_SUFFIX='.bundle'
+ INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
+ UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+ CLEAN_LIB=''
+ ;;
+- solaris*)
+- AC_MSG_RESULT(Solaris)
+- LIB_CFLAGS='-fPIC -DPIC'
+- LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
++ mingw* | cygwin*)
++ AC_MSG_RESULT(MinGW / Cygwin)
++ LIB_CFLAGS=''
++ LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
+ LIB_PREFIX='lib'
+- LIB_SUFFIX='.so'
++ LIB_SUFFIX='.dll'
+ LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+- PLUGIN_CFLAGS='-fPIC -DPIC'
++ PLUGIN_CFLAGS=''
+ PLUGIN_LDFLAGS='-shared'
+- PLUGIN_SUFFIX='.so'
+- INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
+- UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+- CLEAN_LIB=''
++ PLUGIN_SUFFIX='.dll'
++ INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
++ UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
++ CLEAN_LIB='${SHARED_LIB}.a'
+ ;;
+ openbsd* | mirbsd*)
+ AC_MSG_RESULT(OpenBSD)
+@@ -148,22 +160,36 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+ UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
+ CLEAN_LIB=''
+ ;;
+- cygwin* | mingw*)
+- AC_MSG_RESULT(Win32)
+- LIB_CFLAGS=''
+- LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
++ solaris*)
++ AC_MSG_RESULT(Solaris)
++ LIB_CFLAGS='-fPIC -DPIC'
++ LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
+ LIB_PREFIX='lib'
+- LIB_SUFFIX='.dll'
++ LIB_SUFFIX='.so'
+ LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+- PLUGIN_CFLAGS=''
++ PLUGIN_CFLAGS='-fPIC -DPIC'
+ PLUGIN_LDFLAGS='-shared'
+- PLUGIN_SUFFIX='.dll'
+- INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
+- UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
+- CLEAN_LIB='${SHARED_LIB}.a'
++ PLUGIN_SUFFIX='.so'
++ INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
++ UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
++ CLEAN_LIB=''
++ ;;
++ *-android*)
++ AC_MSG_RESULT(Android)
++ LIB_CFLAGS='-fPIC -DPIC'
++ LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
++ LIB_PREFIX='lib'
++ LIB_SUFFIX='.so'
++ LDFLAGS_RPATH=''
++ PLUGIN_CFLAGS='-fPIC -DPIC'
++ PLUGIN_LDFLAGS='-shared'
++ PLUGIN_SUFFIX='.so'
++ INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
++ UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
++ CLEAN_LIB=''
+ ;;
+ *)
+- AC_MSG_RESULT(GNU)
++ AC_MSG_RESULT(ELF)
+ LIB_CFLAGS='-fPIC -DPIC'
+ LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
+ LIB_PREFIX='lib'
+@@ -183,6 +209,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+ AC_SUBST(LIB_PREFIX)
+ AC_SUBST(LIB_SUFFIX)
+ AC_SUBST(LDFLAGS_RPATH)
++ AC_SUBST(LDFLAGS_INSTALL_NAME)
+ AC_SUBST(PLUGIN_CFLAGS)
+ AC_SUBST(PLUGIN_LDFLAGS)
+ AC_SUBST(PLUGIN_SUFFIX)
</ins></span></pre>
</div>
</div>
</body>
</html>