Date: Wednesday, August 26, 2020 @ 12:47:01 Author: arodseth Revision: 688918
upgpkg: xmms2 0.8DrO_o.7391.dedc33d7-1 Modified: xmms2/trunk/PKGBUILD ----------+ PKGBUILD | 82 +++++++++++++++++++++++++------------------------------------ 1 file changed, 34 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-26 12:37:40 UTC (rev 688917) +++ PKGBUILD 2020-08-26 12:47:01 UTC (rev 688918) @@ -8,12 +8,11 @@ # Contributor: Xilon <[email protected]> pkgname=xmms2 -pkgver=0.8DrO_o.949.gca15e830 -_commit=ca15e830bd1b18e26772657b0a057cfedb91d2eb -pkgrel=20 -pkgdesc="X-platform Music Multiplexing System 2" +pkgver=0.8DrO_o.7391.dedc33d7 +pkgrel=1 +pkgdesc='X-platform Music Multiplexing System 2' arch=(x86_64) -url="https://xmms2.org/"; +url='https://xmms2.org/' license=(GPL LGPL) _depends=('alsa-lib: ALSA output' 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' @@ -53,9 +52,9 @@ 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 +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 @@ -68,53 +67,40 @@ '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 + 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 + 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" + cd xmms2-devel + python2 ./waf --destdir="$pkgdir" install - [ -d "$pkgdir"/usr/lib64 ] && \ - { mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/; rmdir "$pkgdir"/usr/lib64; } || \ - true + 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" - # 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 + [ -d "$pkgdir"/usr/lib64 ] && \ + { mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/; rmdir "$pkgdir"/usr/lib64; } || true }
