Sat May 10 14:56:33 2008 UTC ()
Update cmus to 2.2.0.
Based on patch provided by Adam Hoka in PR 37856.

This release adds replaygain support (with help from Johannes Wei��l).
To enable replaygain do ":set replaygain=true".

New commands:
    prev-view - switch to the previously used view
    tqueue    - add random tracks to the play-queue
    lqueue    - add random albums to the play-queue

New plugins:
    ffmpeg    - .wma files, could extend to support more
    wavpack   - .wv files
    waveout   - output plugin for Windows

There's also Cygwin support, many bug fixes, a new theme (green.theme)
and status scripts for Gaim and Pidgin in the contrib directory.

Changes
-------

Aaron Lehmann (2):
      Date sorting
      Filter: handle yyyy-mm-dd dates

Andrew Fuller (1):
      browse: Keep ".." sorted on top

David Thiel (1):
      Status script for pidgin

Frank Terbeck (2):
      mail address update
      added :prev-view command.

Johannes Wei��l (5):
      mpc: Tag reading fixes
      mpc: Tag reading fixes (part 2)
      Convert "album artist" tag to albumartist (hydrogenaudio suggestion)
      Support artistsort and albumartistsort tags
      Added wavpack plugin, added ape-support for mp3s.

Joshua Kwan (1):
      Status script for Gaim

Kevin Ko (3):
      ffmpeg plugin
      Fix seeking with recent version of ffmpeg
      ffmpeg: Fix deprecated warning and remove audio/x-ms-wma MIME type

Rob Wilson (1):
      Another green theme

Sven Wegener (1):
      Set window hardstatus instead of window alias

Thomas Nordlander (1):
      Display selected line in the settings view as active

Timo Hirvonen (66):
      Close unused fds after fork()
      Simplify tab completion code by removing nr_tails variable
      Simplify tab completion code
      Fix typo in cmus.1
      Sort playlist file for library views in same order as view 2
      Remove simple_track_cmp()
      Add albumartist to valid sort keys
      Use albumartist tag instead of <Compilations> when possible
      Convert album_artist tag to albumartist
      aac/mp4: Fix incompatible type warnings
      Improve searching URLs
      Indent ffmpeg.c
      Collect REPLAYGAIN_* tags
      ID3: Parse replay gain tags
      Pass struct track_info to player functions instead of filename
      Remove cur_track_info hack
      cmus_play_file: Treat URLs specially
      AAC: Detect corrupted stream
      Replaygain support
      Make replaygain limiting optional
      Add helper functions for allocating struct keyval arrays
      mpc: Get replaygain info
      mad: Simplify tag reading somewhat
      Simplify tag reading code in plugins
      Don't add duplicate tags
      flac: Fix metadata reading
      wavpack: Fix "FALSE undeclared" error
      Link ape.o to cmus instead wavpack, mpc and mad plugins
      Rename struct APE to struct apetag and make it public
      wavpack: Pass correct sample count to format_samples()
      wavpack: Get file size only once, use ip_data->remote to see if we can seek
      ID3: Rename struct ID3 to struct id3tag and make it public
      Link id3.o and utf8_encode.o to cmus instead of aac, mad and wavpack plugins
      Make sorting by albumartist fall back to artist
      Some documentation for settings view
      Rename shuffle_list_add_track() to list_add_rand()
      Add tqueue command
      Add lqueue command
      lqueue/tqueue: Lock editable
      configure: Add exampledir variable
      audio/x-mpegurl is playlist, not mpeg stream
      Always write MIME type to the debug file
      Write error messages to the debug file
      Make error_msg() display errors at init time
      Use error_msg() instead of warn() and warn_errno()
      ALSA: Override default error handler
      Always display errors
      Lower minimum error display time to two seconds
      Start playing on :seek if stopped
      seek: Ceil position to duration - 5s
      Document lqueue, tqueue and prev-view commands
      Don't allow saving if tracks are being added
      Remove useless function quit()
      Confirm quit if loading playlist
      Build system: Remove .NOTPARALLEL
      Fix libmikmod 3.1.10 check
      Fix some includes
      mad: Move some code to a separate function
      mad: More code reorganization
      mad: Move XING debug code
      mad: Remove nomad.header
      mad: Avoid calling mad_timer_add() twice
      mad: Fix duration calculation
      Add warnings about insecurity of using TCP/IP
      Document Replay Gain
      2.2.0

dnk000@gmail.com (5):
      Cygwin support
      Waveout plugin
      Waveout fixes
      waveout: Fix buffer space calculation
      aac/mp4: Use faad 2.0 instead of 2.5 due to license issues


(obache)
diff -r1.10 -r1.11 pkgsrc/audio/cmus/Makefile
diff -r1.4 -r1.5 pkgsrc/audio/cmus/PLIST
diff -r1.2 -r1.3 pkgsrc/audio/cmus/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/cmus/options.mk

cvs diff -r1.10 -r1.11 pkgsrc/audio/cmus/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cmus/Makefile 2008/04/12 22:42:58 1.10
+++ pkgsrc/audio/cmus/Makefile 2008/05/10 14:56:33 1.11
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: Makefile,v 1.10 2008/04/12 22:42:58 jlam Exp $ 1# $NetBSD: Makefile,v 1.11 2008/05/10 14:56:33 obache Exp $
2# 2#
3 3
4DISTNAME= cmus-2.1.0 4DISTNAME= cmus-2.2.0
5PKGREVISION= 1 
6CATEGORIES= audio 5CATEGORIES= audio
7MASTER_SITES= http://mirror.greaterscope.net/cmus/ 6MASTER_SITES= http://mirror.greaterscope.net/cmus/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= webmaster@deepblack24.de 9MAINTAINER= webmaster@deepblack24.de
11HOMEPAGE= http://onion.dynserv.net/~timo/files/ 10HOMEPAGE= http://cmus.sourceforge.net/
12COMMENT= Cmus is an ncurses based mp3/ogg player with a lot of features 11COMMENT= Cmus is an ncurses based mp3/ogg player with a lot of features
13 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
14HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
15USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
16 17
17CONFIGURE_ARGS+= prefix=${PREFIX} 18CONFIGURE_ARGS+= prefix=${PREFIX}
18CONFIGURE_ARGS+= CONFIG_ALSA=n 19CONFIGURE_ARGS+= CONFIG_ALSA=n
19CONFIGURE_ARGS+= CONFIG_OSS=y 20CONFIGURE_ARGS+= CONFIG_OSS=y
20CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/ 21CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/
21PLIST_VARS= sunaudio 22PLIST_VARS= sunaudio
22 23
23.if exists(/usr/include/sys/audioio.h) 24.if exists(/usr/include/sys/audioio.h)
24PLIST.sunaudio= yes 25PLIST.sunaudio= yes
25.endif 26.endif
26 27
27.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
28.if ${OPSYS} == "SunOS" 29.if ${OPSYS} == "SunOS"
29CONFIGURE_ARGS+= CONFIG_SUN=y 30CONFIGURE_ARGS+= CONFIG_SUN=y
30.endif 31.endif
31 32
32.include "options.mk" 33.include "options.mk"
33 34
34.include "../../devel/ncurses/buildlink3.mk" 35.include "../../converters/libiconv/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/audio/cmus/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/cmus/PLIST 2008/04/12 22:42:58 1.4
+++ pkgsrc/audio/cmus/PLIST 2008/05/10 14:56:33 1.5
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.5 2008/05/10 14:56:33 obache Exp $
2bin/cmus 2bin/cmus
3bin/cmus-remote 3bin/cmus-remote
4lib/cmus/ip/flac.so 4lib/cmus/ip/flac.so
5lib/cmus/ip/mad.so 5lib/cmus/ip/mad.so
6lib/cmus/ip/modplug.so 6lib/cmus/ip/modplug.so
7lib/cmus/ip/vorbis.so 7lib/cmus/ip/vorbis.so
8lib/cmus/ip/wav.so 8lib/cmus/ip/wav.so
9lib/cmus/op/ao.so 9lib/cmus/op/ao.so
10lib/cmus/op/oss.so 10lib/cmus/op/oss.so
11${PLIST.sunaudio}lib/cmus/op/sun.so 11${PLIST.sunaudio}lib/cmus/op/sun.so
12man/man1/cmus-remote.1 12man/man1/cmus-remote.1
13man/man1/cmus.1 13man/man1/cmus.1
14share/cmus/cyan.theme 14share/cmus/cyan.theme
15share/cmus/default.theme 15share/cmus/default.theme
16share/cmus/gray-88.theme 16share/cmus/gray-88.theme
17share/cmus/green-mono-88.theme 17share/cmus/green-mono-88.theme
 18share/cmus/green.theme
18share/cmus/rc 19share/cmus/rc
19share/cmus/xterm-white.theme 20share/cmus/xterm-white.theme
20share/doc/cmus/examples/cmus-status-display 21share/doc/cmus/examples/cmus-status-display
21@dirrm share/doc/cmus/examples 22@dirrm share/doc/cmus/examples
22@dirrm share/cmus 23@dirrm share/cmus
23@dirrm lib/cmus/op 24@dirrm lib/cmus/op
24@dirrm lib/cmus/ip 25@dirrm lib/cmus/ip
25@dirrm lib/cmus 26@dirrm lib/cmus
26@dirrm share/doc/cmus 27@dirrm share/doc/cmus

cvs diff -r1.2 -r1.3 pkgsrc/audio/cmus/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/cmus/distinfo 2007/01/13 08:57:56 1.2
+++ pkgsrc/audio/cmus/distinfo 2008/05/10 14:56:33 1.3
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.2 2007/01/13 08:57:56 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2008/05/10 14:56:33 obache Exp $
2 2
3SHA1 (cmus-2.1.0.tar.bz2) = 961d4bd1446c9499aeaac5a280761e5d98ca514f 3SHA1 (cmus-2.2.0.tar.bz2) = a6472633ac55660eb3aec5d2ae0296da86903bb2
4RMD160 (cmus-2.1.0.tar.bz2) = f359c8929dd616855aedbe2c4d1d2e252a8946ca 4RMD160 (cmus-2.2.0.tar.bz2) = 1287666c16332ad34222461e29d8355ef607e7b5
5Size (cmus-2.1.0.tar.bz2) = 146956 bytes 5Size (cmus-2.2.0.tar.bz2) = 155448 bytes

cvs diff -r1.3 -r1.4 pkgsrc/audio/cmus/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/cmus/options.mk 2008/02/28 17:15:48 1.3
+++ pkgsrc/audio/cmus/options.mk 2008/05/10 14:56:33 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: options.mk,v 1.3 2008/02/28 17:15:48 jlam Exp $ 1# $NetBSD: options.mk,v 1.4 2008/05/10 14:56:33 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cmus 3PKG_OPTIONS_VAR= PKG_OPTIONS.cmus
4PKG_SUPPORTED_OPTIONS= flac mad vorbis arts ao mpcdec #faad alsa 4PKG_SUPPORTED_OPTIONS= flac mad vorbis arts ao mpcdec #faad alsa
 5PKG_SUPPORTED_OPTIONS+= wide-curses
5PKG_OPTIONS_OPTIONAL_GROUPS= mod 6PKG_OPTIONS_OPTIONAL_GROUPS= mod
6PKG_OPTIONS_GROUP.mod= modplug mikmod 7PKG_OPTIONS_GROUP.mod= modplug mikmod
7PKG_SUGGESTED_OPTIONS= flac mad ao vorbis modplug 8PKG_SUGGESTED_OPTIONS= flac mad ao vorbis modplug
8 9
9.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
10 11
11### 12###
12### Backends 13### Backends
13### 14###
14 15
15# AO support 16# AO support
16# 17#
17.if !empty(PKG_OPTIONS:Mao) 18.if !empty(PKG_OPTIONS:Mao)
@@ -93,13 +94,22 @@ CONFIGURE_ARGS+= CONFIG_MIKMOD=n @@ -93,13 +94,22 @@ CONFIGURE_ARGS+= CONFIG_MIKMOD=n
93 94
94# FAAD support 95# FAAD support
95# 96#
96# XXX: faad2 in pkgsrc is heavily outdated as of 2007Q3, cmus needs newer. 97# XXX: faad2 in pkgsrc is heavily outdated as of 2007Q3, cmus needs newer.
97# 98#
98#.if !empty(PKG_OPTIONS:Mfaad) 99#.if !empty(PKG_OPTIONS:Mfaad)
99#.include "../../audio/faad2/buildlink3.mk" 100#.include "../../audio/faad2/buildlink3.mk"
100#CONFIGURE_ARGS+= CONFIG_AAC=y 101#CONFIGURE_ARGS+= CONFIG_AAC=y
101#CONFIGURE_ARGS+= CONFIG_MP4=y 102#CONFIGURE_ARGS+= CONFIG_MP4=y
102#.else 103#.else
103#CONFIGURE_ARGS+= CONFIG_AAC=n 104#CONFIGURE_ARGS+= CONFIG_AAC=n
104#CONFIGURE_ARGS+= CONFIG_MP4=n 105#CONFIGURE_ARGS+= CONFIG_MP4=n
105#.endif 106#.endif
 107
 108###
 109### Wide curses support; otherwise, default to using narrow curses.
 110###
 111.if !empty(PKG_OPTIONS:Mwide-curses)
 112. include "../../devel/ncursesw/buildlink3.mk"
 113.else
 114. include "../../devel/ncurses/buildlink3.mk"
 115.endif