From 93b88cee7fe70d989500b809396fe700f4adf4a1 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 3 Jan 2017 10:09:29 +0000
Subject: main/flac: upgrade to 1.3.2

---
 main/flac/APKBUILD          | 22 +++++++++-------------
 main/flac/sigemptyset.patch | 11 -----------
 2 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 main/flac/sigemptyset.patch

(limited to 'main/flac')

diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index c53035f018..d22667634f 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=flac
-pkgver=1.3.1
-pkgrel=1
+pkgver=1.3.2
+pkgrel=0
 pkgdesc="Free Lossless Audio Codec"
 url="http://flac.sourceforge.net/"
 arch="all"
@@ -10,13 +10,12 @@ subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="libogg-dev !libiconv"
 source="http://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz
-	sigemptyset.patch
 	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -25,7 +24,7 @@ prepare() {
 }
 
 build () {
-	cd "$_builddir"
+	cd "$builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -42,15 +41,12 @@ build () {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 
 	install -Dm0644 COPYING.Xiph \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph
 }
-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"
+md5sums="454f1bfa3f93cc708098d7890d0499bd  flac-1.3.2.tar.xz"
+sha256sums="91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f  flac-1.3.2.tar.xz"
+sha512sums="63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15  flac-1.3.2.tar.xz"
diff --git a/main/flac/sigemptyset.patch b/main/flac/sigemptyset.patch
deleted file mode 100644
index 0af606f454..0000000000
--- a/main/flac/sigemptyset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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))
- 		{
-- 
cgit v1.2.3