Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
Update libsoxr to 0.1.3 and libsndfile to 1.0.29
Browse files Browse the repository at this point in the history
  • Loading branch information
AnErrupTion committed Jul 12, 2021
1 parent 9e73b46 commit 8040918
Show file tree
Hide file tree
Showing 83 changed files with 5,158 additions and 40,509 deletions.
11 changes: 4 additions & 7 deletions lib-src/audacity-patches.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,16 @@ Upstream Version: master (3069cc2)
libsndfile
----------
Erik de Castro Lopo's audio file I/O library. Core and essential to Audacity.
Version in Audacity GIT: 1.0.29rc2+git4bdd741
Version in Audacity GIT: 1.0.29

libsoxr
-------
The SoX Resampler library performs one-dimensional sample-rate conversion,
by Rob Sykes.
http://sourceforge.net/p/soxr/wiki/Home/
Version in Audacity SVN: 0.1.1
Patches:
* "libsoxr/configure" file: modified cmake params
* add-make-check-support.patch: Add a check target for GNU Autotools integration.
* libsoxr-srcdir.patch: Adds srcdir handling
Upstream Version: 0.1.1
Version in Audacity SVN: 0.1.3
Patches: None
Upstream Version: 0.1.3

libvamp
-------
Expand Down
16 changes: 16 additions & 0 deletions lib-src/libsndfile/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true

[*]
insert_final_newline = true

[*.{h,hpp,c,tpl,def}]
indent_style = tab
tab_width = 4

[*.py]
indent_style = space
indent_size = 4

[*.yml]
indent_style = space
indent_size = 2
15 changes: 15 additions & 0 deletions lib-src/libsndfile/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Declare files that will always have CRLF line endings on checkout.
*.ac text eol=lf
*.am text eol=lf
*.m4 text eol=lf
*.pc text eol=lf
*.spec text eol=lf
*.sh text eol=lf

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text
144 changes: 144 additions & 0 deletions lib-src/libsndfile/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
*.user
*.8svx
*.a
*.aif
*.aifc
*.aiff
*.au
*.bin
*.caf
*.dll
*.exe
*.flac
*.la
*.lib
*.lo
*.loT
*.o
*.oct
*.oga
*.ogg
*.paf
*.raw
*.rifx
*.sd2
*.sds
*.svx
/*.so*
*.w64
*.wav
*.wavex
.DS_Store
.deps
.dirstamp
.libs
Hack
Hack/sndfile-fuzzbomb
INSTALL
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
Makefile
Makefile.in
aclocal.m4
autom4te.cache
build-test-tarball.mk
config.log
config.status
configure
doc/AUTHORS
doc/ChangeLog
doc/NEWS
doc/README
doc/libsndfile.css
echo-install-dirs
examples/generate
examples/list_formats
examples/make_sine
examples/sfprocess
examples/sndfile-loopify
examples/sndfile-to-text
examples/sndfilehandle
libsndfile-1.0.*
libsndfile-testsuite-*
libsndfile.spec
libtool
man/sndfile-deinterleave.1
man/sndfile-metadata-set.1
programs/sndfile-cmp
programs/sndfile-concat
programs/sndfile-convert
programs/sndfile-data-trim
programs/sndfile-deinterleave
programs/sndfile-info
programs/sndfile-interleave
programs/sndfile-jackplay
programs/sndfile-metadata-get
programs/sndfile-metadata-set
programs/sndfile-play
programs/sndfile-salvage
regtest/sndfile-regtest
sndfile.pc
src/Ext
src/G72x/g72x_test
Symbols.darwin
Symbols.gnu-binutils
Symbols.os2
Symbols.static
src/config.h
src/config.h.in
src/config.h.in~
src/libsndfile.so*
libsndfile*.def
src/sndfile.h
src/stamp-h1
src/test_endswap.c
src/test_main
src/version-metadata.rc
tests/*_test
tests/benchmark
tests/benchmark.c
tests/fix_this
tests/floating_point_test.c
tests/header_test.c
tests/libsndfile-1.dll
tests/pcm_test.c
tests/pedantic-header-test.sh
tests/pipe_test.c
tests/rdwr_test.c
tests/scale_clip_test.c
tests/sfversion
tests/test_wrapper.sh
tests/utils.c
tests/utils.h
tests/write_read_test.c
*.log
*.trs
.vs/
packages/
*.vcxproj.user
*.VC.db
*.VC.opendb
Debug/
Release/
bin/
obj/
octave-workspace

CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
CMakeSettings.json

/*[Bb]uild*/

/.vscode/
/.vs/
53 changes: 53 additions & 0 deletions lib-src/libsndfile/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
sudo: required
language: c

matrix:
include:
- os: linux
dist: xenial
compiler: clang
addons:
apt:
packages:
- autogen
- libogg-dev
- libvorbis-dev
- libflac-dev
- libasound2-dev
- libopus-dev
- os: linux
dist: xenial
compiler: gcc
addons:
apt:
packages:
- autogen
- libogg-dev
- libvorbis-dev
- libflac-dev
- libasound2-dev
- libopus-dev

- os: osx
compiler: clang

before_install:
- |
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
brew update
brew install autogen flac libogg libvorbis opus
fi
install:
- true

script:
- mkdir cmake-build && (cd cmake-build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Wall -Wextra" && make VERBOSE=1 && ctest -V)
- pwd
- ./autogen.sh
- |
if [[ "${CC}" == "clang" ]]; then
./configure --enable-werror && make clean all check && make distcheck
else
Scripts/asan-configure.sh --enable-werror && make clean all check && make distcheck
fi
27 changes: 14 additions & 13 deletions lib-src/libsndfile/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
cmake_minimum_required (VERSION 3.1.3)

if (POLICY CMP0091)
cmake_policy(SET CMP0091 NEW)
endif ()
cmake_minimum_required (VERSION 3.1..3.18)

project(sndfile VERSION 1.0.29)

Expand All @@ -18,7 +14,7 @@ set (PACKAGE_NAME lib${PROJECT_NAME})
set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
set (CPACK_PACKAGE_VERSION_STAGE "pre1")
set (CPACK_PACKAGE_VERSION_STAGE "")
set (CPACK_PACKAGE_VERSION_FULL "${PROJECT_VERSION}${CPACK_PACKAGE_VERSION_STAGE}")

#
Expand Down Expand Up @@ -49,7 +45,7 @@ option (BUILD_EXAMPLES "Build examples" ON)
option (ENABLE_CPACK "Enable CPack support" ON)
option (ENABLE_EXPERIMENTAL "Enable experimental code" OFF)
option (ENABLE_BOW_DOCS "Enable black-on-white html docs" OFF)
if (MSVC OR MINGW)
if (MSVC)
option (ENABLE_STATIC_RUNTIME "Enable static runtime" OFF)
endif ()
option (ENABLE_PACKAGE_CONFIG "Generate and install package config file" ON)
Expand All @@ -64,7 +60,7 @@ include(SndFileChecks)


cmake_dependent_option (BUILD_REGTEST "Build regtest" ON "SQLITE3_FOUND" OFF)
cmake_dependent_option (ENABLE_EXTERNAL_LIBS "Enable FLAC, Vorbis, and Opus codecs" ON "VORBISENC_FOUND;FLAC_FOUND;OPUS_FOUND" OFF)
cmake_dependent_option (ENABLE_EXTERNAL_LIBS "Enable FLAC, Vorbis, and Opus codecs" ON "Vorbis_FOUND;FLAC_FOUND;OPUS_FOUND" OFF)
cmake_dependent_option (ENABLE_CPU_CLIP "Enable tricky cpu specific clipper" ON "CPU_CLIPS_POSITIVE;CPU_CLIPS_NEGATIVE" OFF)
if (NOT ENABLE_CPU_CLIP)
set (CPU_CLIPS_POSITIVE FALSE)
Expand Down Expand Up @@ -94,7 +90,7 @@ if (WIN32 AND (NOT MINGW) AND BUILD_SHARED_LIBS)
add_feature_info (ENABLE_COMPATIBLE_LIBSNDFILE_NAME ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to libsndfile-1.dll (canonical name), sndfile.dll otherwise")
endif ()

if (MSVC OR MINGW)
if (MSVC)
add_feature_info (ENABLE_STATIC_RUNTIME ENABLE_STATIC_RUNTIME "Enable static runtime")
endif ()

Expand All @@ -104,7 +100,7 @@ set_package_properties (Ogg PROPERTIES
DESCRIPTION "library for manipulating ogg bitstreams"
PURPOSE "Required to enable Vorbis, Speex, and Opus support"
)
set_package_properties (VorbisEnc PROPERTIES
set_package_properties (Vorbis PROPERTIES
TYPE RECOMMENDED
URL "www.vorbis.com/"
DESCRIPTION "open source lossy audio codec"
Expand Down Expand Up @@ -213,7 +209,7 @@ add_library (sndfile
src/chanmap.c
src/id3.c
$<$<BOOL:${WIN32}>:src/windows.c>
$<$<AND:$<BOOL:${WIN32}>,$<BOOL:${WIN32}>>:src/version-metadata.rc>
$<$<AND:$<BOOL:${WIN32}>,$<BOOL:${BUILD_SHARED_LIBS}>>:src/version-metadata.rc>
src/sndfile.c
src/aiff.c
src/au.c
Expand Down Expand Up @@ -296,6 +292,8 @@ add_library (sndfile
${CMAKE_CURRENT_BINARY_DIR}/src/config.h
)

add_library (SndFile::sndfile ALIAS sndfile)

target_include_directories(sndfile
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
Expand All @@ -305,7 +303,7 @@ target_include_directories(sndfile
target_link_libraries (sndfile
PRIVATE
$<$<BOOL:${LIBM_REQUIRED}>:m>
$<$<BOOL:${HAVE_EXTERNAL_XIPH_LIBS}>:Vorbis::VorbisEnc>
$<$<BOOL:${HAVE_EXTERNAL_XIPH_LIBS}>:Vorbis::vorbisenc>
$<$<BOOL:${HAVE_EXTERNAL_XIPH_LIBS}>:FLAC::FLAC>
$<$<AND:$<BOOL:${ENABLE_EXPERIMENTAL}>,$<BOOL:${HAVE_EXTERNAL_XIPH_LIBS}>,$<BOOL:${HAVE_SPEEX}>>:Speex::Speex>
$<$<BOOL:${HAVE_EXTERNAL_XIPH_LIBS}>:Opus::opus>
Expand Down Expand Up @@ -610,8 +608,11 @@ if (ENABLE_PACKAGE_CONFIG)
set (CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SndFile)
endif()

install (TARGETS ${SNDFILE_PROGRAM_TARGETS}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)

install (TARGETS sndfile ${SNDFILE_PROGRAM_TARGETS}
install (TARGETS sndfile
EXPORT SndFileTargets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
Expand Down

0 comments on commit 8040918

Please sign in to comment.