Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Aug 2015 06:20:24 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r393566 - in branches/2015Q3/audio/ncmpcpp: . files
Message-ID:  <201508050620.t756KOgo052111@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Wed Aug  5 06:20:23 2015
New Revision: 393566
URL: https://svnweb.freebsd.org/changeset/ports/393566

Log:
  MFH: r393424
  
  Fix shuffle playback
  (random number generator is not initialised properly)
  
  While on it:
  Pet portlint
  
  PR:		201645
  Submitted by:	yamagi@yamagi.org (maintainer)
  Approved by:	ports-secteam (delphij)

Added:
  branches/2015Q3/audio/ncmpcpp/files/patch-src_mpdpp.cpp
     - copied unchanged from r393424, head/audio/ncmpcpp/files/patch-src_mpdpp.cpp
  branches/2015Q3/audio/ncmpcpp/files/patch-src_mpdpp.h
     - copied unchanged from r393424, head/audio/ncmpcpp/files/patch-src_mpdpp.h
Modified:
  branches/2015Q3/audio/ncmpcpp/Makefile
  branches/2015Q3/audio/ncmpcpp/distinfo
  branches/2015Q3/audio/ncmpcpp/files/patch-src__status.cpp
Directory Properties:
  branches/2015Q3/   (props changed)

Modified: branches/2015Q3/audio/ncmpcpp/Makefile
==============================================================================
--- branches/2015Q3/audio/ncmpcpp/Makefile	Wed Aug  5 04:35:34 2015	(r393565)
+++ branches/2015Q3/audio/ncmpcpp/Makefile	Wed Aug  5 06:20:23 2015	(r393566)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ncmpcpp
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ncmpcpp.rybczak.net/stable/
 

Modified: branches/2015Q3/audio/ncmpcpp/distinfo
==============================================================================
--- branches/2015Q3/audio/ncmpcpp/distinfo	Wed Aug  5 04:35:34 2015	(r393565)
+++ branches/2015Q3/audio/ncmpcpp/distinfo	Wed Aug  5 06:20:23 2015	(r393566)
@@ -1,2 +1,2 @@
-SHA256 (ncmpcpp-0.6.4.tar.bz2) = 757e2e06b7e17009c24e2b46a69f008e61aa679476f93e00dc602ca087c805f1
-SIZE (ncmpcpp-0.6.4.tar.bz2) = 429705
+SHA256 (ncmpcpp-0.6.5.tar.bz2) = 51128f6835c592c8d4367a66b08e06a9419a86c9d5c6e91d0f1dc73af56cd1fd
+SIZE (ncmpcpp-0.6.5.tar.bz2) = 429699

Modified: branches/2015Q3/audio/ncmpcpp/files/patch-src__status.cpp
==============================================================================
--- branches/2015Q3/audio/ncmpcpp/files/patch-src__status.cpp	Wed Aug  5 04:35:34 2015	(r393565)
+++ branches/2015Q3/audio/ncmpcpp/files/patch-src__status.cpp	Wed Aug  5 06:20:23 2015	(r393566)
@@ -1,5 +1,5 @@
---- src/status.cpp_orig	2014-11-16 09:21:55.651181899 +0100
-+++ src/status.cpp	2014-11-16 09:21:59.233203196 +0100
+--- src/status.cpp.orig	2015-07-05 02:18:34 UTC
++++ src/status.cpp
 @@ -21,6 +21,8 @@
  #include <boost/date_time/posix_time/posix_time.hpp>
  #include <netinet/tcp.h>

Copied: branches/2015Q3/audio/ncmpcpp/files/patch-src_mpdpp.cpp (from r393424, head/audio/ncmpcpp/files/patch-src_mpdpp.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/audio/ncmpcpp/files/patch-src_mpdpp.cpp	Wed Aug  5 06:20:23 2015	(r393566, copy of r393424, head/audio/ncmpcpp/files/patch-src_mpdpp.cpp)
@@ -0,0 +1,29 @@
+--- src/mpdpp.cpp.orig	2015-07-05 02:18:34 UTC
++++ src/mpdpp.cpp
+@@ -38,6 +38,8 @@ Connection::Connection() : m_connection(
+ 				m_port(6600),
+ 				m_timeout(15)
+ {
++	std::random_device rd;
++	m_gen.seed(rd());
+ }
+ 
+ Connection::~Connection()
+@@ -504,7 +506,7 @@ bool Connection::AddRandomTag(mpd_tag_ty
+ 	}
+ 	else
+ 	{
+-		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
+ 	}
+ 	else
+ 	{
+-		std::random_shuffle(files.begin(), files.end());
++		std::shuffle(files.begin(), files.end(), m_gen);
+ 		StartCommandsList();
+ 		auto it = files.begin();
+ 		for (size_t i = 0; i < number && it != files.end(); ++i, ++it)

Copied: branches/2015Q3/audio/ncmpcpp/files/patch-src_mpdpp.h (from r393424, head/audio/ncmpcpp/files/patch-src_mpdpp.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q3/audio/ncmpcpp/files/patch-src_mpdpp.h	Wed Aug  5 06:20:23 2015	(r393566, copy of r393424, head/audio/ncmpcpp/files/patch-src_mpdpp.h)
@@ -0,0 +1,19 @@
+--- src/mpdpp.h.orig	2015-07-05 02:18:34 UTC
++++ src/mpdpp.h
+@@ -23,6 +23,7 @@
+ 
+ #include <cassert>
+ #include <exception>
++#include <random>
+ #include <set>
+ #include <vector>
+ 
+@@ -277,6 +278,8 @@ private:
+ 	std::string m_password;
+ 	
+ 	mpd_tag_type m_searched_field;
++
++	std::mt19937 m_gen;
+ };
+ 
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508050620.t756KOgo052111>