diff --git a/recipes/libdeflate/all/conandata.yml b/recipes/libdeflate/all/conandata.yml index 1aec7d785c0d7..8ee9d519f0aee 100644 --- a/recipes/libdeflate/all/conandata.yml +++ b/recipes/libdeflate/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.8": + url: "https://github.com/ebiggers/libdeflate/archive/refs/tags/v1.8.tar.gz" + sha256: "50711ad4e9d3862f8dfb11b97eb53631a86ee3ce49c0e68ec2b6d059a9662f61" "1.7": url: "https://github.com/ebiggers/libdeflate/archive/v1.7.tar.gz" sha256: "a5e6a0a9ab69f40f0f59332106532ca76918977a974e7004977a9498e3f11350" diff --git a/recipes/libdeflate/all/conanfile.py b/recipes/libdeflate/all/conanfile.py index 043de28c41ebd..9e673aaee69c2 100644 --- a/recipes/libdeflate/all/conanfile.py +++ b/recipes/libdeflate/all/conanfile.py @@ -1,6 +1,8 @@ from conans import ConanFile, AutoToolsBuildEnvironment, VisualStudioBuildEnvironment, tools import os +required_conan_version = ">=1.33.0" + class LibdeflateConan(ConanFile): name = "libdeflate" @@ -31,11 +33,11 @@ def configure(self): def build_requirements(self): if tools.os_info.is_windows and self.settings.compiler != "Visual Studio" and \ not tools.get_env("CONAN_BASH_PATH"): - self.build_requires("msys2/20200517") + self.build_requires("msys2/cci.latest") def source(self): - tools.get(**self.conan_data["sources"][self.version]) - os.rename(self.name + "-" + self.version, self._source_subfolder) + tools.get(**self.conan_data["sources"][self.version], + destination=self._source_subfolder, strip_root=True) def _build_msvc(self): makefile_msc_file = os.path.join(self._source_subfolder, "Makefile.msc") diff --git a/recipes/libdeflate/config.yml b/recipes/libdeflate/config.yml index c17e43d16ae03..47cb566cb2457 100644 --- a/recipes/libdeflate/config.yml +++ b/recipes/libdeflate/config.yml @@ -1,3 +1,5 @@ versions: + "1.8": + folder: all "1.7": folder: all