Date: Sunday, December 24, 2017 @ 23:55:00 Author: arojas Revision: 275881
Remove AUR optdepend and useless conflicts Modified: xmms2/trunk/PKGBUILD ----------+ PKGBUILD | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-24 23:49:18 UTC (rev 275880) +++ PKGBUILD 2017-12-24 23:55:00 UTC (rev 275881) @@ -1,4 +1,4 @@ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: # Contributor: Storm Dragon <stormdragon2...@gmail.com> # Contributor: Aaron 'venisonslurpee' Laursen <venisonslur...@gmail.com> # Contributor: Christopher Rosell <chri...@tanuki.se> @@ -10,7 +10,7 @@ pkgname=xmms2 pkgver=0.8DrO_o.949.gca15e830 _commit=ca15e830bd1b18e26772657b0a057cfedb91d2eb -pkgrel=5 +pkgrel=6 pkgdesc="X-platform Music Multiplexing System 2" arch=(x86_64) url="https://xmms2.org/" @@ -52,26 +52,24 @@ 'wavpack: WavPack support') depends=(glib2 readline) makedepends=("${_depends[@]%%:*}" libpulse python2 git) -optdepends=("${_depends[@]}" 'oss: OSS output' 'pulseaudio: PulseAudio output') -provides=(xmms2) -conflicts=(xmms2 xmms2-devel) +optdepends=("${_depends[@]}" 'pulseaudio: PulseAudio output') install=install.sh source=(git://git.xmms2.org/xmms2/xmms2-devel.git#commit=${_commit} tmpfiles.conf system.service user.service) -md5sums=('SKIP' - 'd3ab09ed8d1cf982468d1ceb141d4a9d' - '4b026ab80e853f24b5cf13b310afb83c' - 'f773f674882946065c02e36e9548eb00') +sha256sums=('SKIP' + 'fd37bd48c61bb71ec03566d740c52dcedd95a37d6c92008606ff7e76c261224f' + 'a159b18c5959cfe76ca87990ff6879d082bfe9a4c6d674c493461f7f2781f348' + '76f1a06b81cec0f5942430401998f6c8cd9cb95d798f97b854f88afd73ffe61d') pkgver() { - cd "$srcdir/xmms2-devel" + cd xmms2-devel git describe --always | sed 's/-/./g' } prepare() { - cd "$srcdir/xmms2-devel" + cd xmms2-devel git submodule update --init 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 @@ -80,7 +78,7 @@ } build() { - cd "$srcdir/xmms2-devel" + cd xmms2-devel CXXFLAGS="-Wall" CFLAGS="-Wall" ./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"]'` \ @@ -91,7 +89,7 @@ } package() { - cd "$srcdir/xmms2-devel" + cd xmms2-devel ./waf --destdir="$pkgdir" install install -dm0755 "$pkgdir/var/lib/xmms2" install -Dm0644 "$srcdir/tmpfiles.conf" \