diff options
Diffstat (limited to 'libre/xmms2')
| -rw-r--r-- | libre/xmms2/PKGBUILD | 32 | ||||
| -rw-r--r-- | libre/xmms2/install.sh | 10 | ||||
| -rw-r--r-- | libre/xmms2/sysusers.conf | 2 | ||||
| -rw-r--r-- | libre/xmms2/tmpfiles.conf | 1 |
4 files changed, 20 insertions, 25 deletions
diff --git a/libre/xmms2/PKGBUILD b/libre/xmms2/PKGBUILD index fa4d1bbfc..f450ef7e4 100644 --- a/libre/xmms2/PKGBUILD +++ b/libre/xmms2/PKGBUILD @@ -11,7 +11,7 @@ pkgname=xmms2 pkgver=0.8DrO_o.949.gca15e830 _commit=ca15e830bd1b18e26772657b0a057cfedb91d2eb -pkgrel=7.parabola1 +pkgrel=12.parabola1 pkgdesc="X-platform Music Multiplexing System 2, without nonfree mac recommendation" arch=(i686 x86_64 armv7h) url="https://xmms2.org/" @@ -53,13 +53,18 @@ _depends=('alsa-lib: ALSA output' depends=(glib2 readline) makedepends=("${_depends[@]%%:*}" libpulse python2 git) optdepends=("${_depends[@]}" 'pulseaudio: PulseAudio output') -install=install.sh 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' - 'fd37bd48c61bb71ec03566d740c52dcedd95a37d6c92008606ff7e76c261224f' + 'SKIP' + 'SKIP' + '13e3e2720e21d048d776156f8ab17c40d05b70437823da00b3c4cc2e7f7ecf7f' + 'a37e35dedd48fb8fbc2c97d79be8a3d3c3b00191826f6046f730f649cd67812a' 'a159b18c5959cfe76ca87990ff6879d082bfe9a4c6d674c493461f7f2781f348' '76f1a06b81cec0f5942430401998f6c8cd9cb95d798f97b854f88afd73ffe61d') @@ -70,7 +75,10 @@ pkgver() { prepare() { cd xmms2-devel - git submodule update --init + 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} @@ -79,19 +87,20 @@ prepare() { build() { cd xmms2-devel - CXXFLAGS="-Wall" CFLAGS="-Wall" ./waf configure --prefix=/usr --sbindir=/usr/bin --without-ldconfig \ + 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 - ./waf build + python2 ./waf build } package() { cd xmms2-devel - ./waf --destdir="$pkgdir" install - install -dm0755 "$pkgdir/var/lib/xmms2" + 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" \ @@ -108,11 +117,4 @@ package() { #PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d #./waf build #./waf --destdir="$pkgdir" install -# template start; name=perl-binary-module-dependency; version=1; -if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then -_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);') -_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);') -depends+=("perl>=$_perlver_min" "perl<$_perlver_max") -fi -# template end; } diff --git a/libre/xmms2/install.sh b/libre/xmms2/install.sh deleted file mode 100644 index 7ee2bf2c2..000000000 --- a/libre/xmms2/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - getent group xmms2 > /dev/null || groupadd -r xmms2 - getent passwd xmms2 > /dev/null || useradd -r -g xmms2 -d /var/lib/xmms2 -s /bin/false -G audio xmms2 - chown -R xmms2:xmms2 var/lib/xmms2 - true -} - -post_upgrade() { - post_install -} diff --git a/libre/xmms2/sysusers.conf b/libre/xmms2/sysusers.conf new file mode 100644 index 000000000..bf5f1d0c5 --- /dev/null +++ b/libre/xmms2/sysusers.conf @@ -0,0 +1,2 @@ +u xmms2 - - /var/lib/xmms2 +m xmms2 audio diff --git a/libre/xmms2/tmpfiles.conf b/libre/xmms2/tmpfiles.conf index 61cd6a797..eec94def3 100644 --- a/libre/xmms2/tmpfiles.conf +++ b/libre/xmms2/tmpfiles.conf @@ -1,2 +1,3 @@ d /run/xmms2 0755 xmms2 xmms2 +d /var/lib/xmms2 0755 xmms2 xmms2 f /var/log/xmms2d.log 0644 xmms2 xmms2 |