Hi,
here's 4 updates for the mpd gang, libmpdclient, mpc & ncmpc are more or
less trivial, mpd was harder:
- switched from autotools to meson. I tried as hard as i could to select
the same featureset as was used with autohell.
- we cant update to 0.21.3 (latest) because ffmpeg>=57 is required since
https://github.com/MusicPlayerDaemon/MPD/commit/08272cdee2b886f759ffe632c3310e3ead095b62
- so the diff is for the latest version before this commit. I tried
updating to the latest mpd by disabling ffmpeg crap and use mpg123
instead, but it fails to link against libmpg123.
- remove the hicolor svg icon to avoid depending on gtk+3,-guic
- patches here and there to install manpages and all, disable broken
ucred detection, etc.
- in ncmpc, cast Style::FOO to int otherwise the ncurses macro complains
about it.
totally untested, will test them in the coming days. Note that mpd 0.21
requires gcc6 so it will probably give bad results on non-clang archs -
but other than that this branch has shitloads of fixes & new features
per https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21/NEWS
on the other hand, we can also update to mpd 0.20.23...
testing & feedback welcome.
Landry
? 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.117
diff -u -r1.117 Makefile
--- Makefile 4 Jul 2018 09:01:59 -0000 1.117
+++ Makefile 9 Dec 2018 21:20:26 -0000
@@ -2,8 +2,11 @@
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
-VER = 0.20.20
+# no 0.21.3, requires ffmpeg 3.1 per
+#
https://github.com/MusicPlayerDaemon/MPD/commit/08272cdee2b886f759ffe632c3310e3ead095b62
+VER = 0.21.1
DISTNAME = mpd-${VER}
+EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
HOMEPAGE = https://www.musicpd.org/
MAINTAINER = David Coppa <[email protected]>
@@ -13,11 +16,11 @@
WANTLIB = FLAC audiofile avcodec avformat avutil \
bz2 c cdio cdio_cdda cdio_paranoia curl \
- expat faad iconv icudata icui18n icuuc \
+ expat faad iconv icui18n icuuc \
id3tag iso9660 m mikmod mp3lame mpcdec \
mpdclient ogg opus pthread samplerate \
- shout sndfile sndio speex sqlite3 theora \
- vorbis vorbisenc yajl z ${COMPILER_LIBCXX}
+ shout sndfile sndio sqlite3 \
+ vorbis vorbisenc yajl ${COMPILER_LIBCXX}
MASTER_SITES = https://www.musicpd.org/download/mpd/${VER:R}/
@@ -44,69 +47,110 @@
net/libshout \
textproc/icu4c
-CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --bindir=${PREFIX}/sbin \
- --disable-adplug \
- --disable-alsa \
- --disable-ao \
- --disable-epoll \
- --disable-fluidsynth \
- --disable-gme \
- --disable-inotify \
- --disable-jack \
- --disable-libwrap \
- --disable-mad \
- --disable-mms \
- --disable-modplug \
- --disable-mpg123 \
- --disable-nfs \
- --disable-neighbor-plugins \
- --disable-oss \
- --disable-openal \
- --disable-pulse \
- --disable-roar \
- --disable-sidplay \
- --disable-shine-encoder \
- --disable-smbclient \
- --disable-soxr \
- --disable-systemd-daemon \
- --disable-twolame-encoder \
- --disable-upnp \
- --disable-wavpack \
- --disable-wildmidi \
- --enable-aac \
- --enable-audiofile \
- --enable-bzip2 \
- --enable-cdio-paranoia \
- --enable-cue \
- --enable-curl \
- --enable-ffmpeg \
- --enable-iconv \
- --enable-lame-encoder \
- --enable-lsr \
- --enable-mikmod \
- --enable-mpc \
- --enable-opus \
- --enable-pipe-output \
- --enable-shout \
- --enable-sndfile \
- --enable-sndio \
- --enable-soundcloud \
- --enable-sqlite \
- --enable-syslog \
- --enable-vorbis \
- --enable-vorbis-encoder \
- --enable-wave-encoder \
- --enable-zlib \
- --with-pollmethod=poll \
- --with-zeroconf=no \
- --without-systemdsystemunitdir
+MODULES = devel/meson
+
+CONFIGURE_ARGS += --bindir ${PREFIX}/sbin \
+ -Dsystemd=disabled \
+ -Dinotify=false \
+ -Depoll=false \
+ -Dsyslog=enabled \
+ -Dupnp=disabled \
+ -Dlibmpdclient=enabled \
+ -Dneighbor=false \
+# storage
+CONFIGURE_ARGS += -Dudisks=disabled \
+ -Dwebdav=enabled
+
+# playlist
+CONFIGURE_ARGS += -Dcue=true
+
+# inputs
+CONFIGURE_ARGS += -Dcdio_paranoia=enabled \
+ -Dcurl=enabled \
+ -Dnfs=disabled \
+ -Dmms=disabled \
+ -Dsmbclient=disabled
+
+# commercial
+CONFIGURE_ARGS += -Dqobuz=disabled \
+ -Dsoundcloud=enabled \
+ -Dtidal=disabled
+
+# archive
+CONFIGURE_ARGS += -Dbzip2=enabled \
+ -Diso9660=enabled \
+ -Dzzip=disabled
+# tag
+CONFIGURE_ARGS += -Did3tag=enabled \
+ -Dchromaprint=disabled
+# decoders
+CONFIGURE_ARGS += -Dadplug=disabled \
+ -Daudiofile=enabled \
+ -Dfaad=enabled \
+ -Dffmpeg=enabled \
+ -Dflac=enabled \
+ -Dfluidsynth=disabled \
+ -Dgme=disabled \
+ -Dmad=disabled \
+ -Dmikmod=enabled \
+ -Dmodplug=disabled \
+ -Dmpcdec=enabled \
+ -Dmpg123=disabled \
+ -Dopus=enabled \
+ -Dsidplay=disabled \
+ -Dsndfile=enabled \
+ -Dvorbis=enabled \
+ -Dwavpack=disabled \
+ -Dwildmidi=disabled
+
+# encoders
+CONFIGURE_ARGS += -Dvorbisenc=enabled \
+ -Dlame=enabled \
+ -Dtwolame=disabled \
+ -Dshine=disabled \
+ -Dwave_encoder=true
+
+# filters
+CONFIGURE_ARGS += -Dlibsamplerate=enabled \
+ -Dsoxr=disabled
+
+# outputs
+CONFIGURE_ARGS += -Dalsa=disabled \
+ -Dao=disabled \
+ -Dfifo=true \
+ -Dhttpd=true \
+ -Djack=disabled \
+ -Dopenal=disabled \
+ -Doss=disabled \
+ -Dpipe=true \
+ -Dpulse=disabled \
+ -Drecorder=true \
+ -Dshout=enabled \
+ -Dsndio=enabled \
+ -Dsolaris_output=disabled
+
+# misc
+CONFIGURE_ARGS += -Ddbus=disabled \
+ -Dexpat=enabled \
+ -Dicu=enabled \
+ -Diconv=enabled \
+ -Dlibwrap=disabled \
+ -Dpcre=enabled \
+ -Dsqlite=enabled \
+ -Dyajl=enabled \
+ -Dzlib=enabled \
+ -Dzeroconf=disabled
# OggFLAC tests, initgroups(3)
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
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
${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \
${PREFIX}/share/examples/mpd/mpd.conf
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/mpd/distinfo,v
retrieving revision 1.49
diff -u -r1.49 distinfo
--- distinfo 4 Jul 2018 09:01:59 -0000 1.49
+++ distinfo 9 Dec 2018 21:20:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.20.20.tar.gz) = KZQHeiWVJIaHynj+EsYdxrHk55EzMMayCjmGJLyolZA=
-SIZE (mpd-0.20.20.tar.gz) = 1139145
+SHA256 (mpd-0.21.1.tar.xz) = VnTnkabzaHoxJDH9fhTZ0n/GLiG4af9rUiv2uhu1wGk=
+SIZE (mpd-0.21.1.tar.xz) = 662308
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 4 Jul 2018 09:01:59 -0000 1.24
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.24 2018/07/04 09:01:59 landry Exp $
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -4680,7 +4680,7 @@ FILTER_LIBS = \
- # Documentation
- #
- man_MANS = doc/mpd.1 doc/mpd.conf.5
--doc_DATA = AUTHORS COPYING NEWS README.md doc/mpdconf.example
-+doc_DATA = AUTHORS COPYING NEWS README.md
- DOCBOOK_FILES = doc/protocol.xml doc/user.xml doc/developer.xml
- @ENABLE_DOCUMENTATION_TRUE@protocoldir = $(docdir)/protocol
- @ENABLE_DOCUMENTATION_TRUE@protocol_DATA = $(wildcard doc/protocol/*.html)
Index: patches/patch-doc_meson_build
===================================================================
RCS file: patches/patch-doc_meson_build
diff -N patches/patch-doc_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_meson_build 9 Dec 2018 21:20:26 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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()),
+ )
Index: patches/patch-doc_mpdconf_example
===================================================================
RCS file: /cvs/ports/audio/mpd/patches/patch-doc_mpdconf_example,v
retrieving revision 1.18
diff -u -r1.18 patch-doc_mpdconf_example
--- patches/patch-doc_mpdconf_example 2 Nov 2017 19:22:40 -0000 1.18
+++ patches/patch-doc_mpdconf_example 9 Dec 2018 21:20:26 -0000
@@ -78,19 +78,19 @@
# This setting is the TCP port that is desired for the daemon to get assigned
# to.
#
-@@ -307,11 +310,11 @@ input {
+@@ -303,11 +306,11 @@ input {
#
# An example of an sndio output.
#
-#audio_output {
-# type "sndio"
-# name "sndio output"
--# mixer_type "software"
+-# mixer_type "hardware"
-#}
+audio_output {
+ type "sndio"
+ name "sndio output"
-+ mixer_type "software"
++ mixer_type "hardware"
+}
#
# An example of an OS X output:
Index: patches/patch-src_Main_cxx
===================================================================
RCS file: patches/patch-src_Main_cxx
diff -N patches/patch-src_Main_cxx
--- patches/patch-src_Main_cxx 4 Jul 2018 09:01:59 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Main_cxx,v 1.5 2018/07/04 09:01:59 landry Exp $
-
-Fix logic
-
-Index: src/Main.cxx
---- src/Main.cxx.orig
-+++ src/Main.cxx
-@@ -115,7 +115,7 @@ static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
- static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE;
-
- static
--#if GCC_OLDER_THAN(5,0)
-+#if GCC_OLDER_THAN(5,0) || defined(__clang__)
- /* gcc 4.x has no "constexpr" for std::max() */
- const
- #else
Index: patches/patch-src_command_CommandError_cxx
===================================================================
RCS file: patches/patch-src_command_CommandError_cxx
diff -N patches/patch-src_command_CommandError_cxx
--- patches/patch-src_command_CommandError_cxx 12 Mar 2017 10:13:49 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_command_CommandError_cxx,v 1.2 2017/03/12 10:13:49 dcoppa
Exp $
---- src/command/CommandError.cxx.orig Wed Mar 1 16:37:19 2017
-+++ src/command/CommandError.cxx Sun Mar 12 11:03:39 2017
-@@ -35,6 +35,7 @@
- #define GLIBCXX_492_Debian_9 20141220
- #define GLIBCXX_493 20150626
- #define GLIBCXX_494 20160803
-+#define GLIBCXX_494_OPENBSD 20160726
- #define GLIBCXX_49X_NDK_r13b 20150123
-
- /* the big mess attempts to detect whether we're compiling with
-@@ -48,6 +49,7 @@
- __GLIBCXX__ == GLIBCXX_492_Debian_9 || \
- __GLIBCXX__ == GLIBCXX_493 || \
- __GLIBCXX__ == GLIBCXX_494 || \
-+ __GLIBCXX__ == GLIBCXX_494_OPENBSD || \
- __GLIBCXX__ == GLIBCXX_49X_NDK_r13b))
- #define GLIBCXX_49X
- #endif
Index: patches/patch-src_net_meson_build
===================================================================
RCS file: patches/patch-src_net_meson_build
diff -N patches/patch-src_net_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_net_meson_build 9 Dec 2018 21:20:26 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/net/meson.build
+--- src/net/meson.build.orig
++++ src/net/meson.build
+@@ -19,7 +19,6 @@ have_local_socket = not is_windows and get_option('loc
+ conf.set('HAVE_UN', have_local_socket)
+
+ if have_local_socket
+- conf.set('HAVE_STRUCT_UCRED', compiler.has_header_symbol('sys/socket.h',
'struct ucred') and compiler.has_header_symbol('sys/socket.h', 'SO_PEERCRED'))
+ conf.set('HAVE_GETPEEREID', compiler.has_function('getpeereid'))
+ endif
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/mpd/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- pkg/PLIST 23 Feb 2017 13:03:46 -0000 1.11
+++ pkg/PLIST 9 Dec 2018 21:20:26 -0000
@@ -4,6 +4,7 @@
@newuser _mpd:560:560:daemon:Music Player Daemon:/var/empty:/sbin/nologin
@extraunexec rm -rf /var/log/mpd/*
@extraunexec find /var/spool/mpd \! -name playlists -mindepth 1 -exec rm -rf
"{}" \;
+@rcscript ${RCDIR}/mpd
@man man/man1/mpd.1
@man man/man5/mpd.conf.5
@bin sbin/mpd
@@ -21,7 +22,3 @@
@sample /var/log/mpd/
@sample /var/spool/mpd/
@sample /var/spool/mpd/playlists/
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/mpd
? libmpdclient-2.14-libmpdclient.so.3.0
? libmpdclient-2.16-libmpdclient.so.3.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/libmpdclient/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile 23 Apr 2018 16:49:48 -0000 1.20
+++ Makefile 9 Dec 2018 17:01:03 -0000
@@ -2,9 +2,9 @@
COMMENT= library for interfacing MPD
-VER= 2.14
+VER= 2.16
DISTNAME= libmpdclient-${VER}
-SHARED_LIBS= mpdclient 3.0 # 2.13
+SHARED_LIBS= mpdclient 3.1 # 2.13
CATEGORIES= audio
HOMEPAGE= https://www.musicpd.org/libs/libmpdclient/
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/libmpdclient/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo 23 Apr 2018 16:49:48 -0000 1.11
+++ distinfo 9 Dec 2018 17:01:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (libmpdclient-2.14.tar.xz) =
CoTieRv+MHfPIu4XhMgF1btVCAPf/lajmqNpCjgGE3I=
-SIZE (libmpdclient-2.14.tar.xz) = 58268
+SHA256 (libmpdclient-2.16.tar.xz) =
+mvatnwOBJAwKzjwDCe0lZc1w+yK73qIMnrbFAdlRGQ=
+SIZE (libmpdclient-2.16.tar.xz) = 60480
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/libmpdclient/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 11 Aug 2017 08:57:16 -0000 1.7
+++ pkg/PLIST 9 Dec 2018 17:01:03 -0000
@@ -14,6 +14,7 @@
include/mpd/list.h
include/mpd/message.h
include/mpd/mixer.h
+include/mpd/mount.h
include/mpd/output.h
include/mpd/pair.h
include/mpd/parser.h
? patch-doc_meson_build
? patch-src_colors_cxx
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/ncmpc/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 4 Jul 2018 09:02:58 -0000 1.38
+++ Makefile 9 Dec 2018 17:53:13 -0000
@@ -2,7 +2,7 @@
COMMENT= curses based frontend for mpd
-VER= 0.30
+VER= 0.33
DISTNAME= ncmpc-${VER}
EPOCH= 0
CATEGORIES= audio
@@ -14,7 +14,7 @@
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c glib-2.0 intl mpdclient>=1 ${COMPILER_LIBCXX} curses
+WANTLIB= c intl mpdclient>=1 ${COMPILER_LIBCXX} curses pcre
MASTER_SITES= https://www.musicpd.org/download/ncmpc/${VER:R}/
@@ -28,17 +28,18 @@
textproc/py-sphinx
LIB_DEPENDS= devel/gettext \
- devel/glib2 \
+ devel/pcre \
audio/libmpdclient>=2.4
-CONFIGURE_ARGS= -Dlirc=false \
- -Dlocale=true \
- -Dmouse=true
+CONFIGURE_ARGS= -Dlirc=disabled \
+ -Dhtml_manual=false \
+ -Dlocale=enabled \
+ -Dmouse=enabled
CONFIGURE_ENV= CPP=${CPP} \
CPPFLAGS="-D_GNU_SOURCE \
-D_DEFAULT_SOURCE \
-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -lintl"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ncmpc
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/ncmpc/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo 4 Jul 2018 09:02:58 -0000 1.16
+++ distinfo 9 Dec 2018 17:53:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (ncmpc-0.30.tar.xz) = 4/4MtYuKd/Y/sWRcL5dLM08WFO/cg07GmO59hh8bEqM=
-SIZE (ncmpc-0.30.tar.xz) = 245212
+SHA256 (ncmpc-0.33.tar.xz) = lOBKNIVAFaoBO0PsFbV49FQdB3z3rlv3wJREdWc/16U=
+SIZE (ncmpc-0.33.tar.xz) = 226344
Index: patches/patch-doc_meson_build
===================================================================
RCS file: /cvs/ports/audio/ncmpc/patches/patch-doc_meson_build,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_meson_build
--- patches/patch-doc_meson_build 4 Jul 2018 09:02:58 -0000 1.1
+++ patches/patch-doc_meson_build 9 Dec 2018 17:53:13 -0000
@@ -1,32 +1,17 @@
-$OpenBSD: patch-doc_meson_build,v 1.1 2018/07/04 09:02:58 landry Exp $
+$OpenBSD$
Index: doc/meson.build
--- doc/meson.build.orig
+++ doc/meson.build
-@@ -1,23 +1,13 @@
- sphinx = find_program('sphinx-build', required:false)
- if sphinx.found()
+@@ -30,9 +30,9 @@ endif
+ if get_option('manual')
custom_target(
-- 'HTML documentation',
-- output: 'html',
-- input: ['index.rst', 'conf.py'],
-- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
-- build_by_default: true,
-- install: true,
-- install_dir: join_paths(get_option('datadir'), 'doc',
meson.project_name()),
-- )
--
-- custom_target(
'Manpage documentation',
- output: 'man',
+ output: 'man1',
input: ['index.rst', 'conf.py'],
-- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@/man1'],
-+ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
+- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees',
meson.current_source_dir(), '@OUTPUT@/man1'],
++ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees',
meson.current_source_dir(), '@OUTPUT@'],
build_by_default: true,
install: true,
-- install_dir: get_option('datadir'),
-+ install_dir: get_option('mandir'),
- )
- endif
-
+ install_dir: get_option('mandir'),
Index: patches/patch-src_ProgressBar_cxx
===================================================================
RCS file: patches/patch-src_ProgressBar_cxx
diff -N patches/patch-src_ProgressBar_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ProgressBar_cxx 9 Dec 2018 17:53:13 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/ProgressBar.cxx
+--- src/ProgressBar.cxx.orig
++++ src/ProgressBar.cxx
+@@ -29,7 +29,7 @@ ProgressBar::ProgressBar(Point p, unsigned _width)
+ leaveok(window.w, true);
+ #ifdef ENABLE_COLORS
+ if (options.enable_colors)
+- wbkgd(window.w, COLOR_PAIR(Style::PROGRESSBAR));
++ wbkgd(window.w, COLOR_PAIR((int)Style::PROGRESSBAR));
+ #endif
+ }
+
Index: patches/patch-src_StatusBar_cxx
===================================================================
RCS file: patches/patch-src_StatusBar_cxx
diff -N patches/patch-src_StatusBar_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_StatusBar_cxx 9 Dec 2018 17:53:13 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/StatusBar.cxx
+--- src/StatusBar.cxx.orig
++++ src/StatusBar.cxx
+@@ -44,7 +44,7 @@ StatusBar::StatusBar(boost::asio::io_service &io_servi
+
+ #ifdef ENABLE_COLORS
+ if (options.enable_colors)
+- wbkgd(window.w, COLOR_PAIR(Style::STATUS));
++ wbkgd(window.w, COLOR_PAIR((int)Style::STATUS));
+ #endif
+ }
+
Index: patches/patch-src_TitleBar_cxx
===================================================================
RCS file: patches/patch-src_TitleBar_cxx
diff -N patches/patch-src_TitleBar_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_TitleBar_cxx 9 Dec 2018 17:53:13 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/TitleBar.cxx
+--- src/TitleBar.cxx.orig
++++ src/TitleBar.cxx
+@@ -38,7 +38,7 @@ TitleBar::TitleBar(Point p, unsigned width)
+
+ #ifdef ENABLE_COLORS
+ if (options.enable_colors)
+- wbkgd(window.w, COLOR_PAIR(Style::TITLE));
++ wbkgd(window.w, COLOR_PAIR((int)Style::TITLE));
+ #endif
+ }
+
Index: patches/patch-src_colors_cxx
===================================================================
RCS file: patches/patch-src_colors_cxx
diff -N patches/patch-src_colors_cxx
--- patches/patch-src_colors_cxx 4 Jul 2018 09:02:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_colors_cxx,v 1.1 2018/07/04 09:02:58 landry Exp $
-
-
-"Fix" screen corruption in ncmpc. Colors and attributes can not be mixed.
-Colors are in the low 8 bit, mask them in the appropriate places.
-
-Index: src/colors.cxx
---- src/colors.cxx.orig
-+++ src/colors.cxx
-@@ -99,7 +99,7 @@ colors_update_pair(enum color id)
- {
- assert(id > 0 && id < COLOR_END);
-
-- int fg = colors[id].color;
-+ int fg = colors[id].color & 0xff;
- int bg = colors[COLOR_BACKGROUND].color;
-
- /* If color == COLOR_NONE (negative),
-@@ -257,7 +257,7 @@ colors_use(WINDOW *w, enum color id)
- if (options.enable_colors) {
- /* color mode */
- if ((int)attrs != entry->color || (short)id != pair)
-- wattr_set(w, entry->color, id, nullptr);
-+ wattr_set(w, entry->color & 0xff, id, nullptr);
- } else {
- #endif
- /* mono mode */
Index: patches/patch-src_screen_cxx
===================================================================
RCS file: /cvs/ports/audio/ncmpc/patches/patch-src_screen_cxx,v
retrieving revision 1.1
diff -u -r1.1 patch-src_screen_cxx
--- patches/patch-src_screen_cxx 4 Jul 2018 09:02:58 -0000 1.1
+++ patches/patch-src_screen_cxx 9 Dec 2018 17:53:13 -0000
@@ -5,7 +5,7 @@
Index: src/screen.cxx
--- src/screen.cxx.orig
+++ src/screen.cxx
-@@ -56,8 +56,8 @@ ScreenManager::MakePage(const struct screen_functions
+@@ -48,8 +48,8 @@ ScreenManager::MakePage(const PageMeta &sf)
return i;
auto j = pages.emplace(&sf,
Index: patches/patch-src_screen_init_cxx
===================================================================
RCS file: patches/patch-src_screen_init_cxx
diff -N patches/patch-src_screen_init_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_screen_init_cxx 9 Dec 2018 17:53:13 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/screen_init.cxx
+--- src/screen_init.cxx.orig
++++ src/screen_init.cxx
+@@ -54,8 +54,8 @@ ScreenManager::ScreenManager(boost::asio::io_service &
+ #ifdef ENABLE_COLORS
+ if (options.enable_colors) {
+ /* set background attributes */
+- wbkgd(stdscr, COLOR_PAIR(Style::LIST));
+- wbkgd(main_window.w, COLOR_PAIR(Style::LIST));
++ wbkgd(stdscr, COLOR_PAIR((int)Style::LIST));
++ wbkgd(main_window.w, COLOR_PAIR((int)Style::LIST));
+ }
+ #endif
+ }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/ncmpc/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 26 Sep 2017 09:55:07 -0000 1.7
+++ pkg/PLIST 9 Dec 2018 17:53:13 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2017/09/26 09:55:07 dcoppa Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/ncmpc
@man man/man1/ncmpc.1
share/doc/ncmpc/
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/mpc/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile 4 Jul 2018 09:02:21 -0000 1.27
+++ Makefile 9 Dec 2018 17:00:47 -0000
@@ -2,7 +2,7 @@
COMMENT= command line client for mpd
-VER= 0.30
+VER= 0.31
DISTNAME= mpc-${VER}
CATEGORIES= audio
EXTRACT_SUFX= .tar.xz
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/mpc/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo 4 Jul 2018 09:02:21 -0000 1.16
+++ distinfo 9 Dec 2018 17:00:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpc-0.30.tar.xz) = ZfxbCoQw7+msvm4mESeWBoJ2SyCrmUZ2NxvceX2Gf84=
-SIZE (mpc-0.30.tar.xz) = 41968
+SHA256 (mpc-0.31.tar.xz) = Yjc+g6ihZbLtQ5Z5de/s0/7uUw9FV9a4Yd0IqonVKy0=
+SIZE (mpc-0.31.tar.xz) = 43896
Index: patches/patch-doc_meson_build
===================================================================
RCS file: /cvs/ports/audio/mpc/patches/patch-doc_meson_build,v
retrieving revision 1.2
diff -u -r1.2 patch-doc_meson_build
--- patches/patch-doc_meson_build 4 Jul 2018 09:02:21 -0000 1.2
+++ patches/patch-doc_meson_build 9 Dec 2018 17:00:47 -0000
@@ -5,30 +5,26 @@
Index: doc/meson.build
--- doc/meson.build.orig
+++ doc/meson.build
-@@ -1,23 +1,14 @@
- sphinx = find_program('sphinx-build', required:false)
-
- if sphinx.found()
-- custom_target(
-- 'HTML documentation',
-- output: 'html',
-- input: ['index.rst', 'conf.py'],
-- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
-- build_by_default: true,
-- install: true,
-- install_dir: join_paths(get_option('datadir'), 'doc',
meson.project_name()),
-- )
-
- custom_target(
- 'Manpage documentation',
-- output: 'man',
-+ output: 'man1',
- input: ['index.rst', 'conf.py'],
-- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@/man1'],
-+ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
- build_by_default: true,
- install: true,
-- install_dir: get_option('datadir'),
-+ install_dir: get_option('mandir'),
- )
- endif
+@@ -1,19 +1,9 @@
+ custom_target(
+- 'HTML documentation',
+- output: 'html',
+- input: ['index.rst', 'conf.py'],
+- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
+- build_by_default: true,
+- install: true,
+- install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
+-)
+-
+-custom_target(
+ 'Manpage documentation',
+- output: 'man',
++ output: 'man1',
+ input: ['index.rst', 'conf.py'],
+- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@/man1'],
++ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees',
meson.current_source_dir(), '@OUTPUT@'],
+ build_by_default: true,
+ install: true,
+- install_dir: get_option('datadir'),
++ install_dir: get_option('mandir'),
+ )
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/audio/mpc/patches/patch-meson_build,v
retrieving revision 1.1
diff -u -r1.1 patch-meson_build
--- patches/patch-meson_build 23 Apr 2018 16:51:50 -0000 1.1
+++ patches/patch-meson_build 9 Dec 2018 17:00:47 -0000
@@ -5,16 +5,16 @@
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -12,16 +12,7 @@ conf = configuration_data()
- conf.set_quoted('PACKAGE', meson.project_name())
- conf.set_quoted('VERSION', meson.project_version())
+@@ -15,16 +15,7 @@ conf.set_quoted('VERSION', meson.project_version())
+
+ conf.set('HAVE_STRNDUP', cc.has_function('strndup', prefix: '#define
_GNU_SOURCE\n#include <string.h>'))
-iconv = get_option('iconv')
--if iconv == 'false'
+-if iconv.disabled()
- iconv = false
-elif cc.has_function('iconv')
- iconv = true
--elif iconv == 'auto'
+-elif iconv.auto()
- iconv = false
-else
- error('iconv() not available')
