Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vcpkg #262

Merged
merged 4 commits into from
Dec 12, 2023
Merged

Update vcpkg #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a204c70
Update vcpkg
rsjbailey Dec 5, 2023
5474bda
Use updated visr to fix build issues
rsjbailey Dec 6, 2023
9458d73
update to latest bear
rsjbailey Dec 6, 2023
dadb21c
Update libbw64
rsjbailey Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions submodules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,14 @@ set(VISR_TARGET_TYPE static_pic)
include(FetchContent)
FetchContent_Declare(
visr
URL https://github.com/ebu/bear/releases/download/v0.0.1-pre/visr-0.13.0-pre-5e13f020.zip
URL_HASH SHA256=9ff85e35da728226c56e6487e3f5beb99b9617cf58d4543a456674a79c2895cb
GIT_REPOSITORY https://github.com/ebu/bear.git
GIT_TAG visr
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/visr"
)
FetchContent_GetProperties(visr)
if(NOT visr_POPULATED)
FetchContent_Populate(visr)

# VISR ffts M1 fix
if(APPLE)
execute_process(COMMAND patch -p1 INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/0001-fix-build-on-apple-m1.patch
WORKING_DIRECTORY "${visr_SOURCE_DIR}"
)
endif()
endif()

message(STATUS visr_POPULATED " - " ${visr_POPULATED})
Expand Down
2 changes: 1 addition & 1 deletion submodules/bear
Open in desktop
Submodule bear updated 60 files
+27 −0 .github/workflows/build.yml
+1 −0 .gitignore
+0 −1 .gitmodules
+77 −7 README.md
+0 −2 bear/data_file.py
+415 −0 bear/irs.py
+73 −0 bear/layout.py
+153 −0 bear/process_irs/Snakefile
+0 −0 bear/process_irs/__init__.py
+ − bear/process_irs/data/AmbiHOA3_magLS.sofa
+245 −0 bear/process_irs/extract.py
+440 −0 bear/process_irs/finalise.py
+98 −0 bear/process_irs/find_delay_over_view.py
+141 −0 bear/process_irs/find_global_delays.py
+411 −0 bear/process_irs/report.py
+21 −0 bear/process_irs/snakemake_config.yaml
+358 −0 bear/sofa.py
+41 −0 bear/tensorfile.py
+0 −0 bear/test_files/__init__.py
+107 −0 bear/test_files/make_extent.py
+84 −0 bear/test_files/make_rotation.py
+111 −0 bear/test_files/normalize.py
+52 −0 bear/test_files/utils.py
+80 −0 bear/test_irs.py
+190 −0 doc/ir_processing.md
+ − doc/ir_processing_steps.drawio.png
+114 −0 flake.lock
+113 −0 flake.nix
+10 −0 nix/bear.nix
+9 −0 nix/bear_docker.nix
+22 −0 nix/data_files/default.nix
+14 −0 nix/data_files/extract_files.txt
+7 −0 nix/default.nix
+7 −0 nix/ear.nix
+4 −0 nix/format.sh
+24 −0 nix/gitignore.nix
+7 −0 nix/libear.nix
+13 −0 nix/numpy_quaternion.nix
+15 −0 nix/pyloudnorm.nix
+16 −0 nix/visr.nix
+24 −0 nix/visr_bear.nix
+28 −0 nix/xsimd.nix
+1 −0 tox.ini
+24 −6 visr_bear/CMakeLists.txt
+2 −0 visr_bear/format.sh
+18 −3 visr_bear/pythonwrappers/CMakeLists.txt
+6 −1 visr_bear/pythonwrappers/array_conversion.hpp
+1 −2 visr_bear/src/dynamic_renderer.cpp
+197 −0 visr_bear/src/ear_bits/hoa.hpp
+8 −8 visr_bear/src/gain_calc_hoa.cpp
+7 −5 visr_bear/submodules/CMakeLists.txt
+902 −523 visr_bear/submodules/catch2/catch.hpp
+1 −1 visr_bear/submodules/libear
+2 −2 visr_bear/test/benchmark.cpp
+55 −0 visr_bear/test/eigen_utils.hpp
+28 −26 visr_bear/test/gen_tensorfile_test_files.py
+37 −7 visr_bear/test/test_dynamic_renderer.py
+1 −1 visr_bear/test/test_select_brir.py
+4 −4 visr_bear/test/test_sh_rotation.cpp
+3 −0 visr_bear/test/test_variable_block_size.cpp
2 changes: 1 addition & 1 deletion submodules/libbw64
Open in desktop
Submodule libbw64 updated 11 files
+4 −0 CHANGELOG.md
+6 −0 docs/tutorial.rst
+60 −0 flake.lock
+38 −0 flake.nix
+5 −8 include/bw64/chunks.hpp
+2 −3 include/bw64/parser.hpp
+16 −7 include/bw64/reader.hpp
+52 −18 include/bw64/writer.hpp
+1 −0 submodules/catch2.cmake
+54 −0 tests/chunk_tests.cpp
+128 −3 tests/file_tests.cpp
2 changes: 1 addition & 1 deletion submodules/vcpkg
Open in desktop
Submodule vcpkg updated 7631 files
Loading