CVS commit: pkgsrc/audio/flac

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jan  1 11:52:36 UTC 2017

Modified Files:
        pkgsrc/audio/flac: Makefile distinfo
        pkgsrc/audio/flac/patches: patch-configure
Added Files:
        pkgsrc/audio/flac/patches: patch-strip_non_asm_libtool_args.sh
Removed Files:
        pkgsrc/audio/flac/patches: patch-af

Log Message:
FLAC 1.3.2:
General:
* Fix undefined behaviour using GCC/Clang UBSAN (erikd).
* General hardening via fuzz testing with AFL (erikd and others).
* General code improvements (lvqcl, erikd and others).
* Add FLAC in MP4 specification docs (Ralph Giles).
* MSVS build cleanups (lvqcl).
* Fix some cppcheck warnings (erikd).
* Assume all currently used OSes support SSE2.

flac:
* Fix potential infinite loop on flac-to-flac conversion (erikd).
* Add WAVEFORMATEXTENSIBLE to WAV (as needed) when decoding (lvqcl).
* Only write vorbis-comments if they are non-empty.
* Error out if decoding RAW with bits != (8|16|24).

metaflac:
* Add --scan-replay-gain option.

build system:
* Fixes for MSVC and Makefile.lite build systems.

libraries:
* CPU detection cleanup and fixes (Julian Calaby, erikd and lvqcl).
* Fix two stream decoder bugs (Max Kellermann).
* Fix a NULL dereference bug (on a malformed file).
* Changed the LPC order guess for a slight compression improvement, particularly for classical music (Martijn van Beurden).
* Improved encoding speed on older Intel CPUs.
* Fixed a seeking bug when decoding certain files (Miroslav Lichvar).
* Put an upper bound (32768) on the number of seek points.
* Fix potential memory leaks.
* Support 64bit brword/bwword allowing FLAC__BYTES_PER_WORD to be set to 8 (disabled by default).
* Fix an out-of-bounds heap read.
* Win32: Only use large buffers when writing to disk.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/audio/flac/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/flac/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/flac/patches/patch-af
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/flac/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/flac/patches/patch-strip_non_asm_libtool_args.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/flac/Makefile
diff -u pkgsrc/audio/flac/Makefile:1.50 pkgsrc/audio/flac/Makefile:1.51
--- pkgsrc/audio/flac/Makefile:1.50     Sat Nov 29 20:42:12 2014
+++ pkgsrc/audio/flac/Makefile  Sun Jan  1 11:52:36 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2014/11/29 20:42:12 adam Exp $
+# $NetBSD: Makefile,v 1.51 2017/01/01 11:52:36 adam Exp $
 
-DISTNAME=      flac-1.3.1
+DISTNAME=      flac-1.3.2
 CATEGORIES=    audio archivers
 MASTER_SITES=  http://downloads.xiph.org/releases/flac/
 EXTRACT_SUFX=  .tar.xz
@@ -40,13 +40,6 @@ CONFIGURE_ARGS+=     --disable-asm-optimizat
 
 .include "../../mk/compiler.mk"
 
-# Version 1.1.2 of flac doesn't seem to build correctly with -O3 using
-# the MIPSpro compiler.
-# XXX: retry for 1.1.3
-.if !empty(PKGSRC_COMPILER:Mmipspro)
-BUILDLINK_TRANSFORM+=  rm:-O3
-.endif
-
 # SunPro does not support __inline
 .if !empty(PKGSRC_COMPILER:Msunpro)
 CFLAGS+=       -D__inline=inline
@@ -58,5 +51,4 @@ BUILDLINK_TRANSFORM+= rm:-fgnu89-inline
 .endif
 
 .include "../../multimedia/libogg/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/flac/distinfo
diff -u pkgsrc/audio/flac/distinfo:1.24 pkgsrc/audio/flac/distinfo:1.25
--- pkgsrc/audio/flac/distinfo:1.24     Thu Jan  7 15:34:33 2016
+++ pkgsrc/audio/flac/distinfo  Sun Jan  1 11:52:36 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2016/01/07 15:34:33 jperkin Exp $
+$NetBSD: distinfo,v 1.25 2017/01/01 11:52:36 adam Exp $
 
-SHA1 (flac-1.3.1.tar.xz) = 38e17439d11be26207e4af0ff50973815694b26f
-RMD160 (flac-1.3.1.tar.xz) = 50d93b3663c1983af2b8cd0cea9f7069d5b8ab46
-SHA512 (flac-1.3.1.tar.xz) = 923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5
-Size (flac-1.3.1.tar.xz) = 941848 bytes
-SHA1 (patch-af) = f90f09fbf6a0fa938693a9d52316d3a4105129e5
-SHA1 (patch-configure) = 10d46b998336e95517e692674a7ae6f692b055eb
+SHA1 (flac-1.3.2.tar.xz) = 658d1acc9e39267de8ca377f2aa8ece677aee2cd
+RMD160 (flac-1.3.2.tar.xz) = d69613859a5b9958ee59b5334fa4665196e97668
+SHA512 (flac-1.3.2.tar.xz) = b6dfc7e31dc1fad434ff751a9f4748354de242af94d56c93254245ddb740ffa19e56f32100c3723b601ba345156e927d61a80722126cc75ebe55092179427cac
+Size (flac-1.3.2.tar.xz) = 776016 bytes
+SHA1 (patch-configure) = 74e3e944f70ba6d1bf9d94fab1d9174a3dab04bb
+SHA1 (patch-strip_non_asm_libtool_args.sh) = f90f09fbf6a0fa938693a9d52316d3a4105129e5

Index: pkgsrc/audio/flac/patches/patch-configure
diff -u pkgsrc/audio/flac/patches/patch-configure:1.1 pkgsrc/audio/flac/patches/patch-configure:1.2
--- pkgsrc/audio/flac/patches/patch-configure:1.1       Thu Jan  7 15:34:33 2016
+++ pkgsrc/audio/flac/patches/patch-configure   Sun Jan  1 11:52:36 2017
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2016/01/07 15:34:33 jperkin Exp $
+$NetBSD: patch-configure,v 1.2 2017/01/01 11:52:36 adam Exp $
 
-Don't remove -g, breaks -gfoo arguments.
+Don't force compiler optimisations.
 
---- configure.orig     2014-11-27 02:46:58.688355504 +0000
+--- configure.orig     2017-01-01 01:48:15.000000000 +0000
 +++ configure
-@@ -19874,7 +19874,7 @@ if test "x$debug" = xtrue; then
+@@ -20547,8 +20547,6 @@ if test "x$debug" = xtrue; then
        CFLAGS="-g $CFLAGS"
  else
        CPPFLAGS="-DNDEBUG $CPPFLAGS"
--      CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
-+      CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
-       CFLAGS="-O3 -funroll-loops $CFLAGS"
+-      CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
+-      CFLAGS="-O3 -funroll-loops $CFLAGS"
  fi
  
+ 

Added files:

Index: pkgsrc/audio/flac/patches/patch-strip_non_asm_libtool_args.sh
diff -u /dev/null pkgsrc/audio/flac/patches/patch-strip_non_asm_libtool_args.sh:1.1
--- /dev/null   Sun Jan  1 11:52:36 2017
+++ pkgsrc/audio/flac/patches/patch-strip_non_asm_libtool_args.sh       Sun Jan  1 11:52:36 2017
@@ -0,0 +1,29 @@
+$NetBSD: patch-strip_non_asm_libtool_args.sh,v 1.1 2017/01/01 11:52:36 adam Exp $
+
+Support -kPIC and simplify.
+
+--- strip_non_asm_libtool_args.sh.orig 2004-07-29 08:43:23.000000000 +0200
++++ strip_non_asm_libtool_args.sh      2007-02-22 20:11:41.000000000 +0100
+@@ -5,15 +5,12 @@
+ # Also, on some versions of OS X it tries to pass -fno-common
+ # to 'as' which causes problems.
+ command=""
+-while [ $1 ]; do
+-      if [ "$1" != "-fPIC" ]; then
+-              if [ "$1" != "-DPIC" ]; then
+-                      if [ "$1" != "-fno-common" ]; then
+-                              command="$command $1"
+-                      fi
+-              fi
+-      fi
+-      shift
++for arg; do
++      case "$arg" in
++      -[DfK]PIC |\
++      -fno-common)    continue;;
++      esac
++      command="$command $arg"
+ done
+-echo $command
++echo "$command"
+ exec $command