Accepting request 517718 from home:cornelisbb

OBS-URL: https://build.opensuse.org/request/show/517718
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=1

.gitattributes

@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -0,0 +1 @@
+.osc

README.mpd

@@ -0,0 +1,41 @@
+mpd config file /etc/mpd.cond should be customised, at least a path to
+music directories (music_directory).
+
+To use alsa sound output instead of pulse, activate the corresponding
+part of mpd.conf and put comment on pulse part.
+
+For security reasons, MPD runs as restricted user mpd, group
+audio. Please consider that music_directory and all directories in the
+path to it should be readable and executable either for user mpd or
+group audio. IF you ask youself what should "executable" means to
+a directory, it is a right to change into it. So a directory could
+either belong to mpd user or belong to the audio group or be readable
+for all (others). Directories and files beneath it should be accessable
+the same way. Some examples for right permissions:
+
+ls -l -d /mnt/mp3
+
+readable by everyone
+drwxr-xr-x  226 user    users       16384 Mar 24 23:36 /mnt/mp3
+
+readable by audio group
+drwxr-x---  226 user    audio       16384 Mar 24 23:36 /mnt/mp3
+
+readable by mpd user
+drwx------  226 mpd    audio       16384 Mar 24 23:36 /mnt/mp3
+
+If you would like to set up some independent directories, declare one
+of it as music_directory and link others in it. Permissions for other
+directories are to be set accordingly. 
+
+MPD will be bounded to the local address (localhost): If you would
+like to control it over network , then change bind_to_address to the
+network address. You can set password and the list of activities to
+restrict control of MPD over network.
+
+To start MPD at boot time, call as root:
+
+systemctl enable mpd
+
+If filenames or directory names don't display correctly, set the
+character set (encoding) for the filesystem in mpd.conf.

mpd-0.20.9.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7
+size 773404

mpd-configh.patch

@@ -0,0 +1,12 @@
+--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+@@ -20,8 +20,8 @@
+ /* necessary because libavutil/common.h uses UINT64_C */
+ #define __STDC_CONSTANT_MACROS
+ 
+-#include "lib/ffmpeg/Time.hxx"
+ #include "config.h"
++#include "lib/ffmpeg/Time.hxx"
+ #include "FfmpegDecoderPlugin.hxx"
+ #include "lib/ffmpeg/Domain.hxx"
+ #include "lib/ffmpeg/Error.hxx"

mpd-mpdconf_suse.patch

@@ -0,0 +1,86 @@
+--- a/doc/mpdconf.example	2017-02-01 21:58:30.000000000 +0100
++++ b/doc/mpdconf.example	2017-08-10 12:26:41.316129281 +0200
+@@ -17,7 +17,7 @@
+ # 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/lib/mpd/playlists"
+ #
+ # This setting sets the location of the MPD database. This file is used to
+ # load the database at server start up and store the database while the 
+@@ -25,7 +25,7 @@
+ # MPD to accept files over ipc socket (using file:// protocol) or streaming
+ # files over an accepted protocol.
+ #
+-#db_file			"~/.mpd/database"
++#db_file			"/var/lib/mpd/mpd.db"
+ # 
+ # These settings are the locations for the daemon log files for the daemon.
+ # 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.
+ #
+-#log_file			"~/.mpd/log"
++#log_file			"syslog"
+ #
+ # This setting sets the location of the file which stores the process ID
+ # for use of mpd --kill and some init scripts. This setting is disabled by
+ # default and the pid file will not be stored.
+ #
+-#pid_file			"~/.mpd/pid"
++#pid_file			"/var/lib/mpd/mpd.pid"
+ #
+ # This setting sets the location of the file which contains information about
+ # most variables to get MPD back into the same general shape it was in before
+ # it was brought down. This setting is disabled by default and the server 
+ # state will be reset on server start up.
+ #
+-#state_file			"~/.mpd/state"
++#state_file			"/var/lib/mpd/mpdstate"
+ #
+ # The location of the sticker database.  This is a database which
+ # manages dynamic information attached to songs.
+ #
+-#sticker_file			"~/.mpd/sticker.sql"
++#sticker_file			"/var/lib/mpd/sticker.sql"
+ #
+ ###############################################################################
+ 
+@@ -64,14 +64,14 @@
+ # initialization. This setting is disabled by default and MPD is run as the
+ # current user.
+ #
+-#user				"nobody"
++#user				"mpd"
+ #
+ # This setting specifies the group that MPD will run as. If not specified
+ # primary group of user specified with "user" setting will be used (if set).
+ # This is useful if MPD needs to be a member of group such as "audio" to
+ # have permission to use sound card.
+ #
+-#group				"nogroup"
++#group				"audio"
+ #
+ # This setting sets the address for the daemon to listen on. Careful attention
+ # should be paid if this is assigned to anything other then the default, any.
+@@ -280,8 +280,8 @@
+ # An example of a pulseaudio output (streaming to a remote pulseaudio server)
+ #
+ #audio_output {
+-#	type		"pulse"
+-#	name		"My Pulse Output"
++	type		"pulse"
++	name		"Pulse Output"
+ ##	server		"remote_server"		# optional
+ ##	sink		"remote_server_sink"	# optional
+ #}
+@@ -389,6 +389,6 @@
+ # If file or directory names do not display correctly for your locale then you 
+ # may need to modify this setting.
+ #
+-#filesystem_charset		"UTF-8"
++filesystem_charset		"UTF-8"
+ #
+ ###############################################################################

mpd-user.conf

@@ -0,0 +1,53 @@
+music_directory         "~/data/music"
+playlist_directory      "~/.mpd/playlists"
+db_file                 "~/.mpd/database"
+log_file			    "~/.mpd/log"
+pid_file			    "~/.mpd/pid"
+state_file			    "~/.mpd/state"
+sticker_file			"~/.mpd/sticker.sql"
+bind_to_address		    "127.0.0.1"
+port				    "6600"
+#bind_to_address		"~/.mpd/socket"
+#gapless_mp3_playback	"yes"
+save_absolute_paths_in_playlists	"no"
+metadata_to_use	"artist,album,title,track,name,date"
+auto_update	"yes"
+#auto_update_depth "3"
+follow_outside_symlinks	"yes"
+follow_inside_symlinks		"yes"
+zeroconf_enabled		"yes"
+zeroconf_name			"Music Player"
+#password                        "password@read,add,control,admin"
+#default_permissions             "read,add,control,admin"
+
+input {
+        plugin "curl"
+}
+
+audio_output {
+type		"pulse"
+name		"PulseAudio"
+}
+
+#audio_output {       
+#type        "jack"       
+#name        "mpd"
+#}
+
+audio_output_format		"48000:16:2"
+samplerate_converter		"Fastest Sinc Interpolator"
+
+#replaygain			"album"
+#replaygain_preamp		"0"
+#volume_normalization		"no"
+#audio_buffer_size		"2048"
+#buffer_before_play		"10%"
+#connection_timeout		"60"
+#max_connections		"10"
+#max_playlist_length		"16384"
+#max_command_list_size		"2048"
+#max_output_buffer_size		"8192"
+
+filesystem_charset		"UTF-8"
+#id3v1_encoding			"ISO-8859-1"
+

mpd.spec

@@ -0,0 +1,314 @@
+#
+# spec file for package mpd
+#
+# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+%bcond_with    faad
+%bcond_with    lame
+%bcond_with    mad
+%bcond_with    twolame
+
+%if !%{defined _userunitdir}
+%define _userunitdir /usr/lib/systemd/user
+%endif
+Name:           mpd
+Version:        0.20.9
+Release:        0
+License:        GPL-3.0+
+Summary:        Music Player Daemon
+Url:            http://www.musicpd.org/
+Group:          Productivity/Multimedia/Sound/Players
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source:         http://www.musicpd.org/download/mpd/0.20/mpd-%{version}.tar.xz
+Source2:        README.%{name}
+Source3:        mpd-user.conf
+# PATCH-FEATURE-OPENSUSE mpd-mpdconf_suse.patch --
+Patch0:         %{name}-mpdconf_suse.patch
+Patch1:         mpd-configh.patch
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  pkg-config
+%if 0%{?suse_version} > 1320
+BuildRequires:  libboost_headers-devel
+%else
+BuildRequires:  boost-devel
+%endif
+#uildRequires:  cdrkit-cdrtools-compat
+%if 0%{?suse_version} > 1320
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+%else
+# mpd requires C++14 support.
+%if 0%{?sle_version} == 120100
+# Leap 42.1
+BuildRequires:  gcc5
+BuildRequires:  gcc5-c++
+%else
+# Leap 42.2+ / SLE12SP2Backports
+BuildRequires:  gcc6
+BuildRequires:  gcc6-c++
+%endif
+%endif
+BuildRequires:  libcue-devel
+BuildRequires:  libmikmod-devel
+# MPD_ENABLE_AUTO_LIB
+BuildRequires:  pkgconfig(bzip2)
+%if %{with faad}
+BuildRequires:  faad2-devel
+%endif
+%if %{with lame}
+BuildRequires:  libmp3lame-devel
+%endif
+# MPD_ENABLE_AUTO_PKG
+BuildRequires:  pkgconfig(alsa) >= 0.9.0
+BuildRequires:  pkgconfig(ao)
+BuildRequires:  pkgconfig(audiofile) >= 0.3
+BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(flac) >= 1.2
+BuildRequires:  pkgconfig(fluidsynth) >= 1.1
+BuildRequires:  pkgconfig(icu-i18n)
+BuildRequires:  pkgconfig(id3tag)
+BuildRequires:  pkgconfig(jack) >= 0.100
+BuildRequires:  pkgconfig(libavcodec) >= 53.25
+BuildRequires:  pkgconfig(libavformat) >= 53.17
+BuildRequires:  pkgconfig(libavutil) >= 51.17
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libcurl) >= 7.18
+BuildRequires:  pkgconfig(libgme)
+BuildRequires:  pkgconfig(libiso9660)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libmms) >= 0.4
+BuildRequires:  pkgconfig(libmodplug)
+BuildRequires:  pkgconfig(libmpdclient) >= 2.2
+BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libpulse) >= 0.9.16
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libupnp)
+%if %{with mad}
+BuildRequires:  pkgconfig(mad)
+%endif
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(openal)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(samplerate) >= 0.1.3
+BuildRequires:  pkgconfig(shine) >= 3.1
+BuildRequires:  pkgconfig(shout)
+BuildRequires:  pkgconfig(smbclient) >= 0.2
+BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  pkgconfig(soxr)
+BuildRequires:  pkgconfig(sqlite3) >= 3.7.3
+%if %{with twolame}
+BuildRequires:  pkgconfig(twolame)
+%endif
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vorbisenc)
+BuildRequires:  pkgconfig(wavpack)
+# soundcloud
+#uildRequires:  pkgconfig(yajl) >= 2.0
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(zziplib) >= 0.13
+#
+%if %{suse_version} > 1320
+BuildRequires: group(audio)
+Requires(pre): group(audio)
+%endif
+Requires(pre): pwdutils
+Requires(pre): shadow
+Requires(pre): %fillup_prereq
+%{?systemd_requires}
+
+%description
+A daemon for playing music (mp3, ogg vorbis, flac, and wav).  Music is
+played through the server's audio device.  The daemon stores info
+about all available music, and this info can be easily searched and
+retrieved.  Player control, info retrieval, and playlist management
+can all be managed remotely. There a bunch of clients to control mpd:
+for Gnome, KDE, console and Apache (PHP).
+
+Please read README.mpd how to configure it.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+%build
+%if 0%{?suse_version} > 1320
+export CC=gcc
+export CXX=g++
+%else
+# mpd requires C++14 support.
+%if 0%{?sle_version} == 120100
+# Leap 42.1
+export CC=gcc-5
+export CXX=g++-5
+%else
+# Leap 42.2+ / SLE12SP2Backports
+export CC=gcc-6
+export CXX=g++-6
+%endif
+%endif
+#Need to run as makefile.in built with later version of automake. 
+[ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
+%configure \
+        --disable-sidplay \
+        --disable-aac \
+        --disable-mad \
+        --disable-lame-encoder \
+        --disable-twolame-encoder \
+        \
+    --enable-syslog \
+    --enable-eventfd \
+    --enable-signalfd \
+    --enable-poll \
+    --enable-epoll \
+    --enable-database \
+    --enable-daemon \
+    --enable-debug \
+    --disable-documentation \
+    --enable-dsd \
+    --enable-fifo \
+    --enable-httpd-output \
+    --enable-inotify \
+    --enable-ipv6 \
+    --enable-largefile \
+    --disable-soundcloud \
+    --disable-libwrap \
+    --enable-mikmod  \
+    --enable-openal \
+    --disable-oss \
+    --disable-osx  \
+    --enable-pipe-output \
+    --enable-recorder-output \
+    --enable-shout  \
+    --enable-solaris-output \
+    --enable-tcp \
+    --disable-test \
+    --enable-un \
+    --enable-vorbis \
+    --enable-wave-encoder \
+    --disable-werror \
+    --enable-icu \
+    --enable-iconv \
+    --enable-systemd-daemon \
+    --enable-libmpdclient \
+    --enable-expat \
+    --enable-id3 \
+    --enable-sqlite \
+    --enable-lsr \
+    --enable-soxr \
+    --enable-curl \
+    --enable-smbclient \
+    --enable-nfs \
+    --enable-cdio-paranoia \
+    --enable-mms \
+    --enable-webdav \
+    --enable-cue \
+    --enable-neighbor-plugins \
+    --enable-iso9660 \
+    --enable-zlib \
+    --enable-bzip2 \
+    --enable-upnp \
+    --enable-zzip \
+    --disable-adplug \
+    --enable-audiofile \
+%if %{with faad}
+    --enable-aac \
+%endif
+    --enable-ffmpeg \
+    --enable-flac \
+    --enable-fluidsynth \
+    --enable-gme \
+%if %{with mad}
+    --enable-mad \
+%endif
+    --enable-mpg123 \
+    --enable-modplug \
+    --enable-opus \
+    --enable-sndfile \
+    --disable-mpc \
+    --enable-wavpack \
+    --disable-wildmidi \
+    --enable-shine-encoder \
+    --enable-vorbis-encoder \
+%if %{with lame}
+    --enable-lame-encoder \
+%endif
+%if %{with twolame}
+    --enable-twolame-encoder \
+%endif
+    --enable-alsa \
+    --disable-roar \
+    --disable-sndio \
+    --disable-haiku \
+    --enable-jack \
+    --enable-ao \
+    --enable-pulse \
+        \
+        --with-boost=yes \
+        --enable-systemd-daemon \
+        --with-systemdsystemunitdir=%_unitdir \
+        --with-systemduserunitdir=%_userunitdir
+make %{?_smp_mflags}
+
+%install
+%make_install docdir=%{_docdir}/%{name}
+find %{buildroot} -ls
+# missing dirs
+install -d \
+        %{buildroot}%{_localstatedir}/lib/%{name}/playlists \
+        %{buildroot}%{_sbindir}
+# additional docs
+install -m 0644 %{SOURCE2} README.mpd
+# copy example mpd.conf
+install -Dm0644 %{buildroot}%{_docdir}/%{name}/mpdconf.example %{buildroot}/etc/mpd.conf
+cp -a "%{SOURCE3}" "%{buildroot}%{_docdir}/%{name}/"
+ln -s service %{buildroot}%{_sbindir}/rcmpd
+
+%pre
+# add mpd user only when installing first time
+getent passwd mpd >/dev/null || useradd -r -g audio -d /var/lib/mpd -s /sbin/nologin -c "user for mpd" mpd
+exit 0
+%service_add_pre mpd.service
+
+%post
+%service_add_post mpd.service
+
+%preun
+%service_del_preun mpd.service
+
+%postun
+%service_del_postun mpd.service
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS COPYING NEWS README.md README.mpd
+%config(noreplace) /etc/%{name}.conf
+%{_bindir}/%{name}
+%{_sbindir}/rcmpd
+%attr(0755,mpd,audio) %{_localstatedir}/lib/%{name}
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man5/%{name}.conf.5*
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}
+%{_unitdir}/mpd.service
+%{_unitdir}/mpd.socket
+%{_userunitdir}/mpd.service
+
+%changelog