From 1e3e92c93442ab5309ae596e7429bd3efb3b9f5c Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Oct 2021 16:53:46 +0200 Subject: [PATCH 1/7] openscenegraph: add missing imports also, fix class name --- recipes/openscenegraph/all/conanfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/openscenegraph/all/conanfile.py b/recipes/openscenegraph/all/conanfile.py index 72f9601d490cc..deaf5b3a70e1f 100644 --- a/recipes/openscenegraph/all/conanfile.py +++ b/recipes/openscenegraph/all/conanfile.py @@ -1,10 +1,11 @@ from conans import CMake, ConanFile, tools -import glob, os +from conans.errors import ConanInvalidConfiguration +import glob, os, errno required_conan_version = ">=1.29.1" -class ConanFile(ConanFile): +class OpenSceneGraphConanFile(ConanFile): name = "openscenegraph" description = "OpenSceneGraph is an open source high performance 3D graphics toolkit" topics = "conan", "openscenegraph", "graphics" From 2103ef4cdc1b16f6964ce9c7d314b56204c3b316 Mon Sep 17 00:00:00 2001 From: bincrafters-user Date: Fri, 15 Oct 2021 14:54:20 +0000 Subject: [PATCH 2/7] openscenegraph: Update Conan conventions Automatically created by bincrafters-conventions 0.30.5 --- recipes/openscenegraph/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/openscenegraph/all/conanfile.py b/recipes/openscenegraph/all/conanfile.py index deaf5b3a70e1f..1fed80fc06ac8 100644 --- a/recipes/openscenegraph/all/conanfile.py +++ b/recipes/openscenegraph/all/conanfile.py @@ -8,7 +8,7 @@ class OpenSceneGraphConanFile(ConanFile): name = "openscenegraph" description = "OpenSceneGraph is an open source high performance 3D graphics toolkit" - topics = "conan", "openscenegraph", "graphics" + topics = ("conan", "openscenegraph", "graphics") url = "https://github.com/conan-io/conan-center-index" homepage = "http://www.openscenegraph.org" license = "LGPL-2.1-only", "WxWindows-exception-3.1" @@ -113,7 +113,7 @@ def requirements(self): self.requires("opengl/system") if self.options.use_fontconfig: - self.requires("fontconfig/2.13.92") + self.requires("fontconfig/2.13.93") if self.options.get_safe("with_asio", False): # Should these be private requires? From 66076a7cab24ba0a89d766732016bed791b7768a Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Oct 2021 16:57:35 +0200 Subject: [PATCH 3/7] Update conanfile.py --- recipes/openscenegraph/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/openscenegraph/all/conanfile.py b/recipes/openscenegraph/all/conanfile.py index 1fed80fc06ac8..2e0c11b6dc630 100644 --- a/recipes/openscenegraph/all/conanfile.py +++ b/recipes/openscenegraph/all/conanfile.py @@ -145,8 +145,8 @@ def requirements(self): self.requires("zlib/1.2.11") def source(self): - tools.get(**self.conan_data["sources"][self.version]) - os.rename("OpenSceneGraph-OpenSceneGraph-" + self.version, self._source_subfolder) + tools.get(**self.conan_data["sources"][self.version], + strip_root=True, destination=self._source_subfolder) def _patch_sources(self): for patch in self.conan_data["patches"].get(self.version, []): From cb0d0dc775d68a0465c923637fce54216855e46b Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Oct 2021 22:47:50 +0200 Subject: [PATCH 4/7] Update conanfile.py --- recipes/openscenegraph/all/conanfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/openscenegraph/all/conanfile.py b/recipes/openscenegraph/all/conanfile.py index 2e0c11b6dc630..89fd4a85c359c 100644 --- a/recipes/openscenegraph/all/conanfile.py +++ b/recipes/openscenegraph/all/conanfile.py @@ -104,8 +104,11 @@ def configure(self): del self.options.with_png del self.options.with_dcmtk + def validate(self): if self.options.get_safe("with_asio", False): raise ConanInvalidConfiguration("ASIO support in OSG is broken, see https://github.com/openscenegraph/OpenSceneGraph/issues/921") + if hasattr(self, "settings_build") and tools.cross_building(self): + raise ConanInvalidConfiguration("openscenegraph recipe cannot be cross-built yet. Contributions are welcome.") def requirements(self): if self.options.enable_windowing_system and self.settings.os == "Linux": From 8fed87f225d17c2d4b1dc57dfd328a48d0b1df46 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Sat, 16 Oct 2021 08:04:02 +0200 Subject: [PATCH 5/7] Update recipes/openscenegraph/all/conanfile.py Co-authored-by: Anonymous Maarten --- recipes/openscenegraph/all/conanfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/openscenegraph/all/conanfile.py b/recipes/openscenegraph/all/conanfile.py index 89fd4a85c359c..a9640a93a0ac0 100644 --- a/recipes/openscenegraph/all/conanfile.py +++ b/recipes/openscenegraph/all/conanfile.py @@ -1,6 +1,8 @@ from conans import CMake, ConanFile, tools from conans.errors import ConanInvalidConfiguration -import glob, os, errno +import glob +import os +import errno required_conan_version = ">=1.29.1" From 142e5307991c1c1339ae1cadc8ceab4615b3c96c Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Sat, 16 Oct 2021 08:04:17 +0200 Subject: [PATCH 6/7] Update recipes/openscenegraph/all/conanfile.py Co-authored-by: Anonymous Maarten --- recipes/openscenegraph/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openscenegraph/all/conanfile.py b/recipes/openscenegraph/all/conanfile.py index a9640a93a0ac0..ab21180742b27 100644 --- a/recipes/openscenegraph/all/conanfile.py +++ b/recipes/openscenegraph/all/conanfile.py @@ -10,7 +10,7 @@ class OpenSceneGraphConanFile(ConanFile): name = "openscenegraph" description = "OpenSceneGraph is an open source high performance 3D graphics toolkit" - topics = ("conan", "openscenegraph", "graphics") + topics = ("openscenegraph", "graphics") url = "https://github.com/conan-io/conan-center-index" homepage = "http://www.openscenegraph.org" license = "LGPL-2.1-only", "WxWindows-exception-3.1" From fc7c12662ae13f74aa8f95eeeb005d158ba632b0 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Oct 2021 10:52:07 +0200 Subject: [PATCH 7/7] Update conanfile.py --- recipes/openscenegraph/all/conanfile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/openscenegraph/all/conanfile.py b/recipes/openscenegraph/all/conanfile.py index ab21180742b27..f7210c49de22e 100644 --- a/recipes/openscenegraph/all/conanfile.py +++ b/recipes/openscenegraph/all/conanfile.py @@ -1,8 +1,6 @@ from conans import CMake, ConanFile, tools from conans.errors import ConanInvalidConfiguration -import glob import os -import errno required_conan_version = ">=1.29.1"