Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (63e06a16990c414d779cd2745ee4d1d7af7dade2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (63e06a16990c414d779cd2745ee4d1d7af7dade2)
  • Date: Mon, 27 Apr 2015 10:57:11 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

audio-players/ncmpcpp/BUILD | 2 +
audio-players/ncmpcpp/CONFIGURE | 20 +++++++++++++------
audio-players/ncmpcpp/DEPENDS | 4 +++
audio-players/ncmpcpp/DETAILS | 30 +++++++++++++++++------------
audio-players/ncmpcpp/HISTORY | 11 ++++++++++
audio-players/ncmpcpp/PRE_BUILD | 9 ++++++++
audio-players/ncmpcpp/cxx11.patch | 39
++++++++++++++++++++++++++++++++++++++
7 files changed, 97 insertions(+), 18 deletions(-)

New commits:
commit 63e06a16990c414d779cd2745ee4d1d7af7dade2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ncmpcpp: => 0.6.3

diff --git a/audio-players/ncmpcpp/BUILD b/audio-players/ncmpcpp/BUILD
index db47218..394d466 100755
--- a/audio-players/ncmpcpp/BUILD
+++ b/audio-players/ncmpcpp/BUILD
@@ -1,3 +1,5 @@
OPTS="$NCMPCPP_OPTS $OPTS" &&

+OPTS="BOOST_LIB_SUFFIX= $OPTS" &&
+
default_build
diff --git a/audio-players/ncmpcpp/CONFIGURE b/audio-players/ncmpcpp/CONFIGURE
index 1bc0395..af47abd 100755
--- a/audio-players/ncmpcpp/CONFIGURE
+++ b/audio-players/ncmpcpp/CONFIGURE
@@ -1,11 +1,23 @@
+if [[ ! -v NCMPCPP_OPTS ]]; then
+ persistent_add NCMPCPP_OPTS
+fi &&
+
+# deprecation of old variables
+for o in NCMPCPP_UNICODE NCMPCPP_CLOCK; do
+ if [[ -n ${!o} ]]; then
+ list_add "NCMPCPP_OPTS" "${!o}" &&
+ persistent_remove ${o}
+ fi
+done &&
+
config_query_option NCMPCPP_OPTS \
"Do you want support for unicode?" \
- ${NCMPCPP_UNICODE:-y} \
+ y \
"--enable-unicode" \
"--disable-unicode" &&
config_query_option NCMPCPP_OPTS \
"Do you want ncmpcpp to display a clock?" \
- ${NCMPCPP_CLOCK:-n} \
+ n \
"--enable-clock" \
"--disable-clock" &&
config_query_option NCMPCPP_OPTS \
@@ -13,7 +25,3 @@ config_query_option NCMPCPP_OPTS \
n \
"--enable-outputs" \
"--disable-outputs"
-
-# deprecation of old variables
-persistent_remove NCMPCPP_UNICODE
-persistent_remove NCMPCPP_CLOCK
diff --git a/audio-players/ncmpcpp/DEPENDS b/audio-players/ncmpcpp/DEPENDS
index ae04f8f..b41f20e 100755
--- a/audio-players/ncmpcpp/DEPENDS
+++ b/audio-players/ncmpcpp/DEPENDS
@@ -1,5 +1,9 @@
depends ncurses &&
+depends readline &&
depends libmpdclient &&
+depends -sub CXX gcc &&
+depends -sub "SYSTEM FILESYSTEM LOCALE PROGRAM_OPTIONS THREAD" boost &&
+
optional_depends curl \
"--with-curl" \
"--without-curl" \
diff --git a/audio-players/ncmpcpp/DETAILS b/audio-players/ncmpcpp/DETAILS
index 7672a0d..1b526d9 100755
--- a/audio-players/ncmpcpp/DETAILS
+++ b/audio-players/ncmpcpp/DETAILS
@@ -1,20 +1,26 @@
SPELL=ncmpcpp
- VERSION=0.5.10
+ VERSION=0.6.3
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://${SPELL}.rybczak.net/stable/${SOURCE}
-
SOURCE_HASH=sha512:8ddbc05bd8f3febe80cc5c04992a02f8c86151bb171f8f2e46e8df79210f9445e73fd65bdcaa397b3039ebcf510c6bb6ef61be790a6dcf07d5e35e59f71f3702
+ SOURCE_URL[0]=http://ncmpcpp.rybczak.net/stable/${SOURCE}
+
SOURCE_HASH=sha512:c3d05376bed2e0161f25ab6a491f46a568f0021f4003a3300423920b6b65d8ef3ace37daf1024db87054cfee4e92dd66bb57e5f705ee1bdfa55a142e442ff4f0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://unkart.ovh.org/ncmpcpp/";
+ WEB_SITE=http://ncmpcpp.rybczak.net/
LICENSE[0]=GPL
ENTERED=20081129
- SHORT="a mpd console client"
+ SHORT="featureful ncurses based MPD client inspired by ncmpc"
cat << EOF
-Ncmpcpp is almost exact clone of ncmpc but it contains some new features
-ncmpc doesn't have:
+ncmpcpp is very similar to ncmpc if it comes to user interface, but it
provides
+a lot of additional features:

-* tag editor * playlists editor * easy to use search screen * media library
-screen * lyrics screen * possibility of going to any position in * currently
-playing track without * rewinding/fastforwarding * multi colored main window
-(if you want) * songs can be added to playlist more than once * a lot of
-minor useful functions
+* tag editor
+* playlist editor
+* easy to use search engine
+* media library
+* music visualizer
+* ability to fetch artist info from last.fm
+* new display mode
+* alternative user interface
+* ability to browse and add files from outside of MPD music directory
+
+...and a lot more minor functions.
EOF
diff --git a/audio-players/ncmpcpp/HISTORY b/audio-players/ncmpcpp/HISTORY
index 27686d8..5f7d870 100644
--- a/audio-players/ncmpcpp/HISTORY
+++ b/audio-players/ncmpcpp/HISTORY
@@ -1,3 +1,14 @@
+2015-04-27 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.3; updated source url, website,
+ descriptions
+ * BUILD: corrected our boost lib prefix
+ * DEPENDS: added missing dependencies -- readline, gcc; boost is
+ required since 0.6.0
+ * CONFIGURE: simplified default answers
+ * PRE_BUILD: added, to optionally apply the patch
+ * cxx11.patch: added, patch by Nikolay Khabarov to fix build by
+ compilers with partial C++11 (C++0x) support (e.g. gcc 4.6)
+
2013-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.5.10

diff --git a/audio-players/ncmpcpp/PRE_BUILD b/audio-players/ncmpcpp/PRE_BUILD
new file mode 100755
index 0000000..d4f23a5
--- /dev/null
+++ b/audio-players/ncmpcpp/PRE_BUILD
@@ -0,0 +1,9 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# see https://gcc.gnu.org/projects/cxx0x.html
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.7; then
+ patch -p0 < "$SPELL_DIRECTORY/cxx11.patch"
+fi
diff --git a/audio-players/ncmpcpp/cxx11.patch
b/audio-players/ncmpcpp/cxx11.patch
new file mode 100644
index 0000000..f1daf3a
--- /dev/null
+++ b/audio-players/ncmpcpp/cxx11.patch
@@ -0,0 +1,39 @@
+--- src/bindings.h.orig 2015-03-02 21:02:17.000000000 +0300
++++ src/bindings.h 2015-04-27 17:46:42.000000000 +0300
+@@ -77,13 +77,20 @@
+ typedef std::vector<Actions::BaseAction *> ActionChain;
+
+ template <typename ArgT>
+- Binding(ArgT &&actions)
+- : m_actions(std::forward<ArgT>(actions)) {
++ void SuperInit(ArgT &&actions) {
++ m_actions = std::forward<ArgT>(actions);
+ assert(!m_actions.empty());
+ }
+- Binding(Actions::Type at)
+- : Binding(ActionChain({&Actions::get(at)})) { }
+-
++
++ template <typename ArgT>
++ Binding(ArgT &&actions) {
++ SuperInit(actions);
++ }
++
++ Binding(Actions::Type at) {
++ SuperInit(ActionChain({&Actions::get(at)}));
++ }
++
+ bool execute() const {
+ return std::all_of(m_actions.begin(), m_actions.end(),
+ boost::bind(&Actions::BaseAction::execute, _1)
+--- src/utility/conversion.h.orig 2015-03-02 21:02:17.000000000 +0300
++++ src/utility/conversion.h 2015-04-27 16:29:22.000000000 +0300
+@@ -41,6 +41,8 @@
+
+ struct OutOfBounds : std::exception
+ {
++ ~OutOfBounds() throw() { }
++
+ const std::string &errorMessage() { return m_error_message; }
+
+ template <typename Type>



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (63e06a16990c414d779cd2745ee4d1d7af7dade2), Vlad Glagolev, 04/27/2015

Archive powered by MHonArc 2.6.24.

Top of Page