FS-4657 --resolve update libsndfile to its latest master

libs/libsndfile/Scripts/android-configure.sh

@@ -0,0 +1,92 @@
+#!/bin/bash -e
+
+# Copyright (C) 2013 Erik de Castro Lopo <erikd@mega-nerd.com>
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Neither the author nor the names of any contributors may be used
+#       to endorse or promote products derived from this software without
+#       specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Android NDK version number; eg r8e, r9 etc
+ANDROID_NDK_VER=r9
+
+# Android NDK gcc version; eg 4.7, 4.9 etc.
+ANDROID_GCC_VER=4.8
+
+# Android API version; eg 9 (Android 2.3), 14 (Android 4.0) etc.
+ANDROID_API_VER=9
+
+#-------------------------------------------------------------------------------
+# No more user config beyond here.
+
+BUILD_MACHINE=$(uname -s | tr 'A-Z' 'a-z')-$(uname -m)
+
+function die_with {
+	echo $1
+	exit 1
+}
+
+export CROSS_COMPILE=arm-linux-androideabi
+
+# I put all my dev stuff in here
+export DEV_PREFIX=$HOME/Android
+test -d ${DEV_PREFIX} || die_with "Error : DEV_PREFIX '$DEV_PREFIX' does not exist."
+
+# Don't forget to adjust this to your NDK path
+export ANDROID_NDK=${DEV_PREFIX}/android-ndk-${ANDROID_NDK_VER}
+test -d ${ANDROID_NDK} || die_with "Error : ANDROID_NDK '$ANDROID_NDK' does not exist."
+
+export ANDROID_PREFIX=${ANDROID_NDK}/toolchains/arm-linux-androideabi-${ANDROID_GCC_VER}/prebuilt/${BUILD_MACHINE}
+test -d ${ANDROID_PREFIX} || die_with "Error : ANDROID_PREFIX '$ANDROID_PREFIX' does not exist."
+
+export SYSROOT=${ANDROID_NDK}/platforms/android-${ANDROID_API_VER}/arch-arm
+test -d ${SYSROOT} || die_with "Error : SYSROOT '$SYSROOT' does not exist."
+
+export CROSS_PREFIX=${ANDROID_PREFIX}/bin/${CROSS_COMPILE}
+test -f ${CROSS_PREFIX}-gcc || die_with "Error : CROSS_PREFIX compiler '${CROSS_PREFIX}-gcc' does not exist."
+
+
+# Non-exhaustive lists of compiler + binutils
+# Depending on what you compile, you might need more binutils than that
+export CPP=${CROSS_PREFIX}-cpp
+export AR=${CROSS_PREFIX}-ar
+export AS=${CROSS_PREFIX}-as
+export NM=${CROSS_PREFIX}-nm
+export CC=${CROSS_PREFIX}-gcc
+export CXX=${CROSS_PREFIX}-g++
+export LD=${CROSS_PREFIX}-ld
+export RANLIB=${CROSS_PREFIX}-ranlib
+
+# Don't mix up .pc files from your host and build target
+export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
+
+# Set up the needed FLAGS.
+export CFLAGS="${CFLAGS} -gstabs --sysroot=${SYSROOT} -I${SYSROOT}/usr/include -I${ANDROID_PREFIX}/include"
+export CXXFLAGS="${CXXFLAGS} -gstabs -fno-exceptions --sysroot=${SYSROOT} -I${SYSROOT}/usr/include -I${ANDROID_PREFIX}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_GCC_VER}/include/ -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_GCC_VER}/libs/armeabi/include"
+
+export CPPFLAGS="${CFLAGS}"
+export LDFLAGS="${LDFLAGS} -L${SYSROOT}/usr/lib -L${ANDROID_PREFIX}/lib"
+
+# Create a symlink to the gdbclient.
+test -h gdbclient || ln -s ${ANDROID_PREFIX}/bin/arm-linux-androideabi-gdb gdbclient
+
+./configure --host=${CROSS_COMPILE} --with-sysroot=${SYSROOT} "$@"

libs/libsndfile/Scripts/build-test-tarball.mk.in

@@ -0,0 +1,61 @@
+#!/usr/bin/make -f
+
+# This is probably only going to work with GNU Make.
+# This in a separate file instead of in Makefile.am because Automake complains
+# about the GNU Make-isms.
+
+EXEEXT = @EXEEXT@
+
+PACKAGE_VERSION = @PACKAGE_VERSION@
+
+HOST_TRIPLET = @HOST_TRIPLET@
+
+SRC_BINDIR = @SRC_BINDIR@
+TEST_BINDIR = @TEST_BINDIR@
+
+LIBRARY := $(SRC_BINDIR)libsndfile.so.$(LIB_VERSION)
+
+LIB_VERSION := $(shell echo $(PACKAGE_VERSION) | sed -e 's/[a-z].*//')
+
+TESTNAME = libsndfile-testsuite-$(HOST_TRIPLET)-$(PACKAGE_VERSION)
+
+TARBALL = $(TESTNAME).tar.gz
+
+# Find the test programs by grepping the script for the programs it executes.
+testprogs := $(shell grep '^\./' tests/test_wrapper.sh | sed -e "s|./||" -e "s/ .*//" | sort | uniq)
+# Also add the programs not found by the above.
+testprogs += sfversion@EXEEXT@ stdin_test@EXEEXT@ stdout_test@EXEEXT@ cpp_test@EXEEXT@ win32_test@EXEEXT@
+
+# Find the single test program in src/ .
+srcprogs := $(shell if test -x src/.libs/test_main$(EXEEXT) ; then echo "src/.libs/test_main$(EXEEXT)" ; else echo "src/test_main$(EXEEXT)" ; fi)
+
+libfiles := $(shell if test ! -z $(EXEEXT) ; then echo "src/libsndfile-1.def src/.libs/libsndfile-1.dll" ; elif test -f $(LIBRARY) ; then echo $(LIBRARY) ; fi  ; fi)
+
+testbins := $(addprefix $(TEST_BINDIR),$(subst @EXEEXT@,$(EXEEXT),$(testprogs))) $(libfiles) $(srcprogs)
+
+
+all : $(TARBALL)
+
+clean :
+	rm -rf $(TARBALL) $(TESTNAME)/
+
+check : $(TESTNAME)/test_wrapper.sh
+	(cd ./$(TESTNAME)/ && ./test_wrapper.sh)
+
+$(TARBALL) : $(TESTNAME)/test_wrapper.sh
+	tar zcf $@ $(TESTNAME)
+	rm -rf $(TESTNAME)
+	@echo
+	@echo "Created : $(TARBALL)"
+	@echo
+
+$(TESTNAME)/test_wrapper.sh : $(testbins) tests/test_wrapper.sh tests/pedantic-header-test.sh
+	rm -rf $(TESTNAME)
+	mkdir -p $(TESTNAME)/tests/
+	cp $(testbins) $(TESTNAME)/tests/
+	cp tests/test_wrapper.sh $(TESTNAME)/
+	cp tests/pedantic-header-test.sh $(TESTNAME)/tests/
+	chmod u+x $@
+
+tests/test_wrapper.sh : tests/test_wrapper.sh.in
+	(cd tests/ ; make $@)

libs/libsndfile/Scripts/clang-sanitize.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# This is known to work with clang-3.4 from Debian testing/unstable.
+# 2013/07/14
+
+export CC=clang
+export CXX=clang++
+export CFLAGS="-O3 -fsanitize=address,integer,undefined"
+export CXXFLAGS="-O3 -fsanitize=address,integer,undefined"
+
+./configure --enable-gcc-werror
+
+make clean all check

libs/libsndfile/Scripts/cstyle.py

@@ -0,0 +1,246 @@
+#!/usr/bin/python -tt
+#
+# Copyright (C) 2005-2012 Erik de Castro Lopo <erikd@mega-nerd.com>
+#
+# Released under the 2 clause BSD license.
+
+"""
+This program checks C code for compliance to coding standards used in
+libsndfile and other projects I run.
+"""
+
+import re
+import sys
+
+
+class Preprocessor:
+	"""
+	Preprocess lines of C code to make it easier for the CStyleChecker class to
+	test for correctness. Preprocessing works on a single line at a time but
+	maintains state between consecutive lines so it can preprocessess multi-line
+	comments.
+	Preprocessing involves:
+	  - Strip C++ style comments from a line.
+	  - Strip C comments from a series of lines. When a C comment starts and
+	    ends on the same line it will be replaced with 'comment'.
+	  - Replace arbitrary C strings with the zero length string.
+	  - Replace '#define f(x)' with '#define f (c)' (The C #define requires that
+	    there be no space between defined macro name and the open paren of the
+	    argument list).
+	Used by the CStyleChecker class.
+	"""
+	def __init__ (self):
+		self.comment_nest = 0
+		self.leading_space_re = re.compile ('^(\t+| )')
+		self.trailing_space_re = re.compile ('(\t+| )$')
+		self.define_hack_re = re.compile ("(#\s*define\s+[a-zA-Z0-9_]+)\(")
+
+	def comment_nesting (self):
+		"""
+		Return the currect comment nesting. At the start and end of the file,
+		this value should be zero. Inside C comments it should be 1 or
+		(possibly) more.
+		"""
+		return self.comment_nest
+
+	def __call__ (self, line):
+		"""
+		Strip the provided line of C and C++ comments. Stripping of multi-line
+		C comments works as expected.
+		"""
+
+		line = self.define_hack_re.sub (r'\1 (', line)
+
+		line = self.process_strings (line)
+
+		# Strip C++ style comments.
+		if self.comment_nest == 0:
+			line = re.sub ("( |\t*)//.*", '', line)
+
+		# Strip C style comments.
+		open_comment = line.find ('/*')
+		close_comment = line.find ('*/')
+
+		if self.comment_nest > 0 and close_comment < 0:
+			# Inside a comment block that does not close on this line.
+			return ""
+
+		if open_comment >= 0 and close_comment < 0:
+			# A comment begins on this line but doesn't close on this line.
+			self.comment_nest += 1
+			return self.trailing_space_re.sub ('', line [:open_comment])
+
+		if open_comment < 0 and close_comment >= 0:
+			# Currently open comment ends on this line.
+			self.comment_nest -= 1
+			return self.trailing_space_re.sub ('', line [close_comment + 2:])
+
+		if open_comment >= 0 and close_comment > 0 and self.comment_nest == 0:
+			# Comment begins and ends on this line. Replace it with 'comment'
+			# so we don't need to check whitespace before and after the comment
+			# we're removing.
+			newline = line [:open_comment] + "comment" + line [close_comment + 2:]
+			return self.__call__ (newline)
+
+		return line
+
+	def process_strings (self, line):
+		"""
+		Given a line of C code, return a string where all literal C strings have
+		been replaced with the empty string literal "".
+		"""
+		for k in range (0, len (line)):
+			if line [k] == '"':
+				start = k
+				for k in range (start + 1, len (line)):
+					if line [k] == '"' and line [k - 1] != '\\':
+						return line [:start + 1] + '"' + self.process_strings (line [k + 1:])
+		return line
+
+
+class CStyleChecker:
+	"""
+	A class for checking the whitespace and layout of a C code.
+	"""
+	def __init__ (self, debug):
+		self.debug = debug
+		self.filename = None
+		self.error_count = 0
+		self.line_num = 1
+		self.orig_line = ''
+		self.trailing_newline_re = re.compile ('[\r\n]+$')
+		self.indent_re = re.compile ("^\s*")
+		self.last_line_indent = ""
+		self.last_line_indent_curly = False
+		self.re_checks = \
+			[ ( re.compile ("  "),		"multiple space instead of tab" )
+			, ( re.compile ("\t "), 	"space after tab" )
+			, ( re.compile ("[^ ];"),	"missing space before semi-colon" )
+			, ( re.compile ("{[^\s}]"),	"missing space after open brace" )
+			, ( re.compile ("[^{\s]}"),	"missing space before close brace" )
+			, ( re.compile ("[ \t]+$"),	"contains trailing whitespace" )
+
+			, ( re.compile (",[^\s\n]"),		"missing space after comma" )
+			, ( re.compile (";[a-zA-Z0-9]"), 	"missing space after semi-colon" )
+			, ( re.compile ("=[^\s\"'=]"),		"missing space after assignment" )
+
+			# Open and close parenthesis.
+			, ( re.compile ("[^\s\(\[\*&']\("),				"missing space before open parenthesis" )
+			, ( re.compile ("\)(-[^>]|[^,'\s\n\)\]-])"),	"missing space after close parenthesis" )
+			, ( re.compile ("\s(do|for|if|when)\s.*{$"),	"trailing open parenthesis at end of line" )
+			, ( re.compile ("\( [^;]"),						"space after open parenthesis" )
+			, ( re.compile ("[^;] \)"),						"space before close parenthesis" )
+
+			# Open and close square brace.
+			, ( re.compile ("[^\s\(\]]\["),			"missing space before open square brace" )
+			, ( re.compile ("\][^,\)\]\[\s\.-]"),	"missing space after close square brace" )
+			, ( re.compile ("\[ "),					"space after open square brace" )
+			, ( re.compile (" \]"),					"space before close square brace" )
+
+			# Space around operators.
+			, ( re.compile ("[^\s][\*/%+-][=][^\s]"),		"missing space around opassign" )
+			, ( re.compile ("[^\s][<>!=^/][=]{1,2}[^\s]"),	"missing space around comparison" )
+
+			# Parens around single argument to return.
+			, ( re.compile ("\s+return\s+\([a-zA-Z0-9_]+\)\s+;"),	"parens around return value" )
+			]
+
+	def get_error_count (self):
+		"""
+		Return the current error count for this CStyleChecker object.
+		"""
+		return self.error_count
+
+	def check_files (self, files):
+		"""
+		Run the style checker on all the specified files.
+		"""
+		for filename in files:
+			self.check_file (filename)
+
+	def check_file (self, filename):
+		"""
+		Run the style checker on the specified file.
+		"""
+		self.filename = filename
+		cfile = open (filename, "r")
+
+		self.line_num = 1
+
+		preprocess = Preprocessor ()
+		while 1:
+			line = cfile.readline ()
+			if not line:
+				break
+
+			line = self.trailing_newline_re.sub ('', line)
+			self.orig_line = line
+
+			self.line_checks (preprocess (line))
+
+			self.line_num += 1
+
+		cfile.close ()
+		self.filename = None
+
+		# Check for errors finding comments.
+		if preprocess.comment_nesting () != 0:
+			print ("Weird, comments nested incorrectly.")
+			sys.exit (1)
+
+		return
+
+	def line_checks (self, line):
+		"""
+		Run the style checker on provided line of text, but within the context
+		of how the line fits within the file.
+		"""
+
+		indent = len (self.indent_re.search (line).group ())
+		if re.search ("^\s+}", line):
+			if not self.last_line_indent_curly and indent != self.last_line_indent:
+				None	# self.error ("bad indent on close curly brace")
+			self.last_line_indent_curly = True
+		else:
+			self.last_line_indent_curly = False
+
+		# Now all the regex checks.
+		for (check_re, msg) in self.re_checks:
+			if check_re.search (line):
+				self.error (msg)
+
+		if re.search ("[a-zA-Z0-9][<>!=^/&\|]{1,2}[a-zA-Z0-9]", line):
+			if not re.search (".*#include.*[a-zA-Z0-9]/[a-zA-Z]", line):
+				self.error ("missing space around operator")
+
+		self.last_line_indent = indent
+		return
+
+	def error (self, msg):
+		"""
+		Print an error message and increment the error count.
+		"""
+		print ("%s (%d) : %s" % (self.filename, self.line_num, msg))
+		if self.debug:
+			print ("'" + self.orig_line + "'")
+		self.error_count += 1
+
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+if len (sys.argv) < 1:
+	print ("Usage : yada yada")
+	sys.exit (1)
+
+# Create a new CStyleChecker object
+if sys.argv [1] == '-d' or sys.argv [1] == '--debug':
+	cstyle = CStyleChecker (True)
+	cstyle.check_files (sys.argv [2:])
+else:
+	cstyle = CStyleChecker (False)
+	cstyle.check_files (sys.argv [1:])
+
+
+if cstyle.get_error_count ():
+	sys.exit (1)
+
+sys.exit (0)

libs/libsndfile/Scripts/git-pre-commit-hook

@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+
+if git rev-parse --verify HEAD >/dev/null 2>&1 ; then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+	fi
+
+files=$(git diff-index --name-status --cached HEAD | grep -v ^D | sed -r "s/^[A-Z]+[A-Z0-9]*[ \t]+/ /")
+
+# Redirect output to stderr.
+exec 1>&2
+
+#-------------------------------------------------------------------------------
+# Check the copyright notice of all files to be commited.
+
+user=`git config --global user.email`
+year=`date +"%Y"`
+
+missing_copyright_year=""
+if test $user = "erikd@mega-nerd.com" ; then
+	for f in $files ; do
+		if test `head -5 $f | grep -c -i copyright` -gt 0 ; then
+			user_copyright=`grep -i copyright $f | grep $user | grep -c $year`
+			if test $user_copyright -lt 1 ; then
+				missing_copyright_year="$missing_copyright_year $f"
+				fi
+			fi
+		done
+	fi
+
+if test -n "$missing_copyright_year" ; then
+	echo "Missing current year in the copyright notice of the following files:"
+	for f in $missing_copyright_year ; do
+		echo "    $f"
+		done
+	echo "Commit aborted."
+	exit 1
+	fi
+
+#-------------------------------------------------------------------------------
+# Check the formatting of all C files.
+
+cfiles=""
+for f in $files ; do
+	if test `dirname $f` = "src/ALAC" ; then
+		echo "Skipping cstyle checking on $f"
+	elif test `echo $f | grep -c "\.[ch]$"` -gt 0 ; then
+		cfiles="$cfiles $f"
+		fi
+	done
+
+if test -n "$cfiles" ; then
+	Scripts/cstyle.py $cfiles
+	if test $? -ne 0 ; then
+		echo
+		echo "Commit aborted. Fix the above error before trying again."
+		exit 1
+		fi
+	fi
+
+#-------------------------------------------------------------------------------
+# Prevent files with non-ascii filenames from being committed.
+
+if test $(git diff --cached --name-only --diff-filter=A -z $against | LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 ; then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "Commit aborted."
+	exit 1
+	fi
+
+exit 0

libs/libsndfile/Scripts/linux-to-win-cross-configure.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+case "$1" in
+	w32)
+		compiler_name=i686-w64-mingw32
+		;;
+	w64)
+		compiler_name=x86_64-w64-mingw32
+		;;
+	*)
+		echo "$0 (w32|w64) <other args>"
+		exit 0
+		;;
+	esac
+
+shift
+
+build_cpu=$(dpkg-architecture -qDEB_BUILD_GNU_CPU)
+build_host=$build_cpu-linux
+
+./configure --host=$compiler_name --target=$compiler_name --build=$build_host \
+		--program-prefix='' --disable-sqlite --disable-static $@