Re: [update] mpd 0.21, mpc, libmpdclient, ncmpc

2018-12-23 Thread Landry Breuil
On Sun, Dec 09, 2018 at 10:29:33PM +0100, Landry Breuil wrote:
> 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...

Might actually be safer, since some ppl use exotic non-clang archs for
audio jukeboxes, stay on the 0.20 branch until we have ffmpeg 3.1 & gcc
6.
Running this version at home.

Landry
Index: Makefile
===
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.117
diff -u -r1.117 Makefile
--- Makefile4 Jul 2018 09:01:59 -   1.117
+++ Makefile23 Dec 2018 10:04:10 -
@@ -2,7 +2,7 @@
 
 BROKEN-hppa =  no atomic ops
 COMMENT =  Music Player Daemon
-VER =  0.20.20
+VER =  0.20.23
 DISTNAME = mpd-${VER}
 CATEGORIES =   audio
 HOMEPAGE = https://www.musicpd.org/
Index: distinfo
===
RCS file: /cvs/ports/audio/mpd/distinfo,v
retrieving revision 1.49
diff -u -r1.49 distinfo
--- distinfo4 Jul 2018 09:01:59 -   1.49
+++ distinfo23 Dec 2018 10:04:10 -
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.20.20.tar.gz) = KZQHeiWVJIaHynj+EsYdxrHk55EzMMayCjmGJLyolZA=
-SIZE (mpd-0.20.20.tar.gz) = 1139145
+SHA256 (mpd-0.20.23.tar.gz) = zZAEPeY4zPCk5rOPwu53rLmZlZvM8ABHfxQXTDwXYGw=
+SIZE (mpd-0.20.23.tar.gz) = 1161696
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/audio/mpd/patches/patch-Makefile_in,v
retrieving revision 1.24
diff -u -r1.24 patch-Makefile_in
--- patches/patch-Makefile_in   4 Jul 2018 09:01:59 -   1.24
+++ patches/patch-Makefile_in   23 Dec 2018 10:04:10 -
@@ -2,7 +2,7 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -4680,7 +4680,7 @@ FILTER_LIBS = \
+@@ -5313,7 +5313,7 @@ icons_DATA = mpd.svg
  # Documentation
  #
  man_MANS = doc/mpd.1 doc/mpd.conf.5
Index: patches/patch-src_Main_cxx
===
RCS file: /cvs/ports/audio/mpd/patches/patch-src_Main_cxx,v
retrieving revision 1.5
diff -u -r1.5 patch-src_Main_cxx
--- patches/patch-src_Main_cxx  4 Jul 2018 09:01:59 -   1.5
+++ patches/patch-src_Main_cxx  23 Dec 2018 10:04:10 -
@@ -5,7 +5,7 @@
 Index: src/Main.cxx
 --- src/Main.cxx.orig
 +++ src/Main.cxx
-@@ -115,7 +115,7 @@ static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
+@@ -116,7 +116,7 @@ static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
  static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE;
  
  static


Re: [update] mpd 0.21, mpc, libmpdclient, ncmpc

2018-12-18 Thread Bryan Linton
On 2018-12-09 22:29:33, Landry Breuil  wrote:
> 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.
> 

I primarily use mpd with audio/ario, and everything works fine.  I had
to update my database before songs would play, but I generally do that
as a matter of course whenever new major versions of mpd are released anyway.

Also lightly tested mpc and ncmpc, and no regressions seen with them.

-- 
Bryan



[update] mpd 0.21, mpc, libmpdclient, ncmpc

2018-12-09 Thread Landry Breuil
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
--- Makefile4 Jul 2018 09:01:59 -   1.117
+++ Makefile9 Dec 2018 21:20:26 -
@@ -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 
@@ -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 \
-