flac: updated to 1.3.3

FLAC 1.3.3:

General:
- Fix CPU detection
- Switch from unsigned types to uint32_t
- CppCheck fixes
- Improve SIMD decoding of 24 bit files
- POWER* amnd POWER9 improvements
- More tests.

flac:
- When converting to WAV, use WAVEFORMATEXTENSIBLE when bits per second is not 8 or 16
- Fix --output-prefix with input-files in sub-directories

build system:
- Cmake support
- Visual Studio updates
- Fix for MSVC when UNICODE is enabled
- Fix for OpenBSD/i386

4 files changed, 33 insertions, 54 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index eb52e7fa3f1..9216aef1eb9 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,28 +1,23 @@
-# $NetBSD: Makefile,v 1.53 2017/08/01 14:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2019/08/05 15:35:12 adam Exp $
 
-DISTNAME=	flac-1.3.2
+DISTNAME=	flac-1.3.3
 CATEGORIES=	audio archivers
 MASTER_SITES=	http://downloads.xiph.org/releases/flac/
 EXTRACT_SUFX=	.tar.xz
 
-# XXX remove at next update
-DIST_SUBDIR=	flac
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://xiph.org/flac/
 COMMENT=	Free lossless audio codec
 LICENSE=	modified-bsd AND gnu-gpl-v2 AND gnu-lgpl-v2.1
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-
-CONFIGURE_ENV+=		ac_cv_path_XMMS_CONFIG="no"
-CONFIGURE_ENV+=		ac_cv_prog_DOXYGEN=""
-
-PKGCONFIG_OVERRIDE+=	src/libFLAC++/flac++.pc.in src/libFLAC/flac.pc.in
+CONFIGURE_ARGS+=	--disable-doxygen-docs
+CONFIGURE_ARGS+=	--disable-xmms-plugin
+PKGCONFIG_OVERRIDE+=	src/libFLAC++/flac++.pc.in
+PKGCONFIG_OVERRIDE+=	src/libFLAC/flac.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/audio/flac/PLIST b/audio/flac/PLIST
index 04d474c6fd1..6f61e45120e 100644
--- a/audio/flac/PLIST
+++ b/audio/flac/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2014/11/29 20:42:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/08/05 15:35:12 adam Exp $
 bin/flac
 bin/metaflac
 include/FLAC++/all.h
@@ -23,24 +23,24 @@ man/man1/flac.1
 man/man1/metaflac.1
 share/aclocal/libFLAC++.m4
 share/aclocal/libFLAC.m4
-share/doc/${PKGNAME}/FLAC.tag
-share/doc/${PKGNAME}/html/changelog.html
-share/doc/${PKGNAME}/html/developers.html
-share/doc/${PKGNAME}/html/documentation.html
-share/doc/${PKGNAME}/html/documentation_bugs.html
-share/doc/${PKGNAME}/html/documentation_example_code.html
-share/doc/${PKGNAME}/html/documentation_format_overview.html
-share/doc/${PKGNAME}/html/documentation_tools.html
-share/doc/${PKGNAME}/html/documentation_tools_flac.html
-share/doc/${PKGNAME}/html/documentation_tools_metaflac.html
-share/doc/${PKGNAME}/html/faq.html
-share/doc/${PKGNAME}/html/favicon.ico
-share/doc/${PKGNAME}/html/features.html
-share/doc/${PKGNAME}/html/flac.css
-share/doc/${PKGNAME}/html/format.html
-share/doc/${PKGNAME}/html/id.html
-share/doc/${PKGNAME}/html/images/logo.svg
-share/doc/${PKGNAME}/html/images/logo130.gif
-share/doc/${PKGNAME}/html/index.html
-share/doc/${PKGNAME}/html/license.html
-share/doc/${PKGNAME}/html/ogg_mapping.html
+share/doc/flac/FLAC.tag
+share/doc/flac/changelog.html
+share/doc/flac/developers.html
+share/doc/flac/documentation.html
+share/doc/flac/documentation_bugs.html
+share/doc/flac/documentation_example_code.html
+share/doc/flac/documentation_format_overview.html
+share/doc/flac/documentation_tools.html
+share/doc/flac/documentation_tools_flac.html
+share/doc/flac/documentation_tools_metaflac.html
+share/doc/flac/faq.html
+share/doc/flac/favicon.ico
+share/doc/flac/features.html
+share/doc/flac/flac.css
+share/doc/flac/format.html
+share/doc/flac/id.html
+share/doc/flac/images/logo.svg
+share/doc/flac/images/logo130.gif
+share/doc/flac/index.html
+share/doc/flac/license.html
+share/doc/flac/ogg_mapping.html
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 09b5b3570a8..188cdcc6aba 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.27 2017/01/07 10:26:53 adam Exp $
+$NetBSD: distinfo,v 1.28 2019/08/05 15:35:12 adam Exp $
 
-SHA1 (flac/flac-1.3.2.tar.xz) = 2bdbb56b128a780a5d998e230f2f4f6eb98f33ee
-RMD160 (flac/flac-1.3.2.tar.xz) = fd25a098941556c5787d7369b12c43aca9a9df78
-SHA512 (flac/flac-1.3.2.tar.xz) = 63910e8ebbe508316d446ffc9eb6d02efbd5f47d29d2ea7864da9371843c8e671854db6e89ba043fe08aef1845b8ece70db80f1cce853f591ca30d56ef7c3a15
-Size (flac/flac-1.3.2.tar.xz) = 776192 bytes
-SHA1 (patch-configure) = 74e3e944f70ba6d1bf9d94fab1d9174a3dab04bb
+SHA1 (flac-1.3.3.tar.xz) = 6ac2e8f1dd18c9b0214c4d81bd70cdc1e943cffe
+RMD160 (flac-1.3.3.tar.xz) = 8e5d51781d2cead83f2f0cdd1f28ba4cc641e0e1
+SHA512 (flac-1.3.3.tar.xz) = d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
+Size (flac-1.3.3.tar.xz) = 1044472 bytes
 SHA1 (patch-microbench_util.c) = f03bfbef537d10ceb9742451ec3509be886e15ed
 SHA1 (patch-strip_non_asm_libtool_args.sh) = f90f09fbf6a0fa938693a9d52316d3a4105129e5
diff --git a/audio/flac/patches/patch-configure b/audio/flac/patches/patch-configure
deleted file mode 100644
index b4d49415a68..00000000000
--- a/audio/flac/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2017/01/01 11:52:36 adam Exp $
-
-Don't force compiler optimisations.
-
---- configure.orig	2017-01-01 01:48:15.000000000 +0000
-+++ configure
-@@ -20547,8 +20547,6 @@ if test "x$debug" = xtrue; then
- 	CFLAGS="-g $CFLAGS"
- else
- 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
--	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
--	CFLAGS="-O3 -funroll-loops $CFLAGS"
- fi
- 
-