[arch-commits] Commit in mpd/trunk (7 files)
David Runge
dvzrv at archlinux.org
Thu Sep 3 22:16:11 UTC 2020
Date: Thursday, September 3, 2020 @ 22:16:10
Author: dvzrv
Revision: 395429
upgpkg: mpd 0.21.25-3: Rebuild to add further dependencies.
Switch to correct license (GPL2).
Add all available sodeps in package() and the respective packages to makedepends.
Add all direct library dependencies in depends.
Run tests in check().
Modify files in prepare()
Minor fixes and cleanups.
Update maintainer info.
Added:
mpd/trunk/mpd.conf
(from rev 395428, mpd/trunk/conf)
mpd/trunk/mpd.sysusers
(from rev 395428, mpd/trunk/sysusers.d)
mpd/trunk/mpd.tmpfiles
(from rev 395428, mpd/trunk/tmpfiles.d)
Modified:
mpd/trunk/PKGBUILD
Deleted:
mpd/trunk/conf
mpd/trunk/sysusers.d
mpd/trunk/tmpfiles.d
--------------+
PKGBUILD | 120 +++++++++++++++++++++++++++++++++------------------------
conf | 6 --
mpd.conf | 6 ++
mpd.sysusers | 2
mpd.tmpfiles | 3 +
sysusers.d | 2
tmpfiles.d | 3 -
7 files changed, 82 insertions(+), 60 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-03 21:54:22 UTC (rev 395428)
+++ PKGBUILD 2020-09-03 22:16:10 UTC (rev 395429)
@@ -1,4 +1,5 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
# Contributor: Angel Velasquez <angvp at archlinux.org>
# Contributor: Andrea Scarpino <andrea at archlinux.org>
# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
@@ -6,65 +7,86 @@
pkgname=mpd
pkgver=0.21.25
-pkgrel=2
-pkgdesc='Flexible, powerful, server-side application for playing music'
-url='https://www.musicpd.org/'
-license=('GPL')
+pkgrel=3
+pkgdesc="Flexible, powerful, server-side application for playing music"
+url="https://www.musicpd.org/"
+license=('GPL2')
arch=('x86_64')
-depends=('audiofile' 'avahi' 'curl' 'faad2' 'ffmpeg' 'fluidsynth'
- 'icu' 'jack' 'libao' 'libcdio-paranoia' 'libgme' 'libid3tag' 'libmad'
- 'libmikmod' 'libmms' 'libmodplug' 'libmpcdec' 'libmpdclient' 'libnfs'
- 'libsamplerate' 'libshout' 'libsoxr' 'libvorbis' 'systemd-libs'
- 'libupnp' 'mpg123' 'openal' 'smbclient' 'sqlite' 'twolame' 'wavpack'
- 'wildmidi' 'yajl' 'zziplib')
-makedepends=('boost' 'meson' 'python-sphinx')
-validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
-#source=("https://www.musicpd.org/download/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+depends=('bzip2' 'chromaprint' 'expat' 'gcc-libs' 'glibc' 'lame' 'libcdio'
+'libcdio-paranoia' 'libgcrypt' 'libgme' 'libmad' 'libmms' 'libmodplug'
+'libmpcdec' 'libnfs' 'libshout' 'libsidplayfp' 'libsoxr' 'libupnp' 'openal'
+'opus' 'smbclient' 'sqlite' 'wavpack' 'wildmidi' 'yajl' 'zlib' 'zziplib')
+makedepends=('alsa-lib' 'audiofile' 'avahi' 'boost' 'curl' 'dbus' 'faad2'
+'ffmpeg' 'flac' 'fluidsynth' 'icu' 'jack' 'libao' 'libid3tag' 'libmikmod'
+'libmpdclient' 'libogg' 'libpulse' 'libsamplerate' 'libsndfile' 'libvorbis'
+'meson' 'mpg123' 'python-sphinx' 'systemd-libs' 'twolame')
+backup=("etc/${pkgname}.conf")
source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
- 'tmpfiles.d'
- 'sysusers.d'
- 'conf')
-sha256sums=('20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201'
+ "${pkgname}.conf"
+ "${pkgname}.sysusers"
+ "${pkgname}.tmpfiles")
+sha512sums=('67e0cbf176d18cd63effab0d12b22bea846458cbaa383ead9078c4b5f2a472dbb1d7308af4d6898691e8864a911c808af5ca2c553d8233323b8aaedfdc7189fc'
'SKIP'
- '2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a'
- '0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6'
- 'f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03')
+ '25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1'
+ '6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18'
+ 'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d')
+b2sums=('9bc294850ddd2b5e1468d4988179f633c8fec14f7f99ffa2581d1aa30991a85ace8361a558e674f5c4b8e7471c9911dcb1286f61f1d42a2315ad05db4dfd9053'
+ 'SKIP'
+ '0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
+ '4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
+ 'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a')
+validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max at blarg.de>
-backup=('etc/mpd.conf')
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- rm -fr build
- install -d build
+ cd "${pkgname}-${pkgver}"
+ sed -e '/\[Service\]/a User=mpd' \
+ -i "systemd/system/mpd.service.in"
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}/build"
- _opts=('-Ddocumentation=true'
- '-Dchromaprint=disabled' # appears not to be used for anything
- '-Dsidplay=disabled' # unclear why but disabled in the past
- '-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
- )
- arch-meson .. ${_opts[@]}
- ninja
+ cd "${pkgname}-${pkgver}"
+ # NOTE: sndio conflicts with alsa
+ # TODO: package adplug
+ # TODO: package shine
+ meson --prefix /usr \
+ --libexecdir lib \
+ --sbindir bin \
+ --buildtype plain \
+ --auto-features enabled \
+ --wrap-mode nodownload \
+ -D b_lto=true \
+ -D b_pie=true \
+ -D documentation=true \
+ -D adplug=disabled \
+ -D sndio=disabled \
+ -D shine=disabled \
+ -D tremor=disabled \
+ build
+ ninja -C build
}
+check() {
+ cd "${pkgname}-${pkgver}"
+ ninja -C build test
+}
+
package() {
- cd "${srcdir}/${pkgname}-${pkgver}/build"
- DESTDIR="${pkgdir}" ninja install
- install -Dm644 ../doc/mpdconf.example "${pkgdir}"/usr/share/doc/mpd/mpdconf.example
- install -Dm644 ../doc/mpd.conf.5 "${pkgdir}"/usr/share/man/man5/mpd.conf.5
- install -Dm644 ../doc/mpd.1 "${pkgdir}"/usr/share/man/man1/mpd.1
+ depends+=('libFLAC.so' 'libao.so' 'libasound.so' 'libaudiofile.so'
+ 'libavahi-client.so' 'libavahi-common.so' 'libavcodec.so' 'libavformat.so'
+ 'libavutil.so' 'libcurl.so' 'libdbus-1.so' 'libfaad.so' 'libfluidsynth.so'
+ 'libicui18n.so' 'libicuuc.so' 'libid3tag.so' 'libjack.so' 'libmikmod.so'
+ 'libmpdclient.so' 'libmpg123.so' 'libogg.so' 'libpulse.so' 'libsamplerate.so'
+ 'libsndfile.so' 'libsystemd.so' 'libtwolame.so' 'libvorbis.so'
+ 'libvorbisenc.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 "doc/${pkgname}.conf.5" -t "${pkgdir}/usr/share/man/man5/"
+ install -vDm 644 "doc/${pkgname}.1" -t "${pkgdir}/usr/share/man/man1/"
- install -Dm644 ../../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
- install -Dm644 ../../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/mpd.conf
- install -Dm644 ../../conf "${pkgdir}"/etc/mpd.conf
-
- sed \
- -e '/\[Service\]/a User=mpd' \
- -e '/WantedBy=/c WantedBy=default.target' \
- -i "${pkgdir}"/usr/lib/systemd/system/mpd.service
+ 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"
}
Deleted: conf
===================================================================
--- conf 2020-09-03 21:54:22 UTC (rev 395428)
+++ conf 2020-09-03 22:16:10 UTC (rev 395429)
@@ -1,6 +0,0 @@
-# See: /usr/share/doc/mpd/mpdconf.example
-
-pid_file "/run/mpd/mpd.pid"
-db_file "/var/lib/mpd/mpd.db"
-state_file "/var/lib/mpd/mpdstate"
-playlist_directory "/var/lib/mpd/playlists"
Copied: mpd/trunk/mpd.conf (from rev 395428, mpd/trunk/conf)
===================================================================
--- mpd.conf (rev 0)
+++ mpd.conf 2020-09-03 22:16:10 UTC (rev 395429)
@@ -0,0 +1,6 @@
+# See: /usr/share/doc/mpd/mpdconf.example
+
+pid_file "/run/mpd/mpd.pid"
+db_file "/var/lib/mpd/mpd.db"
+state_file "/var/lib/mpd/mpdstate"
+playlist_directory "/var/lib/mpd/playlists"
Copied: mpd/trunk/mpd.sysusers (from rev 395428, mpd/trunk/sysusers.d)
===================================================================
--- mpd.sysusers (rev 0)
+++ mpd.sysusers 2020-09-03 22:16:10 UTC (rev 395429)
@@ -0,0 +1,2 @@
+u mpd 45 - /var/lib/mpd
+m mpd audio
Copied: mpd/trunk/mpd.tmpfiles (from rev 395428, mpd/trunk/tmpfiles.d)
===================================================================
--- mpd.tmpfiles (rev 0)
+++ mpd.tmpfiles 2020-09-03 22:16:10 UTC (rev 395429)
@@ -0,0 +1,3 @@
+d /run/mpd 0755 mpd mpd
+d /var/lib/mpd 0755 mpd mpd
+d /var/lib/mpd/playlists 0755 mpd mpd
Deleted: sysusers.d
===================================================================
--- sysusers.d 2020-09-03 21:54:22 UTC (rev 395428)
+++ sysusers.d 2020-09-03 22:16:10 UTC (rev 395429)
@@ -1,2 +0,0 @@
-u mpd 45 - /var/lib/mpd
-m mpd audio
Deleted: tmpfiles.d
===================================================================
--- tmpfiles.d 2020-09-03 21:54:22 UTC (rev 395428)
+++ tmpfiles.d 2020-09-03 22:16:10 UTC (rev 395429)
@@ -1,3 +0,0 @@
-d /run/mpd 0755 mpd mpd
-d /var/lib/mpd 0755 mpd mpd
-d /var/lib/mpd/playlists 0755 mpd mpd
More information about the arch-commits
mailing list