diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-03 09:31:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-03 10:04:43 +0000 |
| commit | cd1a2a838522299d7b28d89497433a4484a961bb (patch) | |
| tree | f5412c0e479c8a63b1dc55a322db245f6d114245 | |
| parent | dab384bacb78fb565df80531c29a8aa81236998a (diff) | |
| download | aports-cd1a2a838522299d7b28d89497433a4484a961bb.tar.bz2 aports-cd1a2a838522299d7b28d89497433a4484a961bb.tar.xz | |
main/wavpack: fix underlinking of libiconv
| -rw-r--r-- | main/wavpack/APKBUILD | 19 | ||||
| -rw-r--r-- | main/wavpack/iconv-underlinking.patch | 21 |
2 files changed, 34 insertions, 6 deletions
diff --git a/main/wavpack/APKBUILD b/main/wavpack/APKBUILD index f9c850cdbc..def61f19c7 100644 --- a/main/wavpack/APKBUILD +++ b/main/wavpack/APKBUILD @@ -2,25 +2,31 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wavpack pkgver=4.60.1 -pkgrel=2 +pkgrel=3 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" url="http://www.wavpack.com/" arch="all" license="custom" depends= -makedepends= +makedepends="autoconf automake libtool" if [ "$ALPINE_LIBC" != eglibc ]; then - makedepends="$makdepends libiconv-dev" + makedepends="$makedepends libiconv-dev" fi install= subpackages="$pkgname-dev $pkgname-doc" -source="http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2" +source="http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2 + iconv-underlinking.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - # apply patches here + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize --force && aclocal && autoconf && automake || return 1 } build() { @@ -42,4 +48,5 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2" +md5sums="7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2 +262979a78da1ff825243352c7bfb691e iconv-underlinking.patch" diff --git a/main/wavpack/iconv-underlinking.patch b/main/wavpack/iconv-underlinking.patch new file mode 100644 index 0000000000..1d920a1905 --- /dev/null +++ b/main/wavpack/iconv-underlinking.patch @@ -0,0 +1,21 @@ +--- ./cli/Makefile.am.orig ++++ ./cli/Makefile.am +@@ -2,15 +2,15 @@ + + wavpack_SOURCES = wavpack.c utils.c md5.c + wavpack_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include +-wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) ++wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) $(ICONV_LIBS) + + wvunpack_SOURCES = wvunpack.c utils.c md5.c + wvunpack_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include +-wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) ++wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) $(ICONV_LIBS) + + wvgain_SOURCES = wvgain.c utils.c + wvgain_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include +-wvgain_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) ++wvgain_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) $(ICONV_LIBS) + + noinst_HEADERS = \ + utils.h \ |