ffmpeg Rebuild

3 files changed, 28 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1901c09aff18..b411b7663c36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mpd-light-pulse-ffmpeg
 	pkgdesc = Flexible, powerful, server-side application for playing music. Light version without openal, ao, jack, mikmod, modplug, mpg123, openmpt, pipewire, shout, sidplay, soundcloud, wavpack, fluidsynth, avahi, zziplib and gme support.
 	pkgver = 0.23.5
-	pkgrel = 1
+	pkgrel = 3
 	url = https://www.musicpd.org/
 	arch = x86_64
 	license = GPL2
@@ -21,7 +21,7 @@ pkgbase = mpd-light-pulse-ffmpeg
 	depends = audiofile
 	depends = curl
 	depends = faad2
-	depends = ffmpeg
+	depends = ffmpeg4.4
 	depends = flac
 	depends = fmt
 	depends = icu
@@ -33,20 +33,21 @@ pkgbase = mpd-light-pulse-ffmpeg
 	depends = libupnp
 	depends = liburing
 	depends = libvorbis
-	provides = mpd=0.23.5
+	provides = mpd
 	conflicts = mpd
-	replaces = mpd
 	backup = etc/mpd.conf
 	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.5.tar.xz
 	source = https://www.musicpd.org/download/mpd/0.23/mpd-0.23.5.tar.xz.sig
 	source = mpd.conf
 	source = mpd.sysusers
 	source = mpd.tmpfiles
+	source = mpd.service.override
 	validpgpkeys = 0392335A78083894A4301C43236E8A58C6DB4512
 	sha512sums = 3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34
 	sha512sums = SKIP
 	sha512sums = 25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1
 	sha512sums = 6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18
 	sha512sums = db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d
+	sha512sums = c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c
 
 pkgname = mpd-light-pulse-ffmpeg
diff --git a/PKGBUILD b/PKGBUILD
index da2d84e7fdc9..24e8eb0df504 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,48 +11,41 @@
 pkgname=mpd-light-pulse-ffmpeg
 _pkgname=mpd
 pkgver=0.23.5
-pkgrel=1
+pkgrel=3
 pkgdesc='Flexible, powerful, server-side application for playing music. Light version without openal, ao, jack, mikmod, modplug, mpg123, openmpt, pipewire, shout, sidplay, soundcloud, wavpack, fluidsynth, avahi, zziplib and gme support.'
 url='https://www.musicpd.org/'
 license=('GPL2')
 arch=('x86_64')
 depends=('gcc-libs' 'glibc' 'libcdio-paranoia' 'libmad' 'sqlite'
          'libmms' 'libnfs' 'libsoxr' 'zlib'
-         'alsa-lib' 'audiofile' 'curl' 'faad2' 'ffmpeg' 'flac' 'fmt'
+         'alsa-lib' 'audiofile' 'curl' 'faad2' 'ffmpeg4.4' 'flac' 'fmt'
          'icu' 'libid3tag' 'libmpdclient' 'libogg' 'libpulse' 'libsamplerate'
          'libupnp' 'liburing' 'libvorbis')
 makedepends=('boost' 'meson' 'python-sphinx')
 provides=("mpd=${pkgver}")
-conflicts=('mpd')
-replaces=('mpd')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
 source=("https://www.musicpd.org/download/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz"{,.sig}
         "${_pkgname}.conf"
         "${_pkgname}.sysusers"
-        "${_pkgname}.tmpfiles")
+        "${_pkgname}.tmpfiles"
+        "${_pkgname}.service.override")
 sha512sums=('3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34'
             'SKIP'
             '25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1'
             '6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18'
-            'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d')
+            'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d'
+            'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max@blarg.de>
 backup=("etc/${_pkgname}.conf")
 
-prepare() {
-  cd "${_pkgname}-${pkgver}"
-  sed -e '/\[Service\]/a User=mpd' \
-      -i "systemd/system/mpd.service.in"
-}
-
 build() {
-  cd "${_pkgname}-${pkgver}"
-
-
   _opts=('-Ddocumentation=enabled'
          '-Dadplug=disabled' # not in an official repo
          '-Dsndio=disabled' # interferes with detection of alsa devices
          '-Dshine=disabled' # not in an official repo
          '-Dtremor=disabled' # not in an official repo
-         '-D b_ndebug=true' # see https://bugs.archlinux.org/task/72455
+         '-Db_ndebug=true' # see https://bugs.archlinux.org/task/72455
          '-Dpipewire=disabled'
          '-Dopenmpt=disabled'
          '-Dchromaprint=disabled'
@@ -80,12 +73,16 @@ build() {
          '-Dyajl=disabled'
          '-Dgme=disabled'
   )
-  arch-meson ${_opts[@]} build
+
+  # we currently require ffmpeg4.4 as otherwise database update is broken:
+  # https://github.com/MusicPlayerDaemon/MPD/issues/1448
+  export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
+
+  arch-meson ${_opts[@]} build "${_pkgname}-${pkgver}"
   ninja -C build
 }
 
 check() {
-  cd "${_pkgname}-${pkgver}"
   ninja -C build test
 }
 
@@ -94,20 +91,11 @@ package() {
             # 'libcurl.so' 'libfaad.so' 'libfmt.so' 'libicui18n.so' 'libicuuc.so' 'libid3tag.so'
             # 'libmpdclient.so' 'libogg.so' 'libsamplerate.so'
             # 'libvorbis.so' 'libupnp.so' 'liburing.so' 'libixml.so')
-  cd "${_pkgname}-${pkgver}"
-	DESTDIR="${pkgdir}" ninja -C build install
-  install -vDm 644 "doc/${_pkgname}conf.example" \
-    -t "${pkgdir}/usr/share/doc/${_pkgname}/"
-  install -vDm 644 "../${_pkgname}.conf" -t "${pkgdir}/etc/"
-  install -vDm 644 "../${_pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf"
-  install -vDm 644 "../${_pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${_pkgname}.conf"
-
-	# Now service file installs only when libsystemd package was found
-	if [ -e "${pkgdir}"/usr/lib/systemd/system/mpd.service ]; then
-		sed \
-			-e '/\[Service\]/a User=mpd' \
-			-e '/WantedBy=/c WantedBy=default.target' \
-			-i "${pkgdir}"/usr/lib/systemd/system/mpd.service
-	fi
+  DESTDIR="$pkgdir" ninja -C build install
+  install -vDm 644 ${_pkgname}-$pkgver/doc/${_pkgname}conf.example -t "$pkgdir/usr/share/doc/${_pkgname}/"
+  install -vDm 644 ${_pkgname}.service.override "$pkgdir/usr/lib/systemd/system/mpd.service.d/00-arch.conf"
+  install -vDm 644 ${_pkgname}.conf -t "$pkgdir/etc/"
+  install -vDm 644 ${_pkgname}.sysusers "$pkgdir/usr/lib/sysusers.d/${_pkgname}.conf"
+  install -vDm 644 ${_pkgname}.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/${_pkgname}.conf"
 }
 # vim: ts=2 sw=2 et:
diff --git a/mpd.service.override b/mpd.service.override
new file mode 100644
index 000000000000..d38c0594680c
--- /dev/null
+++ b/mpd.service.override
@@ -0,0 +1,2 @@
+[Service]
+User=mpd