From owner-svn-ports-head@freebsd.org Sat Jan 28 14:28:51 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 572E1CC552C; Sat, 28 Jan 2017 14:28:51 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0AD68A84; Sat, 28 Jan 2017 14:28:50 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0SESosW014843; Sat, 28 Jan 2017 14:28:50 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0SESnCH014834; Sat, 28 Jan 2017 14:28:49 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201701281428.v0SESnCH014834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 28 Jan 2017 14:28:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432625 - in head/audio/musicpd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2017 14:28:51 -0000 Author: riggs Date: Sat Jan 28 14:28:49 2017 New Revision: 432625 URL: https://svnweb.freebsd.org/changeset/ports/432625 Log: Update to upstream version 0.20.3; fixes see below Detailed log: - Update to upstream version 0.20.3 - Resolve c++ stdlib overlinking on FreeBSD-10, fixes [1] - Promote HTTPD to default OPTION (proposal by jungleboogie0@gmail.com) - Update REINPLACEs on example config file to match upstream changes - Add additional hint on directory permissions and ownership for initial mpd service start in pkg-message.in - Pet portlint PR: 216371 Reported by: hideo@lastamericanempire.com Added: head/audio/musicpd/files/patch-src_db_Count.cxx (contents, props changed) head/audio/musicpd/files/patch-src_db_DatabasePlaylist.cxx (contents, props changed) head/audio/musicpd/files/patch-src_db_DatabasePrint.cxx (contents, props changed) head/audio/musicpd/files/patch-src_db_DatabaseQueue.cxx (contents, props changed) head/audio/musicpd/files/patch-src_db_Helpers.cxx (contents, props changed) Modified: head/audio/musicpd/Makefile head/audio/musicpd/distinfo head/audio/musicpd/files/pkg-message.in Modified: head/audio/musicpd/Makefile ============================================================================== --- head/audio/musicpd/Makefile Sat Jan 28 14:22:53 2017 (r432624) +++ head/audio/musicpd/Makefile Sat Jan 28 14:28:49 2017 (r432625) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.2 -PORTREVISION= 1 +PORTVERSION= 0.20.3 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} @@ -15,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libicudata.so:devel/icu -USES= gmake pkgconfig compiler:c++14-lang tar:xz +USES= compiler:c++14-lang gmake pkgconfig tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 @@ -67,7 +66,7 @@ VORBISENC_DESC= Ogg Vorbis encoder WILDMIDI_DESC= WildMIDI support (MIDI files) YAJL_DESC= SoundCloud support via libyajl -OPTIONS_DEFAULT=ID3TAG MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL +OPTIONS_DEFAULT=HTTPD ID3TAG MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL AAC_CONFIGURE_ENABLE=aac AAC_LIB_DEPENDS=libfaad.so:audio/faad @@ -156,10 +155,6 @@ GROUPS= ${MPDGROUP} .include -.if ${OSVERSION} < 1100000 -USE_GCC= 5+ -.endif - .ifdef MPDCONF IGNORE=Please remove the MPDCONF line from make.conf, then rename ${PREFIX}/etc/${MPDCONF} to musicpd.conf, if it exists .endif @@ -213,8 +208,8 @@ CONFIGURE_ARGS+=--disable-shout .endif post-patch: -# Replace ~/ with /var/mpd and make musicpd run as mpd by default - @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd,g' \ +# Replace ~/ with /var/mpd/ and make musicpd run as mpd by default + @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd/,g' \ -e 's,^#\(user[^"]*"\)nobody,\1${MPDUSER},g' \ ${WRKSRC}/doc/mpdconf.example # Uncomment OSS audio output part from MPDCONF; dragons! Modified: head/audio/musicpd/distinfo ============================================================================== --- head/audio/musicpd/distinfo Sat Jan 28 14:22:53 2017 (r432624) +++ head/audio/musicpd/distinfo Sat Jan 28 14:28:49 2017 (r432625) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484486662 -SHA256 (mpd-0.20.2.tar.xz) = 552a87d71c2981baeddf28c1856a7e071ea0236dd38bc75ec25d58529605ff77 -SIZE (mpd-0.20.2.tar.xz) = 768816 +TIMESTAMP = 1485595393 +SHA256 (mpd-0.20.3.tar.xz) = 2238c1233f5318800ede7c37eeaf705c04920315de572dc666aff6ca682eb0f9 +SIZE (mpd-0.20.3.tar.xz) = 770568 Added: head/audio/musicpd/files/patch-src_db_Count.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musicpd/files/patch-src_db_Count.cxx Sat Jan 28 14:28:49 2017 (r432625) @@ -0,0 +1,38 @@ +--- src/db/Count.cxx.orig 2017-01-03 19:47:53 UTC ++++ src/db/Count.cxx +@@ -62,7 +62,7 @@ Print(Response &r, TagType group, const + } + } + +-static bool ++static void + stats_visitor_song(SearchStats &stats, const LightSong &song) + { + stats.n_songs++; +@@ -70,8 +70,6 @@ stats_visitor_song(SearchStats &stats, c + const auto duration = song.GetDuration(); + if (!duration.IsNegative()) + stats.total_duration += duration; +- +- return true; + } + + static bool +@@ -94,7 +92,7 @@ CollectGroupCounts(TagCountMap &map, Tag + return found; + } + +-static bool ++static void + GroupCountVisitor(TagCountMap &map, TagType group, const LightSong &song) + { + assert(song.tag != nullptr); +@@ -103,8 +101,6 @@ GroupCountVisitor(TagCountMap &map, TagT + if (!CollectGroupCounts(map, group, tag) && group == TAG_ALBUM_ARTIST) + /* fall back to "Artist" if no "AlbumArtist" was found */ + CollectGroupCounts(map, TAG_ARTIST, tag); +- +- return true; + } + + void Added: head/audio/musicpd/files/patch-src_db_DatabasePlaylist.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musicpd/files/patch-src_db_DatabasePlaylist.cxx Sat Jan 28 14:28:49 2017 (r432625) @@ -0,0 +1,17 @@ +--- src/db/DatabasePlaylist.cxx.orig 2017-01-03 19:47:53 UTC ++++ src/db/DatabasePlaylist.cxx +@@ -27,13 +27,12 @@ + + #include + +-static bool ++static void + AddSong(const Storage &storage, const char *playlist_path_utf8, + const LightSong &song) + { + spl_append_song(playlist_path_utf8, + DatabaseDetachSong(storage, song)); +- return true; + } + + void Added: head/audio/musicpd/files/patch-src_db_DatabasePrint.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musicpd/files/patch-src_db_DatabasePrint.cxx Sat Jan 28 14:28:49 2017 (r432625) @@ -0,0 +1,112 @@ +--- src/db/DatabasePrint.cxx.orig 2017-01-03 19:47:53 UTC ++++ src/db/DatabasePrint.cxx +@@ -49,16 +49,14 @@ PrintDirectoryURI(Response &r, bool base + ApplyBaseFlag(directory.GetPath(), base)); + } + +-static bool ++static void + PrintDirectoryBrief(Response &r, bool base, const LightDirectory &directory) + { + if (!directory.IsRoot()) + PrintDirectoryURI(r, base, directory); +- +- return true; + } + +-static bool ++static void + PrintDirectoryFull(Response &r, bool base, const LightDirectory &directory) + { + if (!directory.IsRoot()) { +@@ -67,8 +65,6 @@ PrintDirectoryFull(Response &r, bool bas + if (directory.mtime > 0) + time_print(r, "Last-Modified", directory.mtime); + } +- +- return true; + } + + static void +@@ -96,7 +92,7 @@ print_playlist_in_directory(Response &r, + directory->GetPath(), name_utf8); + } + +-static bool ++static void + PrintSongBrief(Response &r, Partition &partition, + bool base, const LightSong &song) + { +@@ -106,11 +102,9 @@ PrintSongBrief(Response &r, Partition &p + /* this song file has an embedded CUE sheet */ + print_playlist_in_directory(r, base, + song.directory, song.uri); +- +- return true; + } + +-static bool ++static void + PrintSongFull(Response &r, Partition &partition, + bool base, const LightSong &song) + { +@@ -120,21 +114,18 @@ PrintSongFull(Response &r, Partition &pa + /* this song file has an embedded CUE sheet */ + print_playlist_in_directory(r, base, + song.directory, song.uri); +- +- return true; + } + +-static bool ++static void + PrintPlaylistBrief(Response &r, bool base, + const PlaylistInfo &playlist, + const LightDirectory &directory) + { + print_playlist_in_directory(r, base, + &directory, playlist.name.c_str()); +- return true; + } + +-static bool ++static void + PrintPlaylistFull(Response &r, bool base, + const PlaylistInfo &playlist, + const LightDirectory &directory) +@@ -144,8 +135,6 @@ PrintPlaylistFull(Response &r, bool base + + if (playlist.mtime > 0) + time_print(r, "Last-Modified", playlist.mtime); +- +- return true; + } + + void +@@ -191,15 +180,13 @@ db_selection_print(Response &r, Partitio + 0, std::numeric_limits::max()); + } + +-static bool ++static void + PrintSongURIVisitor(Response &r, Partition &partition, const LightSong &song) + { + song_print_uri(r, partition, song); +- +- return true; + } + +-static bool ++static void + PrintUniqueTag(Response &r, TagType tag_type, + const Tag &tag) + { +@@ -211,8 +198,6 @@ PrintUniqueTag(Response &r, TagType tag_ + if (item.type != tag_type) + r.Format("%s: %s\n", + tag_item_names[item.type], item.value); +- +- return true; + } + + void Added: head/audio/musicpd/files/patch-src_db_DatabaseQueue.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musicpd/files/patch-src_db_DatabaseQueue.cxx Sat Jan 28 14:28:49 2017 (r432625) @@ -0,0 +1,18 @@ +--- src/db/DatabaseQueue.cxx.orig 2017-01-03 19:47:53 UTC ++++ src/db/DatabaseQueue.cxx +@@ -27,14 +27,13 @@ + + #include + +-static bool ++static void + AddToQueue(Partition &partition, const LightSong &song) + { + const Storage &storage = *partition.instance.storage; + partition.playlist.AppendSong(partition.pc, + DatabaseDetachSong(storage, + song)); +- return true; + } + + void Added: head/audio/musicpd/files/patch-src_db_Helpers.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musicpd/files/patch-src_db_Helpers.cxx Sat Jan 28 14:28:49 2017 (r432625) @@ -0,0 +1,19 @@ +--- src/db/Helpers.cxx.orig 2017-01-03 19:47:53 UTC ++++ src/db/Helpers.cxx +@@ -67,15 +67,13 @@ StatsVisitTag(DatabaseStats &stats, Stri + } + } + +-static bool ++static void + StatsVisitSong(DatabaseStats &stats, StringSet &artists, StringSet &albums, + const LightSong &song) + { + ++stats.song_count; + + StatsVisitTag(stats, artists, albums, *song.tag); +- +- return true; + } + + DatabaseStats Modified: head/audio/musicpd/files/pkg-message.in ============================================================================== --- head/audio/musicpd/files/pkg-message.in Sat Jan 28 14:22:53 2017 (r432624) +++ head/audio/musicpd/files/pkg-message.in Sat Jan 28 14:28:49 2017 (r432625) @@ -2,11 +2,19 @@ The musicpd package has been successfully installed. -In order to run the MPD server, you need to edit +In order to run the MPD server, you need to edit the provided +sample configuration file %%PREFIX%%/etc/musicpd.conf -and add the following line to /etc/rc.conf: +Edit the variables in the section "Files and directories" +according to your local environment. Ensure that the referenced +directories exist and owned by the 'mpd' user, except for the +variable music_directory. It is sufficient for the 'mpd' user +to have read permissions to the referenced directory. + +To enable the service at boot time, add the following line to +/etc/rc.conf: musicpd_enable="YES" @@ -16,8 +24,6 @@ Then start the server with or reboot. -The example configuration of MPD server requires music files to -be stored in the /var/mpd/music directory. NOTE: The musicpd server is pretty useless without a client. You might want to install one of the following ports too: