Date: Wednesday, August 26, 2020 @ 12:47:09 Author: arodseth Revision: 688919
archrelease: copy trunk to community-x86_64 Added: xmms2/repos/community-x86_64/PKGBUILD (from rev 688918, xmms2/trunk/PKGBUILD) xmms2/repos/community-x86_64/system.service (from rev 688918, xmms2/trunk/system.service) xmms2/repos/community-x86_64/sysusers.conf (from rev 688918, xmms2/trunk/sysusers.conf) xmms2/repos/community-x86_64/tmpfiles.conf (from rev 688918, xmms2/trunk/tmpfiles.conf) xmms2/repos/community-x86_64/user.service (from rev 688918, xmms2/trunk/user.service) Deleted: xmms2/repos/community-x86_64/PKGBUILD xmms2/repos/community-x86_64/system.service xmms2/repos/community-x86_64/sysusers.conf xmms2/repos/community-x86_64/tmpfiles.conf xmms2/repos/community-x86_64/user.service ----------------+ PKGBUILD | 226 +++++++++++++++++++++++++------------------------------ system.service | 34 ++++---- sysusers.conf | 4 tmpfiles.conf | 6 - user.service | 26 +++--- 5 files changed, 141 insertions(+), 155 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-08-26 12:47:01 UTC (rev 688918) +++ PKGBUILD 2020-08-26 12:47:09 UTC (rev 688919) @@ -1,120 +0,0 @@ -# Maintainer: -# Contributor: Storm Dragon <stormdragon2...@gmail.com> -# Contributor: Aaron 'venisonslurpee' Laursen <venisonslur...@gmail.com> -# Contributor: Christopher Rosell <chri...@tanuki.se> -# Contributor: lh <jarry...@gmail.com> -# Contributor: Sebastian Schwarz <sesch...@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Xilon <xi...@gmail.com> - -pkgname=xmms2 -pkgver=0.8DrO_o.949.gca15e830 -_commit=ca15e830bd1b18e26772657b0a057cfedb91d2eb -pkgrel=20 -pkgdesc="X-platform Music Multiplexing System 2" -arch=(x86_64) -url="https://xmms2.org/" -license=(GPL LGPL) -_depends=('alsa-lib: ALSA output' - 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' - 'boost: C++ bindings' - 'curl: play HTTP streams' - 'cython: Python bindings' - 'faad2: AAC support' - 'ffmpeg: WMA, avcodec & avformat support' - 'fftw: visualization' - 'flac: FLAC support' - 'fluidsynth: MIDI support' - 'jack: JACK output' - 'libao: libao output' - 'libcdio-paranoia: CDDA support' - 'libdiscid: CDDA support' - 'libgme: support for various video game music formats' - 'libmad: MP3 support' - 'libmms: play MMS streams' - 'libmodplug: MOD support' - 'libmpcdec: Musepack support' - 'libofa: MusicDNS fingerprinting' - 'libsamplerate: vocoder support' - 'libshout: Icecast output' - 'libvorbis: Ogg Vorbis support' - 'libxml2: XSPF and podcast support' - 'mac: APE support' - 'mpg123: alternative MP3 support' - 'opusfile: Opus support' - 'perl: Perl bindings' - 'ruby: Ruby bindings' -# 'sidplay2-libs: support for C64 music files' -# we do not have sidplay 2 series in repos; also it's -# somehow connected with resid i guess(not in repos also) - 'smbclient: direct CIFS/SMB access' - 'speex: Speex support' - 'wavpack: WavPack support') -depends=(glib2) -makedepends=("${_depends[@]%%:*}" libpulse python2 git perl-pod-parser) -optdepends=("${_depends[@]}" 'pulseaudio: PulseAudio output') -source=(git://git.xmms2.org/xmms2/xmms2-devel.git#commit=${_commit} - git://git.xmms2.org/xmms2/xmms2-tutorial.git - git://git.xmms2.org/xmms2/s4.git - tmpfiles.conf - sysusers.conf - system.service - user.service) -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - '13e3e2720e21d048d776156f8ab17c40d05b70437823da00b3c4cc2e7f7ecf7f' - 'a37e35dedd48fb8fbc2c97d79be8a3d3c3b00191826f6046f730f649cd67812a' - 'a159b18c5959cfe76ca87990ff6879d082bfe9a4c6d674c493461f7f2781f348' - '76f1a06b81cec0f5942430401998f6c8cd9cb95d798f97b854f88afd73ffe61d') - -pkgver() { - cd xmms2-devel - git describe --always | sed 's/-/./g' -} - -prepare() { - cd xmms2-devel - git submodule init - git config submodule.doc/tutorial.url "$srcdir"/xmms2-tutorial - git config submodule.src/lib/s4.url "$srcdir"/s4 - git submodule update - sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' src/plugins/avcodec/avcodec_compat.h - sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c - sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript} - sed -i 's|Werror|Wno-error|g' waftools/*.py -} - -build() { - cd xmms2-devel - CXXFLAGS="-Wall" CFLAGS="-Wall" python2 ./waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \ - --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ - --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` \ - --with-perl-archdir=`perl -V:installvendorarch | cut -f2 -d\'` \ - --with-optionals=launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater,sqlite2s4 \ - --without-optionals=python - python2 ./waf build -} - -package() { - cd xmms2-devel - python2 ./waf --destdir="$pkgdir" install - install -Dm0644 "$srcdir/sysusers.conf" \ - "$pkgdir/usr/lib/sysusers.d/xmms2.conf" - install -Dm0644 "$srcdir/tmpfiles.conf" \ - "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf" - install -Dm0644 "$srcdir/system.service" \ - "$pkgdir/usr/lib/systemd/system/xmms2d.service" - install -Dm0644 "$srcdir/user.service" \ - "$pkgdir/usr/lib/systemd/user/xmms2d.service" - - [ -d "$pkgdir"/usr/lib64 ] && \ - { mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/; rmdir "$pkgdir"/usr/lib64; } || \ - true - - # also install python2 bindings - #./waf distclean - #PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d - #./waf build - #./waf --destdir="$pkgdir" install -} Copied: xmms2/repos/community-x86_64/PKGBUILD (from rev 688918, xmms2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-08-26 12:47:09 UTC (rev 688919) @@ -0,0 +1,106 @@ +# Maintainer: +# Contributor: Storm Dragon <stormdragon2...@gmail.com> +# Contributor: Aaron 'venisonslurpee' Laursen <venisonslur...@gmail.com> +# Contributor: Christopher Rosell <chri...@tanuki.se> +# Contributor: lh <jarry...@gmail.com> +# Contributor: Sebastian Schwarz <sesch...@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Xilon <xi...@gmail.com> + +pkgname=xmms2 +pkgver=0.8DrO_o.7391.dedc33d7 +pkgrel=1 +pkgdesc='X-platform Music Multiplexing System 2' +arch=(x86_64) +url='https://xmms2.org/' +license=(GPL LGPL) +_depends=('alsa-lib: ALSA output' + 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' + 'boost: C++ bindings' + 'curl: play HTTP streams' + 'cython: Python bindings' + 'faad2: AAC support' + 'ffmpeg: WMA, avcodec & avformat support' + 'fftw: visualization' + 'flac: FLAC support' + 'fluidsynth: MIDI support' + 'jack: JACK output' + 'libao: libao output' + 'libcdio-paranoia: CDDA support' + 'libdiscid: CDDA support' + 'libgme: support for various video game music formats' + 'libmad: MP3 support' + 'libmms: play MMS streams' + 'libmodplug: MOD support' + 'libmpcdec: Musepack support' + 'libofa: MusicDNS fingerprinting' + 'libsamplerate: vocoder support' + 'libshout: Icecast output' + 'libvorbis: Ogg Vorbis support' + 'libxml2: XSPF and podcast support' + 'mac: APE support' + 'mpg123: alternative MP3 support' + 'opusfile: Opus support' + 'perl: Perl bindings' + 'ruby: Ruby bindings' +# 'sidplay2-libs: support for C64 music files' +# we do not have sidplay 2 series in repos; also it's +# somehow connected with resid i guess(not in repos also) + 'smbclient: direct CIFS/SMB access' + 'speex: Speex support' + 'wavpack: WavPack support') +depends=(glib2) +makedepends=("${_depends[@]%%:*}" libpulse python2 git perl-pod-parser) +optdepends=("${_depends[@]}" 'pulseaudio: PulseAudio output') +source=('git+https://github.com/xmms2/xmms2-devel#commit=dedc33d7408e140bce714c2c3eb5bcc793f1af6c' + 'git+https://github.com/xmms2/xmms2-tutorial#commit=8ff8c66' + 'git+https://github.com/xmms2/s4#commit=b46e597' + tmpfiles.conf + sysusers.conf + system.service + user.service) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + '13e3e2720e21d048d776156f8ab17c40d05b70437823da00b3c4cc2e7f7ecf7f' + 'a37e35dedd48fb8fbc2c97d79be8a3d3c3b00191826f6046f730f649cd67812a' + 'a159b18c5959cfe76ca87990ff6879d082bfe9a4c6d674c493461f7f2781f348' + '76f1a06b81cec0f5942430401998f6c8cd9cb95d798f97b854f88afd73ffe61d') + +prepare() { + cd xmms2-devel + git submodule init + git config submodule.doc/tutorial.url "$srcdir"/xmms2-tutorial + git config submodule.src/lib/s4.url "$srcdir"/s4 + git submodule update + sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' \ + src/plugins/avcodec/avcodec_compat.h + sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c + sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript} + sed -i 's|Werror|Wno-error|g' waftools/*.py +} + +build() { + cd xmms2-devel + CXXFLAGS="-Wall" CFLAGS="-Wall" python2 ./waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \ + --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ + --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` \ + --with-perl-archdir=`perl -V:installvendorarch | cut -f2 -d\'` \ + --with-optionals=launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater,sqlite2s4 \ + --without-optionals=python + python2 ./waf build +} + +package() { + cd xmms2-devel + python2 ./waf --destdir="$pkgdir" install + + cd "$srcdir" + install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/xmms2.conf" + install -Dm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf" + install -Dm644 system.service "$pkgdir/usr/lib/systemd/system/xmms2d.service" + install -Dm644 user.service "$pkgdir/usr/lib/systemd/user/xmms2d.service" + + [ -d "$pkgdir"/usr/lib64 ] && \ + { mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/; rmdir "$pkgdir"/usr/lib64; } || true +} Deleted: system.service =================================================================== --- system.service 2020-08-26 12:47:01 UTC (rev 688918) +++ system.service 2020-08-26 12:47:09 UTC (rev 688919) @@ -1,17 +0,0 @@ -[Unit] -Description=XMMS2 daemon -Documentation=man:xmms2-launcher(1) man:xmms2d(1) -Wants=fluidsynth.service -After=fluidsynth.service network.target sound.target - -[Service] -Type=forking -User=xmms2 -# Trick xmms2d into correctly using /var/lib/xmms2 for its configuration -Environment=XDG_CONFIG_HOME=/var/lib -PIDFile=%t/xmms2/xmms2d.pid -ExecStart=/usr/bin/xmms2-launcher -l /var/log/xmms2d.log -P %t/xmms2/xmms2d.pid -ExecStop=/usr/bin/xmms2 server shutdown - -[Install] -WantedBy=multi-user.target Copied: xmms2/repos/community-x86_64/system.service (from rev 688918, xmms2/trunk/system.service) =================================================================== --- system.service (rev 0) +++ system.service 2020-08-26 12:47:09 UTC (rev 688919) @@ -0,0 +1,17 @@ +[Unit] +Description=XMMS2 daemon +Documentation=man:xmms2-launcher(1) man:xmms2d(1) +Wants=fluidsynth.service +After=fluidsynth.service network.target sound.target + +[Service] +Type=forking +User=xmms2 +# Trick xmms2d into correctly using /var/lib/xmms2 for its configuration +Environment=XDG_CONFIG_HOME=/var/lib +PIDFile=%t/xmms2/xmms2d.pid +ExecStart=/usr/bin/xmms2-launcher -l /var/log/xmms2d.log -P %t/xmms2/xmms2d.pid +ExecStop=/usr/bin/xmms2 server shutdown + +[Install] +WantedBy=multi-user.target Deleted: sysusers.conf =================================================================== --- sysusers.conf 2020-08-26 12:47:01 UTC (rev 688918) +++ sysusers.conf 2020-08-26 12:47:09 UTC (rev 688919) @@ -1,2 +0,0 @@ -u xmms2 - - /var/lib/xmms2 -m xmms2 audio Copied: xmms2/repos/community-x86_64/sysusers.conf (from rev 688918, xmms2/trunk/sysusers.conf) =================================================================== --- sysusers.conf (rev 0) +++ sysusers.conf 2020-08-26 12:47:09 UTC (rev 688919) @@ -0,0 +1,2 @@ +u xmms2 - - /var/lib/xmms2 +m xmms2 audio Deleted: tmpfiles.conf =================================================================== --- tmpfiles.conf 2020-08-26 12:47:01 UTC (rev 688918) +++ tmpfiles.conf 2020-08-26 12:47:09 UTC (rev 688919) @@ -1,3 +0,0 @@ -d /run/xmms2 0755 xmms2 xmms2 -d /var/lib/xmms2 0755 xmms2 xmms2 -f /var/log/xmms2d.log 0644 xmms2 xmms2 Copied: xmms2/repos/community-x86_64/tmpfiles.conf (from rev 688918, xmms2/trunk/tmpfiles.conf) =================================================================== --- tmpfiles.conf (rev 0) +++ tmpfiles.conf 2020-08-26 12:47:09 UTC (rev 688919) @@ -0,0 +1,3 @@ +d /run/xmms2 0755 xmms2 xmms2 +d /var/lib/xmms2 0755 xmms2 xmms2 +f /var/log/xmms2d.log 0644 xmms2 xmms2 Deleted: user.service =================================================================== --- user.service 2020-08-26 12:47:01 UTC (rev 688918) +++ user.service 2020-08-26 12:47:09 UTC (rev 688919) @@ -1,13 +0,0 @@ -[Unit] -Description=XMMS2 daemon -Documentation=man:xmms2-launcher(1) man:xmms2d(1) -After=network.target sound.target - -[Service] -Type=forking -PIDFile=%t/xmms2d.pid -ExecStart=/usr/bin/xmms2-launcher -P %t/xmms2d.pid -ExecStop=/usr/bin/xmms2 server shutdown - -[Install] -WantedBy=default.target Copied: xmms2/repos/community-x86_64/user.service (from rev 688918, xmms2/trunk/user.service) =================================================================== --- user.service (rev 0) +++ user.service 2020-08-26 12:47:09 UTC (rev 688919) @@ -0,0 +1,13 @@ +[Unit] +Description=XMMS2 daemon +Documentation=man:xmms2-launcher(1) man:xmms2d(1) +After=network.target sound.target + +[Service] +Type=forking +PIDFile=%t/xmms2d.pid +ExecStart=/usr/bin/xmms2-launcher -P %t/xmms2d.pid +ExecStop=/usr/bin/xmms2 server shutdown + +[Install] +WantedBy=default.target