[153443] trunk/dports/multimedia/audacious-core
ionic at macports.org
ionic at macports.org
Fri Sep 30 13:15:18 CEST 2016
Revision: 153443
https://trac.macports.org/changeset/153443
Author: ionic at macports.org
Date: 2016-09-30 04:15:18 -0700 (Fri, 30 Sep 2016)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/dports/multimedia/audacious-core/Portfile
trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff
Added Paths:
-----------
trunk/dports/multimedia/audacious-core/files/patch-drop-libc++.diff
trunk/dports/multimedia/audacious-core/files/patch-update-buildsys-and-make-verbose.diff
Removed Paths:
-------------
trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff
trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff
Modified: trunk/dports/multimedia/audacious-core/Portfile
===================================================================
--- 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)
@@ -9,7 +9,7 @@
set real_name audacious
# Please keep audacious, audacious-core and audacious-plugins synchronized.
-version 3.7.2
+version 3.8
revision 0
license BSD
@@ -32,15 +32,15 @@
master_sites http://distfiles.audacious-media-player.org
distname ${real_name}-${version}
use_bzip2 yes
-checksums rmd160 83faedd98deea056f319bf7723d3e8cc7383ede5 \
- sha256 04f9eaba4522ce9674e6ed8afc7bd6b5fa9a1e240f8090589fc1874f6659f340
+checksums rmd160 63abcb3536a1bc88a8c3b9674d9d46b7519ec48c \
+ sha256 ffe8c0661dcb999598887e8ee05cd24faa7939086f5a8183fdba6210a95c4a71
universal_variant no
conflicts_build ${name}
-patchfiles patch-buildsys.diff \
- patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff
+patchfiles patch-update-buildsys-and-make-verbose.diff \
+ patch-drop-libc++.diff
depends_build path:bin/pkg-config:pkgconfig \
path:bin/aclocal:automake \
@@ -77,8 +77,8 @@
--enable-qt
notes-append {
- Qt5 support is optional and untested.
- If it breaks, you've got to keep the pieces.\
+ The Qt5 interface is known to crash upon exit, \
+ but should otherwise be functional.\
}
}
Deleted: trunk/dports/multimedia/audacious-core/files/patch-acinclude.m4-drop-libc++-switch-from-gnu++11-to-c++11.diff
===================================================================
--- 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)
@@ -1,22 +0,0 @@
---- 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
Deleted: trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff
===================================================================
--- 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)
@@ -1,670 +0,0 @@
---- 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 at 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 at Entering directory @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n"; cd $$i || exit $$?
--DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6 at Leaving directory @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF6 at .@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 at Entering directory @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
-+DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6 at Leaving directory @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
- DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Generating dependencies... at TERM_SGR0@\r"
- DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully generated dependencies. at TERM_SGR0@\n"
- DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
--COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
--COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
--COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)... at TERM_SGR0@\r"
--COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib). at TERM_SGR0@\n"
--COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
--COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)... at TERM_SGR0@\r"
--COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin). at TERM_SGR0@\n"
--COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
-+COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r" "$<"
-+COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n" "$<"
-+COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
-+COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3@ (lib)... at TERM_SGR0@\r" "$<"
-+COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2@ (lib). at TERM_SGR0@\n" "$<"
-+COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
-+COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3@ (plugin)... at TERM_SGR0@\r" "$<"
-+COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2@ (plugin). at TERM_SGR0@\n" "$<"
-+COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
- LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
- LINK_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
- LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Installing @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
--INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully installed @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
--INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to install @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--DELETE_OK = printf "@TERM_EL@@TERM_SETAF4 at Deleted @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF4 at .@TERM_SGR0@\n"
--DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to delete @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--
--include .deps
-+INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Installing @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r" "$$i"
-+INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully installed @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n" "$$i"
-+INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to install @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
-+DELETE_OK = printf "@TERM_EL@@TERM_SETAF4 at Deleted @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF4 at .@TERM_SGR0@\n" "$$i"
-+DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to delete @TERM_BOLD@%s at 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 at 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)
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)
===================================================================
--- 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)
@@ -0,0 +1,22 @@
+--- 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
Modified: trunk/dports/multimedia/audacious-core/files/patch-gtk3.diff
===================================================================
--- 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)
@@ -36,7 +36,7 @@
--- src/libaudgui/eq-preset.cc.old
+++ src/libaudgui/eq-preset.cc
-@@ -241,16 +241,16 @@ static GtkWidget * create_eq_preset_window ()
+@@ -240,16 +240,16 @@ static GtkWidget * create_eq_preset_window ()
g_signal_connect (window, "destroy", (GCallback) cleanup_eq_preset_window, nullptr);
@@ -56,7 +56,7 @@
gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 0);
entry = gtk_entry_new ();
-@@ -275,7 +275,7 @@ static GtkWidget * create_eq_preset_window ()
+@@ -274,7 +274,7 @@ static GtkWidget * create_eq_preset_window ()
audgui_list_add_column (list, nullptr, 0, G_TYPE_STRING, -1);
gtk_container_add ((GtkContainer *) scrolled, list);
@@ -127,7 +127,7 @@
gtk_container_add ((GtkContainer *) window, vbox);
GtkWidget * chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
-@@ -110,17 +109,24 @@ static GtkWidget * create_filebrowser (gboolean open)
+@@ -111,17 +110,24 @@ static GtkWidget * create_filebrowser (gboolean open)
if (path[0])
gtk_file_chooser_set_current_folder ((GtkFileChooser *) chooser, path);
@@ -279,7 +279,7 @@
}
--- src/libaudgui/infowin.cc.old
+++ src/libaudgui/infowin.cc
-@@ -133,7 +133,7 @@ static GtkWidget * small_label_new (const char * text)
+@@ -134,7 +134,7 @@ static GtkWidget * small_label_new (const char * text)
GtkWidget * label = gtk_label_new (text);
gtk_label_set_attributes ((GtkLabel *) label, attrs);
@@ -288,7 +288,7 @@
return label;
}
-@@ -287,10 +287,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
+@@ -286,10 +286,11 @@ static void add_entry (GtkWidget * grid, const char * title, GtkWidget * entry,
{
GtkWidget * label = small_label_new (title);
@@ -304,7 +304,7 @@
g_signal_connect (entry, "changed", (GCallback) entry_changed, nullptr);
}
-@@ -305,44 +306,41 @@ static void create_infowin ()
+@@ -304,44 +305,41 @@ static void create_infowin ()
gtk_window_set_type_hint ((GtkWindow *) infowin,
GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -367,7 +367,7 @@
widgets.title = gtk_entry_new ();
gtk_widget_set_size_request (widgets.title, 3 * dpi, -1);
-@@ -370,9 +368,8 @@ static void create_infowin ()
+@@ -369,9 +367,8 @@ static void create_infowin ()
widgets.track = gtk_entry_new ();
add_entry (grid, _("Track Number"), widgets.track, 1, 12, 1);
@@ -434,7 +434,7 @@
GtkWidget * toggle = gtk_check_button_new_with_mnemonic (_("C_lose on jump"));
--- src/libaudgui/list.cc.old
+++ src/libaudgui/list.cc
-@@ -385,7 +385,7 @@ static void autoscroll (void * widget)
+@@ -389,7 +389,7 @@ static void autoscroll (void * widget)
ListModel * model = (ListModel *) gtk_tree_view_get_model
((GtkTreeView *) widget);
@@ -443,7 +443,7 @@
g_return_if_fail (adj);
int pos, end;
-@@ -402,7 +402,7 @@ static void autoscroll (void * widget)
+@@ -406,7 +406,7 @@ static void autoscroll (void * widget)
static void start_autoscroll (ListModel * model, GtkWidget * widget, int speed)
{
@@ -452,7 +452,7 @@
g_return_if_fail (adj);
int pos, end;
-@@ -532,6 +532,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
+@@ -534,6 +534,10 @@ static void drag_data_received (GtkWidget * widget, GdkDragContext * context, in
static void destroy_cb (GtkWidget * list, ListModel * model)
{
@@ -529,7 +529,7 @@
static void widget_changed (GtkWidget * widget, const PreferencesWidget * w)
{
switch (w->type)
-@@ -181,7 +185,7 @@ static void create_label (const PreferencesWidget * widget, GtkWidget * * label,
+@@ -200,7 +204,7 @@ static void create_label (const PreferencesWidget * widget, GtkWidget * * label,
* label = gtk_label_new_with_mnemonic (dgettext (domain, widget->label));
gtk_label_set_use_markup ((GtkLabel *) * label, true);
gtk_label_set_line_wrap ((GtkLabel *) * label, true);
@@ -538,7 +538,7 @@
}
/* WIDGET_SPIN_BTN */
-@@ -193,7 +197,7 @@ static void create_spin_button (const PreferencesWidget * widget,
+@@ -212,7 +216,7 @@ static void create_spin_button (const PreferencesWidget * widget,
if (widget->label)
{
* label_pre = gtk_label_new (dgettext (domain, widget->label));
@@ -547,7 +547,7 @@
}
* spin_btn = gtk_spin_button_new_with_range (widget->data.spin_btn.min,
-@@ -202,7 +206,7 @@ static void create_spin_button (const PreferencesWidget * widget,
+@@ -221,7 +225,7 @@ static void create_spin_button (const PreferencesWidget * widget,
if (widget->data.spin_btn.right_label)
{
* label_past = gtk_label_new (dgettext (domain, widget->data.spin_btn.right_label));
@@ -556,7 +556,7 @@
}
widget_init (* spin_btn, widget);
-@@ -214,13 +218,14 @@ void create_font_btn (const PreferencesWidget * widget, GtkWidget * * label,
+@@ -233,13 +237,14 @@ void create_font_btn (const PreferencesWidget * widget, GtkWidget * * label,
GtkWidget * * font_btn, const char * domain)
{
* font_btn = gtk_font_button_new ();
@@ -572,7 +572,7 @@
}
if (widget->data.font_btn.title)
-@@ -236,12 +241,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
+@@ -255,12 +260,13 @@ static void create_entry (const PreferencesWidget * widget, GtkWidget * * label,
GtkWidget * * entry, const char * domain)
{
* entry = gtk_entry_new ();
@@ -587,8 +587,22 @@
}
widget_init (* entry, widget);
-@@ -259,8 +265,7 @@ static void combobox_update (GtkWidget * combobox, const PreferencesWidget * wid
+@@ -282,10 +288,12 @@ static void create_file_entry (const PreferencesWidget * widget,
+ break;
+ }
++ 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
+
g_object_set_data ((GObject *) combobox, "comboitems", (void *) items.data);
- /* no gtk_combo_box_text_clear()? */
@@ -597,7 +611,7 @@
for (const ComboItem & item : items)
gtk_combo_box_text_append_text ((GtkComboBoxText *) combobox,
-@@ -302,7 +307,7 @@ static void create_cbox (const PreferencesWidget * widget, GtkWidget * * label,
+@@ -346,7 +353,7 @@ static void create_cbox (const PreferencesWidget * widget, GtkWidget * * label,
if (widget->label)
{
* label = gtk_label_new (dgettext (domain, widget->label));
@@ -606,7 +620,7 @@
}
g_object_set_data ((GObject *) * combobox, "combodomain", (void *) domain);
-@@ -317,7 +322,6 @@ static void fill_table (GtkWidget * table,
+@@ -361,7 +368,6 @@ static void fill_table (GtkWidget * table,
for (const PreferencesWidget & w : widgets)
{
GtkWidget * widget_left = nullptr, * widget_middle = nullptr, * widget_right = nullptr;
@@ -614,15 +628,20 @@
switch (w.type)
{
-@@ -336,7 +340,6 @@ static void fill_table (GtkWidget * table,
+@@ -380,12 +386,10 @@ static void fill_table (GtkWidget * table,
case PreferencesWidget::Entry:
create_entry (& w, & widget_left, & widget_middle, domain);
- middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
break;
+ case PreferencesWidget::FileEntry:
+ create_file_entry (& w, & widget_left, & widget_middle, domain);
+- middle_policy = (GtkAttachOptions) (GTK_EXPAND | GTK_FILL);
+ break;
+
case PreferencesWidget::ComboBox:
-@@ -350,16 +353,13 @@ static void fill_table (GtkWidget * table,
+@@ -399,16 +403,13 @@ static void fill_table (GtkWidget * table,
int i = & w - widgets.data;
if (widget_left)
@@ -642,7 +661,7 @@
}
}
-@@ -384,13 +384,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -433,13 +434,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
{
if (! child_box)
{
@@ -659,7 +678,7 @@
if (disable_child)
gtk_widget_set_sensitive (child_box, false);
-@@ -399,16 +397,15 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -448,10 +447,6 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
else
child_box = nullptr;
@@ -670,8 +689,9 @@
widget = nullptr;
disable_child = false;
- if (radio_btn_group && w.type != PreferencesWidget::RadioButton)
- radio_btn_group = nullptr;
+@@ -461,6 +456,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+ if (! w.child)
+ radio_btn_group[true] = nullptr;
+ int pad_left = indent;
+ int pad_top = spacing;
@@ -679,7 +699,7 @@
switch (w.type)
{
case PreferencesWidget::Button:
-@@ -427,7 +424,8 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -479,7 +477,8 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
if (strstr (w.label, "<b>"))
{
/* headings get double spacing and no indent */
@@ -689,7 +709,7 @@
/* set indent for items below the heading */
indent = 12;
-@@ -438,7 +436,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -490,7 +489,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
if (icon)
{
@@ -698,7 +718,7 @@
gtk_box_pack_start ((GtkBox *) widget, icon, false, false, 0);
gtk_box_pack_start ((GtkBox *) widget, label, false, false, 0);
}
-@@ -457,7 +455,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -510,7 +509,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
case PreferencesWidget::SpinButton:
{
@@ -707,7 +727,7 @@
GtkWidget * label_pre = nullptr, * spin_btn = nullptr, * label_past = nullptr;
create_spin_button (& w, & label_pre, & spin_btn, & label_past, domain);
-@@ -480,7 +478,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -533,7 +532,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
case PreferencesWidget::FontButton:
{
@@ -716,7 +736,7 @@
GtkWidget * font_btn = nullptr;
create_font_btn (& w, & label, & font_btn, domain);
-@@ -494,9 +492,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -547,9 +546,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
}
case PreferencesWidget::Table:
@@ -729,17 +749,17 @@
fill_table (widget, w.data.table.widgets, domain);
-@@ -504,7 +502,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
-
+@@ -558,7 +557,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
case PreferencesWidget::Entry:
+ case PreferencesWidget::FileEntry:
{
- widget = gtk_hbox_new (false, 6);
+ widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
GtkWidget * entry = nullptr;
- create_entry (& w, & label, & entry, domain);
-@@ -519,7 +517,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -577,7 +576,7 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+
case PreferencesWidget::ComboBox:
{
- widget = gtk_hbox_new (false, 6);
@@ -747,7 +767,7 @@
GtkWidget * combo = nullptr;
create_cbox (& w, & label, & combo, domain);
-@@ -534,9 +532,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -592,9 +591,9 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
case PreferencesWidget::Box:
if (w.data.box.horizontal)
@@ -759,7 +779,7 @@
audgui_create_widgets_with_domain (widget, w.data.box.widgets, domain);
-@@ -550,13 +548,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -608,13 +607,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
break;
case PreferencesWidget::Notebook:
@@ -774,7 +794,7 @@
gtk_container_set_border_width ((GtkContainer *) vbox, 6);
audgui_create_widgets_with_domain (vbox, tab.widgets, domain);
-@@ -565,11 +561,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -623,11 +620,13 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
gtk_label_new (dgettext (domain, tab.name)));
}
@@ -790,7 +810,7 @@
break;
default:
-@@ -577,7 +575,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
+@@ -635,7 +634,11 @@ void audgui_create_widgets_with_domain (GtkWidget * box,
}
if (widget)
@@ -805,7 +825,7 @@
if (gtk_orientable_get_orientation ((GtkOrientable *) box) == GTK_ORIENTATION_VERTICAL)
--- src/libaudgui/prefs-window.cc.old
+++ src/libaudgui/prefs-window.cc
-@@ -516,29 +516,32 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
+@@ -528,29 +528,31 @@ static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
static void * create_titlestring_table ()
{
@@ -841,7 +861,7 @@
GtkWidget * titlestring_help_button = gtk_button_new ();
gtk_widget_set_can_focus (titlestring_help_button, false);
- gtk_button_set_focus_on_click ((GtkButton *) titlestring_help_button, false);
+- gtk_button_set_focus_on_click ((GtkButton *) titlestring_help_button, false);
gtk_button_set_relief ((GtkButton *) titlestring_help_button, GTK_RELIEF_HALF);
- gtk_table_attach ((GtkTable *) grid, titlestring_help_button, 2, 3, 1, 2,
- GTK_FILL, GTK_FILL, 0, 0);
@@ -849,7 +869,7 @@
GtkWidget * titlestring_tag_menu = create_titlestring_tag_menu ();
-@@ -553,14 +556,14 @@ static void * create_titlestring_table ()
+@@ -565,14 +567,14 @@ static void * create_titlestring_table ()
static void create_playlist_category ()
{
@@ -866,7 +886,7 @@
gtk_container_add ((GtkContainer *) category_notebook, vbox);
audgui_create_widgets (vbox, song_info_page_widgets);
}
-@@ -603,14 +606,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
+@@ -615,14 +617,14 @@ static ArrayRef<ComboItem> iface_combo_fill ()
static void * iface_create_prefs_box ()
{
@@ -883,7 +903,7 @@
gtk_container_add ((GtkContainer *) category_notebook, vbox);
audgui_create_widgets (vbox, appearance_page_widgets);
}
-@@ -734,17 +737,17 @@ static void record_update (void * = nullptr, void * = nullptr)
+@@ -753,17 +755,17 @@ static void record_update (void * = nullptr, void * = nullptr)
static void create_audio_category ()
{
@@ -904,7 +924,7 @@
gtk_box_pack_start ((GtkBox *) connectivity_page_vbox, vbox, true, true, 0);
audgui_create_widgets (vbox, connectivity_page_widgets);
-@@ -753,6 +756,7 @@ static void create_connectivity_category ()
+@@ -772,6 +774,7 @@ static void create_connectivity_category ()
static void create_plugin_category ()
{
plugin_notebook = gtk_notebook_new ();
@@ -912,7 +932,7 @@
gtk_container_add ((GtkContainer *) category_notebook, plugin_notebook);
for (const PluginCategory & category : plugin_categories)
-@@ -780,10 +784,10 @@ static void create_prefs_window ()
+@@ -799,10 +802,10 @@ static void create_prefs_window ()
gtk_container_set_border_width ((GtkContainer *) prefswin, 12);
gtk_window_set_title ((GtkWindow *) prefswin, _("Audacious Settings"));
@@ -925,7 +945,7 @@
gtk_box_pack_start ((GtkBox *) vbox, hbox, true, true, 0);
GtkWidget * scrolledwindow = gtk_scrolled_window_new (nullptr, nullptr);
-@@ -813,17 +817,17 @@ static void create_prefs_window ()
+@@ -832,17 +835,17 @@ static void create_prefs_window ()
create_song_info_category ();
create_plugin_category ();
@@ -979,7 +999,7 @@
progress_label = gtk_label_new (nullptr);
--- src/libaudgui/util.cc.old
+++ src/libaudgui/util.cc
-@@ -66,12 +66,27 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
+@@ -88,12 +88,40 @@ EXPORT int audgui_get_digit_width (GtkWidget * widget)
EXPORT void audgui_get_mouse_coords (GtkWidget * widget, int * x, int * y)
{
@@ -989,8 +1009,14 @@
+
+ GdkWindow * window = gtk_widget_get_window (widget);
+ GdkDisplay * display = gdk_window_get_display (window);
++
++#if GTK_CHECK_VERSION (3, 20, 0)
++ GdkSeat * seat = gdk_display_get_default_seat (display);
++ GdkDevice * device = gdk_seat_get_pointer (seat);
++#else
+ GdkDeviceManager * manager = gdk_display_get_device_manager (display);
+ GdkDevice * device = gdk_device_manager_get_client_pointer (manager);
++#endif
+
+ gdk_window_get_device_position (window, device, & xwin, & ywin, nullptr);
+ gtk_widget_get_allocation (widget, & alloc);
@@ -1003,14 +1029,21 @@
{
- gdk_display_get_pointer (gdk_screen_get_display (screen), nullptr, x, y, nullptr);
+ GdkDisplay * display = gdk_screen_get_display (screen);
++
++#if GTK_CHECK_VERSION (3, 20, 0)
++ GdkSeat * seat = gdk_display_get_default_seat (display);
++ GdkDevice * device = gdk_seat_get_pointer (seat);
++#else
+ GdkDeviceManager * manager = gdk_display_get_device_manager (display);
+ GdkDevice * device = gdk_device_manager_get_client_pointer (manager);
++#endif
++
+ gdk_device_get_position (device, nullptr, x, y);
}
EXPORT void audgui_get_monitor_geometry (GdkScreen * screen, int x, int y, GdkRectangle * geom)
-@@ -125,6 +140,22 @@ EXPORT GtkWidget * audgui_button_new (const char * text, const char * icon,
- return button;
+@@ -227,6 +255,22 @@ EXPORT void audgui_file_entry_set_uri (GtkWidget * entry, const char * uri)
+ gtk_editable_set_position ((GtkEditable *) entry, -1);
}
+static const char * icon_for_message_type (GtkMessageType type)
@@ -1032,7 +1065,7 @@
EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
const char * text, GtkWidget * button1, GtkWidget * button2)
{
-@@ -132,6 +163,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
+@@ -234,6 +278,13 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
GTK_BUTTONS_NONE, "%s", text);
gtk_window_set_title ((GtkWindow *) dialog, title);
@@ -1046,7 +1079,7 @@
if (button2)
{
gtk_dialog_add_action_widget ((GtkDialog *) dialog, button2, GTK_RESPONSE_NONE);
-@@ -147,6 +185,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
+@@ -249,6 +300,8 @@ EXPORT GtkWidget * audgui_dialog_new (GtkMessageType type, const char * title,
return dialog;
}
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)
===================================================================
--- 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)
@@ -0,0 +1,721 @@
+--- buildsys.mk.in.old
++++ buildsys.mk.in
+@@ -1,8 +1,8 @@
+ #
+-# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
+-# Jonathan Schleifer <js at webkeks.org>
++# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
++# Jonathan Schleifer <js at 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 at Entering directory @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n"; cd $$i || exit $$?
+-DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6 at Leaving directory @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF6 at .@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 at Entering directory @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
++DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6 at Leaving directory @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
+ DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Generating dependencies... at TERM_SGR0@\r"
+ DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully generated dependencies. at TERM_SGR0@\n"
+ DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
+-COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
+-COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
+-COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)... at TERM_SGR0@\r"
+-COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib). at TERM_SGR0@\n"
+-COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
+-COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)... at TERM_SGR0@\r"
+-COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin). at TERM_SGR0@\n"
+-COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
++COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r" "$<"
++COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n" "$<"
++COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3@ (lib)... at TERM_SGR0@\r" "$<"
++COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2@ (lib). at TERM_SGR0@\n" "$<"
++COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3@ (plugin)... at TERM_SGR0@\r" "$<"
++COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2@ (plugin). at TERM_SGR0@\n" "$<"
++COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
+ LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
+ LINK_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
+ LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Installing @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
+-INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully installed @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
+-INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to install @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-DELETE_OK = printf "@TERM_EL@@TERM_SETAF4 at Deleted @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF4 at .@TERM_SGR0@\n"
+-DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to delete @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-
+-include .deps
++INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Installing @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r" "$$i"
++INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully installed @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n" "$$i"
++INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to install @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
++DELETE_OK = printf "@TERM_EL@@TERM_SETAF4 at Deleted @TERM_BOLD@%s at TERM_SGR0@@TERM_SETAF4 at .@TERM_SGR0@\n" "$$i"
++DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to delete @TERM_BOLD@%s at 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 at webkeks.org>
++dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016
++dnl Jonathan Schleifer <js at 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20160930/2e30df31/attachment-0002.html>
More information about the macports-changes
mailing list