diff --git a/3rdparty/SConscript b/3rdparty/SConscript index 4372e8f94..a872d8010 100644 --- a/3rdparty/SConscript +++ b/3rdparty/SConscript @@ -285,11 +285,13 @@ elif 'libogg' in system_dependencies: # dep: libvorbis if 'libvorbis' in autobuild_dependencies: - env.BuildThirdParty(thirdparty_versions, 'libvorbis') - - conf = Configure(env, custom_tests=env.CustomTests) + pa_deps = [ + 'libogg', + ] - env = conf.Finish() + env.BuildThirdParty(thirdparty_versions, 'libogg') + env.BuildThirdParty(thirdparty_versions, 'libvorbis', + deps=pa_deps) elif 'libvorbis' in system_dependencies: conf = Configure(env, custom_tests=env.CustomTests) diff --git a/scripts/scons_helpers/build-3rdparty.py b/scripts/scons_helpers/build-3rdparty.py index 0bd146a42..f7a2375b8 100644 --- a/scripts/scons_helpers/build-3rdparty.py +++ b/scripts/scons_helpers/build-3rdparty.py @@ -1453,7 +1453,6 @@ def die(text, *args): '--enable-static', ]))) execute_make(ctx) - execute(ctx, 'make install') install_tree(ctx, 'include', ctx.pkg_inc_dir, include=['*.h']) install_files(ctx, 'src/.libs/libogg.a', ctx.pkg_lib_dir) install_files(ctx, 'ogg.pc', ctx.pkg_rpath_dir) diff --git a/src/internal_modules/roc_audio/vorbis_encoder.cpp b/src/internal_modules/roc_audio/vorbis_encoder.cpp index 643e69288..5c083df3b 100644 --- a/src/internal_modules/roc_audio/vorbis_encoder.cpp +++ b/src/internal_modules/roc_audio/vorbis_encoder.cpp @@ -1,3 +1,11 @@ +/* + * Copyright (c) 2024 Roc Streaming authors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include "roc_audio/vorbis_encoder.h" #include "roc_core/panic.h" diff --git a/src/internal_modules/roc_audio/vorbis_encoder.h b/src/internal_modules/roc_audio/vorbis_encoder.h index 538017a34..332238ed9 100644 --- a/src/internal_modules/roc_audio/vorbis_encoder.h +++ b/src/internal_modules/roc_audio/vorbis_encoder.h @@ -1,3 +1,14 @@ +/* + * Copyright (c) 2024 Roc Streaming authors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +//! @file roc_audio/vorbis_encoder.h +//! @brief TODO. + #ifndef ROC_AUDIO_VORBIS_ENCODER_H_ #define ROC_AUDIO_VORBIS_ENCODER_H_