From 53cbf1e153daef2d410e18053f3773116876c008 Mon Sep 17 00:00:00 2001
From: Leonardo Invernizzi <lminvernizzi@gmail.com>
Date: Thu, 8 Aug 2024 17:45:13 +0000
Subject: [PATCH] Added vorbisenc and vorbisfile libraries

---
 3rdparty/SConscript                     | 17 +----------------
 scripts/scons_helpers/build-3rdparty.py |  2 ++
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/3rdparty/SConscript b/3rdparty/SConscript
index a872d8010..ea3462219 100644
--- a/3rdparty/SConscript
+++ b/3rdparty/SConscript
@@ -268,21 +268,6 @@ elif 'sndfile' in system_dependencies:
 if 'libogg' in autobuild_dependencies:
     env.BuildThirdParty(thirdparty_versions, 'libogg')
 
-    conf = Configure(env, custom_tests=env.CustomTests)
-
-    env = conf.Finish()
-
-elif 'libogg' in system_dependencies:
-    conf = Configure(env, custom_tests=env.CustomTests)
-
-    if not conf.AddPkgConfigDependency('ogg', '--cflags --libs', exclude_from_pc=True):
-        conf.env.AddManualDependency(libs=['ogg'], exclude_from_pc=True)
-
-    if not conf.CheckLibWithHeaderExt('ogg', 'ogg/ogg.h', 'C', run=False):
-        env.Die("libogg not found (see 'config.log' for details)")
-
-    env = conf.Finish()
-
 # dep: libvorbis
 if 'libvorbis' in autobuild_dependencies:
     pa_deps = [
@@ -297,7 +282,7 @@ elif 'libvorbis' in system_dependencies:
     conf = Configure(env, custom_tests=env.CustomTests)
 
     if not conf.AddPkgConfigDependency('vorbis', '--cflags --libs', exclude_from_pc=True):
-        conf.env.AddManualDependency(libs=['vorbis'], exclude_from_pc=True)
+        conf.env.AddManualDependency(libs=['vorbis', 'vorbisenc', 'vorbisfile'], exclude_from_pc=True)
 
     if not conf.CheckLibWithHeaderExt('vorbis', 'vorbis/vorbisenc.h', 'C', run=False):
         env.Die("libvorbis not found (see 'config.log' for details)")
diff --git a/scripts/scons_helpers/build-3rdparty.py b/scripts/scons_helpers/build-3rdparty.py
index f7a2375b8..9736e4e88 100644
--- a/scripts/scons_helpers/build-3rdparty.py
+++ b/scripts/scons_helpers/build-3rdparty.py
@@ -1476,6 +1476,8 @@ def die(text, *args):
     execute_make(ctx)
     install_tree(ctx, 'include', ctx.pkg_inc_dir, include=['*.h'])
     install_files(ctx, 'lib/.libs/libvorbis.a', ctx.pkg_lib_dir)
+    install_files(ctx, 'lib/.libs/libvorbisenc.a', ctx.pkg_lib_dir)
+    install_files(ctx, 'lib/.libs/libvorbisfile.a', ctx.pkg_lib_dir)
 elif ctx.pkg_name == 'ltdl':
     download(
         ctx,