aboutsummaryrefslogtreecommitdiffstats
path: root/main/flac
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-12-01 10:41:10 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-12-01 10:41:30 +0000
commit49fd0f4cebc46e2753d6a60e450078446f7f18a7 (patch)
treeb1f54461ebe5b5254f2de91ad498026bca2ba202 /main/flac
parent4ed3d1dbc8963a29d2cd76fb8b656be26b6f7112 (diff)
downloadaports-49fd0f4cebc46e2753d6a60e450078446f7f18a7.tar.bz2
aports-49fd0f4cebc46e2753d6a60e450078446f7f18a7.tar.xz
main/flac: fix build on x86
Diffstat (limited to 'main/flac')
-rw-r--r--main/flac/APKBUILD18
-rw-r--r--main/flac/sigemptyset.patch11
2 files changed, 25 insertions, 4 deletions
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index 6b826b4496..45b12421c5 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -9,12 +9,19 @@ license="custom:Xiph LGPL GPL FDL"
subpackages="$pkgname-dev $pkgname-doc"
depends=
makedepends="libogg-dev !libiconv"
-source="http://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz"
+source="http://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz
+ sigemptyset.patch
+ "
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
}
build () {
@@ -42,6 +49,9 @@ package() {
install -Dm0644 COPYING.Xiph \
"$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph
}
-md5sums="b9922c9a0378c88d3e901b234f852698 flac-1.3.1.tar.xz"
-sha256sums="4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c flac-1.3.1.tar.xz"
-sha512sums="923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5 flac-1.3.1.tar.xz"
+md5sums="b9922c9a0378c88d3e901b234f852698 flac-1.3.1.tar.xz
+64b5b5af461c48e8f0f622612ffeee17 sigemptyset.patch"
+sha256sums="4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c flac-1.3.1.tar.xz
+2e142638667e39e75e7a60b595e9306138eb536b592e47f55a1bd8c18de22192 sigemptyset.patch"
+sha512sums="923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5 flac-1.3.1.tar.xz
+46af0738739212c4fd4bfdff81b5ced9682bf692bf6c0be261fec8b65d3f19a4b60d528c40cf0522d50fef7f3e28de1892cdbcdef659e6097d1cc9483cc39799 sigemptyset.patch"
diff --git a/main/flac/sigemptyset.patch b/main/flac/sigemptyset.patch
new file mode 100644
index 0000000000..0af606f454
--- /dev/null
+++ b/main/flac/sigemptyset.patch
@@ -0,0 +1,11 @@
+--- ./src/libFLAC/cpu.c.orig
++++ ./src/libFLAC/cpu.c
+@@ -243,7 +243,7 @@
+ struct sigaction sigill_save;
+ struct sigaction sigill_sse;
+ sigill_sse.sa_sigaction = sigill_handler_sse_os;
+- __sigemptyset(&sigill_sse.sa_mask);
++ sigemptyset(&sigill_sse.sa_mask);
+ sigill_sse.sa_flags = SA_SIGINFO | SA_RESETHAND; /* SA_RESETHAND just in case our SIGILL return jump breaks, so we don't get stuck in a loop */
+ if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save))
+ {