From 8f95a3843f10af06f68001ad953f7115bb0cdfba Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sat, 10 Jan 2015 00:32:58 +0100 Subject: [PATCH] sound group (part 3) --- libvirt/PKGBUILD | 17 +++++++----- lilv/PKGBUILD | 6 +--- mpg123/PKGBUILD | 6 ++-- mplayer2/PKGBUILD | 2 +- perl-xml-xpath/PKGBUILD | 29 ++++++++++++++++++++ timidity++/PKGBUILD | 18 ++++++++---- timidity++/timidity-jack.patch | 11 ++++++++ timidity++/timidity-tk86.patch | 39 ++++++++++++++++++++++++++ zeitgeist/PKGBUILD | 50 ++++++++++++++++++++++------------ 9 files changed, 139 insertions(+), 39 deletions(-) create mode 100644 perl-xml-xpath/PKGBUILD create mode 100644 timidity++/timidity-jack.patch create mode 100644 timidity++/timidity-tk86.patch diff --git a/libvirt/PKGBUILD b/libvirt/PKGBUILD index 4b2705d35..49433c902 100644 --- a/libvirt/PKGBUILD +++ b/libvirt/PKGBUILD @@ -2,8 +2,8 @@ # contributor abveritas@chakra-project.org pkgname=libvirt -pkgver=1.2.5 -pkgrel=3 +pkgver=1.2.11 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('x86_64') url="http://libvirt.org/" @@ -11,11 +11,12 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'systemd' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'netcf' 'libnl') -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'audit' ) -optdepends=('bridge-utils: for briged networking (default)' + 'iproute2' 'netcf' 'libnl' 'libx11') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'audit' 'perl-xml-xpath' 'dnsmasq' 'perl-xml-xpath') +optdepends=('dnsmasq: required for default NAT/DHCP for guests' + 'bridge-utils: for briged networking (default)' 'openbsd-netcat: for remote management over ssh' - 'qemu-kvm' + 'qemu' 'dmidecode') options=('emptydirs') backup=('etc/conf.d/libvirtd' @@ -24,6 +25,8 @@ backup=('etc/conf.d/libvirtd' 'etc/libvirt/libvirt.conf' 'etc/libvirt/lxc.conf' 'etc/libvirt/qemu.conf' + 'etc/libvirt/virt-login-shell.conf' + 'etc/libvirt/virtlockd.conf' 'etc/logrotate.d/libvirtd' 'etc/logrotate.d/libvirtd.lxc' 'etc/logrotate.d/libvirtd.qemu' @@ -34,7 +37,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" 'libvirtd.conf.d' 'libvirtd-guests.conf.d' 'libvirt.tmpfiles.d') -md5sums=('787960669a40181fd381a87a318c0660' +md5sums=('616ad039f212c02f7e055c5cf28c0a76' '3ed0e24f5b5e25bf553f5427d64915e6' 'bc2971dacdbac967fc3474e50affc345' '8d98e62915785686b0b6c8c070628392') diff --git a/lilv/PKGBUILD b/lilv/PKGBUILD index df86b7d25..1d9bf9888 100644 --- a/lilv/PKGBUILD +++ b/lilv/PKGBUILD @@ -5,7 +5,7 @@ pkgdesc="A library to make the use of LV2 plugins as simple as possible for appl arch=('x86_64') url="http://drobilla.net/software/lilv/" license=('custom:ISC') -depends=('python2' 'sratom>=0.4.6' 'jack') +depends=('python2-numpy' 'sratom>=0.4.6' 'jack') makedepends=('swig') optdepends=('bash-completion: auto-complete words') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") @@ -14,10 +14,6 @@ md5sums=('f88419fa70cc96dfdc7e0bf3cd09b180') build() { cd "$srcdir/$pkgname-$pkgver" - # fix UI API error - # backport of http://dev.drobilla.net/changeset/5092 - patch -Np2 -i "$srcdir/lilvmm.patch" - # pick up python2 even when python3 exists # (the build system has flaky support for python3) export PYTHON="/usr/bin/python2" diff --git a/mpg123/PKGBUILD b/mpg123/PKGBUILD index afdf4b533..43ec5da43 100644 --- a/mpg123/PKGBUILD +++ b/mpg123/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: franzmari@chakra-project.it pkgname=mpg123 -pkgver=1.16.0 -pkgrel=2 +pkgver=1.21.0 +pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('x86_64') url="http://sourceforge.net/projects/mpg123" @@ -17,7 +17,7 @@ provides=('mpg321') replaces=('mpg321') categories=('multimedia') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('73105629f8d4b9426ec9fe93455a8271a96c4ae4') +sha1sums=('a2fd84078632b7ab73ae4cd64c3f941d140167a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/mplayer2/PKGBUILD b/mplayer2/PKGBUILD index 9b419f7cd..199fc0a70 100644 --- a/mplayer2/PKGBUILD +++ b/mplayer2/PKGBUILD @@ -7,7 +7,7 @@ pkgname=mplayer2 pkgver=20130428 _commit=6c87a98 -pkgrel=5 +pkgrel=6 pkgdesc="A movie player" arch=('x86_64') license=('GPL') diff --git a/perl-xml-xpath/PKGBUILD b/perl-xml-xpath/PKGBUILD new file mode 100644 index 000000000..d0d61c4d7 --- /dev/null +++ b/perl-xml-xpath/PKGBUILD @@ -0,0 +1,29 @@ +#Maintainer: AlmAck + +pkgname=perl-xml-xpath +pkgver=1.13 +pkgrel=1 +pkgdesc="A set of modules for parsing and evaluating XPath statements" +arch=('any') +url="https://metacpan.org/release/XML-XPath" +license=('PerlArtistic' 'GPL') +depends=('perl' 'perl-xml-parser') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-XPath-${pkgver}.tar.gz") +sha1sums=('72a8e7a71f5d0b46e004adfbc5c5dbf59affd03c') + +build() { + cd "${srcdir}/XML-XPath-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/XML-XPath-${pkgver}" + make test +} + +package() { + cd "${srcdir}/XML-XPath-${pkgver}" + make DESTDIR="$pkgdir" install +} diff --git a/timidity++/PKGBUILD b/timidity++/PKGBUILD index 31cb8474e..141666335 100644 --- a/timidity++/PKGBUILD +++ b/timidity++/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: abveritas@chakra-project.org +# Maintainer: almack pkgname=timidity++ pkgver=2.14.0 -pkgrel=5 +pkgrel=6 pkgdesc="A MIDI to WAVE converter and player" arch=('x86_64') url="http://timidity.sourceforge.net" @@ -12,10 +12,18 @@ makedepends=('tk' 'libxaw') optdepends=('xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') source=("http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.bz2" \ - 'timidity.cfg' 'timidity.service') + 'timidity.cfg' 'timidity.service' 'timidity-tk86.patch' 'timidity-jack.patch') md5sums=('37a8e9720928869e8adbfa6ce1c313aa' - '3fcc8f065c959205113fa7e9ab2be3c6' - '6e3e6080a74aa6774abfa661c6f67daa') + '3fcc8f065c959205113fa7e9ab2be3c6' + '6e3e6080a74aa6774abfa661c6f67daa' + '36f02b16c0ad8324d839ff8f3145384f' + 'ac348d9fe09de26b2b18ac90edcdec9e') + +prepare() { + cd TiMidity++-${pkgver} + patch -p1 -i "${srcdir}/timidity-tk86.patch" + patch -p1 -i "${srcdir}/timidity-jack.patch" +} build() { cd "${srcdir}/TiMidity++-${pkgver}" diff --git a/timidity++/timidity-jack.patch b/timidity++/timidity-jack.patch new file mode 100644 index 000000000..e125847e7 --- /dev/null +++ b/timidity++/timidity-jack.patch @@ -0,0 +1,11 @@ +diff -Naur TiMidity++-2.14.0-orig/timidity/jack_a.c TiMidity++-2.14.0/timidity/jack_a.c +--- TiMidity++-2.14.0-orig/timidity/jack_a.c 2014-09-26 22:08:51.531559553 -0400 ++++ TiMidity++-2.14.0/timidity/jack_a.c 2014-09-26 22:11:12.864659285 -0400 +@@ -508,6 +508,7 @@ + pthread_cond_wait(&ctx->cond, &ctx->lock); + } + /* fallthrough */ ++ case PM_REQ_PLAY_START: + case PM_REQ_DISCARD: + ctx->running = 0; + ringbuf_clear(&ctx->rbuf); diff --git a/timidity++/timidity-tk86.patch b/timidity++/timidity-tk86.patch new file mode 100644 index 000000000..594e95a93 --- /dev/null +++ b/timidity++/timidity-tk86.patch @@ -0,0 +1,39 @@ +--- a/interface/tk_c.c ++++ b/interface/tk_c.c +@@ -65,6 +65,9 @@ + #define TKPROGPATH PKGLIBDIR "/tkmidity.tcl" + #endif /* TKPROGPATH */ + ++#if (TCL_MAJOR_VERSION < 8) ++#define Tcl_GetStringResult(interp) (interp->result) ++#endif + + static void ctl_refresh(void); + static void ctl_total_time(int tt); +@@ -117,7 +120,7 @@ + + static void start_panel(void); + +-#define MAX_TK_MIDI_CHANNELS 16 ++#define MAX_TK_MIDI_CHANNELS 32 + + typedef struct { + int reset_panel; +@@ -933,7 +936,7 @@ + } + + /* evaluate Tcl script */ +-static char *v_eval(char *fmt, ...) ++static const char *v_eval(char *fmt, ...) + { + char buf[256]; + va_list ap; +@@ -941,7 +944,7 @@ + vsnprintf(buf, sizeof(buf), fmt, ap); + Tcl_Eval(my_interp, buf); + va_end(ap); +- return my_interp->result; ++ return Tcl_GetStringResult(my_interp); + } + + static const char *v_get2(const char *v1, const char *v2) diff --git a/zeitgeist/PKGBUILD b/zeitgeist/PKGBUILD index 5c1a97d7a..cc745673d 100644 --- a/zeitgeist/PKGBUILD +++ b/zeitgeist/PKGBUILD @@ -1,31 +1,45 @@ # -# Platform Packages for Chakra, part of chakra-project.org +# Platform Packages for Chakra, part of chakraos.org # -# maintainer abveritas@chakra-project.org +# maintainer almack pkgname=zeitgeist -pkgver=0.9.0 -pkgrel=3 +pkgver=0.9.15 +pkgrel=1 pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://zeitgeist-project.com/" license=('GPL') -depends=('dbus-python' 'python2-gobject' 'pyxdg' 'xapian-core') -makedepends=('intltool' 'raptor' 'python2-rdflib') -source=("http://launchpad.net/$pkgname/0.9/$pkgver/+download/$pkgname-$pkgver.tar.bz2") -md5sums=('fc2706611f435a027cd520f0da0982d7') +depends=(json-glib telepathy-glib) +makedepends=(intltool gobject-introspection vala raptor python2-rdflib gnome-common git) +source=("$pkgname::git://anongit.freedesktop.org/$pkgname/$pkgname#commit=d2c966f") +md5sums=('SKIP') + +prepare() { + cd $pkgname + + sed -i 's/python -/$PYTHON -/' configure.ac + sed -i '1s/python$/python2/' data/ontology2code + + mkdir m4 + NOCONFIGURE=1 ./autogen.sh +} build() { - cd "$srcdir/$pkgname-$pkgver" - - PYTHON=/usr/bin/python2 LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var + cd $pkgname + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-datahub make } -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" zeitgeistdocdir=/usr/share/doc/zeitgeist install - install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon" +check() { + cd $pkgname + # Log test fails in chroot, as we have no X and no proper dbus + make -k check || : } + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} \ No newline at end of file