Skip to content

Commit

Permalink
Add libogg as dependency of libvorbis
Browse files Browse the repository at this point in the history
  • Loading branch information
runei committed Aug 4, 2024
1 parent 3e2c76c commit 0138d90
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
10 changes: 6 additions & 4 deletions 3rdparty/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion scripts/scons_helpers/build-3rdparty.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 8 additions & 0 deletions src/internal_modules/roc_audio/vorbis_encoder.cpp
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
11 changes: 11 additions & 0 deletions src/internal_modules/roc_audio/vorbis_encoder.h
Original file line number Diff line number Diff line change
@@ -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_

Expand Down

0 comments on commit 0138d90

Please sign in to comment.