X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mpd.spec;h=d1ce4d6be9c382a35e11a5107282b91b0bd6a919;hb=a1df62eec9ac77d8b62d8e893174c93413518572;hp=907af59ac4815d04da58e0ead79fdf98d6a14597;hpb=3e2d1979472dfd3e10d0c1f73d896b859a92eb1d;p=packages%2Fmpd.git

diff --git a/mpd.spec b/mpd.spec
index 907af59..d1ce4d6 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -9,16 +9,17 @@
 Summary:	Music Player Daemon
 Summary(pl.UTF-8):	Music Player Daemon - demon odtwarzający muzykę
 Name:		mpd
-Version:	0.21.14
+Version:	0.23
 Release:	1
 License:	GPL v2+
 Group:		Applications/Multimedia
-Source0:	http://www.musicpd.org/download/mpd/0.21/%{name}-%{version}.tar.xz
-# Source0-md5:	980404964cc4c882246168049fdf2dea
+Source0:	https://www.musicpd.org/download/mpd/0.23/%{name}-%{version}.tar.xz
+# Source0-md5:	103db74cc275ec0f7e5b7503cfd80131
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
+Patch0:		smb.patch
 URL:		http://www.musicpd.org/
 BuildRequires:	OpenAL-devel
 BuildRequires:	adplug-devel
@@ -27,7 +28,7 @@ BuildRequires:	alsa-lib-devel >= 0.9.0
 BuildRequires:	avahi-devel
 BuildRequires:	boost-devel >= 1.58
 BuildRequires:	bzip2-devel
-BuildRequires:	curl-devel >= 7.18
+BuildRequires:	curl-devel >= 7.33
 BuildRequires:	dbus-devel
 BuildRequires:	doxygen
 BuildRequires:	expat-devel
@@ -36,49 +37,55 @@ BuildRequires:	ffmpeg-devel >= 2.4.0
 BuildRequires:	flac-devel >= 1.2.0
 BuildRequires:	fluidsynth-devel >= 1.1
 BuildRequires:	game-music-emu-devel
-BuildRequires:	gcc >= 6:5
+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:	libcdio-paranoia-devel >= 0.4
-BuildRequires:	libcue-devel
+BuildRequires:	libcdio-paranoia-devel >= 0.93
+BuildRequires:	libchromaprint-devel
+BuildRequires:	libfmt-devel
 BuildRequires:	libicu-devel >= 50
 BuildRequires:	libid3tag-devel
 BuildRequires:	libmad-devel
 %{?with_mod:BuildRequires:	libmikmod-devel >= 3.2}
 BuildRequires:	libmms-devel >= 0.4
 BuildRequires:	libmodplug-devel
-BuildRequires:	libmpdclient-devel >= 2.9
-BuildRequires:	libmpg123-devel
+BuildRequires:	libmpdclient-devel >= 2.11
+BuildRequires:	libmpg123-devel >= 1.28.0
 BuildRequires:	libnfs-devel >= 1.11
 BuildRequires:	libogg-devel
+BuildRequires:	libopenmpt-devel >= 0.5
 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:	libstdc++-devel >= 0.2
-BuildRequires:	libupnp-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libupnp-devel >= 1.8
+BuildRequires:	liburing-devel
 BuildRequires:	libvorbis-devel
-BuildRequires:	libwrap-devel
-BuildRequires:	meson >= 0.49.0
+BuildRequires:	meson >= 0.56.0
 BuildRequires:	musepack-devel
 BuildRequires:	ninja
 BuildRequires:	opus-devel
+BuildRequires:	pcre-devel
+BuildRequires:	pipewire-devel >= 0.3
 BuildRequires:	pkgconfig >= 1:0.9.0
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel >= 0.9.16}
-BuildRequires:	rpmbuild(macros) >= 1.727
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	shine-devel >= 3.1
 BuildRequires:	soxr-devel
 BuildRequires:	sphinx-pdg
 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:	xz
 BuildRequires:	yajl-devel >= 2.0
 BuildRequires:	zlib-devel
 BuildRequires:	zziplib-devel >= 0.13
@@ -86,7 +93,7 @@ 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:	curl-libs >= 7.18
+Requires:	curl-libs >= 7.33
 Requires:	faad2-libs >= 2.6.1-5
 Requires:	ffmpeg-libs >= 2.4.0
 Requires:	flac >= 1.2.0
@@ -95,15 +102,19 @@ Requires:	glib2 >= 1:2.28.0
 Requires:	hicolor-icon-theme
 Requires:	jack-audio-connection-kit-libs >= 0.100
 Requires:	libao >= 0.8.3
-Requires:	libcdio-paranoia >= 0.4
+Requires:	libcdio-paranoia >= 0.93
 Requires:	libicu >= 50
 %{?with_mod:Requires:	libmikmod >= 3.2}
 Requires:	libmms >= 0.4
-Requires:	libmpdclient >= 2.9
+Requires:	libmpdclient >= 2.11
+Requires:	libmpg123 >= 1.28.0
 Requires:	libnfs >= 1.11
+Requires:	libopenmpt >= 0.5
 Requires:	libsamplerate >= 0.1.3
-Requires:	libsidplay2 >= 2.1.1-5
+Requires:	libsidplayfp >= 1.8
 Requires:	libsmbclient >= 0.2
+Requires:	libupnp >= 1.8
+Requires:	pipewire-libs >= 0.3
 %{?with_pulseaudio:Requires:	pulseaudio-libs >= 0.9.16}
 Requires:	shine >= 3.1
 Requires:	sqlite3 >= 3.7.3
@@ -161,6 +172,7 @@ Dokumentacja do Music Player Daemon (MPD).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build \
@@ -171,10 +183,10 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dao=enabled \
 	-Daudiofile=%{?with_audiofile:enabled}%{!?with_audiofile:disabled} \
 	-Dbzip2=enabled \
-	-Dcdio-paranoia=enabled \
+	-Dcdio_paranoia=enabled \
 	-Dcurl=enabled \
 	-Ddatabase=true \
-	-Ddocumentation=true \
+	-Ddocumentation=enabled \
 	-Ddsd=true \
 	-Dexpat=enabled \
 	-Dffmpeg=enabled \
@@ -184,15 +196,14 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dgme=enabled \
 	-Dhttpd=true \
 	-Dicu=enabled \
-	-Did3=enabled \
+	-Did3tag=enabled \
 	-Dinotify=true \
+	-Dio_uring=enabled \
 	-Dipv6=enabled \
 	-Diso9660=enabled \
 	-Djack=enabled \
-	-Dlame-encoder=enabled \
+	-Dlame=enabled \
 	-Dlibmpdclient=enabled \
-	-Dlibwrap=enabled \
-	-Dlsr=enabled \
 	-Dmad=enabled \
 	-Dmikmod=enabled \
 	-Dmms=enabled \
@@ -205,7 +216,7 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dpipe=true \
 	-Drecorder=true \
 	-Dsidplay=enabled \
-	-Dshine-encoder=enabled \
+	-Dshine=enabled \
 	-Dshout=enabled \
 	-Dsmbclient=enabled \
 	-Dsndfile=enabled \
@@ -215,11 +226,10 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Ddaemon=true \
 	-Dsystemd=enabled \
 	-Dtcp=true \
-	-Dtwolame-encoder=enabled \
-	-Dupnp=enabled \
-	-Dun=enabled \
+	-Dtwolame=enabled \
+	-Dupnp=pupnp \
 	-Dvorbis=enabled \
-	-Dvorbis-encoder=enabled \
+	-Dvorbisenc=enabled \
 	-Dwave_encoder=true \
 	-Dwavpack=enabled \
 	-Dwildmidi=enabled \
@@ -228,7 +238,7 @@ Dokumentacja do Music Player Daemon (MPD).
 	-Dzeroconf=avahi \
 	-Dsystemd_system_unit_dir=%{systemdunitdir} \
 	-Dsystemd_user_unit_dir=%{systemduserunitdir}
-%meson_build -C build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -236,7 +246,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}
 
-%meson_install -C build
+%ninja_install -C build
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mpd