seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #110540 from akien-mga/linux-system-libturbojpeg

Browse Source 
Linux: Allow unbundling libjpeg-turbo to use system package
This commit is contained in:
Thaddeus Crews
2025-09-18 21:02:31 -05:00
parent f30859d7f3 6d8aa8582f
commit be11bf1d6b
2 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/jpg/SCsub
View File

@ -8,9 +8,10 @@ env_jpg = env_modules.Clone()
thirdparty_obj = []
thirdparty_dir = "#thirdparty/libjpeg-turbo"
if env["builtin_libjpeg_turbo"]:
thirdparty_dir = "#thirdparty/libjpeg-turbo"
thirdparty_sources_common = [
thirdparty_sources_common = [
"jaricom.c",
"jcapimin.c",
"jcarith.c",
@ -43,9 +44,9 @@ thirdparty_sources_common = [
"jpeg_nbits.c",
"transupp.c",
"turbojpeg.c",
]
]
thirdparty_sources_bit_dependent = [
thirdparty_sources_bit_dependent = [
"jcapistd.c",
"jccoefct.c",
"jccolor.c",
@ -70,36 +71,33 @@ thirdparty_sources_bit_dependent = [
"jutils.c",
"jquant1.c",
"jquant2.c",
]
]
thirdparty_sources_by_bits = {
thirdparty_sources_by_bits = {
8: list(thirdparty_sources_bit_dependent),
12: list(thirdparty_sources_bit_dependent),
}
}
def source_paths(files):
def source_paths(files):
return [thirdparty_dir + "/src/" + f for f in files]
env_jpg.Prepend(CPPEXTPATH=[thirdparty_dir + "/src"])
env_jpg.Prepend(CPPEXTPATH=[thirdparty_dir + "/src"])
def add_bit_depth(bit_depth: int):
def add_bit_depth(bit_depth: int):
env_bit_depth = env_jpg.Clone()
env_bit_depth.disable_warnings()
env_bit_depth["OBJSUFFIX"] = f"_{bit_depth}{env_bit_depth['OBJSUFFIX']}"
env_bit_depth.Append(CPPDEFINES=[f"BITS_IN_JSAMPLE={bit_depth}"])
env_bit_depth.add_source_files(thirdparty_obj, source_paths(thirdparty_sources_by_bits[bit_depth]))
add_bit_depth(8)
add_bit_depth(12)
add_bit_depth(8)
add_bit_depth(12)
env_thirdparty = env_jpg.Clone()
env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(thirdparty_obj, source_paths(thirdparty_sources_common))
env.modules_sources += thirdparty_obj
env_thirdparty = env_jpg.Clone()
env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(thirdparty_obj, source_paths(thirdparty_sources_common))
env.modules_sources += thirdparty_obj
# Godot source files

3
platform/linuxbsd/detect.py
View File

@ -278,6 +278,9 @@ def configure(env: "SConsEnvironment"):
if not env["builtin_libwebp"]:
env.ParseConfig("pkg-config libwebp --cflags --libs")
if not env["builtin_libjpeg_turbo"]:
env.ParseConfig("pkg-config libturbojpeg --cflags --libs")
if not env["builtin_mbedtls"]:
# mbedTLS only provides a pkgconfig file since 3.6.0, but we still support 2.28.x,
# so fallback to manually specifying LIBS if it fails.