On Sun, Apr 28, 2019 at 09:52:35AM +0200, Landry Breuil wrote:
> Hi,
>
> now that we have ffmpeg 4 & gcc 8, there should be no blocker anymore
> for updating mpd to the latest version of the 0.21 branch. All configure
> options changed since the switch to meson, i tried to keep them the
> same.
> might take maintainership, after all i've been using mpd for at least 12
> years now...
>
> runtime tests welcome on gcc archs of course :)
New diff, with correctly removed patches (hopefully). cvs sucks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/mpd/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- Makefile 24 Apr 2019 16:26:54 -0000 1.119
+++ Makefile 1 May 2019 19:43:59 -0000
@@ -2,21 +2,21 @@
BROKEN-hppa = no atomic ops
COMMENT = Music Player Daemon
-VER = 0.20.23
+VER = 0.21.8
DISTNAME = mpd-${VER}
+EXTRACT_SUFX = .tar.xz
CATEGORIES = audio
HOMEPAGE = https://www.musicpd.org/
-REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
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 \
+ mpdclient ogg opus pcre pthread samplerate \
+ shout sndfile sndio sqlite3 \
vorbis vorbisenc yajl z ${COMPILER_LIBCXX}
MASTER_SITES = https://www.musicpd.org/download/mpd/${VER:R}/
@@ -39,74 +39,117 @@
databases/sqlite3 \
devel/libaudiofile \
devel/libyajl \
+ devel/pcre \
graphics/ffmpeg \
net/curl \
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 \
+ -Dtremor=disabled \
+ -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.50
diff -u -r1.50 distinfo
--- distinfo 2 Jan 2019 21:32:32 -0000 1.50
+++ distinfo 1 May 2019 19:43:59 -0000
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.20.23.tar.gz) = zZAEPeY4zPCk5rOPwu53rLmZlZvM8ABHfxQXTDwXYGw=
-SIZE (mpd-0.20.23.tar.gz) = 1161696
+SHA256 (mpd-0.21.8.tar.xz) = I+CD8RNWxmv7SlPABWjTcPV3B99WSWspnEFKquWal1c=
+SIZE (mpd-0.21.8.tar.xz) = 670508
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 2 Jan 2019 21:32:32 -0000 1.25
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.25 2019/01/02 21:32:32 landry Exp $
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -5313,7 +5313,7 @@ icons_DATA = mpd.svg
- # 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 1 May 2019 19:43:59 -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 1 May 2019 19:43:59 -0000
@@ -30,7 +30,7 @@
# These logs are great for troubleshooting, depending on your log_level
@@ -34,25 +34,25 @@
# The special value "syslog" makes MPD use the local syslog daemon. This
- # setting defaults to logging to syslog, otherwise logging is disabled.
+ # setting defaults to logging to syslog.
#
-#log_file "~/.mpd/log"
+log_file "/var/log/mpd/mpd.log"
@@ -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 2 Jan 2019 21:32:32 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Main_cxx,v 1.6 2019/01/02 21:32:32 landry Exp $
-
-Fix logic
-
-Index: src/Main.cxx
---- src/Main.cxx.orig
-+++ src/Main.cxx
-@@ -116,7 +116,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 1 May 2019 19:43:59 -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 1 May 2019 19:43:59 -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
