aboutsummaryrefslogtreecommitdiffstats
path: root/main/cdparanoia
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-10-08 08:37:08 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-10-08 08:37:08 +0000
commit364d51e6f42a946e9fa61b30d094350e724868f2 (patch)
treeb1333672c3cb99d2dd25f9b0f0b9958a497591d7 /main/cdparanoia
parent7d364746ce9ad378592c1810d4b4d145cabb27cc (diff)
downloadaports-364d51e6f42a946e9fa61b30d094350e724868f2.tar.bz2
aports-364d51e6f42a946e9fa61b30d094350e724868f2.tar.xz
main/cdparanoia: fix musl build
Diffstat (limited to 'main/cdparanoia')
-rw-r--r--main/cdparanoia/APKBUILD23
-rw-r--r--main/cdparanoia/fix-includes.patch7
2 files changed, 17 insertions, 13 deletions
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
index 56ead88e5b..31680853aa 100644
--- a/main/cdparanoia/APKBUILD
+++ b/main/cdparanoia/APKBUILD
@@ -11,7 +11,7 @@ depends=
makedepends="libtool autoconf automake"
install=
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-patches="gcc.patch"
+patches="gcc.patch fix-includes.patch"
source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.tgz
$patches"
@@ -19,28 +19,18 @@ _builddir="$srcdir/cdparanoia-III-$pkgver"
prepare() {
cd "$_builddir"
- update_config_sub || return 1
-}
-prepare() {
- cd "$_builddir"
for i in $patches; do
msg $i
patch -p1 -i "$srcdir"/$i || return 1
done
mv configure.guess config.guess
mv configure.sub config.sub
+ update_config_sub || return 1
sed -i -e '/configure.\(guess\|sub\)/d' configure.in || return 1
aclocal && autoconf || return 1
libtoolize || return 1
}
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
- cd "$_builddir"
- update_config_sub || return 1
-}
-
build() {
cd "$_builddir"
./configure \
@@ -67,4 +57,11 @@ libs() {
}
md5sums="b304bbe8ab63373924a744eac9ebc652 cdparanoia-III-10.2.src.tgz
-0555411001f5546162dfb798b37ebf16 gcc.patch"
+0555411001f5546162dfb798b37ebf16 gcc.patch
+0ab32817fdd8dd4abaf74185a8d0a3fc fix-includes.patch"
+sha256sums="005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df cdparanoia-III-10.2.src.tgz
+f754529da4318c091962aa766e9da526df7a922a2f3ac4a15d58c2935e57e739 gcc.patch
+0fff8bd83311e7866b6f9b32107fa357d693c401821066354b492b75afc514bf fix-includes.patch"
+sha512sums="4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7 cdparanoia-III-10.2.src.tgz
+27bf216e8b5b9d6971e3999166544025f166587df06065b89657dac62d0d53c01b76f53146c1e9a400dd71460567fadb8fd4ce00576836f972914d69e8855909 gcc.patch
+e8a5ef0f5bcdba697d2d49e31346832bfa2460e6f6cac9256420f57c74a5da2945bdc664368c91365a880ba76e638f58773468d8e8bd16e7afcaff955a1a82ce fix-includes.patch"
diff --git a/main/cdparanoia/fix-includes.patch b/main/cdparanoia/fix-includes.patch
new file mode 100644
index 0000000000..8d32539321
--- /dev/null
+++ b/main/cdparanoia/fix-includes.patch
@@ -0,0 +1,7 @@
+--- cdparanoia-III-10.2.orig/utils.h
++++ cdparanoia-III-10.2/utils.h
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <endian.h>
+ #include <stdio.h>