Ticket #44595: audacious-group-002-patch_files_update.diff
File audacious-group-002-patch_files_update.diff, 31.0 KB (added by Ionic (Mihai Moldovan), 10 years ago) |
---|
-
multimedia/audacious-core/files/patch-buildsys.diff
commit 517019117b1cff0d172cdf1a4266f0e515d0b17f Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 10 20:39:45 2014 +0200 multimedia/audacious-{core,plugins}: update patch files for 3.5.1. Merge buildsys changes from upstream (https://github.com/Midar/buildsys). diff --git a/multimedia/audacious-core/files/patch-buildsys.diff b/multimedia/audacious-core/files/patch-buildsys.diff index b47d342..fc648d1 100644
a b 1 --- buildsys.mk.in.old 2014-05-10 20:05:12.000000000 +02002 +++ buildsys.mk.in 2014-05-10 20:06:01.000000000 +02003 @@ -107, 7 +107,6 @@1 --- buildsys.mk.in.old 2 +++ buildsys.mk.in 3 @@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o} 4 4 5 5 MO_FILES = ${LOCALES:.po=.mo} 6 6 7 7 -.SILENT: 8 8 .SUFFIXES: 9 9 .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 10 .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 11 --- m4/buildsys.m4.old 2014-05-10 20:05:12.000000000 +0200 12 +++ m4/buildsys.m4 2014-05-10 20:05:47.000000000 +0200 13 @@ -109,14 +109,14 @@ 10 -.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 11 +.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER} 12 13 all: 14 + ${MAKE} pre-all 15 ${MAKE} ${MFLAGS} subdirs 16 ${MAKE} ${MFLAGS} depend 17 ${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 18 + ${MAKE} ${MFLAGS} subdirs-after 19 + ${MAKE} post-all 20 + 21 +pre-all post-all: 22 23 subdirs: ${SUBDIRS} 24 +subdirs-after: ${SUBDIRS_AFTER} 25 26 -${SUBDIRS}: 27 +${SUBDIRS} ${SUBDIRS_AFTER}: 28 for i in $@; do \ 29 ${DIR_ENTER}; \ 30 ${MAKE} ${MFLAGS} || exit $$?; \ 31 @@ -205,6 +210,7 @@ pre-depend: 32 33 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} 34 ${LINK_STATUS} 35 + out="$@"; \ 36 if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ 37 ${LINK_OK}; \ 38 else \ 39 @@ -228,7 +234,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA} 40 fi 41 42 ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} 43 - ${LINK_STATUS}; \ 44 + ${LINK_STATUS} 45 + out="$@"; \ 46 objs=""; \ 47 ars=""; \ 48 for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \ 49 @@ -264,6 +271,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} 50 51 ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} 52 ${LINK_STATUS} 53 + out="$@"; \ 54 objs=""; \ 55 ars=""; \ 56 for i in ${PLUGIN_OBJS}; do \ 57 @@ -300,6 +308,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} 58 ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} 59 ${LINK_STATUS} 60 rm -f $@ 61 + out="$@"; \ 62 objs=""; \ 63 ars=""; \ 64 for i in ${OBJS} ${OBJS_EXTRA}; do \ 65 @@ -337,6 +346,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} 66 ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} 67 ${LINK_STATUS} 68 rm -f $@ 69 + out="$@"; \ 70 objs=""; \ 71 ars=""; \ 72 for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \ 73 @@ -375,6 +385,8 @@ locales: ${MO_FILES} 74 75 .c.o: 76 ${COMPILE_STATUS} 77 + in="$<"; \ 78 + out="$@"; \ 79 if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 80 ${COMPILE_OK}; \ 81 else \ 82 @@ -382,6 +394,8 @@ locales: ${MO_FILES} 83 fi 84 .c.lib.o: 85 ${COMPILE_LIB_STATUS} 86 + in="$<"; \ 87 + out="$@"; \ 88 if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 89 ${COMPILE_LIB_OK}; \ 90 else \ 91 @@ -389,6 +403,8 @@ locales: ${MO_FILES} 92 fi 93 .c.plugin.o: 94 ${COMPILE_PLUGIN_STATUS} 95 + in="$<"; \ 96 + out="$@"; \ 97 if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 98 ${COMPILE_PLUGIN_OK}; \ 99 else \ 100 @@ -397,6 +413,8 @@ locales: ${MO_FILES} 101 102 .cc.o .cxx.o: 103 ${COMPILE_STATUS} 104 + in="$<"; \ 105 + out="$@"; \ 106 if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 107 ${COMPILE_OK}; \ 108 else \ 109 @@ -404,6 +422,8 @@ locales: ${MO_FILES} 110 fi 111 .cc.lib.o .cxx.lib.o: 112 ${COMPILE_LIB_STATUS} 113 + in="$<"; \ 114 + out="$@"; \ 115 if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 116 ${COMPILE_LIB_OK}; \ 117 else \ 118 @@ -411,6 +431,8 @@ locales: ${MO_FILES} 119 fi 120 .cc.plugin.o .cxx.plugin.o: 121 ${COMPILE_PLUGIN_STATUS} 122 + in="$<"; \ 123 + out="$@"; \ 124 if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 125 ${COMPILE_PLUGIN_OK}; \ 126 else \ 127 @@ -419,6 +441,8 @@ locales: ${MO_FILES} 128 129 .d.o: 130 ${COMPILE_STATUS} 131 + in="$<"; \ 132 + out="$@"; \ 133 if test x"$(basename ${DC})" = x"dmd"; then \ 134 if ${DC} ${DFLAGS} -c -of$@ $<; then \ 135 ${COMPILE_OK}; \ 136 @@ -435,6 +459,8 @@ locales: ${MO_FILES} 137 138 .erl.beam: 139 ${COMPILE_STATUS} 140 + in="$<"; \ 141 + out="$@"; \ 142 if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \ 143 ${COMPILE_OK}; \ 144 else \ 145 @@ -443,6 +469,8 @@ locales: ${MO_FILES} 146 147 .java.class: 148 ${COMPILE_STATUS} 149 + in="$<"; \ 150 + out="$@"; \ 151 if ${JAVAC} ${JAVACFLAGS} $<; then \ 152 ${COMPILE_OK}; \ 153 else \ 154 @@ -451,6 +479,8 @@ locales: ${MO_FILES} 155 156 .m.o: 157 ${COMPILE_STATUS} 158 + in="$<"; \ 159 + out="$@"; \ 160 if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 161 ${COMPILE_OK}; \ 162 else \ 163 @@ -458,6 +488,8 @@ locales: ${MO_FILES} 164 fi 165 .m.lib.o: 166 ${COMPILE_LIB_STATUS} 167 + in="$<"; \ 168 + out="$@"; \ 169 if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 170 ${COMPILE_LIB_OK}; \ 171 else \ 172 @@ -465,6 +497,8 @@ locales: ${MO_FILES} 173 fi 174 .m.plugin.o: 175 ${COMPILE_PLUGIN_STATUS} 176 + in="$<"; \ 177 + out="$@"; \ 178 if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 179 ${COMPILE_PLUGIN_OK}; \ 180 else \ 181 @@ -473,6 +507,8 @@ locales: ${MO_FILES} 182 183 .mm.o: 184 ${COMPILE_STATUS} 185 + in="$<"; \ 186 + out="$@"; \ 187 if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 188 ${COMPILE_OK}; \ 189 else \ 190 @@ -480,6 +516,8 @@ locales: ${MO_FILES} 191 fi 192 .mm.lib.o: 193 ${COMPILE_LIB_STATUS} 194 + in="$<"; \ 195 + out="$@"; \ 196 if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 197 ${COMPILE_LIB_OK}; \ 198 else \ 199 @@ -487,6 +525,8 @@ locales: ${MO_FILES} 200 fi 201 .mm.plugin.o: 202 ${COMPILE_PLUGIN_STATUS} 203 + in="$<"; \ 204 + out="$@"; \ 205 if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 206 ${COMPILE_PLUGIN_OK}; \ 207 else \ 208 @@ -495,6 +535,8 @@ locales: ${MO_FILES} 209 210 .po.mo: 211 ${COMPILE_STATUS} 212 + in="$<"; \ 213 + out="$@"; \ 214 if ${MSGFMT} -c -o $@ $<; then \ 215 ${COMPILE_OK}; \ 216 else \ 217 @@ -503,6 +545,8 @@ locales: ${MO_FILES} 218 219 .py.pyc: 220 ${COMPILE_STATUS} 221 + in="$<"; \ 222 + out="$@"; \ 223 if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \ 224 ${COMPILE_OK}; \ 225 else \ 226 @@ -511,7 +555,9 @@ locales: ${MO_FILES} 227 228 .rc.o .rc.lib.o .rc.plugin.o: 229 ${COMPILE_STATUS} 230 - if ${WINDRES} -J rc -O coff -o $@ $<; then \ 231 + in="$<"; \ 232 + out="$@"; \ 233 + if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \ 234 ${COMPILE_OK}; \ 235 else \ 236 ${COMPILE_FAILED}; \ 237 @@ -519,6 +565,8 @@ locales: ${MO_FILES} 238 239 .S.o: 240 ${COMPILE_STATUS} 241 + in="$<"; \ 242 + out="$@"; \ 243 if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 244 ${COMPILE_OK}; \ 245 else \ 246 @@ -526,6 +574,8 @@ locales: ${MO_FILES} 247 fi 248 .S.lib.o: 249 ${COMPILE_LIB_STATUS} 250 + in="$<"; \ 251 + out="$@"; \ 252 if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 253 ${COMPILE_LIB_OK}; \ 254 else \ 255 @@ -533,6 +583,8 @@ locales: ${MO_FILES} 256 fi 257 .S.plugin.o: 258 ${COMPILE_PLUGIN_STATUS} 259 + in="$<"; \ 260 + out="$@"; \ 261 if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 262 ${COMPILE_PLUGIN_OK}; \ 263 else \ 264 @@ -541,6 +593,8 @@ locales: ${MO_FILES} 265 266 .xpm.o: 267 ${COMPILE_STATUS} 268 + in="$<"; \ 269 + out="$@"; \ 270 if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ 271 ${COMPILE_OK}; \ 272 else \ 273 @@ -548,6 +602,8 @@ locales: ${MO_FILES} 274 fi 275 .xpm.lib.o: 276 ${COMPILE_LIB_STATUS} 277 + in="$<"; \ 278 + out="$@"; \ 279 if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ 280 ${COMPILE_LIB_OK}; \ 281 else \ 282 @@ -555,14 +611,16 @@ locales: ${MO_FILES} 283 fi 284 .xpm.plugin.o: 285 ${COMPILE_PLUGIN_STATUS} 286 + in="$<"; \ 287 + out="$@"; \ 288 if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ 289 ${COMPILE_PLUGIN_OK}; \ 290 else \ 291 ${COMPILE_PLUGIN_FAILED}; \ 292 fi 293 294 -install: install-extra 295 - for i in ${SUBDIRS}; do \ 296 +install: all install-extra 297 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 298 ${DIR_ENTER}; \ 299 ${MAKE} ${MFLAGS} install || exit $$?; \ 300 ${DIR_LEAVE}; \ 301 @@ -643,7 +701,7 @@ install: install-extra 302 install-extra: 303 304 uninstall: uninstall-extra 305 - for i in ${SUBDIRS}; do \ 306 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 307 ${DIR_ENTER}; \ 308 ${MAKE} ${MFLAGS} uninstall || exit $$?; \ 309 ${DIR_LEAVE}; \ 310 @@ -736,7 +794,7 @@ uninstall: uninstall-extra 311 uninstall-extra: 312 313 clean: 314 - for i in ${SUBDIRS}; do \ 315 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 316 ${DIR_ENTER}; \ 317 ${MAKE} ${MFLAGS} clean || exit $$?; \ 318 ${DIR_LEAVE}; \ 319 @@ -753,7 +811,7 @@ clean: 320 done 321 322 distclean: clean 323 - for i in ${SUBDIRS}; do \ 324 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 325 ${DIR_ENTER}; \ 326 ${MAKE} ${MFLAGS} distclean || exit $$?; \ 327 ${DIR_LEAVE}; \ 328 @@ -769,27 +827,39 @@ distclean: clean 329 fi \ 330 done 331 332 -DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$? 333 -DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$? 334 +print-hierarchy: 335 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 336 + echo ${PRINT_HIERARCHY_PREFIX}$$i; \ 337 + cd $$i || exit $$?; \ 338 + ${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \ 339 + cd .. || exit $$?; \ 340 + done 341 + 342 +print-var: 343 + echo '${${VAR}}' 344 + 345 +DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$? 346 +DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$? 347 DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r" 348 DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n" 349 DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err 350 -COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" 351 -COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" 352 -COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 353 -COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" 354 -COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" 355 -COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err 356 -COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" 357 -COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" 358 -COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err 359 +COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<" 360 +COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<" 361 +COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err 362 +COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<" 363 +COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<" 364 +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 365 +COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<" 366 +COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<" 367 +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 368 LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" 369 LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" 370 LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 371 -INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" 372 -INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" 373 -INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 374 -DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" 375 -DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 376 - 377 -include .deps 378 +INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i" 379 +INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i" 380 +INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err 381 +DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i" 382 +DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err 383 + 384 +.CURDIR ?= . 385 +include ${.CURDIR}/.deps 386 --- m4/buildsys.m4.old 387 +++ m4/buildsys.m4 388 @@ -109,14 +109,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [ 14 389 darwin*) 15 390 AC_MSG_RESULT(Darwin) 16 391 LIB_CFLAGS='-fPIC -DPIC' 17 392 - LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}' 18 + LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$ ''@'393 + LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib' 19 394 LIB_PREFIX='lib' 20 395 LIB_SUFFIX='.dylib' 21 396 LDFLAGS_RPATH='-Wl,-rpath,${libdir}' -
multimedia/audacious-plugins/files/patch-buildsys.diff
diff --git a/multimedia/audacious-plugins/files/patch-buildsys.diff b/multimedia/audacious-plugins/files/patch-buildsys.diff index ab01b82..fc648d1 100644
a b 1 --- buildsys.mk.in.old 2014-05-10 20:05:19.000000000 +02002 +++ buildsys.mk.in 2014-05-10 20:08:27.000000000 +02003 @@ -107, 7 +107,6 @@1 --- buildsys.mk.in.old 2 +++ buildsys.mk.in 3 @@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o} 4 4 5 5 MO_FILES = ${LOCALES:.po=.mo} 6 6 7 7 -.SILENT: 8 8 .SUFFIXES: 9 9 .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 10 .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 11 --- m4/buildsys.m4.old 2014-05-10 20:05:19.000000000 +0200 12 +++ m4/buildsys.m4 2014-05-10 20:08:17.000000000 +0200 13 @@ -109,14 +109,14 @@ 10 -.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 11 +.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER} 12 13 all: 14 + ${MAKE} pre-all 15 ${MAKE} ${MFLAGS} subdirs 16 ${MAKE} ${MFLAGS} depend 17 ${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 18 + ${MAKE} ${MFLAGS} subdirs-after 19 + ${MAKE} post-all 20 + 21 +pre-all post-all: 22 23 subdirs: ${SUBDIRS} 24 +subdirs-after: ${SUBDIRS_AFTER} 25 26 -${SUBDIRS}: 27 +${SUBDIRS} ${SUBDIRS_AFTER}: 28 for i in $@; do \ 29 ${DIR_ENTER}; \ 30 ${MAKE} ${MFLAGS} || exit $$?; \ 31 @@ -205,6 +210,7 @@ pre-depend: 32 33 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} 34 ${LINK_STATUS} 35 + out="$@"; \ 36 if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ 37 ${LINK_OK}; \ 38 else \ 39 @@ -228,7 +234,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA} 40 fi 41 42 ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} 43 - ${LINK_STATUS}; \ 44 + ${LINK_STATUS} 45 + out="$@"; \ 46 objs=""; \ 47 ars=""; \ 48 for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \ 49 @@ -264,6 +271,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} 50 51 ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} 52 ${LINK_STATUS} 53 + out="$@"; \ 54 objs=""; \ 55 ars=""; \ 56 for i in ${PLUGIN_OBJS}; do \ 57 @@ -300,6 +308,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} 58 ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} 59 ${LINK_STATUS} 60 rm -f $@ 61 + out="$@"; \ 62 objs=""; \ 63 ars=""; \ 64 for i in ${OBJS} ${OBJS_EXTRA}; do \ 65 @@ -337,6 +346,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} 66 ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} 67 ${LINK_STATUS} 68 rm -f $@ 69 + out="$@"; \ 70 objs=""; \ 71 ars=""; \ 72 for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \ 73 @@ -375,6 +385,8 @@ locales: ${MO_FILES} 74 75 .c.o: 76 ${COMPILE_STATUS} 77 + in="$<"; \ 78 + out="$@"; \ 79 if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 80 ${COMPILE_OK}; \ 81 else \ 82 @@ -382,6 +394,8 @@ locales: ${MO_FILES} 83 fi 84 .c.lib.o: 85 ${COMPILE_LIB_STATUS} 86 + in="$<"; \ 87 + out="$@"; \ 88 if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 89 ${COMPILE_LIB_OK}; \ 90 else \ 91 @@ -389,6 +403,8 @@ locales: ${MO_FILES} 92 fi 93 .c.plugin.o: 94 ${COMPILE_PLUGIN_STATUS} 95 + in="$<"; \ 96 + out="$@"; \ 97 if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 98 ${COMPILE_PLUGIN_OK}; \ 99 else \ 100 @@ -397,6 +413,8 @@ locales: ${MO_FILES} 101 102 .cc.o .cxx.o: 103 ${COMPILE_STATUS} 104 + in="$<"; \ 105 + out="$@"; \ 106 if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 107 ${COMPILE_OK}; \ 108 else \ 109 @@ -404,6 +422,8 @@ locales: ${MO_FILES} 110 fi 111 .cc.lib.o .cxx.lib.o: 112 ${COMPILE_LIB_STATUS} 113 + in="$<"; \ 114 + out="$@"; \ 115 if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 116 ${COMPILE_LIB_OK}; \ 117 else \ 118 @@ -411,6 +431,8 @@ locales: ${MO_FILES} 119 fi 120 .cc.plugin.o .cxx.plugin.o: 121 ${COMPILE_PLUGIN_STATUS} 122 + in="$<"; \ 123 + out="$@"; \ 124 if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 125 ${COMPILE_PLUGIN_OK}; \ 126 else \ 127 @@ -419,6 +441,8 @@ locales: ${MO_FILES} 128 129 .d.o: 130 ${COMPILE_STATUS} 131 + in="$<"; \ 132 + out="$@"; \ 133 if test x"$(basename ${DC})" = x"dmd"; then \ 134 if ${DC} ${DFLAGS} -c -of$@ $<; then \ 135 ${COMPILE_OK}; \ 136 @@ -435,6 +459,8 @@ locales: ${MO_FILES} 137 138 .erl.beam: 139 ${COMPILE_STATUS} 140 + in="$<"; \ 141 + out="$@"; \ 142 if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \ 143 ${COMPILE_OK}; \ 144 else \ 145 @@ -443,6 +469,8 @@ locales: ${MO_FILES} 146 147 .java.class: 148 ${COMPILE_STATUS} 149 + in="$<"; \ 150 + out="$@"; \ 151 if ${JAVAC} ${JAVACFLAGS} $<; then \ 152 ${COMPILE_OK}; \ 153 else \ 154 @@ -451,6 +479,8 @@ locales: ${MO_FILES} 155 156 .m.o: 157 ${COMPILE_STATUS} 158 + in="$<"; \ 159 + out="$@"; \ 160 if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 161 ${COMPILE_OK}; \ 162 else \ 163 @@ -458,6 +488,8 @@ locales: ${MO_FILES} 164 fi 165 .m.lib.o: 166 ${COMPILE_LIB_STATUS} 167 + in="$<"; \ 168 + out="$@"; \ 169 if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 170 ${COMPILE_LIB_OK}; \ 171 else \ 172 @@ -465,6 +497,8 @@ locales: ${MO_FILES} 173 fi 174 .m.plugin.o: 175 ${COMPILE_PLUGIN_STATUS} 176 + in="$<"; \ 177 + out="$@"; \ 178 if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 179 ${COMPILE_PLUGIN_OK}; \ 180 else \ 181 @@ -473,6 +507,8 @@ locales: ${MO_FILES} 182 183 .mm.o: 184 ${COMPILE_STATUS} 185 + in="$<"; \ 186 + out="$@"; \ 187 if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 188 ${COMPILE_OK}; \ 189 else \ 190 @@ -480,6 +516,8 @@ locales: ${MO_FILES} 191 fi 192 .mm.lib.o: 193 ${COMPILE_LIB_STATUS} 194 + in="$<"; \ 195 + out="$@"; \ 196 if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 197 ${COMPILE_LIB_OK}; \ 198 else \ 199 @@ -487,6 +525,8 @@ locales: ${MO_FILES} 200 fi 201 .mm.plugin.o: 202 ${COMPILE_PLUGIN_STATUS} 203 + in="$<"; \ 204 + out="$@"; \ 205 if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 206 ${COMPILE_PLUGIN_OK}; \ 207 else \ 208 @@ -495,6 +535,8 @@ locales: ${MO_FILES} 209 210 .po.mo: 211 ${COMPILE_STATUS} 212 + in="$<"; \ 213 + out="$@"; \ 214 if ${MSGFMT} -c -o $@ $<; then \ 215 ${COMPILE_OK}; \ 216 else \ 217 @@ -503,6 +545,8 @@ locales: ${MO_FILES} 218 219 .py.pyc: 220 ${COMPILE_STATUS} 221 + in="$<"; \ 222 + out="$@"; \ 223 if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \ 224 ${COMPILE_OK}; \ 225 else \ 226 @@ -511,7 +555,9 @@ locales: ${MO_FILES} 227 228 .rc.o .rc.lib.o .rc.plugin.o: 229 ${COMPILE_STATUS} 230 - if ${WINDRES} -J rc -O coff -o $@ $<; then \ 231 + in="$<"; \ 232 + out="$@"; \ 233 + if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \ 234 ${COMPILE_OK}; \ 235 else \ 236 ${COMPILE_FAILED}; \ 237 @@ -519,6 +565,8 @@ locales: ${MO_FILES} 238 239 .S.o: 240 ${COMPILE_STATUS} 241 + in="$<"; \ 242 + out="$@"; \ 243 if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 244 ${COMPILE_OK}; \ 245 else \ 246 @@ -526,6 +574,8 @@ locales: ${MO_FILES} 247 fi 248 .S.lib.o: 249 ${COMPILE_LIB_STATUS} 250 + in="$<"; \ 251 + out="$@"; \ 252 if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 253 ${COMPILE_LIB_OK}; \ 254 else \ 255 @@ -533,6 +583,8 @@ locales: ${MO_FILES} 256 fi 257 .S.plugin.o: 258 ${COMPILE_PLUGIN_STATUS} 259 + in="$<"; \ 260 + out="$@"; \ 261 if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ 262 ${COMPILE_PLUGIN_OK}; \ 263 else \ 264 @@ -541,6 +593,8 @@ locales: ${MO_FILES} 265 266 .xpm.o: 267 ${COMPILE_STATUS} 268 + in="$<"; \ 269 + out="$@"; \ 270 if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ 271 ${COMPILE_OK}; \ 272 else \ 273 @@ -548,6 +602,8 @@ locales: ${MO_FILES} 274 fi 275 .xpm.lib.o: 276 ${COMPILE_LIB_STATUS} 277 + in="$<"; \ 278 + out="$@"; \ 279 if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ 280 ${COMPILE_LIB_OK}; \ 281 else \ 282 @@ -555,14 +611,16 @@ locales: ${MO_FILES} 283 fi 284 .xpm.plugin.o: 285 ${COMPILE_PLUGIN_STATUS} 286 + in="$<"; \ 287 + out="$@"; \ 288 if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ 289 ${COMPILE_PLUGIN_OK}; \ 290 else \ 291 ${COMPILE_PLUGIN_FAILED}; \ 292 fi 293 294 -install: install-extra 295 - for i in ${SUBDIRS}; do \ 296 +install: all install-extra 297 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 298 ${DIR_ENTER}; \ 299 ${MAKE} ${MFLAGS} install || exit $$?; \ 300 ${DIR_LEAVE}; \ 301 @@ -643,7 +701,7 @@ install: install-extra 302 install-extra: 303 304 uninstall: uninstall-extra 305 - for i in ${SUBDIRS}; do \ 306 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 307 ${DIR_ENTER}; \ 308 ${MAKE} ${MFLAGS} uninstall || exit $$?; \ 309 ${DIR_LEAVE}; \ 310 @@ -736,7 +794,7 @@ uninstall: uninstall-extra 311 uninstall-extra: 312 313 clean: 314 - for i in ${SUBDIRS}; do \ 315 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 316 ${DIR_ENTER}; \ 317 ${MAKE} ${MFLAGS} clean || exit $$?; \ 318 ${DIR_LEAVE}; \ 319 @@ -753,7 +811,7 @@ clean: 320 done 321 322 distclean: clean 323 - for i in ${SUBDIRS}; do \ 324 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 325 ${DIR_ENTER}; \ 326 ${MAKE} ${MFLAGS} distclean || exit $$?; \ 327 ${DIR_LEAVE}; \ 328 @@ -769,27 +827,39 @@ distclean: clean 329 fi \ 330 done 331 332 -DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$? 333 -DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$? 334 +print-hierarchy: 335 + for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \ 336 + echo ${PRINT_HIERARCHY_PREFIX}$$i; \ 337 + cd $$i || exit $$?; \ 338 + ${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \ 339 + cd .. || exit $$?; \ 340 + done 341 + 342 +print-var: 343 + echo '${${VAR}}' 344 + 345 +DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$? 346 +DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$? 347 DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r" 348 DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n" 349 DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err 350 -COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" 351 -COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" 352 -COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 353 -COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" 354 -COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" 355 -COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err 356 -COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" 357 -COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" 358 -COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err 359 +COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<" 360 +COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<" 361 +COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err 362 +COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<" 363 +COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<" 364 +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 365 +COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<" 366 +COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<" 367 +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 368 LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" 369 LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" 370 LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 371 -INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" 372 -INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" 373 -INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 374 -DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" 375 -DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err 376 - 377 -include .deps 378 +INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i" 379 +INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i" 380 +INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err 381 +DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i" 382 +DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err 383 + 384 +.CURDIR ?= . 385 +include ${.CURDIR}/.deps 386 --- m4/buildsys.m4.old 387 +++ m4/buildsys.m4 388 @@ -109,14 +109,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [ 14 389 darwin*) 15 390 AC_MSG_RESULT(Darwin) 16 391 LIB_CFLAGS='-fPIC -DPIC' 17 392 - LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}' 18 + LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$ ''@'393 + LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib' 19 394 LIB_PREFIX='lib' 20 395 LIB_SUFFIX='.dylib' 21 396 LDFLAGS_RPATH='-Wl,-rpath,${libdir}' -
multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff
diff --git a/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff b/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff index fef14b5..a96a0da 100644
a b 1 1 --- configure.ac.old 2 2 +++ configure.ac 3 @@ - 603,17 +603,47 @@ AC_ARG_ENABLE(sdlout,3 @@ -570,17 +570,47 @@ AC_ARG_ENABLE(sdlout, 4 4 [AS_HELP_STRING([--disable-sdlout], [disable SDL output plugin])], 5 5 [enable_sdlout=$enableval], [enable_sdlout=auto]) 6 6