From 40b628ef365da5c3b7fa3728a767470a29aabaf6 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Sun, 11 Sep 2022 18:57:52 +0000
Subject: [PATCH] main/flac: upgrade to 1.4.0

---
 main/flac/APKBUILD | 50 ++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index 2e62156cfb29..3d4893b67883 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=flac
-pkgver=1.3.4
+pkgver=1.4.0
 pkgrel=0
 pkgdesc="Free Lossless Audio Codec"
 url="https://xiph.org/flac/"
 arch="all"
 license="custom:Xiph LGPL GPL FDL"
 options="!check" # Tests are infinite
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="libogg-dev !libiconv"
-source="http://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
+makedepends="cmake libogg-dev nasm !libiconv samurai"
+source="https://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
 
 # secfixes:
 #   1.3.4-r0:
@@ -20,36 +20,42 @@ source="http://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
 
 
 build() {
-	local _arch_conf
 	case "$CARCH" in
-		ppc*)	_arch_conf="--enable-altivec" ;;
-		x86_64)	_arch_conf="--enable-sse" ;;
-		x86)	_arch_conf="--disable-sse" ;;
+	x86)
+		local sse=off
+		;;
+	x86_64)
+		local sse=on
+		;;
 	esac
 
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-shared \
-		--enable-ogg \
-		--disable-rpath \
-		--with-pic \
-		$_arch_conf
-	make
+	export CFLAGS="$CFLAGS -O2 -flto=auto"
+	export CXXFLAGS="$CXXFLAGS -O2 -flto=auto"
+
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_MANDIR=/usr/share/man/man1 \
+		-DBUILD_TESTING=OFF \
+		-DBUILD_EXAMPLES=OFF \
+		-DBUILD_SHARED_LIBS=ON \
+		-DNDEBUG=ON \
+		-DWITH_SSE=$sse
+
+	cmake --build build
 }
 
 check() {
-	make check
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 
 	install -Dm0644 COPYING.Xiph \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph
 }
+
 sha512sums="
-4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9  flac-1.3.4.tar.xz
+b7310de7bcf49584c0a1fdc6d5ee7216a8ab3e2b1af85366fa0905752da13e1cbb9638e0d92f3b756568a69848abf4d5c2fe0d21a86c6fdb4840f2678daf0f8d  flac-1.4.0.tar.xz
 "
-- 
GitLab