From owner-svn-ports-all@freebsd.org Sun Nov 15 16:21:03 2015 Return-Path: Delivered-To: svn-ports-all@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 DEA73A2FD4C; Sun, 15 Nov 2015 16:21:03 +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 9975D137A; Sun, 15 Nov 2015 16:21:03 +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 tAFGL2EG012386; Sun, 15 Nov 2015 16:21:02 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFGL1hI012372; Sun, 15 Nov 2015 16:21:01 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201511151621.tAFGL1hI012372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 15 Nov 2015 16:21:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401713 - in head/audio/ncmpcpp: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 16:21:04 -0000 Author: riggs Date: Sun Nov 15 16:21:01 2015 New Revision: 401713 URL: https://svnweb.freebsd.org/changeset/ports/401713 Log: Update to upstream version 0.7.0-b1 PR: 204499 Submitted by: yamagi@yamagi.org (maintainer) Added: head/audio/ncmpcpp/files/patch-src_browser.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_configuration.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_helpers.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_media__library.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_playlist.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_playlist__editor.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_search__engine.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_status.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_tag__editor.cpp (contents, props changed) head/audio/ncmpcpp/files/patch-src_window.h (contents, props changed) Deleted: head/audio/ncmpcpp/files/patch-src__status.cpp head/audio/ncmpcpp/files/patch-src_bindings.cpp head/audio/ncmpcpp/pkg-message Modified: head/audio/ncmpcpp/Makefile head/audio/ncmpcpp/distinfo head/audio/ncmpcpp/files/patch-src_mpdpp.cpp head/audio/ncmpcpp/files/patch-src_mpdpp.h Modified: head/audio/ncmpcpp/Makefile ============================================================================== --- head/audio/ncmpcpp/Makefile Sun Nov 15 15:45:17 2015 (r401712) +++ head/audio/ncmpcpp/Makefile Sun Nov 15 16:21:01 2015 (r401713) @@ -1,9 +1,10 @@ # $FreeBSD$ PORTNAME= ncmpcpp -PORTVERSION= 0.6.7 +PORTVERSION= 0.7.0b1 CATEGORIES= audio MASTER_SITES= http://ncmpcpp.rybczak.net/stable/ +DISTNAME= ncmpcpp-0.7_beta1 MAINTAINER= yamagi@yamagi.org COMMENT= ncurses mpd client, clone of ncmpc with some new features @@ -15,7 +16,9 @@ LIB_DEPENDS= libmpdclient.so:${PORTSDIR} libfftw3.so:${PORTSDIR}/math/fftw3 \ libboost_filesystem.so:${PORTSDIR}/devel/boost-libs -USES= compiler:c++11-lib iconv libtool ncurses pkgconfig tar:bzip2 +WRKSRC= ${WRKDIR}/ncmpcpp-0.7_beta1 + +USES= compiler:c++11-lib iconv libtool ncurses:port pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 CPPFLAGS+= -I${LOCALBASE}/include @@ -51,11 +54,6 @@ VISUALIZER_CONFIGURE_ENABLE= visualizer .include -.if ${NCURSESBASE} == /usr -# no need to use ncurses-config if we use ncurses from the base system -CONFIGURE_ARGS+= NCURSES_CONFIG=/usr/bin/true -.endif - post-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/ post-install-DOCS-on: Modified: head/audio/ncmpcpp/distinfo ============================================================================== --- head/audio/ncmpcpp/distinfo Sun Nov 15 15:45:17 2015 (r401712) +++ head/audio/ncmpcpp/distinfo Sun Nov 15 16:21:01 2015 (r401713) @@ -1,2 +1,2 @@ -SHA256 (ncmpcpp-0.6.7.tar.bz2) = 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b -SIZE (ncmpcpp-0.6.7.tar.bz2) = 429687 +SHA256 (ncmpcpp-0.7_beta1.tar.bz2) = 5d84fca070e19461524bdfcf46245e9ee4d445f1966984b7c48c71115e408065 +SIZE (ncmpcpp-0.7_beta1.tar.bz2) = 440532 Added: head/audio/ncmpcpp/files/patch-src_browser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_browser.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/browser.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/browser.cpp +@@ -42,6 +42,7 @@ + #include "utility/comparators.h" + #include "utility/string.h" + #include "configuration.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Added: head/audio/ncmpcpp/files/patch-src_configuration.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_configuration.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/configuration.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/configuration.cpp +@@ -29,6 +29,7 @@ + #include "mpdpp.h" + #include "settings.h" + #include "utility/string.h" ++#include "format_impl.h" + + namespace po = boost::program_options; + Added: head/audio/ncmpcpp/files/patch-src_helpers.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_helpers.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/helpers.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/helpers.cpp +@@ -26,6 +26,7 @@ + #include "playlist.h" + #include "statusbar.h" + #include "utility/functional.h" ++#include "format_impl.h" + + const MPD::Song *currentSong(const BaseScreen *screen) + { Added: head/audio/ncmpcpp/files/patch-src_media__library.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_media__library.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/media_library.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/media_library.cpp +@@ -40,6 +40,7 @@ + #include "utility/type_conversions.h" + #include "title.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Modified: head/audio/ncmpcpp/files/patch-src_mpdpp.cpp ============================================================================== --- head/audio/ncmpcpp/files/patch-src_mpdpp.cpp Sun Nov 15 15:45:17 2015 (r401712) +++ head/audio/ncmpcpp/files/patch-src_mpdpp.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -1,6 +1,6 @@ ---- src/mpdpp.cpp.orig 2015-07-05 02:18:34 UTC +--- src/mpdpp.cpp.orig 2015-11-09 12:52:27 UTC +++ src/mpdpp.cpp -@@ -38,6 +38,8 @@ Connection::Connection() : m_connection( +@@ -95,6 +95,8 @@ Connection::Connection() : m_connection( m_port(6600), m_timeout(15) { @@ -8,17 +8,17 @@ + m_gen.seed(rd()); } - Connection::~Connection() -@@ -504,7 +506,7 @@ bool Connection::AddRandomTag(mpd_tag_ty - } - else + void Connection::Connect() +@@ -560,7 +562,7 @@ bool Connection::AddRandomTag(mpd_tag_ty + if (number > tags.size()) + return false; + +- std::random_shuffle(tags.begin(), tags.end()); ++ std::shuffle(tags.begin(), tags.end(), m_gen); + auto it = tags.begin(); + for (size_t i = 0; i < number && it != tags.end(); ++i) { -- std::random_shuffle(tags.begin(), tags.end()); -+ std::shuffle(tags.begin(), tags.end(), m_gen); - auto it = tags.begin(); - for (size_t i = 0; i < number && it != tags.end(); ++i) - { -@@ -544,7 +546,7 @@ bool Connection::AddRandomSongs(size_t n +@@ -599,7 +601,7 @@ bool Connection::AddRandomSongs(size_t n } else { Modified: head/audio/ncmpcpp/files/patch-src_mpdpp.h ============================================================================== --- head/audio/ncmpcpp/files/patch-src_mpdpp.h Sun Nov 15 15:45:17 2015 (r401712) +++ head/audio/ncmpcpp/files/patch-src_mpdpp.h Sun Nov 15 16:21:01 2015 (r401713) @@ -1,4 +1,4 @@ ---- src/mpdpp.h.orig 2015-07-05 02:18:34 UTC +--- src/mpdpp.h.orig 2015-11-09 12:51:44 UTC +++ src/mpdpp.h @@ -23,6 +23,7 @@ @@ -8,11 +8,10 @@ #include #include -@@ -277,6 +278,8 @@ private: +@@ -587,6 +588,7 @@ private: + int m_port; + int m_timeout; std::string m_password; - - mpd_tag_type m_searched_field; -+ + std::mt19937 m_gen; }; Added: head/audio/ncmpcpp/files/patch-src_playlist.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_playlist.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/playlist.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/playlist.cpp +@@ -35,6 +35,7 @@ + #include "utility/comparators.h" + #include "utility/functional.h" + #include "title.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Added: head/audio/ncmpcpp/files/patch-src_playlist__editor.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_playlist__editor.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/playlist_editor.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/playlist_editor.cpp +@@ -39,6 +39,7 @@ + #include "utility/comparators.h" + #include "title.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Added: head/audio/ncmpcpp/files/patch-src_search__engine.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_search__engine.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/search_engine.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/search_engine.cpp +@@ -35,6 +35,7 @@ + #include "utility/comparators.h" + #include "title.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Added: head/audio/ncmpcpp/files/patch-src_status.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_status.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,11 @@ +--- src/status.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/status.cpp +@@ -21,6 +21,8 @@ + #include + #include + #include ++#include ++#include + + #include "browser.h" + #include "charset.h" Added: head/audio/ncmpcpp/files/patch-src_tag__editor.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_tag__editor.cpp Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,10 @@ +--- src/tag_editor.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/tag_editor.cpp +@@ -42,6 +42,7 @@ + #include "title.h" + #include "tags.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::myScreen; + using Global::MainHeight; Added: head/audio/ncmpcpp/files/patch-src_window.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/ncmpcpp/files/patch-src_window.h Sun Nov 15 16:21:01 2015 (r401713) @@ -0,0 +1,12 @@ +--- src/window.h.orig 2015-11-04 20:01:29 UTC ++++ src/window.h +@@ -23,7 +23,9 @@ + + #include "config.h" + ++#define _XOPEN_SOURCE_EXTENDED + #include "curses.h" ++ + #include "gcc.h" + + #include