[arch-commits] Commit in mpd/trunk (PKGBUILD mpd.service.override)

[David Runge]

    Date: Saturday, February 19, 2022 @ 12:06:20
  Author: dvzrv
Revision: 437747

upgpkg: mpd 0.23.5-5: Rebuild against ffmpeg4.4.

Database update is broken with ffmpeg >= 5.0:
https://github.com/MusicPlayerDaemon/MPD/issues/1448
Use a systemd service dropin file to configure the user to use for the systemd system service instead of relying on a call to sed in prepare().
Simplify calls to meson/ninja.
Remove unneeded quotes and curly braces.

Added:
  mpd/trunk/mpd.service.override
Modified:
  mpd/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   64 +++++++++++++++++++++++++------------------------
 mpd.service.override |    2 +
 2 files changed, 35 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-19 11:31:42 UTC (rev 437746)
+++ PKGBUILD	2022-02-19 12:06:20 UTC (rev 437747)
@@ -8,7 +8,7 @@
 
 pkgname=mpd
 pkgver=0.23.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Flexible, powerful, server-side application for playing music"
 arch=(x86_64)
 url="https://www.musicpd.org/"
@@ -17,52 +17,54 @@
 libgcrypt libgme libmad libmms libmodplug libmpcdec libnfs libshout
 libsidplayfp libsoxr openal opus smbclient sqlite wavpack wildmidi zlib
 zziplib)
-makedepends=(alsa-lib audiofile avahi boost curl dbus expat faad2 ffmpeg flac
+makedepends=(alsa-lib audiofile avahi boost curl dbus expat faad2 ffmpeg4.4 flac
 fluidsynth fmt icu jack libao libid3tag libmikmod libmpdclient libogg
 libopenmpt libpulse libsamplerate libsndfile libupnp liburing libvorbis meson
 mpg123 pipewire python-sphinx systemd-libs twolame yajl)
-backup=("etc/${pkgname}.conf")
+backup=(etc/$pkgname.conf)
 options=(debug)
-source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
-        "${pkgname}.conf"
-        "${pkgname}.sysusers"
-        "${pkgname}.tmpfiles")
+source=(
+  https://www.musicpd.org/download/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
+  $pkgname.conf
+  $pkgname.sysusers
+  $pkgname.tmpfiles
+  $pkgname.service.override
+)
 sha512sums=('3a870e79bb82c9e8877958d271e933daa3dd970a4510aff4aeea91feab521d7927cd59c7f1ea16a36e84ff879e4f24e4347602ac449c5da31853acb5a3b46f34'
             'SKIP'
             '25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1'
             '6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18'
-            'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d')
+            'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d'
+            'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c')
 b2sums=('91f0d37bca0632a414083f6ecf8838ba5dc4ef4965692b14e56587d3d145140f61bcc120fe4b2bf83eb41f2a7e085da4d999efc19ca9717d2552d92fc6359c65'
         'SKIP'
         '0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
         '4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
-        'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a')
+        'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a'
+        '753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max at blarg.de>
 
+build() {
+  local _meson_options=(
+    -D documentation=enabled
+    -D adplug=disabled
+    -D sndio=disabled
+    -D shine=disabled
+    -D tremor=disabled
+    -D b_ndebug=true
+  )
 
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  sed -e '/\[Service\]/a User=mpd' \
-      -i "systemd/system/mpd.service.in"
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
+  # 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'
   # NOTE: sndio conflicts with alsa
   # TODO: package adplug
   # TODO: package shine
-  arch-meson -D documentation=enabled \
-        -D adplug=disabled \
-        -D sndio=disabled \
-        -D shine=disabled \
-        -D tremor=disabled \
-        -D b_ndebug=true \
-        build
+  arch-meson "${_meson_options[@]}" build $pkgname-$pkgver
   ninja -C build
 }
 
 check() {
-  cd "${pkgname}-${pkgver}"
   ninja -C build test
 }
 
@@ -76,12 +78,12 @@
   libupnp.so liburing.so libvorbis.so libvorbisenc.so libyajl.so libavfilter.so
   libchromaprint.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}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-  install -vDm 644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  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:

Added: mpd.service.override
===================================================================
--- mpd.service.override	                        (rev 0)
+++ mpd.service.override	2022-02-19 12:06:20 UTC (rev 437747)
@@ -0,0 +1,2 @@
+[Service]
+User=mpd