diff options
author | Jakob Gahde | 2018-09-08 13:55:03 +0200 |
---|---|---|
committer | Jakob Gahde | 2018-09-08 13:55:03 +0200 |
commit | fdd8041559149c07ed4a1375f0bc7b851776377c (patch) | |
tree | 009947a71ebbf9ad55f354699d164a7c28f988d1 | |
parent | ebd767da1fc000ec94431ebe36ac5f082c0705e8 (diff) | |
download | aur-fdd8041559149c07ed4a1375f0bc7b851776377c.tar.gz |
libao-jack 1.2.2-1: New version
-rw-r--r-- | .SRCINFO | 19 | ||||
-rw-r--r-- | PKGBUILD | 53 | ||||
-rw-r--r-- | libao.conf | 1 | ||||
-rw-r--r-- | no-circular-dependency.patch | 12 |
4 files changed, 54 insertions, 31 deletions
@@ -1,6 +1,6 @@ pkgbase = libao-jack pkgdesc = Cross-platform audio output library and plugins - patched with JACK support - pkgver = 1.2.0 + pkgver = 1.2.2 pkgrel = 1 url = http://xiph.org/ao/ arch = i686 @@ -8,21 +8,24 @@ pkgbase = libao-jack license = GPL makedepends = libpulse makedepends = jack + makedepends = git depends = alsa-lib - provides = libao=1.2.0-1 - provides = libao-pulse=1.2.0-1 + provides = libao=1.2.2-1 + provides = libao-pulse=1.2.2-1 conflicts = libao conflicts = libao-pulse noextract = libao-jack-plugin.tgz backup = etc/libao.conf - source = http://downloads.xiph.org/releases/ao/libao-1.2.0.tar.gz + source = git+https://git.xiph.org/libao.git#commit=3f4b02f046550aca54d7f11a5d9c56ac421f0b66 source = https://trac.xiph.org/raw-attachment/ticket/2083/libao-jack-plugin.tgz source = https://trac.xiph.org/raw-attachment/ticket/2083/0001-jack-plugin.patch source = libao.conf - sha1sums = 6b1d2c6a2e388e3bb6ebea158d51afef18aacc56 - sha1sums = 9e8436d5aa3c81496a8f315d75c4fba8ea24b3b6 - sha1sums = 53af33fcf7a7981656ad5519cad38a0575c58afe - sha1sums = 603f5e6715e7e50e1c8e8c1935c45a897c46e9af + source = no-circular-dependency.patch + sha256sums = SKIP + sha256sums = 05dad2e84127f730996c11facdb8db3cce00463f6ecca897a5dce606b4ad0758 + sha256sums = 0bc8d4375ca9255d4a97ed7357e053bffe1260c5df4583a290018a86f341a934 + sha256sums = c6cde8eaa3516ab6a2e6f154a70961b3f448f4b739491a82e0c512f2740525af + sha256sums = df5a6ba10efaa3c476c26a675c7a4f9492f6e341e126eed55a6bd28d5d13c0f8 pkgname = libao-jack @@ -2,51 +2,58 @@ # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Gaetan Bisson <bisson@archlinux.org> -_pkgname=libao -pkgname=${_pkgname}-jack -pkgver=1.2.0 +pkgname=libao-jack +pkgver=1.2.2 pkgrel=1 pkgdesc="Cross-platform audio output library and plugins - patched with JACK support" url="http://xiph.org/ao/" arch=('i686' 'x86_64') license=('GPL') depends=('alsa-lib') -makedepends=('libpulse' 'jack') +makedepends=('libpulse' 'jack' 'git') backup=('etc/libao.conf') -source=("http://downloads.xiph.org/releases/ao/${_pkgname}-${pkgver}.tar.gz" +#source=("http://downloads.xiph.org/releases/ao/libao-${pkgver}.tar.gz" +source=("git+https://git.xiph.org/libao.git#commit=3f4b02f046550aca54d7f11a5d9c56ac421f0b66" "https://trac.xiph.org/raw-attachment/ticket/2083/libao-jack-plugin.tgz" "https://trac.xiph.org/raw-attachment/ticket/2083/0001-jack-plugin.patch" - 'libao.conf') + 'libao.conf' + 'no-circular-dependency.patch') noextract=('libao-jack-plugin.tgz') -sha1sums=('6b1d2c6a2e388e3bb6ebea158d51afef18aacc56' - '9e8436d5aa3c81496a8f315d75c4fba8ea24b3b6' - '53af33fcf7a7981656ad5519cad38a0575c58afe' - '603f5e6715e7e50e1c8e8c1935c45a897c46e9af') +sha256sums=('SKIP' + '05dad2e84127f730996c11facdb8db3cce00463f6ecca897a5dce606b4ad0758' + '0bc8d4375ca9255d4a97ed7357e053bffe1260c5df4583a290018a86f341a934' + 'c6cde8eaa3516ab6a2e6f154a70961b3f448f4b739491a82e0c512f2740525af' + 'df5a6ba10efaa3c476c26a675c7a4f9492f6e341e126eed55a6bd28d5d13c0f8') conflicts=('libao' 'libao-pulse') provides=("libao=${pkgver}-${pkgrel}" "libao-pulse=${pkgver}-${pkgrel}") prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - bsdtar -xf "${srcdir}/libao-jack-plugin.tgz" - patch -p1 -i "${srcdir}/0001-jack-plugin.patch" - autoreconf -if +# cd "${srcdir}/libao-${pkgver}" + cd "${srcdir}/libao" + + bsdtar xf "${srcdir}/libao-jack-plugin.tgz" + patch -p1 < "${srcdir}/0001-jack-plugin.patch" + # This change is analogous to 651e2fa2a35e86b31816729063e01e18d4bdbbcc + patch -Np1 < "${srcdir}/no-circular-dependency.patch" + ./autogen.sh } build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +# cd "${srcdir}/libao-${pkgver}" + cd "${srcdir}/libao" - ./configure \ - --prefix=/usr \ - --enable-alsa-mmap \ + ./configure \ + --prefix=/usr \ + --enable-alsa-mmap \ - make + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" +# cd "${srcdir}/libao-${pkgver}" + cd "${srcdir}/libao" - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/libao.conf" "${pkgdir}/etc/libao.conf" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/libao.conf" "${pkgdir}/etc/libao.conf" } diff --git a/libao.conf b/libao.conf index abddf7593d49..f8f7edb78605 100644 --- a/libao.conf +++ b/libao.conf @@ -1,2 +1,3 @@ default_driver=alsa dev=default +quiet diff --git a/no-circular-dependency.patch b/no-circular-dependency.patch new file mode 100644 index 000000000000..88621c9637ed --- /dev/null +++ b/no-circular-dependency.patch @@ -0,0 +1,12 @@ +diff -aur --no-dereference package.pristine/src/plugins/jack/Makefile.am package.new/src/plugins/jack/Makefile.am +--- package.pristine/src/plugins/jack/Makefile.am 2014-09-30 22:00:40.000000000 +0200 ++++ package.new/src/plugins/jack/Makefile.am 2018-09-08 13:45:25.808256834 +0200 +@@ -21,7 +21,7 @@ + + libjack_la_CFLAGS = @JACK_CFLAGS@ + libjack_la_LDFLAGS = @PLUGIN_LDFLAGS@ @JACK_LDFLAGS@ +-libjack_la_LIBADD = @JACK_LIBS@ ../../libao.la ++libjack_la_LIBADD = @JACK_LIBS@ + libjack_la_SOURCES = $(jacksources) + + EXTRA_DIST = ao_jack.c |