From a50d1bb59d9c08f0e627f573c5257befabebdf43 Mon Sep 17 00:00:00 2001 From: Esteve Soria Date: Fri, 13 Jan 2023 16:03:05 +0100 Subject: [PATCH 1/2] libsvtav1: Fixed nitpick from previous PR --- recipes/libsvtav1/all/conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/libsvtav1/all/conanfile.py b/recipes/libsvtav1/all/conanfile.py index ec65f7fe245ee..1abd35e463fd8 100644 --- a/recipes/libsvtav1/all/conanfile.py +++ b/recipes/libsvtav1/all/conanfile.py @@ -50,7 +50,6 @@ def generate(self): tc.variables["BUILD_APPS"] = False tc.variables["BUILD_DEC"] = self.options.build_decoder tc.variables["BUILD_ENC"] = self.options.build_encoder - tc.variables["BUILD_SHARED_LIBS"] = self.options.shared if self.settings.arch in ("x86", "x86_64"): tc.variables["ENABLE_NASM"] = True tc.generate() From 0dd8f849a09964d989bfd5d2f857bf4bc8a7d067 Mon Sep 17 00:00:00 2001 From: Esteve Soria Date: Fri, 13 Jan 2023 16:33:28 +0100 Subject: [PATCH 2/2] libsvtav1: Added latest releases --- recipes/libsvtav1/all/conandata.yml | 6 ++++++ recipes/libsvtav1/all/conanfile.py | 6 +++++- recipes/libsvtav1/config.yml | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/recipes/libsvtav1/all/conandata.yml b/recipes/libsvtav1/all/conandata.yml index de724043d87d6..55ceddae100db 100644 --- a/recipes/libsvtav1/all/conandata.yml +++ b/recipes/libsvtav1/all/conandata.yml @@ -1,4 +1,10 @@ sources: + "1.4.1": + url: https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v1.4.1/SVT-AV1-v1.4.1.tar.bz2 + sha256: 0e988582f315fe76c909accf5e7f81b975c5bd2b850ee760d8e9fac297f70b5d + "1.3.0": + url: https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v1.3.0/SVT-AV1-v1.3.0.tar.bz2 + sha256: f85fd13ef16880550e425797bdfdf1b0ba310c21d6b343f74ea79dd2fbb2336e "1.2.1": url: https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v1.2.1/SVT-AV1-v1.2.1.tar.bz2 sha256: 805827daa8aedec4f1362b959f377075e2a811680bfc76b6f4fbf2ef4e7101d4 diff --git a/recipes/libsvtav1/all/conanfile.py b/recipes/libsvtav1/all/conanfile.py index 1abd35e463fd8..7602f9bdb74a6 100644 --- a/recipes/libsvtav1/all/conanfile.py +++ b/recipes/libsvtav1/all/conanfile.py @@ -2,6 +2,7 @@ from conan import ConanFile from conan.tools.cmake import cmake_layout, CMakeToolchain, CMakeDeps, CMake from conan.tools.files import copy, get, rmdir +from conan.tools.scm import Version required_conan_version = ">=1.53.0" @@ -10,7 +11,7 @@ class SVTAV1Conan(ConanFile): name = "libsvtav1" license = "BSD-3-Clause" description = "An AV1-compliant software encoder/decoder library" - topics = "av1", "codec", "encoder", "ffmpeg", "video" + topics = "av1", "codec", "encoder", "decoder", "video" homepage = "https://gitlab.com/AOMediaCodec/SVT-AV1" url = "https://github.com/conan-io/conan-center-index" settings = "os", "arch", "compiler", "build_type" @@ -36,6 +37,9 @@ def configure(self): self.options.rm_safe("fPIC") def build_requirements(self): + if Version(self.version) >= "1.3.0": + # at least CMake 3.16 + self.tool_requires("cmake/3.25.0") if self.settings.arch in ("x86", "x86_64"): self.tool_requires("nasm/2.15.05") diff --git a/recipes/libsvtav1/config.yml b/recipes/libsvtav1/config.yml index b230418434b61..37cfc8825c04f 100644 --- a/recipes/libsvtav1/config.yml +++ b/recipes/libsvtav1/config.yml @@ -1,3 +1,7 @@ versions: + "1.4.1": + folder: all + "1.3.0": + folder: all "1.2.1": folder: all