]> git.pld-linux.org Git - packages/mpd.git/blobdiff - mpd.spec
- liburing rebuild
[packages/mpd.git] / mpd.spec
index 8ebe18a796c2f4a9dd96d6da29d2fe8e6334d237..a0bfa56768c76af5a8cf69676625a6bec7f7063b 100644 (file)
--- a/mpd.spec
+++ b/mpd.spec
 # - add logrotate
 #
 # Conditional build:
 # - add logrotate
 #
 # Conditional build:
-%bcond_without mod             # enable MOD support
-%bcond_without pulseaudio      # disable PulseAudio support
+%bcond_without mod             # MOD support via libmikmod
+%bcond_without pulseaudio      # PulseAudio support
 %bcond_without audiofile       # Audiofile support (WAV and others)
 
 Summary:       Music Player Daemon
 %bcond_without audiofile       # Audiofile support (WAV and others)
 
 Summary:       Music Player Daemon
-Summary(hu.UTF-8):     Music Player Daemon
 Summary(pl.UTF-8):     Music Player Daemon - demon odtwarzający muzykę
 Name:          mpd
 Summary(pl.UTF-8):     Music Player Daemon - demon odtwarzający muzykę
 Name:          mpd
-Version:       0.20.4
-Release:       1
+Version:       0.22.6
+Release:       2
 License:       GPL v2+
 Group:         Applications/Multimedia
 License:       GPL v2+
 Group:         Applications/Multimedia
-Source0:       http://www.musicpd.org/download/mpd/0.20/%{name}-%{version}.tar.xz
-# Source0-md5: 2c0f2f8acad69e7f93cdef2859c674d0
+Source0:       https://www.musicpd.org/download/mpd/0.22/%{name}-%{version}.tar.xz
+# Source0-md5: 774a6250870730f3d55eb1445ab751dd
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
-Patch0:                %{name}-mpcsv8.patch
 URL:           http://www.musicpd.org/
 BuildRequires: OpenAL-devel
 BuildRequires: adplug-devel
 BuildRequires: alsa-lib-devel >= 0.9.0
 %{?with_audiofile:BuildRequires:       audiofile-devel >= 0.3}
 URL:           http://www.musicpd.org/
 BuildRequires: OpenAL-devel
 BuildRequires: adplug-devel
 BuildRequires: alsa-lib-devel >= 0.9.0
 %{?with_audiofile:BuildRequires:       audiofile-devel >= 0.3}
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.11
 BuildRequires: avahi-devel
 BuildRequires: avahi-devel
-BuildRequires: boost-devel >= 1.54
+BuildRequires: boost-devel >= 1.58
 BuildRequires: bzip2-devel
 BuildRequires: bzip2-devel
-BuildRequires: curl-devel >= 7.18
+BuildRequires: curl-devel >= 7.33
 BuildRequires: dbus-devel
 BuildRequires: doxygen
 BuildRequires: expat-devel
 BuildRequires: faad2-devel >= 2.6.1-5
 BuildRequires: dbus-devel
 BuildRequires: doxygen
 BuildRequires: expat-devel
 BuildRequires: faad2-devel >= 2.6.1-5
-BuildRequires: ffmpeg-devel >= 0.8.0
+BuildRequires: ffmpeg-devel >= 2.4.0
 BuildRequires: flac-devel >= 1.2.0
 BuildRequires: fluidsynth-devel >= 1.1
 BuildRequires: game-music-emu-devel
 BuildRequires: flac-devel >= 1.2.0
 BuildRequires: fluidsynth-devel >= 1.1
 BuildRequires: game-music-emu-devel
-BuildRequires: gcc >= 6:4.7
+BuildRequires: gcc >= 6:8
 BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: jack-audio-connection-kit-devel >= 0.100
 BuildRequires: lame-libs-devel
 BuildRequires: libao-devel >= 0.8.3
 BuildRequires: libcdio-devel
 BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: jack-audio-connection-kit-devel >= 0.100
 BuildRequires: lame-libs-devel
 BuildRequires: libao-devel >= 0.8.3
 BuildRequires: libcdio-devel
-BuildRequires: libcdio-paranoia-devel
-BuildRequires: libcue-devel
-BuildRequires: libicu-devel
+BuildRequires: libcdio-paranoia-devel >= 0.93
+BuildRequires: libchromaprint-devel
+BuildRequires: libicu-devel >= 50
 BuildRequires: libid3tag-devel
 BuildRequires: libmad-devel
 BuildRequires: libid3tag-devel
 BuildRequires: libmad-devel
-%{?with_mod:BuildRequires:     libmikmod-devel >= 3.1.7}
+%{?with_mod:BuildRequires:     libmikmod-devel >= 3.2}
 BuildRequires: libmms-devel >= 0.4
 BuildRequires: libmodplug-devel
 BuildRequires: libmms-devel >= 0.4
 BuildRequires: libmodplug-devel
-BuildRequires: libmpdclient-devel >= 2.2
+BuildRequires: libmpdclient-devel >= 2.9
 BuildRequires: libmpg123-devel
 BuildRequires: libmpg123-devel
-BuildRequires: libnfs-devel
+BuildRequires: libnfs-devel >= 1.11
 BuildRequires: libogg-devel
 BuildRequires: libsamplerate-devel >= 0.1.3
 BuildRequires: libshout-devel
 BuildRequires: libogg-devel
 BuildRequires: libsamplerate-devel >= 0.1.3
 BuildRequires: libshout-devel
-BuildRequires: libsidplay2-devel >= 2.1.1-5
+BuildRequires: libsidplayfp-devel >= 1.8
 BuildRequires: libsmbclient-devel >= 0.2
 BuildRequires: libsndfile-devel
 BuildRequires: libsmbclient-devel >= 0.2
 BuildRequires: libsndfile-devel
-BuildRequires: libstdc++-devel >= 0.2
-BuildRequires: libupnp-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libupnp-devel >= 1.8
+BuildRequires: liburing-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libvorbis-devel
-BuildRequires: libwrap-devel
+BuildRequires: meson >= 0.49.0
 BuildRequires: musepack-devel
 BuildRequires: musepack-devel
+BuildRequires: ninja
 BuildRequires: opus-devel
 BuildRequires: opus-devel
+BuildRequires: pcre-devel
 BuildRequires: pkgconfig >= 1:0.9.0
 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel >= 0.9.16}
 BuildRequires: pkgconfig >= 1:0.9.0
 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel >= 0.9.16}
-BuildRequires: rpmbuild(macros) >= 1.629-2
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: shine-devel >= 3.1
 BuildRequires: soxr-devel
 BuildRequires: shine-devel >= 3.1
 BuildRequires: soxr-devel
+BuildRequires: sphinx-pdg
 BuildRequires: sqlite3-devel >= 3.7.3
 BuildRequires: systemd-devel
 BuildRequires: sqlite3-devel >= 3.7.3
 BuildRequires: systemd-devel
+BuildRequires: tar >= 1:1.22
 BuildRequires: twolame-devel
 BuildRequires: wavpack-devel
 BuildRequires: wildmidi-devel
 BuildRequires: xmlto
 BuildRequires: twolame-devel
 BuildRequires: wavpack-devel
 BuildRequires: wildmidi-devel
 BuildRequires: xmlto
+BuildRequires: xz
 BuildRequires: yajl-devel >= 2.0
 BuildRequires: zlib-devel
 BuildRequires: zziplib-devel >= 0.13
 BuildRequires: yajl-devel >= 2.0
 BuildRequires: zlib-devel
 BuildRequires: zziplib-devel >= 0.13
+Requires(post,postun): gtk-update-icon-cache
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      alsa-lib >= 0.9.0
 %{?with_audiofile:Requires:    audiofile >= 0.3}
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      alsa-lib >= 0.9.0
 %{?with_audiofile:Requires:    audiofile >= 0.3}
-Requires:      curl-libs >= 7.18
+Requires:      curl-libs >= 7.33
 Requires:      faad2-libs >= 2.6.1-5
 Requires:      faad2-libs >= 2.6.1-5
-Requires:      ffmpeg-libs >= 0.8.0
+Requires:      ffmpeg-libs >= 2.4.0
 Requires:      flac >= 1.2.0
 Requires:      fluidsynth >= 1.1
 Requires:      glib2 >= 1:2.28.0
 Requires:      flac >= 1.2.0
 Requires:      fluidsynth >= 1.1
 Requires:      glib2 >= 1:2.28.0
+Requires:      hicolor-icon-theme
 Requires:      jack-audio-connection-kit-libs >= 0.100
 Requires:      libao >= 0.8.3
 Requires:      jack-audio-connection-kit-libs >= 0.100
 Requires:      libao >= 0.8.3
-%{?with_mod:Requires:  libmikmod >= 3.1.7}
+Requires:      libcdio-paranoia >= 0.93
+Requires:      libicu >= 50
+%{?with_mod:Requires:  libmikmod >= 3.2}
 Requires:      libmms >= 0.4
 Requires:      libmms >= 0.4
-Requires:      libmpdclient >= 2.2
+Requires:      libmpdclient >= 2.9
+Requires:      libnfs >= 1.11
 Requires:      libsamplerate >= 0.1.3
 Requires:      libsamplerate >= 0.1.3
-Requires:      libsidplay2 >= 2.1.1-5
+Requires:      libsidplayfp >= 1.8
 Requires:      libsmbclient >= 0.2
 Requires:      libsmbclient >= 0.2
+Requires:      libupnp >= 1.8
 %{?with_pulseaudio:Requires:   pulseaudio-libs >= 0.9.16}
 Requires:      shine >= 3.1
 Requires:      sqlite3 >= 3.7.3
 %{?with_pulseaudio:Requires:   pulseaudio-libs >= 0.9.16}
 Requires:      shine >= 3.1
 Requires:      sqlite3 >= 3.7.3
@@ -135,26 +143,13 @@ w sieci lokalnej. Służy także za dobry odtwarzacz muzyki dla
 komputerów biurkowych, zwłaszcza dla miłośników konsoli, różnych opcji
 frontendów albo często restartujących X.
 
 komputerów biurkowych, zwłaszcza dla miłośników konsoli, różnych opcji
 frontendów albo często restartujących X.
 
-%package apidocs
-Summary:       MPD API documentation
-Summary(pl.UTF-8):     Dokumentacja API biblioteki API
-Group:         Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
-
-%description apidocs
-API and internal documentation for MPD library.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki MPD.
-
 %package doc
 Summary:       Documentation for Music Player Daemon (MPD)
 Summary(fr.UTF-8):     Documentation pour Music Player Daemon (MPD)
 Summary(it.UTF-8):     Documentazione di Music Player Daemon (MPD)
 Summary(pl.UTF-8):     Podręcznik dla Music Player Daemon (MPD)
 Group:         Documentation
 %package doc
 Summary:       Documentation for Music Player Daemon (MPD)
 Summary(fr.UTF-8):     Documentation pour Music Player Daemon (MPD)
 Summary(it.UTF-8):     Documentazione di Music Player Daemon (MPD)
 Summary(pl.UTF-8):     Podręcznik dla Music Player Daemon (MPD)
 Group:         Documentation
+Obsoletes:     mpd-apidocs < 0.21
 
 %description doc
 Documentation for Music Player Daemon (MPD).
 
 %description doc
 Documentation for Music Player Daemon (MPD).
@@ -170,82 +165,72 @@ Dokumentacja do Music Player Daemon (MPD).
 
 %prep
 %setup -q
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 
 %build
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-# ac_cv_* hacks to avoid unwanted linking
-GME_CFLAGS="-I/usr/include/gme" GME_LIBS="-lgme" \
-%configure \
-       ac_cv_lib_iconv_main=no \
-       ac_cv_lib_nsl_gethostbyname=no \
-       %{!?with_pulseaudio:--disable-pulse} \
-       %{?with_mod:--enable-mikmod} \
-       --enable-adplug \
-       --enable-alsa \
-       --enable-ao \
-       %{?with_audiofile:--enable-audiofile} \
-       --enable-bzip2 \
-       --enable-cdio-paranoia \
-       --enable-curl \
-       --enable-database \
-       --enable-documentation \
-       --enable-dsd \
-       --enable-expat \
-       --enable-ffmpeg \
-       --enable-fifo \
-       --enable-flac \
-       --enable-fluidsynth \
-       --enable-gme \
-       --enable-httpd-output \
-       --enable-icu \
-       --enable-id3 \
-       --enable-inotify \
-       --enable-ipv6 \
-       --enable-iso9660 \
-       --enable-jack \
-       --enable-lame-encoder \
-       --enable-libmpdclient \
-       --enable-libwrap \
-       --enable-lsr \
-       --enable-mad \
-       --enable-mikmod \
-       --enable-mms \
-       --enable-modplug \
-       --enable-mpc \
-       --enable-nfs \
-       --enable-openal \
-       --enable-opus \
-       --enable-oss \
-       --enable-pipe-output \
-       --enable-recorder-output \
-       --enable-sidplay \
-       --enable-shine-encoder \
-       --enable-shout \
-       --enable-smbclient \
-       --enable-sndfile \
-       --enable-soundcloud \
-       --enable-soxr \
-       --enable-sqlite \
-       --enable-systemd-daemon \
-       --enable-tcp \
-       --enable-twolame-encoder \
-       --enable-upnp \
-       --enable-un \
-       --enable-vorbis \
-       --enable-vorbis-encoder \
-       --enable-wave-encoder \
-       --enable-wavpack \
-       --enable-wildmidi \
-       --enable-zlib \
-       --enable-zzip \
-       --with-zeroconf=avahi \
-       --without-tremor \
-       --with-systemdsystemunitdir=%{systemdunitdir}
-%{__make}
+%meson build \
+       -Dpulse=%{?with_pulseaudio:enabled}%{!?with_pulseaudio:disabled} \
+       -Dmikmod=%{?with_mod:enabled}%{!?with_mod:disabled} \
+       -Dadplug=enabled \
+       -Dalsa=enabled \
+       -Dao=enabled \
+       -Daudiofile=%{?with_audiofile:enabled}%{!?with_audiofile:disabled} \
+       -Dbzip2=enabled \
+       -Dcdio_paranoia=enabled \
+       -Dcurl=enabled \
+       -Ddatabase=true \
+       -Ddocumentation=enabled \
+       -Ddsd=true \
+       -Dexpat=enabled \
+       -Dffmpeg=enabled \
+       -Dfifo=true \
+       -Dflac=enabled \
+       -Dfluidsynth=enabled \
+       -Dgme=enabled \
+       -Dhttpd=true \
+       -Dicu=enabled \
+       -Did3tag=enabled \
+       -Dinotify=true \
+       -Dio_uring=enabled \
+       -Dipv6=enabled \
+       -Diso9660=enabled \
+       -Djack=enabled \
+       -Dlame=enabled \
+       -Dlibmpdclient=enabled \
+       -Dmad=enabled \
+       -Dmikmod=enabled \
+       -Dmms=enabled \
+       -Dmodplug=enabled \
+       -Dmpcdec=disabled \
+       -Dnfs=enabled \
+       -Dopenal=enabled \
+       -Dopus=enabled \
+       -Doss=enabled \
+       -Dpipe=true \
+       -Drecorder=true \
+       -Dsidplay=enabled \
+       -Dshine=enabled \
+       -Dshout=enabled \
+       -Dsmbclient=enabled \
+       -Dsndfile=enabled \
+       -Dsoundcloud=enabled \
+       -Dsoxr=enabled \
+       -Dsqlite=enabled \
+       -Ddaemon=true \
+       -Dsystemd=enabled \
+       -Dtcp=true \
+       -Dtwolame=enabled \
+       -Dupnp=enabled \
+       -Dvorbis=enabled \
+       -Dvorbisenc=enabled \
+       -Dwave_encoder=true \
+       -Dwavpack=enabled \
+       -Dwildmidi=enabled \
+       -Dzlib=enabled \
+       -Dzzip=enabled \
+       -Dzeroconf=avahi \
+       -Dsystemd_system_unit_dir=%{systemdunitdir} \
+       -Dsystemd_user_unit_dir=%{systemduserunitdir}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -253,8 +238,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
        $RPM_BUILD_ROOT{/var/lib/mpd/playlists,/var/log/mpd,/var/run/mpd} \
        $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
        $RPM_BUILD_ROOT{/var/lib/mpd/playlists,/var/log/mpd,/var/run/mpd} \
        $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mpd
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mpd
@@ -285,6 +269,7 @@ for f in mpd.log; do
 done
 /sbin/chkconfig --add mpd
 %systemd_post %{name}.service %{name}.socket
 done
 /sbin/chkconfig --add mpd
 %systemd_post %{name}.service %{name}.socket
+%update_icon_cache hicolor
 
 %preun
 if [ "$1" = "0" ]; then
 
 %preun
 if [ "$1" = "0" ]; then
@@ -299,13 +284,14 @@ if [ "$1" = "0" ]; then
        %groupremove mpd
 fi
 %systemd_reload
        %groupremove mpd
 fi
 %systemd_reload
+%update_icon_cache hicolor
 
 %triggerpostun -- %{name} < 0.16.6-1
 %systemd_trigger %{name}.service
 
 %files
 %defattr(644,root,root,755)
 
 %triggerpostun -- %{name} < 0.16.6-1
 %systemd_trigger %{name}.service
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS INSTALL NEWS README.md doc/mpdconf.example
+%doc AUTHORS NEWS README.md doc/mpdconf.example
 %attr(755,root,root) %{_bindir}/*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mpd.conf
 %attr(754,root,root) /etc/rc.d/init.d/mpd
 %attr(755,root,root) %{_bindir}/*
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mpd.conf
 %attr(754,root,root) /etc/rc.d/init.d/mpd
@@ -313,6 +299,8 @@ fi
 %{systemdtmpfilesdir}/%{name}.conf
 %{systemdunitdir}/mpd.service
 %{systemdunitdir}/mpd.socket
 %{systemdtmpfilesdir}/%{name}.conf
 %{systemdunitdir}/mpd.service
 %{systemdunitdir}/mpd.socket
+%{systemduserunitdir}/mpd.service
+%{systemduserunitdir}/mpd.socket
 %dir %attr(770,root,mpd) /var/lib/%{name}
 %dir %attr(770,root,mpd) /var/lib/%{name}/playlists
 %dir %attr(751,root,root) /var/log/%{name}
 %dir %attr(770,root,mpd) /var/lib/%{name}
 %dir %attr(770,root,mpd) /var/lib/%{name}/playlists
 %dir %attr(751,root,root) /var/log/%{name}
@@ -321,13 +309,10 @@ fi
 %attr(644,mpd,mpd) %ghost /var/lib/%{name}/mpdstate
 %attr(644,mpd,mpd) %ghost /var/lib/%{name}/sticker.sql
 %attr(644,mpd,mpd) %ghost /var/log/%{name}/mpd.log
 %attr(644,mpd,mpd) %ghost /var/lib/%{name}/mpdstate
 %attr(644,mpd,mpd) %ghost /var/lib/%{name}/sticker.sql
 %attr(644,mpd,mpd) %ghost /var/log/%{name}/mpd.log
+%{_iconsdir}/hicolor/scalable/apps/mpd.svg
 %{_mandir}/man1/mpd.1*
 %{_mandir}/man5/mpd.conf.5*
 
 %files doc
 %defattr(644,root,root,755)
 %{_mandir}/man1/mpd.1*
 %{_mandir}/man5/mpd.conf.5*
 
 %files doc
 %defattr(644,root,root,755)
-%doc doc/user/*
-
-%files apidocs
-%defattr(644,root,root,755)
-%doc doc/api doc/developer doc/protocol
+%doc build/doc/html
This page took 0.086112 seconds and 4 git commands to generate.