From c2cdc476a55cfc453fc612ab3484029fa303c866 Mon Sep 17 00:00:00 2001 From: Yousef Khadadeh Date: Tue, 7 Oct 2025 17:31:06 +0300 Subject: [PATCH] Rollback libdatachannel to v0.23.1 due to issues with windows compilation --- conan/export_libs.bat | 2 +- conan/export_libs.sh | 2 +- conan/libdatachannel/config.yml | 2 ++ conanfile.py | 2 +- linuxinstall/com.infinipaint.infinipaint.yml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conan/export_libs.bat b/conan/export_libs.bat index e176ac1..ef34698 100755 --- a/conan/export_libs.bat +++ b/conan/export_libs.bat @@ -1,3 +1,3 @@ conan export %0/../libjuice/all/conanfile.py --version=1.6.1 -conan export %0/../libdatachannel/all/conanfile.py --version=0.23.2 +conan export %0/../libdatachannel/all/conanfile.py --version=0.23.1 conan export %0/../conan-skia/recipes/skia/all/conanfile.py --version=134.20250327.0 diff --git a/conan/export_libs.sh b/conan/export_libs.sh index 6e3b07e..a4ea045 100755 --- a/conan/export_libs.sh +++ b/conan/export_libs.sh @@ -3,7 +3,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) conan export "$(dirname "$0")/libjuice/all/conanfile.py" --version=1.6.1 -conan export "$(dirname "$0")/libdatachannel/all/conanfile.py" --version=0.23.2 +conan export "$(dirname "$0")/libdatachannel/all/conanfile.py" --version=0.23.1 conan export "$(dirname "$0")/mpg123/all/conanfile.py" --version=1.32.10 conan export "$(dirname "$0")/conan-skia/recipes/skia/all/conanfile.py" --version=134.20250327.0 #conan create . -o use_system_expat=False -o use_system_freetype=False -o use_system_harfbuzz=False -o use_system_icu=False -o use_system_libjpeg_turbo=False -o use_system_libpng=False -o use_system_libwebp=False -o use_system_zlib=False --build=missing --version=134.20250327.0 diff --git a/conan/libdatachannel/config.yml b/conan/libdatachannel/config.yml index ae5e40a..f642896 100644 --- a/conan/libdatachannel/config.yml +++ b/conan/libdatachannel/config.yml @@ -1,4 +1,6 @@ versions: + "0.23.2": + folder: all "0.23.1": folder: all "0.22.2": diff --git a/conanfile.py b/conanfile.py index 1cf65d5..bc3aac7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -51,7 +51,7 @@ class CompressorRecipe(ConanFile): self.requires("onetbb/2022.0.0") if self.settings.os != "Emscripten": - self.requires("libdatachannel/0.23.2") + self.requires("libdatachannel/0.23.1") self.requires("libcurl/8.15.0") self.requires("zstd/1.5.7") diff --git a/linuxinstall/com.infinipaint.infinipaint.yml b/linuxinstall/com.infinipaint.infinipaint.yml index ed249b6..ef66a90 100644 --- a/linuxinstall/com.infinipaint.infinipaint.yml +++ b/linuxinstall/com.infinipaint.infinipaint.yml @@ -21,7 +21,7 @@ modules: - -DCMAKE_BUILD_TYPE=Release sources: - type: git - tag: v0.23.2 + tag: v0.23.1 url: https://github.com/paullouisageneau/libdatachannel.git - name: oneTBB buildsystem: cmake-ninja