Merge tag 'upstream/1.2.0' into tizen_base

Change-Id: I5ab92fa565d7a7ad00de81d9165d52427286a0a9

diff --cc Makefile.am
index 18dc402,7bd00d3..029d010
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -45,8 -46,10 +46,8 @@@ BUILT_SOURCES = src/test_endswap.
  
  SYMBOL_FILES = src/Symbols.gnu-binutils src/Symbols.darwin src/libsndfile-1.def src/Symbols.os2 src/Symbols.static
  
- EXTRA_DIST += include/sndfile.h.in src/config.h.in src/test_endswap.tpl src/test_endswap.def \
+ EXTRA_DIST += src/config.h.in src/test_endswap.tpl src/test_endswap.def \
        $(SYMBOL_FILES) src/create_symbols_file.py src/binheader_writef_check.py \
 -      src/GSM610/README src/GSM610/COPYRIGHT src/GSM610/ChangeLog \
 -      src/G72x/README src/G72x/README.original src/G72x/ChangeLog \
        src/make-static-lib-hidden-privates.sh \
        src/config.h.cmake
  

diff --cc configure.ac
Simple merge

diff --cc packaging/libsndfile.spec
index 63a6f4a,0000000..a047201
mode 100644,000000..100644
--- 1/packaging/libsndfile.spec
--- /dev/null
+++ b/packaging/libsndfile.spec
@@@ -1,87 -1,0 +1,87 @@@
- Version:        1.1.0
 +%define __spec_check_pre exit 0
 +Name:           libsndfile
++Version:        1.2.0
 +Release:        0
 +License:        LGPL-2.1+
 +Summary:        C library for reading and writing sound files
 +Group:          Multimedia/Audio
 +BuildRequires:  gcc-c++
 +BuildRequires:  libtool
 +BuildRequires:  python
 +BuildRequires:  pkg-config
 +BuildRequires:  autogen
 +BuildRequires:  pkgconfig(ogg)
 +BuildRequires:  pkgconfig(vorbis)
 +BuildRequires:  pkgconfig(opus)
 +Requires:       opus
 +Url:            https://github.com/libsndfile/libsndfile
 +Source:         libsndfile-%{version}.tar.gz
 +Source1001:     libsndfile.manifest
 +
 +%description
 +Libsndfile is a C library for reading and writing sound files, such as
 +AIFF, AU, and WAV files, through one standard interface.  It can
 +currently read and write 8, 16, 24, and 32-bit PCM files as well as
 +32-bit floating point WAV files and a number of compressed formats.
 +
 +
 +%package devel
 +Summary:        Development package for the libsndfile library
 +Group:          Development/Libraries
 +Requires:       %{name} = %{version}
 +Requires:       glibc-devel
 +Requires:       libstdc++-devel
 +
 +%description devel
 +This package contains the files needed to compile programs that use the
 +libsndfile library.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +%define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wno-unused-parameter
 +autoreconf --force --install
 +CFLAGS="%{optflags} %{warn_flags} -D__TIZEN__"
 +export CFLAGS
 +LDFLAGS="-ldl"
 +export LDFLAGS
 +%configure --disable-static \
 +    --disable-dependency-tracking \
 +    --disable-sqlite --disable-alsa
 +make %{?_smp_mflags}
 +
 +%check
 +pushd src
 +make check
 +popd
 +
 +%install
 +
 +%make_install
 +# remove programs; built in another spec file
 +rm -rf %{buildroot}%{_bindir}
 +rm -rf %{buildroot}%{_mandir}/man1
 +# remove binaries from examples directory
 +rm -rf %{buildroot}%{_datadir}/doc/libsndfile
 +
 +%post  -p /sbin/ldconfig
 +
 +%postun  -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license COPYING
 +%{_libdir}/libsndfile.so.1*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_libdir}/libsndfile.so
 +%{_includedir}/sndfile.h
 +%{_includedir}/sndfile.hh
 +%{_libdir}/pkgconfig/*.pc
 +
 +%changelog

diff --cc src/aiff.c
Simple merge

diff --cc src/common.h
Simple merge

diff --cc src/flac.c
Simple merge

diff --cc src/ogg_vorbis.c
Simple merge

diff --cc src/sndfile.c
Simple merge

diff --cc src/wav.c
Simple merge