diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
commit | 4a9023500f5b915ccbf556296c756ce3f2faef5b (patch) | |
tree | 28258893f8d5094fdb84ede1e97afa36a5276696 /libre | |
parent | 3dac66779d53dc58badb4f964177f7692c1bd92c (diff) | |
parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gcc/PKGBUILD
extra/shared-mime-info/PKGBUILD
extra/smb4k/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/xfig/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r-- | libre/audacious-plugins-libre/PKGBUILD | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 0dc7a2830..8dc995bdc 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -5,7 +5,7 @@ # Parabola maintainer: Brendan Tildesley pkgname=audacious-plugins-libre -pkgver=3.1 +pkgver=3.2 pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' @@ -14,10 +14,10 @@ license=('GPL' 'GPL3' 'LGPL' 'custom') # Licensing issues: # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice -# but I've been informed by an upstream dev, <nenolod>, that they are all GPL of some type. -# -# The plugin 'psf' is currently BSD+noncommercial, but is apparently being changed to GPL. -# However, 'psf' is apparently an emulator for running non-free code, so I'll leave it out. +# but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version +# +# The plugin 'psf' is currently (Nov 2011) BSD+noncommercial, but is apparently being changed to GPL. +# However, 'psf' is apparently an emulator for running non-free code, so I'm not rushing to fix it. # # All the other custom licensed plugins I think are mostly modified BSD or ISC. @@ -57,15 +57,15 @@ optdepends=('oss: Open Sound System v4 output' 'libmms: libmms-based mms transport' 'libcue: CUE playlist format') -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d5f2ef19cda220d6fa7dd26c514c5c22c8dd7b42') +source=("http://repo.parabolagnulinux.org/~brendan/src-libre/${pkgname}-${pkgver}.tar.xz") +sha1sums=('6375b65b975e2905a8ff1c0ddfaeee2a71bbef94') -# Retrieve upstream & remove plugins 'psf' & 'usf' due to issues mentioned above. Repackage as -libre +# Retrieve upstream & remove plugin 'psf' due to issues mentioned above. Repackage as -libre mksource(){ - [ -f ${pkgname%-libre}-$pkgver.tar.gz ] || wget http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tar.gz - tar xzf ${pkgname%-libre}-${pkgver}.tar.gz + [ -f ${pkgname%-libre}-$pkgver.tar.bz2 ] || wget http://distfiles.audacious-media-player.org/${pkgname%-libre}-$pkgver.tar.bz2 + tar xjf ${pkgname%-libre}-${pkgver}.tar.bz2 - rm -rvf ${pkgname%-libre}-$pkgver/src/{p,u}usf/ + rm -rvf ${pkgname%-libre}-$pkgver/src/psf/ sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver @@ -78,24 +78,20 @@ mksource(){ build() { cd "${srcdir}/${pkgname}-${pkgver}" - # hack to enable global hotkeys with gtk3 - sed -e 's/gdk-x11-2.0/gdk-x11-3.0/g' -i configure - # Get license notices out of custom-licensed packages cd src tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX) head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa + head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer - head -n 22 dockalbumart/dockalbumart.c | cut -c 4- | tail -n 21 > ${tmpdir}/LICENSE.dockalbumart head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 - head -n 17 openal/openal.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.openal + head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2 head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample - head -n 18 roaraudio-vio/roaraudio-vio.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.roaraudio-vio head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs @@ -105,22 +101,22 @@ build() { pushd $tmpdir install -m644 LICENSE.albumart $l install -m644 LICENSE.alsa $l + install -m644 LICENSE.audpl $l install -m644 LICENSE.cairo-spectrum $l install -m644 LICENSE.compressor $l install -m644 LICENSE.crossfade $l install -m644 LICENSE.crystalizer $l - install -m644 LICENSE.dockalbumart $l install -m644 LICENSE.lyricwiki $l install -m644 LICENSE.mpg123 $l - install -m644 LICENSE.openal $l + install -m644 LICENSE.mpris2 $l install -m644 LICENSE.resample $l - install -m644 LICENSE.roaraudio-vio $l install -m644 LICENSE.unix-io $l install -m644 LICENSE.voice_removal $l install -m644 LICENSE.xfs $l popd - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --enable-amidiplug \ --disable-adplug |