Disabled brotli, replaced openssl with mbedtls

Author: acidicoala

.gitattributes

@@ -1,3 +1,4 @@
 * text eol=lf
 
 *.dll binary
+*.so binary

CMakeLists.txt

@@ -100,10 +100,21 @@ CPMAddPackage(
 target_link_libraries(KoalaBox PUBLIC nlohmann_json::nlohmann_json)
 
 CPMAddPackage(
-    URI "gh:libcpr/cpr#1.12.0"
+    URI "gh:Mbed-TLS/mbedtls#mbedtls-3.6.5" # CURL doesn't support v4 yet
     OPTIONS
-    "CURL_USE_LIBPSL OFF"
-    "CPR_USE_SYSTEM_LIB_PSL ON"
+    "DISABLE_PACKAGE_CONFIG_AND_INSTALL OFF"
+    "ENABLE_PROGRAMS OFF"
+    "ENABLE_TESTING OFF"
+)
+
+CPMAddPackage(
+    URI "gh:libcpr/cpr#1.13.0"
+    OPTIONS
+    "CURL_BROTLI OFF" # Brotli is unavailable in certain Steam Linux Runtime environments.
+    "CURL_USE_LIBSSH2 OFF" # SFTP and SCP support is not needed
+    "CURL_USE_OPENSSL OFF"
+    "CPR_FORCE_MBEDTLS_BACKEND ON"
+    "CPR_CURL_USE_LIBPSL OFF" # Requires meson to build
     "ENABLE_CURL_MANUAL OFF"
     "BUILD_LIBCURL_DOCS OFF"
     "BUILD_EXAMPLES OFF"

Dockerfile

@@ -10,13 +10,10 @@ RUN echo -e '\n[multilib]\nInclude = /etc/pacman.d/mirrorlist' >> /etc/pacman.co
 RUN pacman -S --noconfirm \
     cmake git tree zip base-devel gcc clang \
     \
-    brotli     lib32-brotli \
     gcc-libs   lib32-gcc-libs \
     gtk3       lib32-gtk3 \
     libidn2    lib32-libidn2 \
     libnghttp2 lib32-libnghttp2 \
-    libssh2    lib32-libssh2 \
-    openssl    lib32-openssl \
     zlib       lib32-zlib \
     zstd       lib32-zstd
 

README.md

@@ -14,14 +14,11 @@ _C++ utilities for koality projects_
 
 ### 🐧 Linux
 
-- [brotli](https://archlinux.org/packages/core/x86_64/brotli/)
 - [gcc](https://archlinux.org/packages/core/x86_64/gcc/)
 - [clang](https://archlinux.org/packages/core/x86_64/clang/)
 - [gtk3](https://archlinux.org/packages/core/x86_64/gtk3/)
 - [libidn2](https://archlinux.org/packages/core/x86_64/libidn2/)
 - [libnghttp2](https://archlinux.org/packages/core/x86_64/libnghttp2/)
-- [libssh2](https://archlinux.org/packages/core/x86_64/libssh2/)
-- [openssl](https://archlinux.org/packages/core/x86_64/openssl/)
 - [zlib](https://archlinux.org/packages/core/x86_64/zlib/)
 - [zstd](https://archlinux.org/packages/core/x86_64/zstd/)
 

README.template.md

@@ -11,7 +11,7 @@ _C++ utilities for koality projects_
 
 ### 🐧 Linux
 
-inja::## for package in ["brotli", "gcc", "clang", "gtk3", "libidn2", "libnghttp2", "libssh2", "openssl", "zlib", "zstd"]
+inja::## for package in ["gcc", "clang", "gtk3", "libidn2", "libnghttp2", "zlib", "zstd"]
 - [{{ package }}](https://archlinux.org/packages/core/x86_64/{{ package }}/)
 inja::## endfor
 

cmake/KoalaBox.cmake

@@ -8,9 +8,20 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:-Zc:preprocessor>")
 
-set(CPM_SOURCE_CACHE "${CMAKE_SOURCE_DIR}/build/.cache" CACHE STRING "CPM.cmake source cache")
+set(
+    CPM_SOURCE_CACHE
+    "$ENV{HOME}/.cache/cmake/cpm"
+    CACHE PATH "CPM.cmake source cache"
+)
 include("${CMAKE_CURRENT_LIST_DIR}/get_cpm.cmake")
 
+set(
+    FETCHCONTENT_BASE_DIR
+    "$ENV{HOME}/.cache/cmake/fetchcontent"
+    CACHE PATH
+    "Base directory for FetchContent dependencies"
+)
+
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     add_definitions(-DDEBUG_BUILD)
 endif()

templates/markdown/install-linux.md

@@ -13,7 +13,7 @@ you should use the equivalent package for your distro.
 
 inja::## set core-32bit=["gcc-libs", "glibc"]
 Required libraries:
-inja::## for package in ["brotli", "gcc-libs", "glibc", "libidn2", "libnghttp2", "libssh2", "openssl", "zlib", "zstd"]
+inja::## for package in ["gcc-libs", "glibc", "libidn2", "libnghttp2", "zlib", "zstd"]
 - [{{ package }}](https://archlinux.org/packages/core/x86_64/{{ package }}/)
   [[32-bit](https://archlinux.org/packages/{% if package in core-32bit %}core{% else %}multilib{% endif %}/x86_64/lib32-{{ package }}/)]
 
@@ -35,7 +35,6 @@ wrappers might cause issues in theory. However, in practice real tests show that
 chance of success compared to proxy mode. So, at the end of the day, try both modes to see which one works
 best for you.
 
-
 ### 🔀 Proxy mode (🐧 Linux)
 
 Same as on Windows:
@@ -55,10 +54,10 @@ For example:
 1. Extract and paste the {{ unlocker_libs_linux }} in the root of game's installation directory.
 2. In Steam _Library_ open game's _Properties_, switch to the _General_ tab, and set the following _LAUNCH OPTIONS_:
 
-| Bitness | Launch Options                                                                                                         |
-|---------|------------------------------------------------------------------------------------------------------------------------|
-| 32-bit  | `LD_PRELOAD="./libsmoke_api32.so $HOME/.local/share/Steam/ubuntu12_32/gameoverlayrenderer.so" ./<GameExe32> %command%` |
-| 64-bit  | `LD_PRELOAD="./libsmoke_api64.so $HOME/.local/share/Steam/ubuntu12_64/gameoverlayrenderer.so" ./<GameExe64> %command%` |
+| Bitness | Launch Options                                                                                                                  |
+|---------|---------------------------------------------------------------------------------------------------------------------------------|
+| 32-bit  | `LD_PRELOAD="./libsmoke_api32.so $HOME/.local/share/Steam/ubuntu12_32/gameoverlayrenderer.so" ./<GameExe32> ; exit ; %command%` |
+| 64-bit  | `LD_PRELOAD="./libsmoke_api64.so $HOME/.local/share/Steam/ubuntu12_64/gameoverlayrenderer.so" ./<GameExe64> ; exit ; %command%` |
 
 Where `<GameExe32>` and `<GameExe64>` correspond to the actual filename of the game executable. For example:
 - `TheEscapists2.x86` (32-bit)
@@ -74,3 +73,7 @@ and other environment variables you might have specified previously.
 If you have other environment variables, and you don't know how to correctly combine them,
 then please make extensive use of search engines and LLMs for guidance and examples
 before seeking help the official forum topic.
+
+> [!NOTE]
+> The `; exit ; %command%` at the end of launch options
+> is a trick used to force Steam to directly run the game executable.