head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.8 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2010Q4:1.2.0.60 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.58 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.56 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.54 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.52 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.50 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.48 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.46 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.36 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2011.03.07.09.34.33; author ryoon; state dead; branches; next 1.2; 1.2 date 2003.12.03.12.31.37; author cube; state Exp; branches; next 1.1; 1.1 date 2003.09.30.09.44.00; author cube; state Exp; branches; next ; desc @@ 1.3 log @Update to 3.2.5. * Update MASTER_SITES. * Add some options. Changelog: V3.2.5 2009/01/24 ================= * minor compilation fixes from freebsd ports maintainer Roman Bogorodskiy V3.2.4 2009/01/18 ================= * Fixed bug in buffering code when using SDL as audio output; this fixes possible hickups in such cases. * When changing back directories in the file browser, jump to the position in the file list the user came from. * Reduced number of warnings using newer g++ versions V3.2.3 2006/08/05 ================= * Fixed parallel build bug, make -j now works * Fixed typos in CharsetMap documentation * Implemented screen resizing * Fixed a race condition which caused 100% CPU consumption at the end of each played song V3.2.2 2006/01/29 ================= * Added support for audio playback using SDL (mixer is not supported (yet)) * Added Esound (Enlightened Sound Daemon) support * Removed strict dependency on OSS support, now that there are alternatives * Cleaned up code to allow compilation on MacOS X Tiger and Cygwin * Fixed a couple of minor memory allocation bugs * Fixed NAS playback (should work, but untested) V3.2.1 2005/12/06 ================= * Made cursor follow the highlighted bar in playlist/filemanager, to aid blind people * Fixed a bug in mpegsound library that could cause mp3blaster to crash. Thanks go to Serge van den Boom for reporting the problem. @ text @$NetBSD: patch-ae,v 1.2 2003/12/03 12:31:37 cube Exp $ --- nmixer/Makefile.in.orig 2003-11-28 21:07:25.000000000 +0100 +++ nmixer/Makefile.in @@@@ -63,6 +63,7 @@@@ CC = @@CC@@ CXX = @@CXX@@ HAVE_LIB = @@HAVE_LIB@@ LIB = @@LIB@@ +LIBGETOPT = @@LIBGETOPT@@ LIBMPEGSOUND = @@LIBMPEGSOUND@@ LIBMYSQL = @@LIBMYSQL@@ LIBNMIXER = @@LIBNMIXER@@ @@@@ -83,12 +84,11 @@@@ VERSION = @@VERSION@@ bin_PROGRAMS = nmixer nmixer_SOURCES = main.cc -nmixer_DEPENDENCIES = @@LIBNMIXER@@ -LDADD = @@LIBNMIXER@@ @@NCURSES_LIBS@@ +nmixer_DEPENDENCIES = @@LIBNMIXER@@ ../getopt/libgetopt.a +LDADD = @@LIBNMIXER@@ @@NCURSES_LIBS@@ @@LIBGETOPT@@ INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir) noinst_LIBRARIES = libnmixer.a -libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h getopt.c getopt1.c getopt.h - +libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h CXXFLAGS = @@NAS_CFLAGS@@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@@@ -105,8 +105,7 @@@@ X_LIBS = @@X_LIBS@@ X_EXTRA_LIBS = @@X_EXTRA_LIBS@@ X_PRE_LIBS = @@X_PRE_LIBS@@ libnmixer_a_LIBADD = -libnmixer_a_OBJECTS = nmixer.o mixers.o ossmixer.o nasmixer.o getopt.o \ -getopt1.o +libnmixer_a_OBJECTS = nmixer.o mixers.o ossmixer.o nasmixer.o AR = ar PROGRAMS = $(bin_PROGRAMS) @@@@ -128,6 +127,8 @@@@ DISTFILES = $(DIST_COMMON) $(SOURCES) $( TAR = tar GZIP_ENV = --best +DEP_FILES = .deps/main.P .deps/mixers.P .deps/nasmixer.P .deps/nmixer.P \ +.deps/ossmixer.P SOURCES = $(libnmixer_a_SOURCES) $(nmixer_SOURCES) OBJECTS = $(libnmixer_a_OBJECTS) $(nmixer_OBJECTS) @@@@ -135,9 +136,9 @@@@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .cc .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps nmixer/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu nmixer/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@@ CONFIG_HEADERS= $(SHELL) ./config.status @@@@ -151,9 +152,6 @@@@ distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@@@ -224,7 +222,7 @@@@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: @@@@ -240,6 +238,11 @@@@ distdir = $(top_builddir)/$(PACKAGE)-$(V subdir = nmixer distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu nmixer/Makefile @@for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@@@ -250,14 +253,57 @@@@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -getopt.o: getopt.c ../config.h -getopt1.o: getopt1.c ../config.h getopt.h -main.o: main.cc nmixer.h ../config.h getopt.h -mixers.o: mixers.cc nmixer.h ../config.h getopt.h -nasmixer.o: nasmixer.cc -nmixer.o: nmixer.cc nmixer.h ../config.h getopt.h -ossmixer.o: ossmixer.cc nmixer.h ../config.h getopt.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @@echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @@-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @@echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cc + @@echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @@-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cc + @@echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@@@ -296,25 +342,25 @@@@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ mostlyclean-binPROGRAMS mostlyclean-tags \ - mostlyclean-generic + mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-noinstLIBRARIES clean-compile clean-binPROGRAMS \ - clean-tags clean-generic mostlyclean-am + clean-tags clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-binPROGRAMS distclean-tags distclean-generic \ - clean-am + distclean-binPROGRAMS distclean-tags distclean-depend \ + distclean-generic clean-am distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-binPROGRAMS \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @@echo "This command is intended for maintainers to use;" @@echo "it deletes files that may require special tools to rebuild." @@@@ -326,8 +372,9 @@@@ mostlyclean-compile distclean-compile cl maintainer-clean-compile mostlyclean-binPROGRAMS distclean-binPROGRAMS \ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ install-binPROGRAMS tags mostlyclean-tags distclean-tags clean-tags \ -maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ +maintainer-clean-tags distdir mostlyclean-depend distclean-depend \ +clean-depend maintainer-clean-depend info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ install-data-am install-data install-am install uninstall-am uninstall \ all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ @ 1.2 log @Update to version 3.2.0. V3.2.0 2003/11/28 ================= -Updated source to compile with recent gcc compilers -Pausing mp3/wav/ogg playback releases the sound device -Better mp3 integrity checks. Songs that didn't previously play (or only partly), should now play fine (as in, the bits that are valid) -Fixed a bug that would hang mp3blaster if you'd be in a dir that was deleted meanwhile. -bugfix that could crash mp3blaster after a request to quit (..) -bugfix that failed to redraw screen correctly after operations that required input (such as convert to wav, enter group name, ..) -fixed a bug that could crash mp3blaster on opening oggs when sound device was busy. -Check if the playlist directory actually exists before trying to write a playlist -Added '--repeat/-R' command line option -Applied LIRC support patch from Olgierd Pieczul . Thanks a lot! @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Make this correctly compile with gcc3, by reorganizing the way it pulls up getop_long_only implementation. Patch sent to the author. Ok'd by seb@@. @ text @d3 1 a3 1 --- nmixer/Makefile.in.orig 2002-10-20 19:05:08.000000000 +0200 d5 1 a5 3 @@@@ -59,6 +59,7 @@@@ PRE_UNINSTALL = : POST_UNINSTALL = : CC = @@CC@@ d7 2 d13 1 a13 1 @@@@ -77,12 +78,11 @@@@ VERSION = @@VERSION@@ d29 1 a29 1 @@@@ -99,8 +99,7 @@@@ X_LIBS = @@X_LIBS@@ d39 1 a39 1 @@@@ -120,8 +119,10 @@@@ Makefile.in d41 1 a41 4 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar d48 1 a48 1 @@@@ -129,9 +130,9 @@@@ all: all-redirect d60 1 a60 1 @@@@ -145,9 +146,6 @@@@ distclean-noinstLIBRARIES: d70 1 a70 1 @@@@ -218,7 +216,7 @@@@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP d79 1 a79 1 @@@@ -234,6 +232,11 @@@@ distdir = $(top_builddir)/$(PACKAGE)-$(V d91 2 a92 1 @@@@ -245,6 +248,56 @@@@ distdir: $(DISTFILES) d95 7 d156 1 a156 1 @@@@ -283,25 +336,25 @@@@ distclean-generic: d188 1 a188 1 @@@@ -313,8 +366,9 @@@@ mostlyclean-compile distclean-compile cl @