Re: [update] mpd/ncmpc/ncmpcpp
On Sat 20/02/2021 08:37, Landry Breuil wrote:
> Hi,
>
> found those were a bit outdated, changelogs at
> https://rybczak.net/ncmpcpp/
> https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.6/NEWS
> https://github.com/MusicPlayerDaemon/ncmpc/blob/v0.45/NEWS
>
> mpd updates from 0.21 to 0.22 because of some additions to the protocol,
> added BDEP on sphinx because the manpage isnt in the src tarball so
> needs to be generated from the rst file.
>
> Please test !
Build and (lightly) run tested on amd64. OK mpd and ncmpc
It seems that ncmpcpp does not depend on libiconv, as such remove it
from LDEP and sync WANTLIB. While here sync patches. Based on your diff:
diff --git Makefile Makefile
index 5216990772e..168e25b4b0d 100644
--- Makefile
+++ Makefile
@@ -5,8 +5,7 @@ BROKEN-hppa = bindings.h:85:4: error: type 'Binding'
is not a direct base of 'B
COMMENT = ncurses mpd client inspired by ncmpc
-DISTNAME = ncmpcpp-0.8.2
-REVISION = 1
+DISTNAME = ncmpcpp-0.9.2
EXTRACT_SUFX = .tar.bz2
@@ -17,17 +16,16 @@ HOMEPAGE = https://rybczak.net/ncmpcpp/
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB += boost_date_time-mt boost_filesystem-mt boost_locale-mt
-WANTLIB += boost_program_options-mt boost_regex-mt boost_system-mt
-WANTLIB += boost_thread-mt c crypto curl ereadline iconv m mpdclient
-WANTLIB += curses nghttp2 pthread ssl ${LIBCXX} tag z
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} boost_chrono-mt boost_date_time-mt
+WANTLIB += boost_filesystem-mt boost_locale-mt boost_program_options-mt
+WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c crypto
+WANTLIB += curl curses ereadline icudata icui18n icuuc m mpdclient
+WANTLIB += nghttp2 ssl tag z
MASTER_SITES = ${HOMEPAGE}stable/
LIB_DEPENDS = audio/libmpdclient>=2.4 \
audio/taglib \
- converters/libiconv \
devel/boost \
devel/readline \
net/curl
diff --git distinfo distinfo
index fd53b891b20..f1807f24c59 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpcpp-0.8.2.tar.bz2) = ZQuj6AiWJLetnkzBm8GsYCjtt1I8wRH6FobqRMCSFVQ=
-SIZE (ncmpcpp-0.8.2.tar.bz2) = 465713
+SHA256 (ncmpcpp-0.9.2.tar.bz2) = +qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs=
+SIZE (ncmpcpp-0.9.2.tar.bz2) = 486266
diff --git patches/patch-configure patches/patch-configure
index 8b99053d03a..b3c1b09f417 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.11 2018/02/11 10:37:51 dcoppa Exp
$
Index: configure
--- configure.orig
+++ configure
-@@ -19500,7 +19500,7 @@ CPPFLAGS=$boost_thread_save_CPPFLAGS
+@@ -20542,7 +20542,7 @@ CPPFLAGS=$boost_thread_save_CPPFLAGS
diff --git patches/patch-doc_ncmpcpp_1 patches/patch-doc_ncmpcpp_1
index 68e41d9c40e..949c7934e1a 100644
--- patches/patch-doc_ncmpcpp_1
+++ patches/patch-doc_ncmpcpp_1
@@ -8,7 +8,7 @@ Index: doc/ncmpcpp.1
.SH "NAME"
ncmpcpp \- An ncurses Music Player Daemon (MPD) client.
.SH "SYNOPSIS"
-@@ -298,7 +298,7 @@ Slave screen that has to be displayed at start (nothin
+@@ -325,7 +325,7 @@ Slave screen that has to be displayed at start (nothin
.TP
.B startup_slave_screen_focus = yes/no
If set to yes, slave screen will be the active one after startup. Otherwise
master screen will be.
@@ -17,11 +17,11 @@ Index: doc/ncmpcpp.1
.B locked_screen_width_part = 20-80
If you want to lock a screen, ncmpcpp asks for % of locked screen's width to
be reserved before that and provides a default value, which is the one you can
set here.
.TP
-@@ -415,7 +415,6 @@ Border color of pop-up windows. If set to 'none', no b
+@@ -445,7 +445,6 @@ Border color of pop-up windows. If set to 'none', no b
.TP
.B active_window_border = COLOR
Color of active window's border.
-.TP
.SH "BINDINGS"
- When ncmpcpp starts, it tries to read user's bindings from
~/.ncmpcpp/bindings and $XDG_CONFIG_HOME/ncmpcpp/bindings files. If no bindings
file is found, ncmpcpp uses the defaults. An example bindings file with the
default values can be found usually in /usr/share/doc/ncmpcpp (exact location
may depend on used distribution or configure prefix).
-
+ When ncmpcpp starts, it tries to read bindings from
+ $XDG_CONFIG_HOME/ncmpcpp/bindings and ~/.ncmpcpp/bindings files. If no
bindings
diff --git patches/patch-src_ncmpcpp_cpp patches/patch-src_ncmpcpp_cpp
deleted file mode 100644
index ee24f3c24c3..000
--- patches/patch-src_ncmpcpp_cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_ncmpcpp_cpp,v 1.13 2017/06/09 15:09:51 dcoppa Exp $
-
-OpenBSD lacks sigignore(), use the one from NetBSD
-
-Index: src/ncmpcpp.cpp
src/ncmpcpp.cpp.orig
-+++ src/ncmpcpp.cpp
-@@ -68,6 +68,18 @@ void sighandler(int sig)
- #endif // __sun && __SVR4
- }
-
-+int n_sigignore(int sig)
-+{
-+ struct sigaction sa;
-+
-+ sa.sa_handler
[update] mpd/ncmpc/ncmpcpp
Hi,
found those were a bit outdated, changelogs at
https://rybczak.net/ncmpcpp/
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.6/NEWS
https://github.com/MusicPlayerDaemon/ncmpc/blob/v0.45/NEWS
mpd updates from 0.21 to 0.22 because of some additions to the protocol,
added BDEP on sphinx because the manpage isnt in the src tarball so
needs to be generated from the rst file.
Please test !
Landry
? 0.21.8.log
? mpd-0.20.20
? mpd-0.21.1
? patch-src_Main_cxx
Index: Makefile
===
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.132
diff -u -r1.132 Makefile
--- Makefile8 Jul 2020 13:02:24 - 1.132
+++ Makefile20 Feb 2021 07:24:49 -
@@ -2,7 +2,7 @@
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
-VER = 0.21.25
+VER = 0.22.6
DISTNAME = mpd-${VER}
EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
@@ -11,7 +11,7 @@
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB = FLAC audiofile avcodec avformat avutil \
+WANTLIB = FLAC audiofile avcodec avfilter avformat avutil \
bz2 c cdio cdio_cdda cdio_paranoia curl \
expat faad icui18n icuuc \
id3tag iso9660 m mikmod mp3lame mpcdec \
@@ -24,6 +24,7 @@
COMPILER = base-clang ports-gcc
BUILD_DEPENDS =devel/boost
+BUILD_DEPENDS += textproc/py-sphinx
LIB_DEPENDS = audio/faad>=2.6.1p0 \
audio/flac \
@@ -145,9 +146,6 @@
CPPFLAGS="-I${LOCALBASE}/include -D_BSD_SOURCE"
post-install:
- ${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${PREFIX}/man/man1/mpd.1
- ${INSTALL_MAN} ${WRKSRC}/doc/mpd.conf.5 ${PREFIX}/man/man5/mpd.conf.5
-
# avoid dependency on gtk3,-guic
@rm -Rf ${PREFIX}/share/icons/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpd
Index: distinfo
===
RCS file: /cvs/ports/audio/mpd/distinfo,v
retrieving revision 1.57
diff -u -r1.57 distinfo
--- distinfo8 Jul 2020 13:02:24 - 1.57
+++ distinfo20 Feb 2021 07:24:49 -
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.21.25.tar.xz) = IKCtAb8yey2+tq6OGvlSyw3oPS1j+rD6S3GDp0dlwgE=
-SIZE (mpd-0.21.25.tar.xz) = 683768
+SHA256 (mpd-0.22.6.tar.xz) = K+FJpIlcPLYTR3+M8Rk1k+PYodOKdf+n0y2oyDFqTV4=
+SIZE (mpd-0.22.6.tar.xz) = 730524
Index: patches/patch-doc_meson_build
===
RCS file: /cvs/ports/audio/mpd/patches/patch-doc_meson_build,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_meson_build
--- patches/patch-doc_meson_build 6 Aug 2019 17:28:12 - 1.1
+++ patches/patch-doc_meson_build 20 Feb 2021 07:24:49 -
@@ -3,12 +3,12 @@
Index: doc/meson.build
--- doc/meson.build.orig
+++ doc/meson.build
-@@ -11,7 +11,7 @@ sphinx_output = custom_target(
- 'conf.py',
- ],
- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
-- build_by_default: true,
-+ build_by_default: false,
- install: true,
- install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
- )
+@@ -18,7 +18,7 @@ if get_option('html_manual')
+ 'conf.py',
+ ],
+ command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
+-build_by_default: true,
++build_by_default: false,
+ install: true,
+ install_dir: join_paths(get_option('datadir'), 'doc',
meson.project_name()),
+ )
Index: patches/patch-doc_mpdconf_example
===
RCS file: /cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v
retrieving revision 1.19
diff -u -r1.19 patch-doc_mpdconf_example
--- patches/patch-doc_mpdconf_example 6 Aug 2019 17:28:12 - 1.19
+++ patches/patch-doc_mpdconf_example 20 Feb 2021 07:24:49 -
@@ -7,25 +7,25 @@
# file:// protocol) or streaming files over an accepted protocol.
#
-#music_directory "~/music"
-+music_directory "/please-configure-your-music_directory"
++music_directory "/please-configure-your-music_directory"
#
# This setting sets the MPD internal playlist directory. The purpose of this
- # directory is storage for playlists created by MPD. The server will use
+ # directory is storage for playlists created by MPD. The server will use
# playlist files not created by the server but only if they are in the MPD
# format. This setting defaults to playlist saving being disabled.
#
-#playlist_directory "~/.mpd/playlists"
-+playlist_directory "/var/spool/mpd/playlists"
++playlist_directory"/var/spool/mpd/playlists"
#
# This setting sets the location of the MPD database. This file is u
