From c8ecb6c61ccfb99cce3b460680b2f6c286396e3e Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 13 Nov 2024 19:00:12 +0200 Subject: [PATCH 1/3] Drop all non-migrated deprecated recipes --- recipes/at-spi2-atk/all/conandata.yml | 4 - recipes/at-spi2-atk/all/conanfile.py | 93 ------ .../all/test_package/CMakeLists.txt | 9 - .../at-spi2-atk/all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.c | 51 ---- recipes/at-spi2-atk/config.yml | 3 - recipes/at-spi2-core/all/conandata.yml | 23 -- recipes/at-spi2-core/all/conanfile.py | 108 ------- ...6a4c4491eea57d7b713bb4440f541584204b.patch | 37 --- .../all/test_package/CMakeLists.txt | 9 - .../all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.c | 9 - recipes/co/all/CMakeLists.txt | 7 - recipes/co/all/conandata.yml | 8 - recipes/co/all/conanfile.py | 104 ------- recipes/co/all/patches/001-install-dll.patch | 10 - .../all/patches/002-fix-event-destruct.patch | 13 - recipes/co/all/test_package/CMakeLists.txt | 11 - recipes/co/all/test_package/conanfile.py | 16 - recipes/co/all/test_package/test_package.cc | 7 - recipes/co/config.yml | 3 - recipes/cpp-taskflow/all/conandata.yml | 7 - recipes/cpp-taskflow/all/conanfile.py | 73 ----- .../all/test_package/CMakeLists.txt | 14 - .../all/test_package/conanfile.py | 20 -- .../all/test_package/test_package.cpp | 27 -- recipes/cpp-taskflow/config.yml | 5 - .../all/CMakeLists.txt | 7 - .../all/conandata.yml | 4 - .../all/conanfile.py | 59 ---- .../all/test_package/CMakeLists.txt | 10 - .../all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.cpp | 43 --- .../diligentgraphics-spirv-headers/config.yml | 3 - .../all/CMakeLists.txt | 7 - .../all/conandata.yml | 4 - .../all/conanfile.py | 223 -------------- ...upport-SPV_KHR_fragment_shading_rate.patch | 243 ---------------- .../all/test_package/CMakeLists.txt | 23 -- .../all/test_package/conanfile.py | 20 -- .../all/test_package/test_package.c | 31 -- .../all/test_package/test_package.cpp | 65 ----- .../diligentgraphics-spirv-tools/config.yml | 3 - .../all/conandata.yml | 4 - .../all/conanfile.py | 49 ---- .../all/test_package/CMakeLists.txt | 10 - .../all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.c | 21 -- .../config.yml | 3 - recipes/flatc/all/CMakeLists.txt | 10 - recipes/flatc/all/conandata.yml | 14 - recipes/flatc/all/conanfile.py | 64 ---- .../patches/0001-buildflatbuffers-cmake.patch | 13 - recipes/flatc/all/test_package/CMakeLists.txt | 12 - recipes/flatc/all/test_package/conanfile.py | 21 -- .../flatc/all/test_package/test_package.cpp | 4 - .../flatc/all/test_package/test_package.fbs | 8 - recipes/flatc/config.yml | 7 - recipes/jsonformoderncpp/all/conandata.yml | 4 - recipes/jsonformoderncpp/all/conanfile.py | 54 ---- .../all/test_package/CMakeLists.txt | 9 - .../all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.cpp | 25 -- recipes/jsonformoderncpp/config.yml | 3 - recipes/msgpack/all/CMakeLists.txt | 7 - recipes/msgpack/all/conandata.yml | 7 - recipes/msgpack/all/conanfile.py | 135 --------- .../msgpack/all/test_package/CMakeLists.txt | 18 -- recipes/msgpack/all/test_package/conanfile.py | 23 -- .../msgpack/all/test_package/test_package.c | 8 - .../msgpack/all/test_package/test_package.cpp | 10 - recipes/msgpack/config.yml | 5 - recipes/mysql-connector-c/all/CMakeLists.txt | 18 -- recipes/mysql-connector-c/all/conandata.yml | 14 - recipes/mysql-connector-c/all/conanfile.py | 97 ------ .../001-20028_all_mysql-5.6-gcc7.patch | 13 - .../all/patches/002-mysql_config.patch | 55 ---- ...003-cmake-install-standard-locations.patch | 11 - .../all/patches/004-cmake-install-typo.patch | 15 - .../all/test_package/CMakeLists.txt | 10 - .../all/test_package/conanfile.py | 17 -- .../all/test_package/test_package.c | 8 - recipes/mysql-connector-c/config.yml | 3 - recipes/tbb/all/conandata.yml | 16 - recipes/tbb/all/conanfile.py | 275 ------------------ recipes/tbb/all/test_package/CMakeLists.txt | 11 - recipes/tbb/all/test_package/conanfile.py | 17 -- recipes/tbb/all/test_package/test_package.cpp | 40 --- recipes/tbb/config.yml | 11 - 89 files changed, 2680 deletions(-) delete mode 100644 recipes/at-spi2-atk/all/conandata.yml delete mode 100644 recipes/at-spi2-atk/all/conanfile.py delete mode 100644 recipes/at-spi2-atk/all/test_package/CMakeLists.txt delete mode 100644 recipes/at-spi2-atk/all/test_package/conanfile.py delete mode 100644 recipes/at-spi2-atk/all/test_package/test_package.c delete mode 100644 recipes/at-spi2-atk/config.yml delete mode 100644 recipes/at-spi2-core/all/conandata.yml delete mode 100644 recipes/at-spi2-core/all/conanfile.py delete mode 100644 recipes/at-spi2-core/all/patches/08036a4c4491eea57d7b713bb4440f541584204b.patch delete mode 100644 recipes/at-spi2-core/all/test_package/CMakeLists.txt delete mode 100644 recipes/at-spi2-core/all/test_package/conanfile.py delete mode 100644 recipes/at-spi2-core/all/test_package/test_package.c delete mode 100644 recipes/co/all/CMakeLists.txt delete mode 100644 recipes/co/all/conandata.yml delete mode 100644 recipes/co/all/conanfile.py delete mode 100644 recipes/co/all/patches/001-install-dll.patch delete mode 100644 recipes/co/all/patches/002-fix-event-destruct.patch delete mode 100644 recipes/co/all/test_package/CMakeLists.txt delete mode 100644 recipes/co/all/test_package/conanfile.py delete mode 100644 recipes/co/all/test_package/test_package.cc delete mode 100644 recipes/co/config.yml delete mode 100644 recipes/cpp-taskflow/all/conandata.yml delete mode 100644 recipes/cpp-taskflow/all/conanfile.py delete mode 100644 recipes/cpp-taskflow/all/test_package/CMakeLists.txt delete mode 100644 recipes/cpp-taskflow/all/test_package/conanfile.py delete mode 100644 recipes/cpp-taskflow/all/test_package/test_package.cpp delete mode 100644 recipes/cpp-taskflow/config.yml delete mode 100644 recipes/diligentgraphics-spirv-headers/all/CMakeLists.txt delete mode 100644 recipes/diligentgraphics-spirv-headers/all/conandata.yml delete mode 100644 recipes/diligentgraphics-spirv-headers/all/conanfile.py delete mode 100644 recipes/diligentgraphics-spirv-headers/all/test_package/CMakeLists.txt delete mode 100644 recipes/diligentgraphics-spirv-headers/all/test_package/conanfile.py delete mode 100644 recipes/diligentgraphics-spirv-headers/all/test_package/test_package.cpp delete mode 100644 recipes/diligentgraphics-spirv-headers/config.yml delete mode 100644 recipes/diligentgraphics-spirv-tools/all/CMakeLists.txt delete mode 100644 recipes/diligentgraphics-spirv-tools/all/conandata.yml delete mode 100644 recipes/diligentgraphics-spirv-tools/all/conanfile.py delete mode 100644 recipes/diligentgraphics-spirv-tools/all/patches/support-SPV_KHR_fragment_shading_rate.patch delete mode 100644 recipes/diligentgraphics-spirv-tools/all/test_package/CMakeLists.txt delete mode 100644 recipes/diligentgraphics-spirv-tools/all/test_package/conanfile.py delete mode 100644 recipes/diligentgraphics-spirv-tools/all/test_package/test_package.c delete mode 100644 recipes/diligentgraphics-spirv-tools/all/test_package/test_package.cpp delete mode 100644 recipes/diligentgraphics-spirv-tools/config.yml delete mode 100644 recipes/diligentgraphics-vulkan-headers/all/conandata.yml delete mode 100644 recipes/diligentgraphics-vulkan-headers/all/conanfile.py delete mode 100644 recipes/diligentgraphics-vulkan-headers/all/test_package/CMakeLists.txt delete mode 100644 recipes/diligentgraphics-vulkan-headers/all/test_package/conanfile.py delete mode 100644 recipes/diligentgraphics-vulkan-headers/all/test_package/test_package.c delete mode 100644 recipes/diligentgraphics-vulkan-headers/config.yml delete mode 100644 recipes/flatc/all/CMakeLists.txt delete mode 100644 recipes/flatc/all/conandata.yml delete mode 100644 recipes/flatc/all/conanfile.py delete mode 100644 recipes/flatc/all/patches/0001-buildflatbuffers-cmake.patch delete mode 100644 recipes/flatc/all/test_package/CMakeLists.txt delete mode 100644 recipes/flatc/all/test_package/conanfile.py delete mode 100644 recipes/flatc/all/test_package/test_package.cpp delete mode 100644 recipes/flatc/all/test_package/test_package.fbs delete mode 100644 recipes/flatc/config.yml delete mode 100644 recipes/jsonformoderncpp/all/conandata.yml delete mode 100644 recipes/jsonformoderncpp/all/conanfile.py delete mode 100644 recipes/jsonformoderncpp/all/test_package/CMakeLists.txt delete mode 100644 recipes/jsonformoderncpp/all/test_package/conanfile.py delete mode 100644 recipes/jsonformoderncpp/all/test_package/test_package.cpp delete mode 100644 recipes/jsonformoderncpp/config.yml delete mode 100644 recipes/msgpack/all/CMakeLists.txt delete mode 100644 recipes/msgpack/all/conandata.yml delete mode 100644 recipes/msgpack/all/conanfile.py delete mode 100644 recipes/msgpack/all/test_package/CMakeLists.txt delete mode 100644 recipes/msgpack/all/test_package/conanfile.py delete mode 100644 recipes/msgpack/all/test_package/test_package.c delete mode 100644 recipes/msgpack/all/test_package/test_package.cpp delete mode 100644 recipes/msgpack/config.yml delete mode 100644 recipes/mysql-connector-c/all/CMakeLists.txt delete mode 100644 recipes/mysql-connector-c/all/conandata.yml delete mode 100644 recipes/mysql-connector-c/all/conanfile.py delete mode 100644 recipes/mysql-connector-c/all/patches/001-20028_all_mysql-5.6-gcc7.patch delete mode 100644 recipes/mysql-connector-c/all/patches/002-mysql_config.patch delete mode 100644 recipes/mysql-connector-c/all/patches/003-cmake-install-standard-locations.patch delete mode 100644 recipes/mysql-connector-c/all/patches/004-cmake-install-typo.patch delete mode 100644 recipes/mysql-connector-c/all/test_package/CMakeLists.txt delete mode 100644 recipes/mysql-connector-c/all/test_package/conanfile.py delete mode 100644 recipes/mysql-connector-c/all/test_package/test_package.c delete mode 100644 recipes/mysql-connector-c/config.yml delete mode 100644 recipes/tbb/all/conandata.yml delete mode 100644 recipes/tbb/all/conanfile.py delete mode 100644 recipes/tbb/all/test_package/CMakeLists.txt delete mode 100644 recipes/tbb/all/test_package/conanfile.py delete mode 100644 recipes/tbb/all/test_package/test_package.cpp delete mode 100644 recipes/tbb/config.yml diff --git a/recipes/at-spi2-atk/all/conandata.yml b/recipes/at-spi2-atk/all/conandata.yml deleted file mode 100644 index eb79b712b86b1..0000000000000 --- a/recipes/at-spi2-atk/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "2.38.0": - url: "http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz" - sha256: "cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f" diff --git a/recipes/at-spi2-atk/all/conanfile.py b/recipes/at-spi2-atk/all/conanfile.py deleted file mode 100644 index e8f187953a737..0000000000000 --- a/recipes/at-spi2-atk/all/conanfile.py +++ /dev/null @@ -1,93 +0,0 @@ -from conan import ConanFile -from conan.errors import ConanInvalidConfiguration -from conan.tools.files import get, rmdir - -from conans import Meson -import os - -required_conan_version = ">=1.33.0" - -class AtSPI2AtkConan(ConanFile): - name = "at-spi2-atk" - description = "library that bridges ATK to At-Spi2 D-Bus service." - topics = ("conan", "atk", "accessibility") - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk" - license = "LGPL-2.1-or-later" - generators = "pkg_config" - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - } - deprecated = "at-spi2-core" - - _meson = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def validate(self): - if self.settings.os not in ("Linux", "FreeBSD"): - raise ConanInvalidConfiguration("at-spi2-atk is only supported on Linux and FreeBSD") - if self.options.shared and (not self.options["glib"].shared - or not self.options["at-spi2-core"].shared - or not self.options["atk"].shared): - raise ConanInvalidConfiguration( - "Linking a shared library against static glib can cause unexpected behaviour." - ) - - - def configure(self): - if self.options.shared: - del self.options.fPIC - del self.settings.compiler.libcxx - del self.settings.compiler.cppstd - - - def build_requirements(self): - self.build_requires("meson/1.1.1") - self.build_requires('pkgconf/1.9.3') - - def requirements(self): - self.requires("at-spi2-core/2.44.1") - self.requires("atk/2.38.0") - self.requires("glib/2.76.3") - self.requires("libxml2/2.11.4") - - def source(self): - get(self, **self.conan_data["sources"][self.version], - strip_root=True, destination=self._source_subfolder) - - def _configure_meson(self): - if self._meson: - return self._meson - self._meson = Meson(self) - args=[] - args.append('--wrap-mode=nofallback') - self._meson.configure(build_folder=self._build_subfolder, source_folder=self._source_subfolder, pkg_config_paths='.', args=args) - return self._meson - - def build(self): - meson = self._configure_meson() - meson.build() - - def package(self): - self.copy(pattern="COPYING", dst="licenses", src=self._source_subfolder) - meson = self._configure_meson() - meson.install() - rmdir(self, os.path.join(self.package_folder, 'lib', 'pkgconfig')) - - def package_info(self): - self.cpp_info.libs = ['atk-bridge-2.0'] - self.cpp_info.includedirs = [os.path.join('include', 'at-spi2-atk', '2.0')] - self.cpp_info.names['pkg_config'] = 'atk-bridge-2.0' diff --git a/recipes/at-spi2-atk/all/test_package/CMakeLists.txt b/recipes/at-spi2-atk/all/test_package/CMakeLists.txt deleted file mode 100644 index afa2476357074..0000000000000 --- a/recipes/at-spi2-atk/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) diff --git a/recipes/at-spi2-atk/all/test_package/conanfile.py b/recipes/at-spi2-atk/all/test_package/conanfile.py deleted file mode 100644 index d4128b0450777..0000000000000 --- a/recipes/at-spi2-atk/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/at-spi2-atk/all/test_package/test_package.c b/recipes/at-spi2-atk/all/test_package/test_package.c deleted file mode 100644 index 7596156d01b45..0000000000000 --- a/recipes/at-spi2-atk/all/test_package/test_package.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * AT-SPI - Assistive Technology Service Provider Interface - * (Gnome Accessibility Project; https://wiki.gnome.org/Accessibility) - * - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/* - * Testing AT-SPI requires both a test application and AT client. - * Test applications are built using the Dummy ATK implementation: MyAtk. - * This file contains the entry point for all test applications. - * The test will provide its own implementation of atk_get_root, - * and as such provide all the application state for the test. - */ - -#include -#include -#include -#include -#include -#include - - - -static GMainLoop *mainloop; - -int main (int argc, char *argv[]) -{ - atk_bridge_adaptor_init (NULL, NULL); - - mainloop = g_main_loop_new (NULL, FALSE); - - atk_bridge_adaptor_cleanup(); - - return 0; -} diff --git a/recipes/at-spi2-atk/config.yml b/recipes/at-spi2-atk/config.yml deleted file mode 100644 index 3fe6d23a68034..0000000000000 --- a/recipes/at-spi2-atk/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "2.38.0": - folder: all diff --git a/recipes/at-spi2-core/all/conandata.yml b/recipes/at-spi2-core/all/conandata.yml deleted file mode 100644 index 571d10adab672..0000000000000 --- a/recipes/at-spi2-core/all/conandata.yml +++ /dev/null @@ -1,23 +0,0 @@ -sources: - "2.38.0": - url: "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.38/at-spi2-core-2.38.0.tar.xz" - sha256: "84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5" - "2.39.1": - url: "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.39/at-spi2-core-2.39.1.tar.xz" - sha256: "44d2b042e47d25571581efff673af0a8cd79531babbad2b043784879e15e4228" - "2.40.3": - url: "https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.40/at-spi2-core-2.40.3.tar.xz" - sha256: "e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c" - "2.42.0": - url: "https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.42/at-spi2-core-2.42.0.tar.xz" - sha256: "4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386" - "2.44.0": - url: "https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.44/at-spi2-core-2.44.0.tar.xz" - sha256: "7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353" - "2.44.1": - sha256: "4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746" - url: "https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.44/at-spi2-core-2.44.1.tar.xz" -patches: - "2.44.0": - - base_path: "source_subfolder" - patch_file: "patches/08036a4c4491eea57d7b713bb4440f541584204b.patch" diff --git a/recipes/at-spi2-core/all/conanfile.py b/recipes/at-spi2-core/all/conanfile.py deleted file mode 100644 index 32d98e739d744..0000000000000 --- a/recipes/at-spi2-core/all/conanfile.py +++ /dev/null @@ -1,108 +0,0 @@ -from conan import ConanFile -from conan.errors import ConanInvalidConfiguration -from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, replace_in_file,rmdir -from conan.tools.scm import Version - -from conans import Meson -import os - - -class AtSpi2CoreConan(ConanFile): - name = "at-spi2-core" - description = "It provides a Service Provider Interface for the Assistive Technologies available on the GNOME platform and a library against which applications can be linked" - topics = "atk", "accessibility" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core/" - license = "LGPL-2.1-or-later" - generators = "pkg_config" - deprecated = "Consumers should migrate to at-spi2-core/[>=2.45.1], which includes atk and at-spi2-atk" - - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "with_x11": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - "with_x11": False, - } - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - _meson = None - - def export_sources(self): - export_conandata_patches(self) - - def configure(self): - if self.options.shared: - del self.options.fPIC - del self.settings.compiler.libcxx - del self.settings.compiler.cppstd - - def build_requirements(self): - self.build_requires("meson/1.1.1") - self.build_requires("pkgconf/1.9.3") - - def requirements(self): - self.requires("glib/2.76.3") - if self.options.with_x11: - self.requires("xorg/system") - self.requires("dbus/1.15.2") - - def validate(self): - if self.options.shared and not self.options["glib"].shared: - raise ConanInvalidConfiguration( - "Linking a shared library against static glib can cause unexpected behaviour." - ) - if self.settings.os != "Linux": - raise ConanInvalidConfiguration("only linux is supported by this recipe") - - def source(self): - get(self, **self.conan_data["sources"][self.version], - strip_root=True, destination=self._source_subfolder) - - def _configure_meson(self): - if self._meson: - return self._meson - self._meson = Meson(self) - defs = {} - defs["introspection"] = "no" - defs["docs"] = "false" - defs["x11"] = "yes" if self.options.with_x11 else "no" - args=[] - args.append("--datadir=%s" % os.path.join(self.package_folder, "res")) - args.append("--localedir=%s" % os.path.join(self.package_folder, "res")) - args.append("--wrap-mode=nofallback") - self._meson.configure(defs=defs, build_folder=self._build_subfolder, source_folder=self._source_subfolder, pkg_config_paths=".", args=args) - return self._meson - - def build(self): - apply_conandata_patches(self) - if Version(self.version) >= "2.42.0": - replace_in_file(self, os.path.join(self._source_subfolder, "bus", "meson.build"), - "if x11_dep.found()", - "if x11_option == 'yes'") - meson = self._configure_meson() - meson.build() - - def package(self): - self.copy(pattern="COPYING", dst="licenses", src=self._source_subfolder) - meson = self._configure_meson() - meson.install() - rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) - rmdir(self, os.path.join(self.package_folder, "etc")) - - - def package_info(self): - self.cpp_info.libs = ['atspi'] - self.cpp_info.includedirs = ["include/at-spi-2.0"] - self.cpp_info.names["pkg_config"] = "atspi-2" diff --git a/recipes/at-spi2-core/all/patches/08036a4c4491eea57d7b713bb4440f541584204b.patch b/recipes/at-spi2-core/all/patches/08036a4c4491eea57d7b713bb4440f541584204b.patch deleted file mode 100644 index ce10b7a2bce56..0000000000000 --- a/recipes/at-spi2-core/all/patches/08036a4c4491eea57d7b713bb4440f541584204b.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 08036a4c4491eea57d7b713bb4440f541584204b Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Mon, 21 Mar 2022 10:19:03 -0500 -Subject: [PATCH] Fix build with X11 disabled - -Closes #51 ---- - registryd/deviceeventcontroller.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c -index 8a321adc..3068ec4b 100644 ---- a/registryd/deviceeventcontroller.c -+++ b/registryd/deviceeventcontroller.c -@@ -1720,16 +1720,16 @@ spi_dec_synth_keysym (SpiDEController *controller, long keysym) - if (synth_mods != modifiers) { - lock_mods = synth_mods & ~modifiers; - spi_dec_plat_lock_modifiers (controller, lock_mods); -- if (modifiers & LockMask) -- spi_dec_plat_unlock_modifiers (controller, LockMask); -+ if (modifiers & SPI_KEYMASK_SHIFTLOCK) -+ spi_dec_plat_unlock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); - } - spi_dec_plat_synth_keycode_press (controller, key_synth_code); - spi_dec_plat_synth_keycode_release (controller, key_synth_code); - - if (synth_mods != modifiers) { - spi_dec_plat_unlock_modifiers (controller, lock_mods); -- if (modifiers & LockMask) -- spi_dec_plat_lock_modifiers (controller, LockMask); -+ if (modifiers & SPI_KEYMASK_SHIFTLOCK) -+ spi_dec_plat_lock_modifiers (controller, SPI_KEYMASK_SHIFTLOCK); - } - return TRUE; - } --- -GitLab diff --git a/recipes/at-spi2-core/all/test_package/CMakeLists.txt b/recipes/at-spi2-core/all/test_package/CMakeLists.txt deleted file mode 100644 index afa2476357074..0000000000000 --- a/recipes/at-spi2-core/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) diff --git a/recipes/at-spi2-core/all/test_package/conanfile.py b/recipes/at-spi2-core/all/test_package/conanfile.py deleted file mode 100644 index d4128b0450777..0000000000000 --- a/recipes/at-spi2-core/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/at-spi2-core/all/test_package/test_package.c b/recipes/at-spi2-core/all/test_package/test_package.c deleted file mode 100644 index c155308c155ba..0000000000000 --- a/recipes/at-spi2-core/all/test_package/test_package.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "atspi/atspi.h" -#include "assert.h" - -int main() -{ - atspi_init (); - assert(atspi_get_desktop_count() > 0); - return atspi_exit(); -} diff --git a/recipes/co/all/CMakeLists.txt b/recipes/co/all/CMakeLists.txt deleted file mode 100644 index c986d294c7547..0000000000000 --- a/recipes/co/all/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -add_subdirectory("source_subfolder") diff --git a/recipes/co/all/conandata.yml b/recipes/co/all/conandata.yml deleted file mode 100644 index e71aeda87ca26..0000000000000 --- a/recipes/co/all/conandata.yml +++ /dev/null @@ -1,8 +0,0 @@ -sources: - "2.0.2": - url: "https://github.com/idealvin/co/archive/refs/tags/v2.0.2.tar.gz" - sha256: "5dbb90e18627ebe563a6a437e8e28329a6bfc07f266718318bd3adf26027d156" -patches: - "2.0.2": - - patch_file: "patches/001-install-dll.patch" - base_path: "source_subfolder" diff --git a/recipes/co/all/conanfile.py b/recipes/co/all/conanfile.py deleted file mode 100644 index 5be88f24e0ce3..0000000000000 --- a/recipes/co/all/conanfile.py +++ /dev/null @@ -1,104 +0,0 @@ -from conans import ConanFile, CMake, tools -from conans.errors import ConanInvalidConfiguration - -required_conan_version = ">=1.33.0" - - -class CoConan(ConanFile): - name = "co" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/idealvin/co" - license = "MIT" - description = "A go-style coroutine library in C++11 and more." - topics = ("co", "coroutine", "c++11") - - deprecated = "cocoyaxi" - - exports_sources = "CMakeLists.txt", "patches/*" - generators = "cmake", "cmake_find_package" - - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "with_libcurl": [True, False], - "with_openssl": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - "with_libcurl": False, - "with_openssl": False, - } - - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - if self.options.shared: - del self.options.fPIC - - def requirements(self): - if self.options.with_libcurl: - self.requires("libcurl/7.79.1") - if self.options.with_openssl: - self.requires("openssl/1.1.1l") - - def build_requirements(self): - if self.settings.os == "Macos" and self.settings.arch == "armv8": - # The OSX_ARCHITECTURES target property is now respected for the ASM language - self.build_requires("cmake/3.20.1") - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - strip_root=True, destination=self._source_subfolder) - - def build(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) - cmake = self._configure_cmake() - cmake.build() - - def _configure_cmake(self): - if self._cmake: - return self._cmake - self._cmake = CMake(self) - if not self.options.shared: - self._cmake.definitions["FPIC"] = self.options.get_safe("fPIC", False) - runtime = self.settings.get_safe("compiler.runtime") - if runtime: - self._cmake.definitions["STATIC_VS_CRT"] = "MT" in runtime - self._cmake.definitions["WITH_LIBCURL"] = self.options.with_libcurl - self._cmake.definitions["WITH_OPENSSL"] = self.options.with_openssl - self._cmake.configure(build_folder=self._build_subfolder) - return self._cmake - - def package(self): - self.copy("LICENSE.md", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - - def package_info(self): - self.cpp_info.libs = ["co"] - self.cpp_info.names["cmake_find_package"] = "co" - self.cpp_info.names["cmake_find_package_multi"] = "co" - - def validate(self): - if self.options.with_libcurl: - if not self.options.with_openssl: - raise ConanInvalidConfiguration(f"{self.name} requires with_openssl=True when using with_libcurl=True") - if self.options["libcurl"].with_ssl != "openssl": - raise ConanInvalidConfiguration(f"{self.name} requires libcurl:with_ssl='openssl' to be enabled") - if not self.options["libcurl"].with_zlib: - raise ConanInvalidConfiguration(f"{self.name} requires libcurl:with_zlib=True to be enabled") diff --git a/recipes/co/all/patches/001-install-dll.patch b/recipes/co/all/patches/001-install-dll.patch deleted file mode 100644 index 9332f3296762e..0000000000000 --- a/recipes/co/all/patches/001-install-dll.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9e03c9a..499b550 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -112,4 +112,5 @@ install( - TARGETS co - LIBRARY DESTINATION lib # shared lib installed to ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION lib # static lib installed to ${CMAKE_INSTALL_PREFIX}/lib -+ RUNTIME DESTINATION bin - ) diff --git a/recipes/co/all/patches/002-fix-event-destruct.patch b/recipes/co/all/patches/002-fix-event-destruct.patch deleted file mode 100644 index 7949dbdca3146..0000000000000 --- a/recipes/co/all/patches/002-fix-event-destruct.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/co/co.cc b/src/co/co.cc -index 8921296..838ac16 100644 ---- a/src/co/co.cc -+++ b/src/co/co.cc -@@ -8,7 +8,7 @@ namespace co { - class EventImpl { - public: - EventImpl() : _counter(0), _signaled(false), _has_cond(false) {} -- ~EventImpl() { co::xx::cond_destroy(&_cond); } -+ ~EventImpl() { if (_has_cond) co::xx::cond_destroy(&_cond); } - - bool wait(uint32 ms); - diff --git a/recipes/co/all/test_package/CMakeLists.txt b/recipes/co/all/test_package/CMakeLists.txt deleted file mode 100644 index d9ea9b93dcee7..0000000000000 --- a/recipes/co/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -set(CMAKE_CXX_STANDARD 11) -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(co REQUIRED) - -add_executable(${PROJECT_NAME} test_package.cc) -target_link_libraries(${PROJECT_NAME} co::co) diff --git a/recipes/co/all/test_package/conanfile.py b/recipes/co/all/test_package/conanfile.py deleted file mode 100644 index 5493d58611803..0000000000000 --- a/recipes/co/all/test_package/conanfile.py +++ /dev/null @@ -1,16 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/co/all/test_package/test_package.cc b/recipes/co/all/test_package/test_package.cc deleted file mode 100644 index 46b92d23f6830..0000000000000 --- a/recipes/co/all/test_package/test_package.cc +++ /dev/null @@ -1,7 +0,0 @@ -#include "co/str.h" -#include - -int main() { - std::cout << str::from(123) << std::endl; - return 0; -} diff --git a/recipes/co/config.yml b/recipes/co/config.yml deleted file mode 100644 index 5df97e2cc232e..0000000000000 --- a/recipes/co/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "2.0.2": - folder: all diff --git a/recipes/cpp-taskflow/all/conandata.yml b/recipes/cpp-taskflow/all/conandata.yml deleted file mode 100644 index e82779fa22a56..0000000000000 --- a/recipes/cpp-taskflow/all/conandata.yml +++ /dev/null @@ -1,7 +0,0 @@ -sources: - 2.2.0: - url: "https://github.com/taskflow/taskflow/archive/v2.2.0.tar.gz" - sha256: "A8AD8C94CEEAC0BC18D8429F877E10A2AF2CD44CD9DC420D9751E69F48FF85D1" - 2.4.0: - url: "https://github.com/taskflow/taskflow/archive/v2.4.0.tar.gz" - sha256: "1F6CC854DD579396CA22AE86014CBF13DD90205E7C9438E2B6B2FDDACA99668C" diff --git a/recipes/cpp-taskflow/all/conanfile.py b/recipes/cpp-taskflow/all/conanfile.py deleted file mode 100644 index c52e7a7548e56..0000000000000 --- a/recipes/cpp-taskflow/all/conanfile.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -from conans import ConanFile, tools -from conans.errors import ConanInvalidConfiguration - -required_conan_version = ">=1.28.0" - -class CppTaskflowConan(ConanFile): - name = "cpp-taskflow" - description = "A fast C++ header-only library to help you quickly write parallel programs with complex task dependencies." - topics = ("conan", "cpp-taskflow", "taskflow", "tasking", "parallelism") - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/cpp-taskflow/cpp-taskflow" - license = "MIT" - no_copy_source = True - settings = "os", "compiler" - deprecated = "taskflow" - - @property - def _source_subfolder(self): - return "source_subfolder" - - def configure(self): - compiler = str(self.settings.compiler) - compiler_version = tools.Version(self.settings.compiler.version) - min_req_cppstd = "17" if tools.Version(self.version) <= "2.2.0" else "14" - - if self.settings.compiler.cppstd: - tools.check_min_cppstd(self, min_req_cppstd) - else: - self.output.warn("%s recipe lacks information about the %s compiler" - " standard version support" % (self.name, compiler)) - - minimal_version = { - "17": { - "Visual Studio": "16", - "gcc": "7.3", - "clang": "6.0", - "apple-clang": "10.0" - }, - "14": { - "Visual Studio": "15", - "gcc": "5", - "clang": "4.0", - "apple-clang": "8.0" - } - } - - if compiler not in minimal_version[min_req_cppstd]: - self.output.info("%s requires a compiler that supports at least C++%s" % (self.name, min_req_cppstd)) - return - - # Exclude compilers not supported by cpp-taskflow - if compiler_version < minimal_version[min_req_cppstd][compiler]: - raise ConanInvalidConfiguration("%s requires a compiler that supports" - " at least C++%s. %s %s is not" - " supported." % (self.name, min_req_cppstd, compiler, tools.Version(self.settings.compiler.version.value))) - - def source(self): - tools.get(**self.conan_data["sources"][self.version]) - os.rename("taskflow-" + self.version, self._source_subfolder) - - def package(self): - self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder) - self.copy(pattern="*", dst="include/taskflow", src=os.path.join(self._source_subfolder, "taskflow")) - - def package_id(self): - self.info.header_only() - - def package_info(self): - if self.settings.os == "Linux": - self.cpp_info.system_libs.append("pthread") - if self.settings.compiler == "Visual Studio": - self.cpp_info.defines.append("_ENABLE_EXTENDED_ALIGNED_STORAGE") diff --git a/recipes/cpp-taskflow/all/test_package/CMakeLists.txt b/recipes/cpp-taskflow/all/test_package/CMakeLists.txt deleted file mode 100644 index 5694d2375840f..0000000000000 --- a/recipes/cpp-taskflow/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -set(CPPTASKFLOW_CXX_STANDARD 14) -if (CPPTASKFLOW_VERSION LESS_EQUAL "2.2.0") - set(CPPTASKFLOW_CXX_STANDARD 17) -endif() - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) -set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD ${CPPTASKFLOW_CXX_STANDARD}) diff --git a/recipes/cpp-taskflow/all/test_package/conanfile.py b/recipes/cpp-taskflow/all/test_package/conanfile.py deleted file mode 100644 index befc8454d2cdf..0000000000000 --- a/recipes/cpp-taskflow/all/test_package/conanfile.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- - -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.definitions["CPPTASKFLOW_VERSION"] = self.deps_cpp_info["cpp-taskflow"].version - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self.settings): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/cpp-taskflow/all/test_package/test_package.cpp b/recipes/cpp-taskflow/all/test_package/test_package.cpp deleted file mode 100644 index 3b078cb358c93..0000000000000 --- a/recipes/cpp-taskflow/all/test_package/test_package.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include - -int main() -{ - tf::Executor executor; - tf::Taskflow taskflow; - - auto A = taskflow.emplace([](){ std::cout << "Task A\n"; }); - auto B = taskflow.emplace([](){ std::cout << "Task B\n"; }); - auto C = taskflow.emplace([](){ std::cout << "Task C\n"; }); - auto D = taskflow.emplace([](){ std::cout << "Task D\n"; }); - - // - // +---+ - // +---->| B |-----+ - // | +---+ | - // +---+ +-v-+ - // | A | | D | - A.precede(B); // B runs after A // +---+ +-^-+ - A.precede(C); // C runs after A // | +---+ | - B.precede(D); // D runs after B // +---->| C |-----+ - C.precede(D); // D runs after C // +---+ - - executor.run(taskflow).get(); - - return 0; -} diff --git a/recipes/cpp-taskflow/config.yml b/recipes/cpp-taskflow/config.yml deleted file mode 100644 index 69a0530ca48bc..0000000000000 --- a/recipes/cpp-taskflow/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -versions: - 2.2.0: - folder: all - 2.4.0: - folder: all diff --git a/recipes/diligentgraphics-spirv-headers/all/CMakeLists.txt b/recipes/diligentgraphics-spirv-headers/all/CMakeLists.txt deleted file mode 100644 index 1848ca5a77c35..0000000000000 --- a/recipes/diligentgraphics-spirv-headers/all/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -add_subdirectory("source_subfolder") diff --git a/recipes/diligentgraphics-spirv-headers/all/conandata.yml b/recipes/diligentgraphics-spirv-headers/all/conandata.yml deleted file mode 100644 index 484bd4f756594..0000000000000 --- a/recipes/diligentgraphics-spirv-headers/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "cci.20211006": - url: https://github.com/DiligentGraphics/SPIRV-Headers/archive/5ea2d62e8c0ddd9e2a7d0ca5e3f2335e09e5f408.zip - sha256: 8b9a9b49600a01d7d768c7e95ae09a4e81e7b2b3ed0a7a24d2375474c00d06ff diff --git a/recipes/diligentgraphics-spirv-headers/all/conanfile.py b/recipes/diligentgraphics-spirv-headers/all/conanfile.py deleted file mode 100644 index 2ea40ddfdfe54..0000000000000 --- a/recipes/diligentgraphics-spirv-headers/all/conanfile.py +++ /dev/null @@ -1,59 +0,0 @@ -from conans import ConanFile, tools, CMake -import os - -required_conan_version = ">=1.33.0" - - -class SpirvheadersConan(ConanFile): - name = "diligentgraphics-spirv-headers" - homepage = "https://github.com/DiligentGraphics/SPIRV-Headers" - description = "Diligent fork of header files for the SPIRV instruction set." - license = "MIT-KhronosGroup" - topics = ("spirv", "spirv-v", "vulkan", "opengl", "opencl", "khronos") - url = "https://github.com/conan-io/conan-center-index" - provides = "spirv-headers" - deprecated = "spirv-headers" - - settings = "os", "compiler", "arch", "build_type" - - exports_sources = "CMakeLists.txt" - generators = "cmake" - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def package_id(self): - self.info.header_only() - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) - - def _configure_cmake(self): - if self._cmake: - return self._cmake - self._cmake = CMake(self) - self._cmake.definitions["SPIRV_HEADERS_SKIP_EXAMPLES"] = True - self._cmake.configure(build_folder=self._build_subfolder) - return self._cmake - - def build(self): - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy(pattern="LICENSE*", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - tools.rmdir(os.path.join(self.package_folder, "lib")) - tools.rmdir(os.path.join(self.package_folder, "share")) - - def package_info(self): - self.cpp_info.names["cmake_find_package"] = "SPIRV-Headers" - self.cpp_info.names["cmake_find_package_multi"] = "SPIRV-Headers" diff --git a/recipes/diligentgraphics-spirv-headers/all/test_package/CMakeLists.txt b/recipes/diligentgraphics-spirv-headers/all/test_package/CMakeLists.txt deleted file mode 100644 index 1a13bcce874fc..0000000000000 --- a/recipes/diligentgraphics-spirv-headers/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(SPIRV-Headers REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} SPIRV-Headers::SPIRV-Headers) diff --git a/recipes/diligentgraphics-spirv-headers/all/test_package/conanfile.py b/recipes/diligentgraphics-spirv-headers/all/test_package/conanfile.py deleted file mode 100644 index 38f4483872d47..0000000000000 --- a/recipes/diligentgraphics-spirv-headers/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/diligentgraphics-spirv-headers/all/test_package/test_package.cpp b/recipes/diligentgraphics-spirv-headers/all/test_package/test_package.cpp deleted file mode 100644 index db6d549853bea..0000000000000 --- a/recipes/diligentgraphics-spirv-headers/all/test_package/test_package.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2016 The Khronos Group Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and/or associated documentation files (the -// "Materials"), to deal in the Materials without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Materials, and to -// permit persons to whom the Materials are furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Materials. -// -// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS -// KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS -// SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT -// https://www.khronos.org/registry/ -// -// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - -#include -#include -#include - -namespace { - -const GLSLstd450 kSin = GLSLstd450Sin; -const OpenCLLIB::Entrypoints kNative_cos = OpenCLLIB::Native_cos; -const spv::Op kNop = spv::OpNop; - -} - -int main(int argc, char ** argv) -{ - - return 0; -} diff --git a/recipes/diligentgraphics-spirv-headers/config.yml b/recipes/diligentgraphics-spirv-headers/config.yml deleted file mode 100644 index ae88f0a176dec..0000000000000 --- a/recipes/diligentgraphics-spirv-headers/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "cci.20211006": - folder: all diff --git a/recipes/diligentgraphics-spirv-tools/all/CMakeLists.txt b/recipes/diligentgraphics-spirv-tools/all/CMakeLists.txt deleted file mode 100644 index 1848ca5a77c35..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -add_subdirectory("source_subfolder") diff --git a/recipes/diligentgraphics-spirv-tools/all/conandata.yml b/recipes/diligentgraphics-spirv-tools/all/conandata.yml deleted file mode 100644 index 707d246773a1c..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "cci.20211008": - url: https://github.com/DiligentGraphics/SPIRV-Tools/archive/7308083707a4bffb62bcfbc721851033e5534bb7.zip - sha256: bfe9d6f1c2cfc354c0eda3c2139485cae4483d8b12fa994d1f0f1f3624645fcd diff --git a/recipes/diligentgraphics-spirv-tools/all/conanfile.py b/recipes/diligentgraphics-spirv-tools/all/conanfile.py deleted file mode 100644 index 04f39fb2c75a4..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/conanfile.py +++ /dev/null @@ -1,223 +0,0 @@ -from conans import ConanFile, tools, CMake -from conans.errors import ConanInvalidConfiguration -import os -import textwrap - -required_conan_version = ">=1.33.0" - - -class SpirvtoolsConan(ConanFile): - name = "diligentgraphics-spirv-tools" - homepage = "https://github.com/DiligentGraphics/SPIRV-Tools/" - description = "Diligent fork. Create and optimize SPIRV shaders" - topics = ("spirv", "spirv-v", "vulkan", "opengl", "opencl", "hlsl", "khronos", "diligent") - url = "https://github.com/conan-io/conan-center-index" - provides = "spirv-tools" - deprecated = "spirv-tools" - license = "Apache-2.0" - - settings = "os", "compiler", "arch", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "build_executables": [True, False], - } - default_options = { - "shared": False, - "fPIC": True, - "build_executables": True, - } - - short_paths = True - - exports_sources = ["CMakeLists.txt", "patches/**"] - generators = "cmake" - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - if self.options.shared: - del self.options.fPIC - - def requirements(self): - if not self._get_compatible_spirv_headers_version: - raise ConanInvalidConfiguration("unknown diligentgraphics-spirv-headers version") - self.requires("diligentgraphics-spirv-headers/{}".format(self._get_compatible_spirv_headers_version)) - - @property - def _get_compatible_spirv_headers_version(self): - return { - "cci.20211008": "cci.20211006", - }.get(str(self.version), False) - - def validate(self): - if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, 11) - - def _validate_dependency_graph(self): - if self.deps_cpp_info["diligentgraphics-spirv-headers"].version != self._get_compatible_spirv_headers_version: - raise ConanInvalidConfiguration("diligentgraphics-spirv-tools {0} requires diligentgraphics-spirv-headers {1}" - .format(self.version, self._get_compatible_spirv_headers_version)) - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) - - def _configure_cmake(self): - if self._cmake: - return self._cmake - - cmake = CMake(self) - - # Required by the project's CMakeLists.txt - cmake.definitions["SPIRV-Headers_SOURCE_DIR"] = self.deps_cpp_info["diligentgraphics-spirv-headers"].rootpath.replace("\\", "/") - - # There are some switch( ) statements that are causing errors - # need to turn this off - cmake.definitions["SPIRV_WERROR"] = False - - cmake.definitions["SKIP_SPIRV_TOOLS_INSTALL"] = False - cmake.definitions["SPIRV_LOG_DEBUG"] = False - cmake.definitions["SPIRV_SKIP_TESTS"] = True - cmake.definitions["SPIRV_CHECK_CONTEXT"] = False - cmake.definitions["SPIRV_BUILD_FUZZER"] = False - cmake.definitions["SPIRV_SKIP_EXECUTABLES"] = not self.options.build_executables - - cmake.configure(build_folder=self._build_subfolder) - self._cmake = cmake - return self._cmake - - def build(self): - self._validate_dependency_graph() - self._patch_sources() - cmake = self._configure_cmake() - cmake.build() - - def _patch_sources(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) - # CMAKE_POSITION_INDEPENDENT_CODE was set ON for the entire - # project in the lists file. - tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), - "set(CMAKE_POSITION_INDEPENDENT_CODE ON)", "") - - def package(self): - self.copy(pattern="LICENSE*", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - - tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) - tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) - tools.rmdir(os.path.join(self.package_folder, "SPIRV-Tools")) - tools.rmdir(os.path.join(self.package_folder, "SPIRV-Tools-link")) - tools.rmdir(os.path.join(self.package_folder, "SPIRV-Tools-opt")) - tools.rmdir(os.path.join(self.package_folder, "SPIRV-Tools-reduce")) - tools.rmdir(os.path.join(self.package_folder, "SPIRV-Tools-lint")) - - if self.options.shared: - for file_name in ["*SPIRV-Tools", "*SPIRV-Tools-opt", "*SPIRV-Tools-link", "*SPIRV-Tools-reduce"]: - for ext in [".a", ".lib"]: - tools.remove_files_by_mask(os.path.join(self.package_folder, "lib"), file_name + ext) - else: - tools.remove_files_by_mask(os.path.join(self.package_folder, "bin"), "*SPIRV-Tools-shared.dll") - tools.remove_files_by_mask(os.path.join(self.package_folder, "lib"), "*SPIRV-Tools-shared*") - - if self.options.shared: - targets = {"SPIRV-Tools-shared": "diligentgraphics-spirv-tools::SPIRV-Tools"} - else: - targets = { - "SPIRV-Tools": "diligentgraphics-spirv-tools::SPIRV-Tools", # before 2020.5, kept for conveniency - "SPIRV-Tools-static": "diligentgraphics-spirv-tools::SPIRV-Tools", - "SPIRV-Tools-opt": "diligentgraphics-spirv-tools::SPIRV-Tools-opt", - "SPIRV-Tools-link": "diligentgraphics-spirv-tools::SPIRV-Tools-link", - "SPIRV-Tools-reduce": "diligentgraphics-spirv-tools::SPIRV-Tools-reduce", - } - self._create_cmake_module_alias_targets( - os.path.join(self.package_folder, self._module_file_rel_path), - targets, - ) - - @staticmethod - def _create_cmake_module_alias_targets(module_file, targets): - content = "" - for alias, aliased in targets.items(): - content += textwrap.dedent("""\ - if(TARGET {aliased} AND NOT TARGET {alias}) - add_library({alias} INTERFACE IMPORTED) - set_property(TARGET {alias} PROPERTY INTERFACE_LINK_LIBRARIES {aliased}) - endif() - """.format(alias=alias, aliased=aliased)) - tools.save(module_file, content) - - @property - def _module_subfolder(self): - return os.path.join("lib", "cmake") - - @property - def _module_file_rel_path(self): - return os.path.join(self._module_subfolder, - "conan-official-{}-targets.cmake".format(self.name)) - - def package_info(self): - self.cpp_info.filenames["cmake_find_package"] = "SPIRV-Tools" - self.cpp_info.filenames["cmake_find_package_multi"] = "SPIRV-Tools" - self.cpp_info.names["pkg_config"] = "SPIRV-Tools-shared" if self.options.shared else "SPIRV-Tools" - - # SPIRV-Tools - self.cpp_info.components["spirv-tools-core"].names["cmake_find_package"] = "SPIRV-Tools" - self.cpp_info.components["spirv-tools-core"].names["cmake_find_package_multi"] = "SPIRV-Tools" - self.cpp_info.components["spirv-tools-core"].builddirs.append(self._module_subfolder) - self.cpp_info.components["spirv-tools-core"].build_modules["cmake_find_package"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-core"].build_modules["cmake_find_package_multi"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-core"].libs = ["SPIRV-Tools-shared" if self.options.shared else "SPIRV-Tools"] - self.cpp_info.components["spirv-tools-core"].requires = ["diligentgraphics-spirv-headers::diligentgraphics-spirv-headers"] - if self.options.shared: - self.cpp_info.components["spirv-tools-core"].defines = ["SPIRV_TOOLS_SHAREDLIB"] - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.components["spirv-tools-core"].system_libs.extend(["m", "rt"]) - if not self.options.shared and tools.stdcpp_library(self): - self.cpp_info.components["spirv-tools-core"].system_libs.append(tools.stdcpp_library(self)) - - # FIXME: others components should have their own CMake config file - if not self.options.shared: - # SPIRV-Tools-opt - self.cpp_info.components["spirv-tools-opt"].names["cmake_find_package"] = "SPIRV-Tools-opt" - self.cpp_info.components["spirv-tools-opt"].names["cmake_find_package_multi"] = "SPIRV-Tools-opt" - self.cpp_info.components["spirv-tools-opt"].builddirs.append(self._module_subfolder) - self.cpp_info.components["spirv-tools-opt"].build_modules["cmake_find_package"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-opt"].build_modules["cmake_find_package_multi"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-opt"].libs = ["SPIRV-Tools-opt"] - self.cpp_info.components["spirv-tools-opt"].requires = ["spirv-tools-core", "diligentgraphics-spirv-headers::diligentgraphics-spirv-headers"] - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.components["spirv-tools-opt"].system_libs.append("m") - # SPIRV-Tools-link - self.cpp_info.components["spirv-tools-link"].names["cmake_find_package"] = "SPIRV-Tools-link" - self.cpp_info.components["spirv-tools-link"].names["cmake_find_package_multi"] = "SPIRV-Tools-link" - self.cpp_info.components["spirv-tools-link"].builddirs.append(self._module_subfolder) - self.cpp_info.components["spirv-tools-link"].build_modules["cmake_find_package"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-link"].build_modules["cmake_find_package_multi"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-link"].libs = ["SPIRV-Tools-link"] - self.cpp_info.components["spirv-tools-link"].requires = ["spirv-tools-core", "spirv-tools-opt"] - # SPIRV-Tools-reduce - self.cpp_info.components["spirv-tools-reduce"].names["cmake_find_package"] = "SPIRV-Tools-reduce" - self.cpp_info.components["spirv-tools-reduce"].names["cmake_find_package_multi"] = "SPIRV-Tools-reduce" - self.cpp_info.components["spirv-tools-reduce"].builddirs.append(self._module_subfolder) - self.cpp_info.components["spirv-tools-reduce"].build_modules["cmake_find_package"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-reduce"].build_modules["cmake_find_package_multi"] = [self._module_file_rel_path] - self.cpp_info.components["spirv-tools-reduce"].libs = ["SPIRV-Tools-reduce"] - self.cpp_info.components["spirv-tools-reduce"].requires = ["spirv-tools-core", "spirv-tools-opt"] - - bin_path = os.path.join(self.package_folder, "bin") - self.output.info("Appending PATH environment variable: %s" % bin_path) - self.env_info.path.append(bin_path) diff --git a/recipes/diligentgraphics-spirv-tools/all/patches/support-SPV_KHR_fragment_shading_rate.patch b/recipes/diligentgraphics-spirv-tools/all/patches/support-SPV_KHR_fragment_shading_rate.patch deleted file mode 100644 index 67d7765e7856e..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/patches/support-SPV_KHR_fragment_shading_rate.patch +++ /dev/null @@ -1,243 +0,0 @@ -Patch from 2 PR: -https://github.com/KhronosGroup/SPIRV-Tools/pull/3943 -https://github.com/KhronosGroup/SPIRV-Tools/pull/4014 -Mandatory in v2020.5 with spirv-headers 1.5.4, otherwise compilation fails -with 'SPV_OPERAND_TYPE_FRAGMENT_SHADING_RATE': undeclared identifier ---- a/include/spirv-tools/libspirv.h -+++ b/include/spirv-tools/libspirv.h -@@ -182,6 +182,7 @@ typedef enum spv_operand_type_t { - SPV_OPERAND_TYPE_LOOP_CONTROL, // SPIR-V Sec 3.23 - SPV_OPERAND_TYPE_FUNCTION_CONTROL, // SPIR-V Sec 3.24 - SPV_OPERAND_TYPE_MEMORY_ACCESS, // SPIR-V Sec 3.26 -+ SPV_OPERAND_TYPE_FRAGMENT_SHADING_RATE, // SPIR-V Sec 3.FSR - - // The remaining operand types are only used internally by the assembler. - // There are two categories: ---- a/source/operand.cpp -+++ b/source/operand.cpp -@@ -208,6 +208,8 @@ const char* spvOperandTypeStr(spv_operand_type_t type) { - case SPV_OPERAND_TYPE_MEMORY_ACCESS: - case SPV_OPERAND_TYPE_OPTIONAL_MEMORY_ACCESS: - return "memory access"; -+ case SPV_OPERAND_TYPE_FRAGMENT_SHADING_RATE: -+ return "shading rate"; - case SPV_OPERAND_TYPE_SCOPE_ID: - return "scope ID"; - case SPV_OPERAND_TYPE_GROUP_OPERATION: -@@ -360,6 +362,7 @@ bool spvOperandIsConcreteMask(spv_operand_type_t type) { - case SPV_OPERAND_TYPE_LOOP_CONTROL: - case SPV_OPERAND_TYPE_FUNCTION_CONTROL: - case SPV_OPERAND_TYPE_MEMORY_ACCESS: -+ case SPV_OPERAND_TYPE_FRAGMENT_SHADING_RATE: - case SPV_OPERAND_TYPE_DEBUG_INFO_FLAGS: - case SPV_OPERAND_TYPE_CLDEBUG100_DEBUG_INFO_FLAGS: - return true; ---- a/source/val/validate_builtins.cpp -+++ b/source/val/validate_builtins.cpp -@@ -230,6 +230,12 @@ class BuiltInsValidator { - spv_result_t ValidateComputeI32InputAtDefinition(const Decoration& decoration, - const Instruction& inst); - -+ spv_result_t ValidatePrimitiveShadingRateAtDefinition( -+ const Decoration& decoration, const Instruction& inst); -+ -+ spv_result_t ValidateShadingRateAtDefinition(const Decoration& decoration, -+ const Instruction& inst); -+ - // The following section contains functions which are called when id defined - // by |referenced_inst| is - // 1. referenced by |referenced_from_inst| -@@ -383,6 +389,16 @@ class BuiltInsValidator { - const Instruction& referenced_inst, - const Instruction& referenced_from_inst); - -+ spv_result_t ValidatePrimitiveShadingRateAtReference( -+ const Decoration& decoration, const Instruction& built_in_inst, -+ const Instruction& referenced_inst, -+ const Instruction& referenced_from_inst); -+ -+ spv_result_t ValidateShadingRateAtReference( -+ const Decoration& decoration, const Instruction& built_in_inst, -+ const Instruction& referenced_inst, -+ const Instruction& referenced_from_inst); -+ - // Validates that |built_in_inst| is not (even indirectly) referenced from - // within a function which can be called with |execution_model|. - // -@@ -3314,6 +3330,142 @@ spv_result_t BuiltInsValidator::ValidateSMBuiltinsAtReference( - return SPV_SUCCESS; - } - -+spv_result_t BuiltInsValidator::ValidatePrimitiveShadingRateAtDefinition( -+ const Decoration& decoration, const Instruction& inst) { -+ if (spvIsVulkanEnv(_.context()->target_env)) { -+ if (spv_result_t error = ValidateI32( -+ decoration, inst, -+ [this, &inst, -+ &decoration](const std::string& message) -> spv_result_t { -+ return _.diag(SPV_ERROR_INVALID_DATA, &inst) -+ << _.VkErrorID(4486) -+ << "According to the Vulkan spec BuiltIn " -+ << _.grammar().lookupOperandName(SPV_OPERAND_TYPE_BUILT_IN, -+ decoration.params()[0]) -+ << " variable needs to be a 32-bit int scalar. " -+ << message; -+ })) { -+ return error; -+ } -+ } -+ -+ // Seed at reference checks with this built-in. -+ return ValidatePrimitiveShadingRateAtReference(decoration, inst, inst, inst); -+} -+ -+spv_result_t BuiltInsValidator::ValidatePrimitiveShadingRateAtReference( -+ const Decoration& decoration, const Instruction& built_in_inst, -+ const Instruction& referenced_inst, -+ const Instruction& referenced_from_inst) { -+ if (spvIsVulkanEnv(_.context()->target_env)) { -+ const SpvStorageClass storage_class = GetStorageClass(referenced_from_inst); -+ if (storage_class != SpvStorageClassMax && -+ storage_class != SpvStorageClassOutput) { -+ return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst) -+ << _.VkErrorID(4485) << "Vulkan spec allows BuiltIn " -+ << _.grammar().lookupOperandName(SPV_OPERAND_TYPE_BUILT_IN, -+ decoration.params()[0]) -+ << " to be only used for variables with Output storage class. " -+ << GetReferenceDesc(decoration, built_in_inst, referenced_inst, -+ referenced_from_inst) -+ << " " << GetStorageClassDesc(referenced_from_inst); -+ } -+ -+ for (const SpvExecutionModel execution_model : execution_models_) { -+ switch (execution_model) { -+ case SpvExecutionModelVertex: -+ case SpvExecutionModelGeometry: -+ case SpvExecutionModelMeshNV: -+ break; -+ default: { -+ return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst) -+ << _.VkErrorID(4484) << "Vulkan spec allows BuiltIn " -+ << _.grammar().lookupOperandName(SPV_OPERAND_TYPE_BUILT_IN, -+ decoration.params()[0]) -+ << " to be used only with Vertex, Geometry, or MeshNV " -+ "execution models. " -+ << GetReferenceDesc(decoration, built_in_inst, referenced_inst, -+ referenced_from_inst, execution_model); -+ } -+ } -+ } -+ } -+ -+ if (function_id_ == 0) { -+ // Propagate this rule to all dependant ids in the global scope. -+ id_to_at_reference_checks_[referenced_from_inst.id()].push_back( -+ std::bind(&BuiltInsValidator::ValidatePrimitiveShadingRateAtReference, -+ this, decoration, built_in_inst, referenced_from_inst, -+ std::placeholders::_1)); -+ } -+ -+ return SPV_SUCCESS; -+} -+ -+spv_result_t BuiltInsValidator::ValidateShadingRateAtDefinition( -+ const Decoration& decoration, const Instruction& inst) { -+ if (spvIsVulkanEnv(_.context()->target_env)) { -+ if (spv_result_t error = ValidateI32( -+ decoration, inst, -+ [this, &inst, -+ &decoration](const std::string& message) -> spv_result_t { -+ return _.diag(SPV_ERROR_INVALID_DATA, &inst) -+ << _.VkErrorID(4492) -+ << "According to the Vulkan spec BuiltIn " -+ << _.grammar().lookupOperandName(SPV_OPERAND_TYPE_BUILT_IN, -+ decoration.params()[0]) -+ << " variable needs to be a 32-bit int scalar. " -+ << message; -+ })) { -+ return error; -+ } -+ } -+ -+ // Seed at reference checks with this built-in. -+ return ValidateShadingRateAtReference(decoration, inst, inst, inst); -+} -+ -+spv_result_t BuiltInsValidator::ValidateShadingRateAtReference( -+ const Decoration& decoration, const Instruction& built_in_inst, -+ const Instruction& referenced_inst, -+ const Instruction& referenced_from_inst) { -+ if (spvIsVulkanEnv(_.context()->target_env)) { -+ const SpvStorageClass storage_class = GetStorageClass(referenced_from_inst); -+ if (storage_class != SpvStorageClassMax && -+ storage_class != SpvStorageClassInput) { -+ return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst) -+ << _.VkErrorID(4491) << "Vulkan spec allows BuiltIn " -+ << _.grammar().lookupOperandName(SPV_OPERAND_TYPE_BUILT_IN, -+ decoration.params()[0]) -+ << " to be only used for variables with Input storage class. " -+ << GetReferenceDesc(decoration, built_in_inst, referenced_inst, -+ referenced_from_inst) -+ << " " << GetStorageClassDesc(referenced_from_inst); -+ } -+ -+ for (const SpvExecutionModel execution_model : execution_models_) { -+ if (execution_model != SpvExecutionModelFragment) { -+ return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst) -+ << _.VkErrorID(4490) << "Vulkan spec allows BuiltIn " -+ << _.grammar().lookupOperandName(SPV_OPERAND_TYPE_BUILT_IN, -+ decoration.params()[0]) -+ << " to be used only with the Fragment execution model. " -+ << GetReferenceDesc(decoration, built_in_inst, referenced_inst, -+ referenced_from_inst, execution_model); -+ } -+ } -+ } -+ -+ if (function_id_ == 0) { -+ // Propagate this rule to all dependant ids in the global scope. -+ id_to_at_reference_checks_[referenced_from_inst.id()].push_back(std::bind( -+ &BuiltInsValidator::ValidateShadingRateAtReference, this, decoration, -+ built_in_inst, referenced_from_inst, std::placeholders::_1)); -+ } -+ -+ return SPV_SUCCESS; -+} -+ - spv_result_t BuiltInsValidator::ValidateSingleBuiltInAtDefinition( - const Decoration& decoration, const Instruction& inst) { - const SpvBuiltIn label = SpvBuiltIn(decoration.params()[0]); -@@ -3515,6 +3667,12 @@ spv_result_t BuiltInsValidator::ValidateSingleBuiltInAtDefinition( - // No validation rules (for the moment). - break; - } -+ case SpvBuiltInPrimitiveShadingRateKHR: { -+ return ValidatePrimitiveShadingRateAtDefinition(decoration, inst); -+ } -+ case SpvBuiltInShadingRateKHR: { -+ return ValidateShadingRateAtDefinition(decoration, inst); -+ } - } - return SPV_SUCCESS; - } ---- a/source/val/validation_state.cpp -+++ b/source/val/validation_state.cpp -@@ -1517,6 +1517,18 @@ std::string ValidationState_t::VkErrorID(uint32_t id, - return VUID_WRAP(VUID-WorkgroupSize-WorkgroupSize-04426); - case 4427: - return VUID_WRAP(VUID-WorkgroupSize-WorkgroupSize-04427); -+ case 4484: -+ return VUID_WRAP(VUID-PrimitiveShadingRateKHR-PrimitiveShadingRateKHR-04484); -+ case 4485: -+ return VUID_WRAP(VUID-PrimitiveShadingRateKHR-PrimitiveShadingRateKHR-04485); -+ case 4486: -+ return VUID_WRAP(VUID-PrimitiveShadingRateKHR-PrimitiveShadingRateKHR-04486); -+ case 4490: -+ return VUID_WRAP(VUID-ShadingRateKHR-ShadingRateKHR-04490); -+ case 4491: -+ return VUID_WRAP(VUID-ShadingRateKHR-ShadingRateKHR-04491); -+ case 4492: -+ return VUID_WRAP(VUID-ShadingRateKHR-ShadingRateKHR-04492); - default: - return ""; // unknown id - }; diff --git a/recipes/diligentgraphics-spirv-tools/all/test_package/CMakeLists.txt b/recipes/diligentgraphics-spirv-tools/all/test_package/CMakeLists.txt deleted file mode 100644 index 17a8d915b246e..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(SPIRV-Tools REQUIRED CONFIG) - -add_executable(${PROJECT_NAME}_c test_package.c) -if(TARGET SPIRV-Tools-shared) - target_link_libraries(${PROJECT_NAME}_c SPIRV-Tools-shared) -elseif(TARGET SPIRV-Tools-static) - target_link_libraries(${PROJECT_NAME}_c SPIRV-Tools-static) -else() - message(FATAL_ERROR "Neither target SPIRV-Tools-shared or target SPIRV-Tools-shared exist") -endif() - -# TODO: we should call find_package(SPIRV-Tools-opt REQUIRED CONFIG), but not modeled right now -if(TARGET SPIRV-Tools-opt) - add_executable(${PROJECT_NAME}_cpp test_package.cpp) - target_link_libraries(${PROJECT_NAME}_cpp SPIRV-Tools-opt) - set_property(TARGET ${PROJECT_NAME}_cpp PROPERTY CXX_STANDARD 11) -endif() diff --git a/recipes/diligentgraphics-spirv-tools/all/test_package/conanfile.py b/recipes/diligentgraphics-spirv-tools/all/test_package/conanfile.py deleted file mode 100644 index 095f9b5e4320c..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/test_package/conanfile.py +++ /dev/null @@ -1,20 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path_c = os.path.join("bin", "test_package_c") - self.run(bin_path_c, run_environment=True) - if not self.options["diligentgraphics-spirv-tools"].shared: - bin_path_cpp = os.path.join("bin", "test_package_cpp") - self.run(bin_path_cpp, run_environment=True) diff --git a/recipes/diligentgraphics-spirv-tools/all/test_package/test_package.c b/recipes/diligentgraphics-spirv-tools/all/test_package/test_package.c deleted file mode 100644 index 932428db546e7..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/test_package/test_package.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "spirv-tools/libspirv.h" - -int main(int argc, char ** argv) -{ -const char input_text[] = - "OpCapability Shader\n" - "OpCapability Linkage\n" - "OpMemoryModel Logical GLSL450"; - spv_text text; - spv_binary binary; - spv_context context; - - context = spvContextCreate(SPV_ENV_UNIVERSAL_1_1); - - binary = 0; - if( SPV_SUCCESS != spvTextToBinary(context, input_text, sizeof(input_text), &binary, 0) ) - { - return 1; - } - - text = 0; - if( SPV_SUCCESS != spvBinaryToText(context, binary->code, binary->wordCount, 0, &text, 0) ) - { - return 1; - } - - spvTextDestroy(text); - spvBinaryDestroy(binary); - spvContextDestroy(context); - return 0; -} diff --git a/recipes/diligentgraphics-spirv-tools/all/test_package/test_package.cpp b/recipes/diligentgraphics-spirv-tools/all/test_package/test_package.cpp deleted file mode 100644 index a1e22c7365ae8..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/all/test_package/test_package.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This program demonstrates basic SPIR-V module processing using -// SPIRV-Tools C++ API: -// * Assembling -// * Validating -// * Optimizing -// * Disassembling - -#include -#include -#include - -#include "spirv-tools/libspirv.hpp" -#include "spirv-tools/optimizer.hpp" - -int main() { - const std::string source = - " OpCapability Linkage " - " OpCapability Shader " - " OpMemoryModel Logical GLSL450 " - " OpSource GLSL 450 " - " OpDecorate %spec SpecId 1 " - " %int = OpTypeInt 32 1 " - " %spec = OpSpecConstant %int 0 " - "%const = OpConstant %int 42"; - - spvtools::SpirvTools core(SPV_ENV_UNIVERSAL_1_3); - spvtools::Optimizer opt(SPV_ENV_UNIVERSAL_1_3); - - auto print_msg_to_stderr = [](spv_message_level_t, const char*, - const spv_position_t&, const char* m) { - std::cerr << "error: " << m << std::endl; - }; - core.SetMessageConsumer(print_msg_to_stderr); - opt.SetMessageConsumer(print_msg_to_stderr); - - std::vector spirv; - if (!core.Assemble(source, &spirv)) return 1; - if (!core.Validate(spirv)) return 1; - - opt.RegisterPass(spvtools::CreateSetSpecConstantDefaultValuePass({{1, "42"}})) - .RegisterPass(spvtools::CreateFreezeSpecConstantValuePass()) - .RegisterPass(spvtools::CreateUnifyConstantPass()) - .RegisterPass(spvtools::CreateStripDebugInfoPass()); - if (!opt.Run(spirv.data(), spirv.size(), &spirv)) return 1; - - std::string disassembly; - if (!core.Disassemble(spirv, &disassembly)) return 1; - std::cout << disassembly << "\n"; - - return 0; -} diff --git a/recipes/diligentgraphics-spirv-tools/config.yml b/recipes/diligentgraphics-spirv-tools/config.yml deleted file mode 100644 index b60234b0142df..0000000000000 --- a/recipes/diligentgraphics-spirv-tools/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "cci.20211008": - folder: all diff --git a/recipes/diligentgraphics-vulkan-headers/all/conandata.yml b/recipes/diligentgraphics-vulkan-headers/all/conandata.yml deleted file mode 100644 index 055ccbddfe499..0000000000000 --- a/recipes/diligentgraphics-vulkan-headers/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "cci.20211005": - url: "https://github.com/DiligentGraphics/Vulkan-Headers/archive/fa27a13cf74080df2ad421a788299db1276f17a7.zip" - sha256: "c4af8476d8ac788c5d7fea9fc74c982a64e280c592c5c68fe65e3119f40ed58e" diff --git a/recipes/diligentgraphics-vulkan-headers/all/conanfile.py b/recipes/diligentgraphics-vulkan-headers/all/conanfile.py deleted file mode 100644 index 7f3356c28a8d9..0000000000000 --- a/recipes/diligentgraphics-vulkan-headers/all/conanfile.py +++ /dev/null @@ -1,49 +0,0 @@ -from conans import ConanFile, tools -import glob -import os - -required_conan_version = ">=1.33" - - -class VulkanHeadersConan(ConanFile): - name = "diligentgraphics-vulkan-headers" - description = "Diligent fork of Vulkan Header files." - license = "Apache-2.0" - topics = ("vulkan-headers", "vulkan") - homepage = "https://github.com/DiligentGraphics/Vulkan-Headers" - url = "https://github.com/conan-io/conan-center-index" - provides = "vulkan-headers" - deprecated = "vulkan-headers" - no_copy_source = True - - @property - def _source_subfolder(self): - return "source_subfolder" - - def package_id(self): - self.info.header_only() - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) - - def package(self): - self.copy("LICENSE.txt", dst="licenses", src=self._source_subfolder) - self.copy("*", dst="include", src=os.path.join(self.source_folder, self._source_subfolder, "include")) - self.copy("*", dst=os.path.join("res", "vulkan", "registry"), - src=os.path.join(self.source_folder, self._source_subfolder, "registry")) - - def package_info(self): - self.cpp_info.filenames["cmake_find_package"] = "VulkanHeaders" - self.cpp_info.filenames["cmake_find_package_multi"] = "VulkanHeaders" - self.cpp_info.names["cmake_find_package"] = "Vulkan" - self.cpp_info.names["cmake_find_package_multi"] = "Vulkan" - self.cpp_info.components["vulkanheaders"].names["cmake_find_package"] = "Headers" - self.cpp_info.components["vulkanheaders"].names["cmake_find_package_multi"] = "Headers" - self.cpp_info.components["vulkanheaders"].bindirs = [] - self.cpp_info.components["vulkanheaders"].libdirs = [] - self.cpp_info.components["vulkanregistry"].names["cmake_find_package"] = "Registry" - self.cpp_info.components["vulkanregistry"].names["cmake_find_package_multi"] = "Registry" - self.cpp_info.components["vulkanregistry"].includedirs = [os.path.join("res", "vulkan", "registry")] - self.cpp_info.components["vulkanregistry"].bindirs = [] - self.cpp_info.components["vulkanregistry"].libdirs = [] diff --git a/recipes/diligentgraphics-vulkan-headers/all/test_package/CMakeLists.txt b/recipes/diligentgraphics-vulkan-headers/all/test_package/CMakeLists.txt deleted file mode 100644 index 5e69638f3fc18..0000000000000 --- a/recipes/diligentgraphics-vulkan-headers/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package C) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(VulkanHeaders REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} Vulkan::Headers) diff --git a/recipes/diligentgraphics-vulkan-headers/all/test_package/conanfile.py b/recipes/diligentgraphics-vulkan-headers/all/test_package/conanfile.py deleted file mode 100644 index b6a26067f365d..0000000000000 --- a/recipes/diligentgraphics-vulkan-headers/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -import os - -from conans import ConanFile, CMake, tools - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/diligentgraphics-vulkan-headers/all/test_package/test_package.c b/recipes/diligentgraphics-vulkan-headers/all/test_package/test_package.c deleted file mode 100644 index defd9fd301685..0000000000000 --- a/recipes/diligentgraphics-vulkan-headers/all/test_package/test_package.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -int main() { - VkApplicationInfo appInfo; - appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; - appInfo.pApplicationName = "Hello Conan"; - appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0); - appInfo.pEngineName = "Dummy Engine"; - appInfo.engineVersion = VK_MAKE_VERSION(1, 0, 0); - appInfo.apiVersion = VK_API_VERSION_1_0; - - VkInstanceCreateInfo createInfo; - createInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - createInfo.pApplicationInfo = &appInfo; - createInfo.enabledLayerCount = 0; - createInfo.ppEnabledLayerNames = NULL; - createInfo.enabledExtensionCount = 0; - createInfo.ppEnabledExtensionNames = NULL; - - return 0; -} diff --git a/recipes/diligentgraphics-vulkan-headers/config.yml b/recipes/diligentgraphics-vulkan-headers/config.yml deleted file mode 100644 index 3d7bd37111af4..0000000000000 --- a/recipes/diligentgraphics-vulkan-headers/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "cci.20211005": - folder: all diff --git a/recipes/flatc/all/CMakeLists.txt b/recipes/flatc/all/CMakeLists.txt deleted file mode 100644 index 2765caac4dc2c..0000000000000 --- a/recipes/flatc/all/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.4) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -if (WIN32 AND MSVC AND FLATBUFFERS_BUILD_SHAREDLIB) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -endif(WIN32 AND MSVC AND FLATBUFFERS_BUILD_SHAREDLIB) - -add_subdirectory("source_subfolder") diff --git a/recipes/flatc/all/conandata.yml b/recipes/flatc/all/conandata.yml deleted file mode 100644 index ed9781e339181..0000000000000 --- a/recipes/flatc/all/conandata.yml +++ /dev/null @@ -1,14 +0,0 @@ -sources: - 1.11.0: - url: "https://github.com/google/flatbuffers/archive/v1.11.0.tar.gz" - sha256: "3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b" - 1.12.0: - url: "https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz" - sha256: "62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45" -patches: - 1.11.0: - - patch_file: "patches/0001-buildflatbuffers-cmake.patch" - base_path: "source_subfolder" - 1.12.0: - - patch_file: "patches/0001-buildflatbuffers-cmake.patch" - base_path: "source_subfolder" diff --git a/recipes/flatc/all/conanfile.py b/recipes/flatc/all/conanfile.py deleted file mode 100644 index 0968794e0610f..0000000000000 --- a/recipes/flatc/all/conanfile.py +++ /dev/null @@ -1,64 +0,0 @@ -"""Conan recipe package for Google FlatBuffers - Flatc -""" -import os -from conans import ConanFile, CMake, tools - - -class FlatcConan(ConanFile): - name = "flatc" - deprecated = "flatbuffers" - license = "Apache-2.0" - url = "https://github.com/conan-io/conan-center-index" - homepage = "http://google.github.io/flatbuffers/" - topics = ("conan", "flatbuffers", "serialization", "rpc", "json-parser", "installer") - description = "Memory Efficient Serialization Library" - settings = "os", "arch" - exports_sources = ["CMakeLists.txt","patches/**"] - generators = "cmake" - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def _patch_sources(self): - for patch in self.conan_data["patches"][self.version]: - tools.patch(**patch) - - def source(self): - tools.get(**self.conan_data["sources"][self.version]) - extracted_dir = "flatbuffers-" + self.version - os.rename(extracted_dir, self._source_subfolder) - - def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["FLATBUFFERS_BUILD_TESTS"] = False - cmake.definitions["FLATBUFFERS_BUILD_SHAREDLIB"] = False - cmake.definitions["FLATBUFFERS_BUILD_FLATLIB"] = True - cmake.definitions["FLATBUFFERS_BUILD_FLATC"] = True - cmake.definitions["FLATBUFFERS_BUILD_FLATHASH"] = True - cmake.configure(build_folder=self._build_subfolder) - return cmake - - def build(self): - self._patch_sources() - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy(pattern="LICENSE.txt", dst="licenses", src=self._source_subfolder) - extension = ".exe" if self.settings.os == "Windows" else "" - bin_dir = os.path.join(self._build_subfolder, "bin") - self.copy(pattern="flatc" + extension, dst="bin", src=bin_dir) - self.copy(pattern="flathash" + extension, dst="bin", src=bin_dir) - self.copy(pattern="BuildFlatBuffers.cmake", dst="bin/cmake", src=os.path.join(self._source_subfolder,"CMake")) - - def package_info(self): - bin_path = os.path.join(self.package_folder, "bin") - self.output.info('Appending PATH environment variable: %s' % bin_path) - self.env_info.PATH.append(bin_path) - self.cpp_info.builddirs.append("bin/cmake") - self.cpp_info.build_modules.append("bin/cmake/BuildFlatBuffers.cmake") diff --git a/recipes/flatc/all/patches/0001-buildflatbuffers-cmake.patch b/recipes/flatc/all/patches/0001-buildflatbuffers-cmake.patch deleted file mode 100644 index b54f5042542e0..0000000000000 --- a/recipes/flatc/all/patches/0001-buildflatbuffers-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/BuildFlatBuffers.cmake b/CMake/BuildFlatBuffers.cmake -index 835f4b80..edc2fde7 100644 ---- a/CMake/BuildFlatBuffers.cmake -+++ b/CMake/BuildFlatBuffers.cmake -@@ -60,7 +60,7 @@ function(build_flatbuffers flatbuffers_schemas - set(FLATC_TARGET "") - set(FLATC ${FLATBUFFERS_FLATC_EXECUTABLE}) - else() -- set(FLATC_TARGET flatc) -+ set(FLATC_TARGET "") - set(FLATC flatc) - endif() - set(FLATC_SCHEMA_ARGS --gen-mutable) diff --git a/recipes/flatc/all/test_package/CMakeLists.txt b/recipes/flatc/all/test_package/CMakeLists.txt deleted file mode 100644 index 345fa69ffef50..0000000000000 --- a/recipes/flatc/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - - -include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake") -conan_basic_setup() - -find_package(flatc REQUIRED) - -build_flatbuffers("test_package.fbs" "" flatbuffers "" "${CMAKE_CURRENT_BINARY_DIR}" "" "") - -add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/test_package_generated.h test_package.cpp) diff --git a/recipes/flatc/all/test_package/conanfile.py b/recipes/flatc/all/test_package/conanfile.py deleted file mode 100644 index ab7f129616778..0000000000000 --- a/recipes/flatc/all/test_package/conanfile.py +++ /dev/null @@ -1,21 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch" - generators = "cmake", "cmake_find_package" - - def build_requirements(self): - if tools.cross_building(self.settings): - self.build_requires(str(self.requires["flatc"])) - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build(target="flatbuffers") - - def test(self): - if not tools.cross_building(self, skip_x64_x86=True): - self.run("flatc --version", run_environment=True) - self.run("flathash fnv1_16 conan", run_environment=True) diff --git a/recipes/flatc/all/test_package/test_package.cpp b/recipes/flatc/all/test_package/test_package.cpp deleted file mode 100644 index d1381dd5ea96b..0000000000000 --- a/recipes/flatc/all/test_package/test_package.cpp +++ /dev/null @@ -1,4 +0,0 @@ -int main() -{ - return 0; -} diff --git a/recipes/flatc/all/test_package/test_package.fbs b/recipes/flatc/all/test_package/test_package.fbs deleted file mode 100644 index c6391125ec369..0000000000000 --- a/recipes/flatc/all/test_package/test_package.fbs +++ /dev/null @@ -1,8 +0,0 @@ -// example IDL file - -struct Vec3 { - x:float; - y:float; - z:float; -} - diff --git a/recipes/flatc/config.yml b/recipes/flatc/config.yml deleted file mode 100644 index 0b18ee803ecfb..0000000000000 --- a/recipes/flatc/config.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -versions: - 1.11.0: - folder: all - 1.12.0: - folder: all - diff --git a/recipes/jsonformoderncpp/all/conandata.yml b/recipes/jsonformoderncpp/all/conandata.yml deleted file mode 100644 index 4a57b4331cec4..0000000000000 --- a/recipes/jsonformoderncpp/all/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "3.7.0": - sha256: D51A3A8D3EFBB1139D7608E28782EA9EFEA7E7933157E8FF8184901EFD8EE760 - url: https://github.com/nlohmann/json/archive/v3.7.0.tar.gz diff --git a/recipes/jsonformoderncpp/all/conanfile.py b/recipes/jsonformoderncpp/all/conanfile.py deleted file mode 100644 index cd09e5d797c73..0000000000000 --- a/recipes/jsonformoderncpp/all/conanfile.py +++ /dev/null @@ -1,54 +0,0 @@ -from conans import ConanFile, tools, CMake -import os - -required_conan_version = ">=1.28.0" - -class JsonformoderncppConan(ConanFile): - name = "jsonformoderncpp" - homepage = "https://github.com/nlohmann/json" - description = "JSON for Modern C++ parser and generator." - topics = ("conan", "jsonformoderncpp", "json", "header-only") - url = "https://github.com/conan-io/conan-center-index" - settings = "os", "compiler", "arch", "build_type" - no_copy_source = True - license = "MIT" - deprecated = "nlohmann_json" - options = { - "multiple_headers": [True, False] - } - default_options = { - "multiple_headers": False - } - - @property - def _source_subfolder(self): - return "source_subfolder" - - def source(self): - tools.get(**self.conan_data["sources"][self.version]) - extracted_dir = "json-" + self.version - os.rename(extracted_dir, self._source_subfolder) - - def _configure_cmake(self): - cmake = CMake(self) - cmake.definitions["JSON_BuildTests"] = False - cmake.definitions["JSON_MultipleHeaders"] = self.options.multiple_headers - cmake.configure(source_folder=self._source_subfolder) - return cmake - - def build(self): - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy(pattern="LICENSE*", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - tools.rmdir(os.path.join(self.package_folder, "lib")) - try: - os.remove(os.path.join(self.package_folder, "nlohmann_json.natvis")) - except FileNotFoundError: - pass - - def package_id(self): - self.info.header_only() diff --git a/recipes/jsonformoderncpp/all/test_package/CMakeLists.txt b/recipes/jsonformoderncpp/all/test_package/CMakeLists.txt deleted file mode 100644 index 33ae887aa6aea..0000000000000 --- a/recipes/jsonformoderncpp/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) -set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) diff --git a/recipes/jsonformoderncpp/all/test_package/conanfile.py b/recipes/jsonformoderncpp/all/test_package/conanfile.py deleted file mode 100644 index bd7165a553cf4..0000000000000 --- a/recipes/jsonformoderncpp/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self.settings): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/jsonformoderncpp/all/test_package/test_package.cpp b/recipes/jsonformoderncpp/all/test_package/test_package.cpp deleted file mode 100644 index e7ea2ba241a83..0000000000000 --- a/recipes/jsonformoderncpp/all/test_package/test_package.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include - -#include - -using json = nlohmann::json; - -int main() { - const json data = { - {"pi", 3.141}, - {"happy", true}, - {"name", "Niels"}, - {"nothing", nullptr}, - {"answer", { - {"everything", 42} - }}, - {"list", {1, 0, 2}}, - {"object", { - {"currency", "USD"}, - {"value", 42.99} - }} - }; - - std::cout << data.dump(4) << std::endl; - return 0; -} diff --git a/recipes/jsonformoderncpp/config.yml b/recipes/jsonformoderncpp/config.yml deleted file mode 100644 index 20ddf579e6d44..0000000000000 --- a/recipes/jsonformoderncpp/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "3.7.0": - folder: all diff --git a/recipes/msgpack/all/CMakeLists.txt b/recipes/msgpack/all/CMakeLists.txt deleted file mode 100644 index 11573c481bf89..0000000000000 --- a/recipes/msgpack/all/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -add_subdirectory("source_subfolder") diff --git a/recipes/msgpack/all/conandata.yml b/recipes/msgpack/all/conandata.yml deleted file mode 100644 index faaacd5f1a742..0000000000000 --- a/recipes/msgpack/all/conandata.yml +++ /dev/null @@ -1,7 +0,0 @@ -sources: - "3.2.1": - url: "https://github.com/msgpack/msgpack-c/archive/cpp-3.2.1.tar.gz" - sha256: "464f46744a6be778626d11452c4db3c2d09461080c6db42e358e21af19d542f6" - "3.3.0": - url: "https://github.com/msgpack/msgpack-c/archive/cpp-3.3.0.tar.gz" - sha256: "754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b" diff --git a/recipes/msgpack/all/conanfile.py b/recipes/msgpack/all/conanfile.py deleted file mode 100644 index c99fb76c55aa2..0000000000000 --- a/recipes/msgpack/all/conanfile.py +++ /dev/null @@ -1,135 +0,0 @@ -from conans import ConanFile, CMake, tools -from conans.errors import ConanInvalidConfiguration -import os - - -class MsgpackConan(ConanFile): - name = "msgpack" - description = "The official C++ library for MessagePack" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/msgpack/msgpack-c" - topics = ("conan", "msgpack", "message-pack", "serialization") - license = "BSL-1.0" - exports_sources = "CMakeLists.txt" - generators = "cmake" - settings = "os", "arch", "build_type", "compiler" - options = { - "fPIC": [True, False], - "shared": [True, False], - "c_api": [True, False], - "cpp_api": [True, False], - "with_boost": [True, False], - "header_only": [True, False] - } - default_options = { - "fPIC": True, - "shared": False, - "c_api": True, - "cpp_api": True, - "with_boost": False, - "header_only": False - } - deprecated = "msgpack-c or msgpack-cxx" - - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - # Deprecate header_only option - if self.options.header_only: - self.options.c_api = False - self.options.cpp_api = True - self.output.warn("header_only option is deprecated, prefer c_api=False and cpp_api=True") - del self.options.header_only - - if not self.options.c_api and not self.options.cpp_api: - raise ConanInvalidConfiguration("You must enable at least c_api or cpp_api.") - if self.options.c_api: - if self.options.shared: - del self.options.fPIC - del self.settings.compiler.libcxx - del self.settings.compiler.cppstd - else: - del self.options.shared - del self.options.fPIC - if not self.options.cpp_api: - del self.options.with_boost - if self.options.get_safe("with_boost"): - self.options["boost"].header_only = False - self.options["boost"].without_chrono = False - self.options["boost"].without_context = False - self.options["boost"].without_system = False - self.options["boost"].without_timer = False - - def requirements(self): - if self.options.get_safe("with_boost"): - self.requires("boost/1.74.0") - - def package_id(self): - del self.info.options.with_boost - if not self.options.c_api: - self.info.header_only() - - def source(self): - tools.get(**self.conan_data["sources"][self.version]) - extracted_dir = "msgpack-c-cpp-" + self.version - os.rename(extracted_dir, self._source_subfolder) - - def _configure_cmake(self): - if self._cmake: - return self._cmake - self._cmake = CMake(self) - self._cmake.definitions["MSGPACK_ENABLE_SHARED"] = self.options.shared - self._cmake.definitions["MSGPACK_ENABLE_STATIC"] = not self.options.shared - self._cmake.definitions["MSGPACK_ENABLE_CXX"] = self.options.cpp_api - self._cmake.definitions["MSGPACK_BOOST"] = self.options.get_safe("with_boost", False) - self._cmake.definitions["MSGPACK_32BIT"] = self.settings.arch == "x86" - self._cmake.definitions["MSGPACK_BUILD_EXAMPLES"] = False - self._cmake.definitions["MSGPACK_BUILD_TESTS"] = False - self._cmake.configure(build_folder=self._build_subfolder) - return self._cmake - - def build(self): - if self.options.get_safe("with_boost") and \ - (self.options["boost"].header_only or self.options["boost"].without_chrono or \ - self.options["boost"].without_context or self.options["boost"].without_system or \ - self.options["boost"].without_timer): - raise ConanInvalidConfiguration("msgpack with boost requires the following boost components: chrono, context, system and timer.") - if self.options.c_api: - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy("LICENSE_1_0.txt", dst="licenses", src=self._source_subfolder) - if self.options.c_api: - cmake = self._configure_cmake() - cmake.install() - tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) - tools.rmdir(os.path.join(self.package_folder, "lib", "cmake")) - else: - self.copy("*.h", dst="include", src=os.path.join(self._source_subfolder, "include")) - self.copy("*.hpp", dst="include", src=os.path.join(self._source_subfolder, "include")) - - def package_info(self): - # TODO: CMake imported targets shouldn't be namespaced (waiting implementation of https://github.com/conan-io/conan/issues/7615) - if self.options.c_api: - self.cpp_info.components["msgpackc"].names["cmake_find_package"] = "msgpackc" - self.cpp_info.components["msgpackc"].names["cmake_find_package_multi"] = "msgpackc" - self.cpp_info.components["msgpackc"].libs = tools.collect_libs(self) - if self.options.cpp_api: - self.cpp_info.components["msgpackc-cxx"].names["cmake_find_package"] = "msgpackc-cxx" - self.cpp_info.components["msgpackc-cxx"].names["cmake_find_package_multi"] = "msgpackc-cxx" - if self.options.with_boost: - self.cpp_info.components["msgpackc-cxx"].defines = ["MSGPACK_USE_BOOST"] - self.cpp_info.components["msgpackc-cxx"].requires = ["boost::boost"] diff --git a/recipes/msgpack/all/test_package/CMakeLists.txt b/recipes/msgpack/all/test_package/CMakeLists.txt deleted file mode 100644 index 7b194f0596222..0000000000000 --- a/recipes/msgpack/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -find_package(msgpack REQUIRED CONFIG) - -# TODO: remove msgpack:: namespace when fixed in cpp_info of recipe -if(MSGPACK_C_API) - add_executable(${PROJECT_NAME}_c test_package.c) - target_link_libraries(${PROJECT_NAME}_c msgpack::msgpackc) -endif() -if(MSGPACK_CPP_API) - add_executable(${PROJECT_NAME}_cpp test_package.cpp) - target_link_libraries(${PROJECT_NAME}_cpp msgpack::msgpackc-cxx) - set_property(TARGET ${PROJECT_NAME}_cpp PROPERTY CXX_STANDARD 11) -endif() diff --git a/recipes/msgpack/all/test_package/conanfile.py b/recipes/msgpack/all/test_package/conanfile.py deleted file mode 100644 index c3432553ca5d0..0000000000000 --- a/recipes/msgpack/all/test_package/conanfile.py +++ /dev/null @@ -1,23 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.definitions["MSGPACK_C_API"] = self.options["msgpack"].c_api - cmake.definitions["MSGPACK_CPP_API"] = self.options["msgpack"].cpp_api - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self.settings): - if self.options["msgpack"].c_api: - bin_c_path = os.path.join("bin", "test_package_c") - self.run(bin_c_path, run_environment=True) - if self.options["msgpack"].cpp_api: - bin_cpp_path = os.path.join("bin", "test_package_cpp") - self.run(bin_cpp_path, run_environment=True) diff --git a/recipes/msgpack/all/test_package/test_package.c b/recipes/msgpack/all/test_package/test_package.c deleted file mode 100644 index 17422b5a0a3d2..0000000000000 --- a/recipes/msgpack/all/test_package/test_package.c +++ /dev/null @@ -1,8 +0,0 @@ -#include - -#include - -int main() { - printf("msgpack version %s\n", msgpack_version()); - return 0; -} diff --git a/recipes/msgpack/all/test_package/test_package.cpp b/recipes/msgpack/all/test_package/test_package.cpp deleted file mode 100644 index 291dd422b88be..0000000000000 --- a/recipes/msgpack/all/test_package/test_package.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -#include - -int main() { - msgpack::object obj(123); - std::cout << obj << "\n"; - return 0; -} diff --git a/recipes/msgpack/config.yml b/recipes/msgpack/config.yml deleted file mode 100644 index 5d0be2319bc1b..0000000000000 --- a/recipes/msgpack/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -versions: - "3.2.1": - folder: all - "3.3.0": - folder: all diff --git a/recipes/mysql-connector-c/all/CMakeLists.txt b/recipes/mysql-connector-c/all/CMakeLists.txt deleted file mode 100644 index 894d61a215daf..0000000000000 --- a/recipes/mysql-connector-c/all/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12) - -project(cmake_wrapper) -message(WARNING "Conan MySQL Connector/C Wrapped CMake") - -include(../conanbuildinfo.cmake) -conan_basic_setup(NO_OUTPUT_DIRS) -include("CMakeListsOriginal.txt") - -# Turn off -Werror in GCC debug builds. -if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX) - target_compile_options(clientlib - PUBLIC -Wno-error) - target_compile_options(mysys - PUBLIC -Wno-error) - target_compile_options(strings - PUBLIC -Wno-error) -endif() diff --git a/recipes/mysql-connector-c/all/conandata.yml b/recipes/mysql-connector-c/all/conandata.yml deleted file mode 100644 index 41e3b18a983f4..0000000000000 --- a/recipes/mysql-connector-c/all/conandata.yml +++ /dev/null @@ -1,14 +0,0 @@ -sources: - "6.1.11": - sha256: c8664851487200162b38b6f3c8db69850bd4f0e4c5ff5a6d161dbfb5cb76b6c4 - url: "http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.11-src.tar.gz" -patches: - "6.1.11": - - patch_file: "patches/001-20028_all_mysql-5.6-gcc7.patch" - base_path: "source_subfolder" - - patch_file: "patches/002-mysql_config.patch" - base_path: "source_subfolder" - - patch_file: "patches/003-cmake-install-standard-locations.patch" - base_path: "source_subfolder" - - patch_file: "patches/004-cmake-install-typo.patch" - base_path: "source_subfolder" diff --git a/recipes/mysql-connector-c/all/conanfile.py b/recipes/mysql-connector-c/all/conanfile.py deleted file mode 100644 index 6d7ea21e58004..0000000000000 --- a/recipes/mysql-connector-c/all/conanfile.py +++ /dev/null @@ -1,97 +0,0 @@ -from conans import ConanFile, CMake, tools -from conans.errors import ConanInvalidConfiguration -import os - - -class MysqlConnectorCConan(ConanFile): - name = "mysql-connector-c" - url = "https://github.com/conan-io/conan-center-index" - description = "A MySQL client library for C development." - topics = ("mysql", "sql", "connector", "database") - homepage = "https://dev.mysql.com/downloads/connector/c/" - license = "GPL-2.0" - exports_sources = ["CMakeLists.txt", "patches/*.patch"] - generators = "cmake" - settings = "os", "arch", "compiler", "build_type" - options = {"shared": [True, False], "with_ssl": [True, False], "with_zlib": [True, False]} - default_options = {'shared': False, 'with_ssl': True, 'with_zlib': True} - - deprecated = "libmysqlclient" - - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - def requirements(self): - if self.options.with_ssl: - self.requires("openssl/1.0.2u") - - if self.options.with_zlib: - self.requires("zlib/1.2.11") - - def validate(self): - if hasattr(self, "settings_build") and tools.cross_building(self, skip_x64_x86=True): - raise ConanInvalidConfiguration("Cross compilation not yet supported by the recipe. contributions are welcome.") - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - strip_root=True, destination=self._source_subfolder) - - def _configure_cmake(self): - if self._cmake: - return self._cmake - self._cmake = CMake(self) - - self._cmake.definitions["DISABLE_SHARED"] = not self.options.shared - self._cmake.definitions["DISABLE_STATIC"] = self.options.shared - self._cmake.definitions["STACK_DIRECTION"] = "-1" # stack grows downwards, on very few platforms stack grows upwards - self._cmake.definitions["REQUIRE_STDCPP"] = tools.stdcpp_library(self) - - if self.settings.compiler == "Visual Studio": - if self.settings.compiler.runtime == "MD" or self.settings.compiler.runtime == "MDd": - self._cmake.definitions["WINDOWS_RUNTIME_MD"] = True - - if self.options.with_ssl: - self._cmake.definitions["WITH_SSL"] = "system" - - if self.options.with_zlib: - self._cmake.definitions["WITH_ZLIB"] = "system" - - self._cmake.configure(source_dir=self._source_subfolder) - return self._cmake - - def _patch_sources(self): - sources_cmake = os.path.join(self._source_subfolder, "CMakeLists.txt") - sources_cmake_orig = os.path.join(self._source_subfolder, "CMakeListsOriginal.txt") - - tools.rename(sources_cmake, sources_cmake_orig) - tools.rename("CMakeLists.txt", sources_cmake) - - for patch in self.conan_data["patches"][self.version]: - tools.patch(**patch) - - def build(self): - self._patch_sources() - cmake = self._configure_cmake() - cmake.build() - - def package(self): - cmake = self._configure_cmake() - cmake.install() - tools.mkdir(os.path.join(self.package_folder, "licenses")) - tools.rename(os.path.join(self.package_folder, "COPYING"), os.path.join(self.package_folder, "licenses", "COPYING")) - tools.rename(os.path.join(self.package_folder, "COPYING-debug"), os.path.join(self.package_folder, "licenses", "COPYING-debug")) - tools.remove_files_by_mask(self.package_folder, "README*") - tools.remove_files_by_mask(self.package_folder, "*.pdb") - tools.rmdir(os.path.join(self.package_folder, "docs")) - - def package_info(self): - self.cpp_info.libs = ["libmysql" if self.options.shared and self.settings.os == "Windows" else "mysqlclient"] - if not self.options.shared: - stdcpp_library = tools.stdcpp_library(self) - if stdcpp_library: - self.cpp_info.system_libs.append(stdcpp_library) - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.system_libs.append('m') diff --git a/recipes/mysql-connector-c/all/patches/001-20028_all_mysql-5.6-gcc7.patch b/recipes/mysql-connector-c/all/patches/001-20028_all_mysql-5.6-gcc7.patch deleted file mode 100644 index 326bbe3e9f1f3..0000000000000 --- a/recipes/mysql-connector-c/all/patches/001-20028_all_mysql-5.6-gcc7.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sql-common/client_authentication.cc b/sql-common/client_authentication.cc -index eaeb2d4..035ecd2 100644 ---- a/sql-common/client_authentication.cc -+++ b/sql-common/client_authentication.cc -@@ -83,7 +83,7 @@ RSA *rsa_init(MYSQL *mysql) - - if (mysql->options.extension != NULL && - mysql->options.extension->server_public_key_path != NULL && -- mysql->options.extension->server_public_key_path != '\0') -+ mysql->options.extension->server_public_key_path[0] != '\0') - { - pub_key_file= fopen(mysql->options.extension->server_public_key_path, - "r"); diff --git a/recipes/mysql-connector-c/all/patches/002-mysql_config.patch b/recipes/mysql-connector-c/all/patches/002-mysql_config.patch deleted file mode 100644 index 95c1c123bfb36..0000000000000 --- a/recipes/mysql-connector-c/all/patches/002-mysql_config.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- scripts/CMakeLists.txt -+++ scripts/CMakeLists.txt -@@ -50,6 +50,8 @@ IF(POLICY CMP0007) - CMAKE_POLICY(SET CMP0007 OLD) - ENDIF() - -+set(REQUIRE_STDCPP "" CACHE STRING "c++ library") -+ - # Extract dependencies using CMake's internal ${target}_LIB_DEPENDS variable - # returned string in ${var} is can be passed to linker's command line - MACRO(EXTRACT_LINK_LIBRARIES target var) -@@ -72,6 +74,9 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - ENDIF() - ENDIF() - ENDFOREACH() -+ IF(REQUIRE_STDCPP) -+ SET(${var} "${${var}}-l${REQUIRE_STDCPP}") -+ ENDIF() - ENDIF() - IF(MSVC) - STRING(REPLACE "-l" "" ${var} "${${var}}") -@@ -79,6 +84,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - ENDMACRO() - - EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS) -+GET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME TARGET mysqlclient PROPERTY OUTPUT_NAME) - - SET(LIBMYSQLD_LIBS_USAGE " - --libmysqld-libs [$embedded_libs]") -diff --git a/source/source_subfolder/scripts/mysql_config.pl.in b/source/source_subfolder/scripts/mysql_config.pl.in -index 54e3f76..b3c10c9 100644 ---- scripts/mysql_config.pl.in -+++ scripts/mysql_config.pl.in -@@ -184,7 +184,7 @@ else - - - my $flags; --$flags->{libs} = [@lib_opts, qw(@CONFIG_CLIENT_LIBS@)]; -+$flags->{libs} = [@lib_opts, qw(@CLIENT_LIBS@)]; - $flags->{embedded_libs} = [@lib_e_opts, qw(@CONFIG_EMBEDD_LIBS@)]; - - $flags->{include} = ["-I$pkgincludedir"]; -diff --git a/source/source_subfolder/scripts/mysql_config.sh b/source/source_subfolder/scripts/mysql_config.sh -index a900cc6..b8118c1 100644 ---- scripts/mysql_config.sh -+++ scripts/mysql_config.sh -@@ -111,7 +111,7 @@ fi - - # Create options - libs="-L$pkglibdir@RPATH_OPTION@" --libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@" -+libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CLIENT_LIBS@" - embedded_libs="-L$pkglibdir@RPATH_OPTION@" - embedded_libs="$embedded_libs -l@LIBEMBED_OS_OUTPUT_NAME@ @CONFIG_EMBEDD_LIBS@" - diff --git a/recipes/mysql-connector-c/all/patches/003-cmake-install-standard-locations.patch b/recipes/mysql-connector-c/all/patches/003-cmake-install-standard-locations.patch deleted file mode 100644 index 5681047426401..0000000000000 --- a/recipes/mysql-connector-c/all/patches/003-cmake-install-standard-locations.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/install_macros.cmake -+++ cmake/install_macros.cmake -@@ -238,7 +238,7 @@ - IF(ARG_COMPONENT) - SET(COMP COMPONENT ${ARG_COMPONENT}) - ENDIF() -- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP}) -+ INSTALL(TARGETS ${TARGETS} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ${COMP}) - IF(CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "Release") - SET(INSTALL_LOCATION ${ARG_DESTINATION} ) - INSTALL_DEBUG_SYMBOLS("${TARGETS}") diff --git a/recipes/mysql-connector-c/all/patches/004-cmake-install-typo.patch b/recipes/mysql-connector-c/all/patches/004-cmake-install-typo.patch deleted file mode 100644 index 35d2bee366601..0000000000000 --- a/recipes/mysql-connector-c/all/patches/004-cmake-install-typo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- cmake/install_macros.cmake -+++ cmake/install_macros.cmake -@@ -359,10 +359,10 @@ - INSTALL(FILES ${_target_location} - DESTINATION ${_destination} - ${_rename_param} - CONFIGURATIONS Release RelWithDebInfo - COMPONENT ${ARG_COMPONENT} - OPTIONAL) -- ENDIF() -- ENDFOREACH() -+ ENDFOREACH() -+ ENDIF() - - ENDFUNCTION() diff --git a/recipes/mysql-connector-c/all/test_package/CMakeLists.txt b/recipes/mysql-connector-c/all/test_package/CMakeLists.txt deleted file mode 100644 index af5ced10013a7..0000000000000 --- a/recipes/mysql-connector-c/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -find_package(Threads) - -add_executable(${PROJECT_NAME} test_package.c) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/recipes/mysql-connector-c/all/test_package/conanfile.py b/recipes/mysql-connector-c/all/test_package/conanfile.py deleted file mode 100644 index d4128b0450777..0000000000000 --- a/recipes/mysql-connector-c/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/mysql-connector-c/all/test_package/test_package.c b/recipes/mysql-connector-c/all/test_package/test_package.c deleted file mode 100644 index 382117abe3e35..0000000000000 --- a/recipes/mysql-connector-c/all/test_package/test_package.c +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include - -int main(int argc, char **argv) -{ - printf("MySQL client version: %s\n", mysql_get_client_info()); - return 0; -} diff --git a/recipes/mysql-connector-c/config.yml b/recipes/mysql-connector-c/config.yml deleted file mode 100644 index 2c88a55b7af83..0000000000000 --- a/recipes/mysql-connector-c/config.yml +++ /dev/null @@ -1,3 +0,0 @@ -versions: - "6.1.11": - folder: all diff --git a/recipes/tbb/all/conandata.yml b/recipes/tbb/all/conandata.yml deleted file mode 100644 index de98a3aa2d71d..0000000000000 --- a/recipes/tbb/all/conandata.yml +++ /dev/null @@ -1,16 +0,0 @@ -sources: - "2020.3": - url: "https://github.com/oneapi-src/oneTBB/archive/v2020.3.tar.gz" - sha256: "ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3" - "2020.2": - url: "https://github.com/oneapi-src/oneTBB/archive/v2020.2.tar.gz" - sha256: "4804320e1e6cbe3a5421997b52199e3c1a3829b2ecb6489641da4b8e32faf500" - "2020.1": - url: "https://github.com/oneapi-src/oneTBB/archive/v2020.1.tar.gz" - sha256: "7c96a150ed22bc3c6628bc3fef9ed475c00887b26d37bca61518d76a56510971" - "2020.0": - url: "https://github.com/oneapi-src/oneTBB/archive/v2020.0.tar.gz" - sha256: "57714f2d2cf33935db33cee93af57eb3ecd5a7bef40c1fb7ca4a41d79684b118" - "2019_u9": - url: "https://github.com/oneapi-src/oneTBB/archive/2019_U9.tar.gz" - sha256: "3f5ea81b9caa195f1967a599036b473b2e7c347117330cda99b79cfcf5b77c84" diff --git a/recipes/tbb/all/conanfile.py b/recipes/tbb/all/conanfile.py deleted file mode 100644 index 12a63359ae427..0000000000000 --- a/recipes/tbb/all/conanfile.py +++ /dev/null @@ -1,275 +0,0 @@ -from conan.tools.microsoft import msvc_runtime_flag -from conans import ConanFile, tools -from conans.errors import ConanInvalidConfiguration, ConanException -import os -import textwrap - -required_conan_version = ">=1.43.0" - - -class TBBConan(ConanFile): - deprecated = "onetbb" - - name = "tbb" - license = "Apache-2.0" - url = "https://github.com/conan-io/conan-center-index" - homepage = "https://github.com/oneapi-src/oneTBB" - description = ( - "Intel Threading Building Blocks (Intel TBB) lets you easily write " - "parallel C++ programs that take full advantage of multicore " - "performance, that are portable and composable, and that have " - "future-proof scalability" - ) - topics = ("tbb", "threading", "parallelism", "tbbmalloc") - - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False], - "tbbmalloc": [True, False], - "tbbproxy": [True, False], - } - default_options = { - "shared": True, - "fPIC": True, - "tbbmalloc": False, - "tbbproxy": False, - } - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _settings_build(self): - return getattr(self, "settings_build", self.settings) - - @property - def _is_msvc(self): - return str(self.settings.compiler) in ["Visual Studio", "msvc"] - - @property - def _is_clanglc(self): - return self.settings.os == "Windows" and self.settings.compiler == "clang" - - @property - def _base_compiler(self): - base = self.settings.get_safe("compiler.base") - if base: - return self.settings.compiler.base - return self.settings.compiler - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - if self.options.shared: - del self.options.fPIC - - def validate(self): - if self.settings.os == "Macos": - if hasattr(self, "settings_build") and tools.cross_building(self): - # See logs from https://github.com/conan-io/conan-center-index/pull/8454 - raise ConanInvalidConfiguration("Cross building on Macos is not yet supported. Contributions are welcome") - if self.settings.compiler == "apple-clang" and tools.Version(self.settings.compiler.version) < "8.0": - raise ConanInvalidConfiguration("%s %s couldn't be built by apple-clang < 8.0" % (self.name, self.version)) - if not self.options.shared: - self.output.warn("Intel-TBB strongly discourages usage of static linkage") - if self.options.tbbproxy and \ - (not self.options.shared or \ - not self.options.tbbmalloc): - raise ConanInvalidConfiguration("tbbproxy needs tbbmaloc and shared options") - - def package_id(self): - del self.info.options.tbbmalloc - del self.info.options.tbbproxy - - def build_requirements(self): - if self._settings_build.os == "Windows": - if "CONAN_MAKE_PROGRAM" not in os.environ and not tools.which("make"): - self.build_requires("make/4.2.1") - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - strip_root=True, destination=self._source_subfolder) - - def build(self): - def add_flag(name, value): - if name in os.environ: - os.environ[name] += " " + value - else: - os.environ[name] = value - - # Get the version of the current compiler instead of gcc - linux_include = os.path.join(self._source_subfolder, "build", "linux.inc") - tools.replace_in_file(linux_include, "shell gcc", "shell $(CC)") - tools.replace_in_file(linux_include, "= gcc", "= $(CC)") - - if self.version != "2019_u9" and self.settings.build_type == "Debug": - tools.replace_in_file(os.path.join(self._source_subfolder, "Makefile"), "release", "debug") - - if str(self._base_compiler) in ["Visual Studio", "msvc"]: - tools.save( - os.path.join(self._source_subfolder, "build", "big_iron_msvc.inc"), - # copy of big_iron.inc adapted for MSVC - textwrap.dedent("""\ - LIB_LINK_CMD = {}.exe - LIB_OUTPUT_KEY = /OUT: - LIB_LINK_FLAGS = - LIB_LINK_LIBS = - DYLIB_KEY = - override CXXFLAGS += -D__TBB_DYNAMIC_LOAD_ENABLED=0 -D__TBB_SOURCE_DIRECTLY_INCLUDED=1 - ITT_NOTIFY = - DLL = lib - LIBEXT = lib - LIBPREF = - LIBDL = - TBB.DLL = $(LIBPREF)tbb$(DEBUG_SUFFIX).$(LIBEXT) - LINK_TBB.LIB = $(TBB.DLL) - TBB.DEF = - TBB_NO_VERSION.DLL = - MALLOC.DLL = $(LIBPREF)tbbmalloc$(DEBUG_SUFFIX).$(LIBEXT) - LINK_MALLOC.LIB = $(MALLOC.DLL) - MALLOC.DEF = - MALLOC_NO_VERSION.DLL = - MALLOCPROXY.DLL = - MALLOCPROXY.DEF = - """.format("xilib" if self.settings.compiler == "intel" else "lib")) - ) - extra = "" if self.options.shared else "extra_inc=big_iron_msvc.inc" - else: - extra = "" if self.options.shared else "extra_inc=big_iron.inc" - - arch = { - "x86": "ia32", - "x86_64": "intel64", - "armv7": "armv7", - "armv8": "aarch64", - }[str(self.settings.arch)] - extra += " arch=%s" % arch - - if str(self._base_compiler) in ("gcc", "clang", "apple-clang"): - if str(self._base_compiler.libcxx) in ("libstdc++", "libstdc++11"): - extra += " stdlib=libstdc++" - elif str(self._base_compiler.libcxx) == "libc++": - extra += " stdlib=libc++" - - if str(self.settings.compiler) == "intel": - extra += " compiler=icc" - elif str(self.settings.compiler) in ("clang", "apple-clang"): - extra += " compiler=clang" - else: - extra += " compiler=gcc" - - if self.settings.os == "Linux": - # runtime is supposed to track the version of the c++ stdlib, - # the version of glibc, and the version of the linux kernel. - # However, it isn't actually used anywhere other than for - # logging and build directory names. - # TBB computes the value of this variable using gcc, which we - # don't necessarily want to require when building this recipe. - # Setting it to a dummy value prevents TBB from calling gcc. - extra += " runtime=gnu" - elif str(self._base_compiler) in ["Visual Studio", "msvc"]: - if "MT" in msvc_runtime_flag(self): - runtime = "vc_mt" - else: - if self.settings.compiler == "Visual Studio": - runtime = { - "8": "vc8", - "9": "vc9", - "10": "vc10", - "11": "vc11", - "12": "vc12", - "14": "vc14", - "15": "vc14.1", - "16": "vc14.2" - }.get(str(self._base_compiler.version), "vc14.2") - else: - runtime = { - "190": "vc14", - "191": "vc14.1", - "192": "vc14.2" - }.get(str(self._base_compiler.version), "vc14.2") - extra += " runtime=%s" % runtime - - if self.settings.compiler == "intel": - extra += " compiler=icl" - else: - extra += " compiler=cl" - - make = tools.get_env("CONAN_MAKE_PROGRAM", tools.which("make") or tools.which("mingw32-make")) - if not make: - raise ConanException("This package needs 'make' in the path to build") - - with tools.chdir(self._source_subfolder): - # intentionally not using AutoToolsBuildEnvironment for now - it's broken for clang-cl - if self._is_clanglc: - add_flag("CFLAGS", "-mrtm") - add_flag("CXXFLAGS", "-mrtm") - - targets = ["tbb", "tbbmalloc", "tbbproxy"] - context = tools.no_op() - if self.settings.compiler == "intel": - context = tools.intel_compilervars(self) - elif self._is_msvc: - # intentionally not using vcvars for clang-cl yet - context = tools.vcvars(self) - with context: - self.run("%s %s %s" % (make, extra, " ".join(targets))) - - def package(self): - self.copy("LICENSE", dst="licenses", src=self._source_subfolder) - self.copy(pattern="*.h", dst="include", src="%s/include" % self._source_subfolder) - self.copy(pattern="*", dst="include/tbb/compat", src="%s/include/tbb/compat" % self._source_subfolder) - build_folder = "%s/build/" % self._source_subfolder - build_type = "debug" if self.settings.build_type == "Debug" else "release" - self.copy(pattern="*%s*.lib" % build_type, dst="lib", src=build_folder, keep_path=False) - self.copy(pattern="*%s*.a" % build_type, dst="lib", src=build_folder, keep_path=False) - self.copy(pattern="*%s*.dll" % build_type, dst="bin", src=build_folder, keep_path=False) - self.copy(pattern="*%s*.dylib" % build_type, dst="lib", src=build_folder, keep_path=False) - # Copy also .dlls to lib folder so consumers can link against them directly when using MinGW - if self.settings.os == "Windows" and self.settings.compiler == "gcc": - self.copy("*%s*.dll" % build_type, dst="lib", src=build_folder, keep_path=False) - - if self.settings.os == "Linux": - extension = "so" - if self.options.shared: - self.copy("*%s*.%s.*" % (build_type, extension), "lib", build_folder, - keep_path=False) - outputlibdir = os.path.join(self.package_folder, "lib") - os.chdir(outputlibdir) - for fpath in os.listdir(outputlibdir): - self.run("ln -s \"%s\" \"%s\"" % - (fpath, fpath[0:fpath.rfind("." + extension) + len(extension) + 1])) - - def package_info(self): - self.cpp_info.set_property("cmake_file_name", "TBB") - - suffix = "_debug" if self.settings.build_type == "Debug" else "" - - # tbb - self.cpp_info.components["libtbb"].set_property("cmake_target_name", "TBB::tbb") - self.cpp_info.components["libtbb"].libs = ["tbb{}".format(suffix)] - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.components["libtbb"].system_libs = ["dl", "rt", "pthread"] - - # tbbmalloc - if self.options.tbbmalloc: - self.cpp_info.components["tbbmalloc"].set_property("cmake_target_name", "TBB::tbbmalloc") - self.cpp_info.components["tbbmalloc"].libs = ["tbbmalloc{}".format(suffix)] - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.components["tbbmalloc"].system_libs = ["dl", "pthread"] - - # tbbmalloc_proxy - if self.options.tbbproxy: - self.cpp_info.components["tbbmalloc_proxy"].set_property("cmake_target_name", "TBB::tbbmalloc_proxy") - self.cpp_info.components["tbbmalloc_proxy"].libs = ["tbbmalloc_proxy{}".format(suffix)] - self.cpp_info.components["tbbmalloc_proxy"].requires = ["tbbmalloc"] - - # TODO: to remove in conan v2 once cmake_find_package* generators removed - self.cpp_info.names["cmake_find_package"] = "TBB" - self.cpp_info.names["cmake_find_package_multi"] = "TBB" - self.cpp_info.components["libtbb"].names["cmake_find_package"] = "tbb" - self.cpp_info.components["libtbb"].names["cmake_find_package_multi"] = "tbb" diff --git a/recipes/tbb/all/test_package/CMakeLists.txt b/recipes/tbb/all/test_package/CMakeLists.txt deleted file mode 100644 index d5a40167452f4..0000000000000 --- a/recipes/tbb/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(test_package CXX) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -find_package(TBB REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} TBB::tbb) -set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) diff --git a/recipes/tbb/all/test_package/conanfile.py b/recipes/tbb/all/test_package/conanfile.py deleted file mode 100644 index 38f4483872d47..0000000000000 --- a/recipes/tbb/all/test_package/conanfile.py +++ /dev/null @@ -1,17 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake", "cmake_find_package_multi" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True) diff --git a/recipes/tbb/all/test_package/test_package.cpp b/recipes/tbb/all/test_package/test_package.cpp deleted file mode 100644 index bdbc6a7923b4c..0000000000000 --- a/recipes/tbb/all/test_package/test_package.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "tbb/task_group.h" -#include "tbb/flow_graph.h" -#include "tbb/compat/tuple" -#include - -using namespace tbb; -using namespace tbb::flow; - -int Fib(int n) { - if( n<2 ) { - return n; - } else { - int x, y; - task_group g; - g.run([&]{x=Fib(n-1);}); // spawn a task - g.run([&]{y=Fib(n-2);}); // spawn another task - g.wait(); // wait for both tasks to complete - return x+y; - } -} - -int main(){ - std::cout<<"Fib 6="< hello( g, - []( const continue_msg &) { - std::cout << "Hello"; - } - ); - continue_node< continue_msg> world( g, - []( const continue_msg &) { - std::cout << " World\n"; - } - ); - make_edge(hello, world); - hello.try_put(continue_msg()); - g.wait_for_all(); - return 0; -} diff --git a/recipes/tbb/config.yml b/recipes/tbb/config.yml deleted file mode 100644 index 3252e0ec85d9e..0000000000000 --- a/recipes/tbb/config.yml +++ /dev/null @@ -1,11 +0,0 @@ -versions: - "2020.3": - folder: all - "2020.2": - folder: all - "2020.1": - folder: all - "2020.0": - folder: all - "2019_u9": - folder: all From 66bfba9a865a77760563d3de91d1ae7505d74b0c Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 13 Nov 2024 19:04:43 +0200 Subject: [PATCH 2/3] Drop old non-migrated b2 and google-cloud-cpp recipes --- recipes/b2/standard/conandata.yml | 13 - recipes/b2/standard/conanfile.py | 101 ----- recipes/b2/standard/test_package/conanfile.py | 9 - recipes/google-cloud-cpp/all/CMakeLists.txt | 14 - recipes/google-cloud-cpp/all/conandata.yml | 23 -- recipes/google-cloud-cpp/all/conanfile.py | 374 ------------------ .../all/patches/0001-googleapis-folder.patch | 22 -- .../all/test_package/CMakeLists.txt | 14 - .../all/test_package/conanfile.py | 16 - .../all/test_package/storage.cpp | 24 -- recipes/google-cloud-cpp/config.yml | 10 - 11 files changed, 620 deletions(-) delete mode 100644 recipes/b2/standard/conandata.yml delete mode 100644 recipes/b2/standard/conanfile.py delete mode 100644 recipes/b2/standard/test_package/conanfile.py delete mode 100644 recipes/google-cloud-cpp/all/CMakeLists.txt delete mode 100644 recipes/google-cloud-cpp/all/conandata.yml delete mode 100644 recipes/google-cloud-cpp/all/conanfile.py delete mode 100644 recipes/google-cloud-cpp/all/patches/0001-googleapis-folder.patch delete mode 100644 recipes/google-cloud-cpp/all/test_package/CMakeLists.txt delete mode 100644 recipes/google-cloud-cpp/all/test_package/conanfile.py delete mode 100644 recipes/google-cloud-cpp/all/test_package/storage.cpp diff --git a/recipes/b2/standard/conandata.yml b/recipes/b2/standard/conandata.yml deleted file mode 100644 index 574decae59105..0000000000000 --- a/recipes/b2/standard/conandata.yml +++ /dev/null @@ -1,13 +0,0 @@ -sources: - "4.0.0": - sha256: f59bd90bd4d68b44005a83a60d3d933d3768fc5a5b51e45a0462e6f4b81caa8a - url: https://github.com/bfgroup/b2/archive/4.0.0.tar.gz - "4.0.1": - sha256: ebdfb38b3938dba4c2548b2b7f4ca48e209beef9a376a78742bcd75769a9d68f - url: https://github.com/bfgroup/b2/archive/4.0.1.tar.gz - "4.1.0": - sha256: eb562b14677e3ad3619bb67e6be6ea97d5dbe34780bbc47bed4cdda3177835c8 - url: https://github.com/bfgroup/b2/archive/4.1.0.tar.gz - "4.2.0": - sha256: 00e3425e0419688ea61ecbbcd106ce168e334f0acdcc2f4a4ead084f03cd4b60 - url: https://github.com/bfgroup/b2/archive/4.2.0.tar.gz diff --git a/recipes/b2/standard/conanfile.py b/recipes/b2/standard/conanfile.py deleted file mode 100644 index 6eac8be0f9018..0000000000000 --- a/recipes/b2/standard/conanfile.py +++ /dev/null @@ -1,101 +0,0 @@ -from conans import ConanFile, tools -from conans.errors import ConanInvalidConfiguration -import os - - -class B2Conan(ConanFile): - name = "b2" - homepage = "https://www.bfgroup.xyz/b2/" - description = "B2 makes it easy to build C++ projects, everywhere." - topics = ("conan", "installer", "builder") - license = "BSL-1.0" - settings = "os", "arch" - url = "https://github.com/conan-io/conan-center-index" - - ''' - * use_cxx_env: False, True - - Indicates if the build will use the CXX and - CXXFLAGS environment variables. The common use is to add additional flags - for building on specific platforms or for additional optimization options. - - * toolset: 'auto', 'cxx', 'cross-cxx', - 'acc', 'borland', 'clang', 'como', 'gcc-nocygwin', 'gcc', - 'intel-darwin', 'intel-linux', 'intel-win32', 'kcc', 'kylix', - 'mingw', 'mipspro', 'pathscale', 'pgi', 'qcc', 'sun', 'sunpro', - 'tru64cxx', 'vacpp', 'vc12', 'vc14', 'vc141', 'vc142', 'vc143' - - Specifies the toolset to use for building. The default of 'auto' detects - a usable compiler for building and should be preferred. The 'cxx' toolset - uses the 'CXX' and 'CXXFLAGS' solely for building. Using the 'cxx' - toolset will also turn on the 'use_cxx_env' option. And the 'cross-cxx' - toolset uses the 'BUILD_CXX' and 'BUILD_CXXFLAGS' vars. This frees the - 'CXX' and 'CXXFLAGS' variables for use in subprocesses. - ''' - options = { - 'use_cxx_env': [False, True], - 'toolset': [ - 'auto', 'cxx', 'cross-cxx', - 'acc', 'borland', 'clang', 'como', 'gcc-nocygwin', 'gcc', - 'intel-darwin', 'intel-linux', 'intel-win32', 'kcc', 'kylix', - 'mingw', 'mipspro', 'pathscale', 'pgi', 'qcc', 'sun', 'sunpro', - 'tru64cxx', 'vacpp', 'vc12', 'vc14', 'vc141', 'vc142', 'vc143'] - } - default_options = { - 'use_cxx_env': False, - 'toolset': 'auto' - } - - def configure(self): - if (self.options.toolset == 'cxx' or self.options.toolset == 'cross-cxx') and not self.options.use_cxx_env: - raise ConanInvalidConfiguration( - "Option toolset 'cxx' and 'cross-cxx' requires 'use_cxx_env=True'") - - def source(self): - tools.get(**self.conan_data["sources"][self.version], - strip_root=True, destination="source") - - def build(self): - use_windows_commands = os.name == 'nt' - command = "build" if use_windows_commands else "./build.sh" - if self.options.toolset != 'auto': - command += " "+str(self.options.toolset) - build_dir = os.path.join(self.source_folder, "source") - engine_dir = os.path.join(build_dir, "src", "engine") - os.chdir(engine_dir) - with tools.environment_append({"VSCMD_START_DIR": os.curdir}): - if self.options.use_cxx_env: - # Allow use of CXX env vars. - self.run(command) - else: - # To avoid using the CXX env vars we clear them out for the build. - with tools.environment_append({"CXX": "", "CXXFLAGS": ""}): - self.run(command) - os.chdir(build_dir) - command = os.path.join( - engine_dir, "b2.exe" if use_windows_commands else "b2") - if self.options.toolset != 'auto': - full_command = "{0} --ignore-site-config --prefix=../output --abbreviate-paths" \ - " toolset={1} install".format(command, self.options.toolset) - else: - full_command = "{0} --ignore-site-config --prefix=../output --abbreviate-paths" \ - " install".format(command) - self.run(full_command) - - def package(self): - self.copy("LICENSE.txt", dst="licenses", src="source") - self.copy(pattern="*b2", dst="bin", src="output/bin") - self.copy(pattern="*b2.exe", dst="bin", src="output/bin") - self.copy(pattern="*.jam", dst="bin/b2_src", - src="output/share/boost-build") - - def package_info(self): - self.cpp_info.bindirs = ["bin"] - self.env_info.path = [os.path.join( - self.package_folder, "bin")] - self.env_info.BOOST_BUILD_PATH = os.path.join( - self.package_folder, "bin", "b2_src", "src", "kernel") - - def package_id(self): - del self.info.options.use_cxx_env - del self.info.options.toolset diff --git a/recipes/b2/standard/test_package/conanfile.py b/recipes/b2/standard/test_package/conanfile.py deleted file mode 100644 index 24d8a018c8f84..0000000000000 --- a/recipes/b2/standard/test_package/conanfile.py +++ /dev/null @@ -1,9 +0,0 @@ -from conans import ConanFile, tools -import os - - -class TestPackgeConan(ConanFile): - settings = "os", "arch" - - def test(self): - self.run("b2 -v", run_environment=True) diff --git a/recipes/google-cloud-cpp/all/CMakeLists.txt b/recipes/google-cloud-cpp/all/CMakeLists.txt deleted file mode 100644 index a342eb16dcf1a..0000000000000 --- a/recipes/google-cloud-cpp/all/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.4) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup() - -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - -if(MSVC) - add_definitions("-D_SILENCE_CXX20_REL_OPS_DEPRECATION_WARNING") - add_definitions("-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING") -endif() - -add_subdirectory("source_subfolder") diff --git a/recipes/google-cloud-cpp/all/conandata.yml b/recipes/google-cloud-cpp/all/conandata.yml deleted file mode 100644 index a410b93b2e064..0000000000000 --- a/recipes/google-cloud-cpp/all/conandata.yml +++ /dev/null @@ -1,23 +0,0 @@ -sources: - "1.26.1": - url: "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v1.26.1.tar.gz" - sha256: "83108515fc59c72cdb87f178712256f4b0098e1ca5dc6f64c2c20dd2f1e1559d" - "1.27.0": - url: "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v1.27.0.tar.gz" - sha256: "84a7ac7b63db986bb737462e374c11fc6f35f6020ccaacec1d0e4d61ec929528" - "1.30.1": - url: "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v1.30.1.tar.gz" - sha256: "b651a58cb44bd715f0cb8e42c7ea58490b3e768a35ede01d798b983eef88e143" - "1.31.1": - url: "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v1.31.1.tar.gz" - sha256: "dc7cbf95b506a84b48cf71e0462985d262183edeaabdacaaee2109852394a609" - "1.40.1": - url: "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v1.40.1.tar.gz" - sha256: "fb62f0e7dc964c5d3cd0d85977b85f3e0e7dce97e9029abf9c32ecc29db07043" -patches: - "1.26.1": - - patch_file: "patches/0001-googleapis-folder.patch" - base_path: "source_subfolder" - "1.27.0": - - patch_file: "patches/0001-googleapis-folder.patch" - base_path: "source_subfolder" diff --git a/recipes/google-cloud-cpp/all/conanfile.py b/recipes/google-cloud-cpp/all/conanfile.py deleted file mode 100644 index 30fac004d5e19..0000000000000 --- a/recipes/google-cloud-cpp/all/conanfile.py +++ /dev/null @@ -1,374 +0,0 @@ -import os -import textwrap -import functools - -from conans import ConanFile, CMake, tools -from conans.errors import ConanInvalidConfiguration - -required_conan_version = ">=1.33.0" - -class GoogleCloudCppConan(ConanFile): - name = "google-cloud-cpp" - description = "C++ Client Libraries for Google Cloud Services" - license = "Apache-2.0" - topics = "google", "cloud", "google-cloud-storage", "google-cloud-platform", "google-cloud-pubsub", "google-cloud-spanner", "google-cloud-bigtable" - homepage = "https://github.com/googleapis/google-cloud-cpp" - url = "https://github.com/conan-io/conan-center-index" - generators = "cmake", "cmake_find_package_multi", "cmake_find_package" - settings = "os", "arch", "compiler", "build_type" - options = { - "shared": [True, False], - "fPIC": [True, False] - } - default_options = { - "shared": False, - "fPIC": True - } - - short_paths = True - _cmake = None - - @property - def _source_subfolder(self): - return "source_subfolder" - - def export_sources(self): - self.copy("CMakeLists.txt") - for patch in self.conan_data.get("patches", {}).get(self.version, []): - self.copy(patch["patch_file"]) - - def config_options(self): - if self.settings.os == "Windows": - del self.options.fPIC - - def configure(self): - if self.options.shared: - del self.options.fPIC - - def validate(self): - if self.settings.os == 'Windows' and self.options.shared: - raise ConanInvalidConfiguration("Fails to compile for Windows as a DLL") - - if hasattr(self, "settings_build") and tools.cross_building(self): - raise ConanInvalidConfiguration("Recipe not prepared for cross-building (yet)") - - if tools.Version(self.version) >= "1.30.0": - if self.settings.compiler == 'clang' and tools.Version(self.settings.compiler.version) < "6.0": - raise ConanInvalidConfiguration("Clang version must be at least 6.0.") - - if self.settings.compiler.cppstd: - tools.check_min_cppstd(self, 11) - - if self.settings.compiler == 'gcc' and tools.Version(self.settings.compiler.version) < "5.4": - raise ConanInvalidConfiguration("Building requires GCC >= 5.4") - if self.settings.compiler == 'clang' and tools.Version(self.settings.compiler.version) < "3.8": - raise ConanInvalidConfiguration("Building requires clang >= 3.8") - if self.settings.compiler == 'Visual Studio' and tools.Version(self.settings.compiler.version) < "16": - raise ConanInvalidConfiguration("Building requires VS >= 2019") - - def source(self): - tools.get(**self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True) - - def requirements(self): - self.requires('protobuf/3.20.0') - self.requires('grpc/1.45.2') - self.requires('nlohmann_json/3.10.5') - self.requires('crc32c/1.1.2') - self.requires('abseil/20211102.0') - self.requires('libcurl/7.80.0') - self.requires('openssl/1.1.1n') - # TODO: Add googleapis once it is available in CCI (now it is embedded) - - @functools.lru_cache(1) - def _configure_cmake(self): - # Do not build in parallel for certain configurations, it fails writting/reading files at the same time - parallel = not (self.settings.compiler == "Visual Studio" and self.settings.compiler.version == "16" and self.version in ["1.31.1", "1.30.1"]) - cmake = CMake(self, parallel=parallel) - cmake.definitions["BUILD_TESTING"] = 0 - - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK"] = False - - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_BIGTABLE"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_BIGQUERY"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_SPANNER"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_STORAGE"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_FIRESTORE"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_PUBSUB"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_IAM"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_LOGGING"] = True - cmake.definitions["GOOGLE_CLOUD_CPP_ENABLE_GENERATOR"] = True - - cmake.configure() - return cmake - - def _patch_sources(self): - for patch in self.conan_data.get("patches", {}).get(self.version, []): - tools.patch(**patch) - - if tools.Version(self.version) < "1.33.0": - # Do not override CMAKE_CXX_STANDARD if provided - tools.replace_in_file(os.path.join(self._source_subfolder, "CMakeLists.txt"), - textwrap.dedent("""\ - set(CMAKE_CXX_STANDARD - 11 - CACHE STRING "Configure the C++ standard version for all targets.")"""), - textwrap.dedent("""\ - if(NOT "${CMAKE_CXX_STANDARD}") - set(CMAKE_CXX_STANDARD 11 CACHE STRING "Configure the C++ standard version for all targets.") - endif() - """)) - - def build(self): - self._patch_sources() - cmake = self._configure_cmake() - cmake.build() - - def package(self): - self.copy("LICENSE", dst="licenses", src=self._source_subfolder) - cmake = self._configure_cmake() - cmake.install() - tools.rmdir(os.path.join(self.package_folder, 'lib', "cmake")) - tools.rmdir(os.path.join(self.package_folder, 'lib', 'pkgconfig')) - - def package_info(self): - self.cpp_info.components["common"].requires = ["abseil::absl_any", "abseil::absl_flat_hash_map", "abseil::absl_memory", "abseil::absl_optional", "abseil::absl_time"] - self.cpp_info.components["common"].libs = ["google_cloud_cpp_common"] - self.cpp_info.components["common"].names["pkg_config"] = "google_cloud_cpp_common" - - self.cpp_info.components["experimental-bigquery"].requires = ["grpc_utils", "common", "cloud_bigquery_protos"] - self.cpp_info.components["experimental-bigquery"].libs = ["google_cloud_cpp_bigquery"] - self.cpp_info.components["experimental-bigquery"].names["pkg_config"] = "google_cloud_cpp_bigquery" - - self.cpp_info.components["bigtable"].requires = ["abseil::absl_memory", "bigtable_protos", "common", "grpc_utils", "grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["bigtable"].libs = ["google_cloud_cpp_bigtable"] - self.cpp_info.components["bigtable"].names["pkg_config"] = "google_cloud_cpp_bigtable" - - if tools.Version(self.version) < "1.40.1": # FIXME: Probably this library was removed before - self.cpp_info.components["experimental-firestore"].requires = ["common"] - self.cpp_info.components["experimental-firestore"].libs = ["google_cloud_cpp_firestore"] - self.cpp_info.components["experimental-firestore"].names["pkg_config"] = "google_cloud_cpp_firestore" - - self.cpp_info.components["bigtable_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos", "iam_v1_iam_policy_protos", "iam_v1_policy_protos", "longrunning_operations_protos", "rpc_status_protos", "api_auth_protos"] - self.cpp_info.components["bigtable_protos"].libs = ["google_cloud_cpp_bigtable_protos"] - self.cpp_info.components["bigtable_protos"].names["pkg_config"] = "google_cloud_cpp_bigtable_protos" - - self.cpp_info.components["cloud_bigquery_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos", "iam_v1_iam_policy_protos", "iam_v1_policy_protos", "rpc_status_protos", "api_http_protos"] - self.cpp_info.components["cloud_bigquery_protos"].libs = ["google_cloud_cpp_cloud_bigquery_protos"] - self.cpp_info.components["cloud_bigquery_protos"].names["pkg_config"] = "google_cloud_cpp_cloud_bigquery_protos" - - self.cpp_info.components["cloud_speech_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "longrunning_operations_protos", "rpc_status_protos"] - self.cpp_info.components["cloud_speech_protos"].libs = ["google_cloud_cpp_cloud_speech_protos"] - self.cpp_info.components["cloud_speech_protos"].names["pkg_config"] = "google_cloud_cpp_cloud_speech_protos" - - self.cpp_info.components["cloud_texttospeech_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos"] - self.cpp_info.components["cloud_texttospeech_protos"].libs = ["google_cloud_cpp_cloud_texttospeech_protos"] - self.cpp_info.components["cloud_texttospeech_protos"].names["pkg_config"] = "google_cloud_cpp_cloud_texttospeech_protos" - - self.cpp_info.components["iam_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos"] - self.cpp_info.components["iam_protos"].libs = ["google_cloud_cpp_iam_protos"] - self.cpp_info.components["iam_protos"].names["pkg_config"] = "google_cloud_cpp_iam_protos" - - self.cpp_info.components["pubsub_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos"] - self.cpp_info.components["pubsub_protos"].libs = ["google_cloud_cpp_pubsub_protos"] - self.cpp_info.components["pubsub_protos"].names["pkg_config"] = "google_cloud_cpp_pubsub_protos" - - self.cpp_info.components["spanner_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos", "iam_v1_iam_policy_protos", "iam_v1_policy_protos", "longrunning_operations_protos", "rpc_status_protos"] - self.cpp_info.components["spanner_protos"].libs = ["google_cloud_cpp_spanner_protos"] - self.cpp_info.components["spanner_protos"].names["pkg_config"] = "google_cloud_cpp_spanner_protos" - - self.cpp_info.components["storage_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "iam_v1_iam_policy_protos", "iam_v1_policy_protos"] - self.cpp_info.components["storage_protos"].libs = ["google_cloud_cpp_storage_protos"] - self.cpp_info.components["storage_protos"].names["pkg_config"] = "google_cloud_cpp_storage_protos" - - self.cpp_info.components["longrunning_operations_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "rpc_status_protos"] - self.cpp_info.components["longrunning_operations_protos"].libs = ["google_cloud_cpp_longrunning_operations_protos"] - self.cpp_info.components["longrunning_operations_protos"].names["pkg_config"] = "google_cloud_cpp_longrunning_operations_protos" - - self.cpp_info.components["api_http_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["api_http_protos"].libs = ["google_cloud_cpp_api_http_protos"] - self.cpp_info.components["api_http_protos"].names["pkg_config"] = "google_cloud_cpp_api_http_protos" - - self.cpp_info.components["api_annotations_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_http_protos"] - self.cpp_info.components["api_annotations_protos"].libs = ["google_cloud_cpp_api_annotations_protos"] - self.cpp_info.components["api_annotations_protos"].names["pkg_config"] = "google_cloud_cpp_api_annotations_protos" - - self.cpp_info.components["api_auth_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos"] - self.cpp_info.components["api_auth_protos"].libs = ["google_cloud_cpp_api_auth_protos"] - self.cpp_info.components["api_auth_protos"].names["pkg_config"] = "google_cloud_cpp_api_auth_protos" - - self.cpp_info.components["api_client_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["api_client_protos"].libs = ["google_cloud_cpp_api_client_protos"] - self.cpp_info.components["api_client_protos"].names["pkg_config"] = "google_cloud_cpp_api_client_protos" - - self.cpp_info.components["api_distribution_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["api_distribution_protos"].libs = ["google_cloud_cpp_api_distribution_protos"] - self.cpp_info.components["api_distribution_protos"].names["pkg_config"] = "google_cloud_cpp_api_distribution_protos" - - self.cpp_info.components["api_field_behavior_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["api_field_behavior_protos"].libs = ["google_cloud_cpp_api_field_behavior_protos"] - self.cpp_info.components["api_field_behavior_protos"].names["pkg_config"] = "google_cloud_cpp_api_field_behavior_protos" - - self.cpp_info.components["api_label_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["api_label_protos"].libs = ["google_cloud_cpp_api_label_protos"] - self.cpp_info.components["api_label_protos"].names["pkg_config"] = "google_cloud_cpp_api_label_protos" - - self.cpp_info.components["api_launch_stage_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["api_launch_stage_protos"].libs = ["google_cloud_cpp_api_launch_stage_protos"] - self.cpp_info.components["api_launch_stage_protos"].names["pkg_config"] = "google_cloud_cpp_api_launch_stage_protos" - - self.cpp_info.components["api_metric_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_launch_stage_protos", "api_label_protos"] - self.cpp_info.components["api_metric_protos"].libs = ["google_cloud_cpp_api_metric_protos"] - self.cpp_info.components["api_metric_protos"].names["pkg_config"] = "google_cloud_cpp_api_metric_protos" - - self.cpp_info.components["api_monitored_resource_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_launch_stage_protos", "api_label_protos"] - self.cpp_info.components["api_monitored_resource_protos"].libs = ["google_cloud_cpp_api_monitored_resource_protos"] - self.cpp_info.components["api_monitored_resource_protos"].names["pkg_config"] = "google_cloud_cpp_api_monitored_resource_protos" - - self.cpp_info.components["api_resource_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["api_resource_protos"].libs = ["google_cloud_cpp_api_resource_protos"] - self.cpp_info.components["api_resource_protos"].names["pkg_config"] = "google_cloud_cpp_api_resource_protos" - - self.cpp_info.components["devtools_cloudtrace_v2_trace_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_field_behavior_protos", "api_resource_protos", "rpc_status_protos"] - self.cpp_info.components["devtools_cloudtrace_v2_trace_protos"].libs = ["google_cloud_cpp_devtools_cloudtrace_v2_trace_protos"] - self.cpp_info.components["devtools_cloudtrace_v2_trace_protos"].names["pkg_config"] = "google_cloud_cpp_devtools_cloudtrace_v2_trace_protos" - - self.cpp_info.components["devtools_cloudtrace_v2_tracing_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "devtools_cloudtrace_v2_trace_protos", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "rpc_status_protos"] - self.cpp_info.components["devtools_cloudtrace_v2_tracing_protos"].libs = ["google_cloud_cpp_devtools_cloudtrace_v2_tracing_protos"] - self.cpp_info.components["devtools_cloudtrace_v2_tracing_protos"].names["pkg_config"] = "google_cloud_cpp_devtools_cloudtrace_v2_tracing_protos" - - cmp_logging_type_type_protos = None - if tools.Version(self.version) < "1.40.1": # FIXME: Probably this library was removed before - cmp_logging_type_type_protos = "logging_type_protos" - self.cpp_info.components[cmp_logging_type_type_protos].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos"] - self.cpp_info.components[cmp_logging_type_type_protos].libs = ["google_cloud_cpp_logging_type_protos"] - self.cpp_info.components[cmp_logging_type_type_protos].names["pkg_config"] = "google_cloud_cpp_logging_type_protos" - else: - cmp_logging_type_type_protos = "logging_type_type_protos" - self.cpp_info.components[cmp_logging_type_type_protos].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos"] - self.cpp_info.components[cmp_logging_type_type_protos].libs = ["google_cloud_cpp_logging_type_type_protos"] - self.cpp_info.components[cmp_logging_type_type_protos].names["pkg_config"] = "google_cloud_cpp_logging_type_type_protos" - - self.cpp_info.components["logging_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_distribution_protos", "api_field_behavior_protos", "api_metric_protos", "api_monitored_resource_protos", "api_resource_protos", cmp_logging_type_type_protos, "rpc_status_protos"] - self.cpp_info.components["logging_protos"].libs = ["google_cloud_cpp_logging_protos"] - self.cpp_info.components["logging_protos"].names["pkg_config"] = "google_cloud_cpp_logging_protos" - - self.cpp_info.components["monitoring_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_distribution_protos", "api_field_behavior_protos", "api_label_protos", "api_launch_stage_protos", "api_metric_protos", "api_monitored_resource_protos", "api_resource_protos", "rpc_status_protos", "type_calendar_period_protos"] - self.cpp_info.components["monitoring_protos"].libs = ["google_cloud_cpp_monitoring_protos"] - self.cpp_info.components["monitoring_protos"].names["pkg_config"] = "google_cloud_cpp_monitoring_protos" - - self.cpp_info.components["iam_v1_options_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos"] - self.cpp_info.components["iam_v1_options_protos"].libs = ["google_cloud_cpp_iam_v1_options_protos"] - self.cpp_info.components["iam_v1_options_protos"].names["pkg_config"] = "google_cloud_cpp_iam_v1_options_protos" - - self.cpp_info.components["iam_v1_policy_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "type_expr_protos"] - self.cpp_info.components["iam_v1_policy_protos"].libs = ["google_cloud_cpp_iam_v1_policy_protos"] - self.cpp_info.components["iam_v1_policy_protos"].names["pkg_config"] = "google_cloud_cpp_iam_v1_policy_protos" - - self.cpp_info.components["iam_v1_iam_policy_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos", "iam_v1_options_protos", "iam_v1_policy_protos"] - self.cpp_info.components["iam_v1_iam_policy_protos"].libs = ["google_cloud_cpp_iam_v1_iam_policy_protos"] - self.cpp_info.components["iam_v1_iam_policy_protos"].names["pkg_config"] = "google_cloud_cpp_iam_v1_iam_policy_protos" - - self.cpp_info.components["rpc_error_details_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["rpc_error_details_protos"].libs = ["google_cloud_cpp_rpc_error_details_protos"] - self.cpp_info.components["rpc_error_details_protos"].names["pkg_config"] = "google_cloud_cpp_rpc_error_details_protos" - - self.cpp_info.components["rpc_status_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "rpc_error_details_protos"] - self.cpp_info.components["rpc_status_protos"].libs = ["google_cloud_cpp_rpc_status_protos"] - self.cpp_info.components["rpc_status_protos"].names["pkg_config"] = "google_cloud_cpp_rpc_status_protos" - - self.cpp_info.components["type_calendar_period_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_calendar_period_protos"].libs = ["google_cloud_cpp_type_calendar_period_protos"] - self.cpp_info.components["type_calendar_period_protos"].names["pkg_config"] = "google_cloud_cpp_type_calendar_period_protos" - - self.cpp_info.components["type_color_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_color_protos"].libs = ["google_cloud_cpp_type_color_protos"] - self.cpp_info.components["type_color_protos"].names["pkg_config"] = "google_cloud_cpp_type_color_protos" - - self.cpp_info.components["type_date_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_date_protos"].libs = ["google_cloud_cpp_type_date_protos"] - self.cpp_info.components["type_date_protos"].names["pkg_config"] = "google_cloud_cpp_type_date_protos" - - self.cpp_info.components["type_datetime_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_datetime_protos"].libs = ["google_cloud_cpp_type_datetime_protos"] - self.cpp_info.components["type_datetime_protos"].names["pkg_config"] = "google_cloud_cpp_type_datetime_protos" - - self.cpp_info.components["type_dayofweek_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_dayofweek_protos"].libs = ["google_cloud_cpp_type_dayofweek_protos"] - self.cpp_info.components["type_dayofweek_protos"].names["pkg_config"] = "google_cloud_cpp_type_dayofweek_protos" - - self.cpp_info.components["type_expr_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_expr_protos"].libs = ["google_cloud_cpp_type_expr_protos"] - self.cpp_info.components["type_expr_protos"].names["pkg_config"] = "google_cloud_cpp_type_expr_protos" - - self.cpp_info.components["type_fraction_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_fraction_protos"].libs = ["google_cloud_cpp_type_fraction_protos"] - self.cpp_info.components["type_fraction_protos"].names["pkg_config"] = "google_cloud_cpp_type_fraction_protos" - - self.cpp_info.components["type_interval_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_interval_protos"].libs = ["google_cloud_cpp_type_interval_protos"] - self.cpp_info.components["type_interval_protos"].names["pkg_config"] = "google_cloud_cpp_type_interval_protos" - - self.cpp_info.components["type_latlng_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_latlng_protos"].libs = ["google_cloud_cpp_type_latlng_protos"] - self.cpp_info.components["type_latlng_protos"].names["pkg_config"] = "google_cloud_cpp_type_latlng_protos" - - self.cpp_info.components["type_localized_text_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_localized_text_protos"].libs = ["google_cloud_cpp_type_localized_text_protos"] - self.cpp_info.components["type_localized_text_protos"].names["pkg_config"] = "google_cloud_cpp_type_localized_text_protos" - - self.cpp_info.components["type_money_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_money_protos"].libs = ["google_cloud_cpp_type_money_protos"] - self.cpp_info.components["type_money_protos"].names["pkg_config"] = "google_cloud_cpp_type_money_protos" - - self.cpp_info.components["type_month_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_month_protos"].libs = ["google_cloud_cpp_type_month_protos"] - self.cpp_info.components["type_month_protos"].names["pkg_config"] = "google_cloud_cpp_type_month_protos" - - self.cpp_info.components["type_phone_number_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_phone_number_protos"].libs = ["google_cloud_cpp_type_phone_number_protos"] - self.cpp_info.components["type_phone_number_protos"].names["pkg_config"] = "google_cloud_cpp_type_phone_number_protos" - - self.cpp_info.components["type_postal_address_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_postal_address_protos"].libs = ["google_cloud_cpp_type_postal_address_protos"] - self.cpp_info.components["type_postal_address_protos"].names["pkg_config"] = "google_cloud_cpp_type_postal_address_protos" - - self.cpp_info.components["type_quaternion_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_quaternion_protos"].libs = ["google_cloud_cpp_type_quaternion_protos"] - self.cpp_info.components["type_quaternion_protos"].names["pkg_config"] = "google_cloud_cpp_type_quaternion_protos" - - self.cpp_info.components["type_timeofday_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf"] - self.cpp_info.components["type_timeofday_protos"].libs = ["google_cloud_cpp_type_timeofday_protos"] - self.cpp_info.components["type_timeofday_protos"].names["pkg_config"] = "google_cloud_cpp_type_timeofday_protos" - - self.cpp_info.components["cloud_dialogflow_v2_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos", "longrunning_operations_protos", "rpc_status_protos", "type_latlng_protos"] - self.cpp_info.components["cloud_dialogflow_v2_protos"].libs = ["google_cloud_cpp_cloud_dialogflow_v2_protos"] - self.cpp_info.components["cloud_dialogflow_v2_protos"].names["pkg_config"] = "google_cloud_cpp_cloud_dialogflow_v2_protos" - - if tools.Version(self.version) < "1.40.1": # FIXME: Probably this library was removed before - self.cpp_info.components["cloud_dialogflow_v2beta1_protos"].requires = ["grpc::grpc++", "grpc::grpc", "protobuf::libprotobuf", "api_annotations_protos", "api_client_protos", "api_field_behavior_protos", "api_resource_protos", "longrunning_operations_protos", "rpc_status_protos", "type_latlng_protos"] - self.cpp_info.components["cloud_dialogflow_v2beta1_protos"].libs = ["google_cloud_cpp_cloud_dialogflow_v2beta1_protos"] - self.cpp_info.components["cloud_dialogflow_v2beta1_protos"].names["pkg_config"] = "google_cloud_cpp_cloud_dialogflow_v2beta1_protos" - - self.cpp_info.components["grpc_utils"].requires = ["abseil::absl_function_ref", "abseil::absl_memory", "abseil::absl_time", "rpc_status_protos", "common", "grpc::grpc++", "grpc::grpc"] - self.cpp_info.components["grpc_utils"].libs = ["google_cloud_cpp_grpc_utils"] - self.cpp_info.components["grpc_utils"].names["pkg_config"] = "google_cloud_cpp_grpc_utils" - - self.cpp_info.components["experimental-iam"].requires = ["grpc_utils", "common", "iam_protos"] - self.cpp_info.components["experimental-iam"].libs = ["google_cloud_cpp_iam"] - self.cpp_info.components["experimental-iam"].names["pkg_config"] = "google_cloud_cpp_iam" - - self.cpp_info.components["experimental-logging"].requires = ["grpc_utils", "common", "logging_protos"] - self.cpp_info.components["experimental-logging"].libs = ["google_cloud_cpp_logging"] - self.cpp_info.components["experimental-logging"].names["pkg_config"] = "google_cloud_cpp_logging" - - self.cpp_info.components["pubsub"].requires = ["grpc_utils", "common", "pubsub_protos", "abseil::absl_flat_hash_map"] - self.cpp_info.components["pubsub"].libs = ["google_cloud_cpp_pubsub"] - self.cpp_info.components["pubsub"].names["pkg_config"] = "google_cloud_cpp_pubsub" - - self.cpp_info.components["spanner"].requires = ["abseil::absl_fixed_array", "abseil::absl_memory", "abseil::absl_numeric", "abseil::absl_strings", "abseil::absl_time", "grpc_utils", "common", "spanner_protos"] - self.cpp_info.components["spanner"].libs = ["google_cloud_cpp_spanner"] - self.cpp_info.components["spanner"].names["pkg_config"] = "google_cloud_cpp_spanner" - - self.cpp_info.components["storage"].requires = ["abseil::absl_memory", "abseil::absl_strings", "abseil::absl_str_format", "abseil::absl_time", "abseil::absl_variant", "common", "nlohmann_json::nlohmann_json", "crc32c::crc32c", "libcurl::libcurl", "openssl::ssl", "openssl::crypto"] - self.cpp_info.components["storage"].libs = ["google_cloud_cpp_storage"] - self.cpp_info.components["storage"].names["pkg_config"] = "google_cloud_cpp_storage" diff --git a/recipes/google-cloud-cpp/all/patches/0001-googleapis-folder.patch b/recipes/google-cloud-cpp/all/patches/0001-googleapis-folder.patch deleted file mode 100644 index 0fc76cae5ba7c..0000000000000 --- a/recipes/google-cloud-cpp/all/patches/0001-googleapis-folder.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/external/googleapis/CMakeLists.txt b/external/googleapis/CMakeLists.txt -index c3f1ef1..fb65356 100644 ---- a/external/googleapis/CMakeLists.txt -+++ b/external/googleapis/CMakeLists.txt -@@ -25,7 +25,7 @@ set(GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256 - "6762083f829f998c3971efa2ba858c21d4ac4ba77feb9650bad7d358e3add2a5") - - set(EXTERNAL_GOOGLEAPIS_SOURCE -- "${CMAKE_BINARY_DIR}/external/googleapis/src/googleapis_download") -+ "${PROJECT_BINARY_DIR}/external/googleapis/src/googleapis_download") - - set(EXTERNAL_GOOGLEAPIS_PROTO_FILES - "google/api/http.proto" -@@ -161,7 +161,7 @@ include(ExternalProject) - ExternalProject_Add( - googleapis_download - EXCLUDE_FROM_ALL ON -- PREFIX "${CMAKE_BINARY_DIR}/external/googleapis" -+ PREFIX "${PROJECT_BINARY_DIR}/external/googleapis" - URL ${GOOGLE_CLOUD_CPP_GOOGLEAPIS_URL} - URL_HASH SHA256=${GOOGLE_CLOUD_CPP_GOOGLEAPIS_SHA256} - PATCH_COMMAND diff --git a/recipes/google-cloud-cpp/all/test_package/CMakeLists.txt b/recipes/google-cloud-cpp/all/test_package/CMakeLists.txt deleted file mode 100644 index a657ae7a34ce1..0000000000000 --- a/recipes/google-cloud-cpp/all/test_package/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(google-cloud-cpp-storage-quickstart CXX C) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -find_package(google-cloud-cpp REQUIRED) - -# Once the packages are found, define the targets. -add_executable(storage storage.cpp) -target_link_libraries(storage google-cloud-cpp::storage) diff --git a/recipes/google-cloud-cpp/all/test_package/conanfile.py b/recipes/google-cloud-cpp/all/test_package/conanfile.py deleted file mode 100644 index 39f0d1104e661..0000000000000 --- a/recipes/google-cloud-cpp/all/test_package/conanfile.py +++ /dev/null @@ -1,16 +0,0 @@ -from conans import ConanFile, CMake, tools -import os - -class TestPackageConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake", "cmake_find_package" - - def build(self): - cmake = CMake(self) - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self): - bin_path = os.path.join("bin", "storage") - self.run("%s bucket_name" % bin_path, run_environment=True) diff --git a/recipes/google-cloud-cpp/all/test_package/storage.cpp b/recipes/google-cloud-cpp/all/test_package/storage.cpp deleted file mode 100644 index 1cd9a7f126f74..0000000000000 --- a/recipes/google-cloud-cpp/all/test_package/storage.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "google/cloud/storage/client.h" -#include - -int main(int argc, char* argv[]) { - if (argc != 2) { - std::cerr << "Missing bucket name.\n"; - std::cerr << "Usage: quickstart \n"; - return 1; - } - std::string const bucket_name = argv[1]; - - // Create aliases to make the code easier to read. - namespace gcs = google::cloud::storage; - - // Create a client to communicate with Google Cloud Storage. This client - // uses the default configuration for authentication and project id. - google::cloud::StatusOr client = - gcs::Client::CreateDefaultClient(); - if (!client) { - std::cerr << "Failed to create Storage Client, status=" << client.status() - << "\n"; - return 0; - } -} diff --git a/recipes/google-cloud-cpp/config.yml b/recipes/google-cloud-cpp/config.yml index 5960fb5919b52..3f0321b0c5285 100644 --- a/recipes/google-cloud-cpp/config.yml +++ b/recipes/google-cloud-cpp/config.yml @@ -1,14 +1,4 @@ versions: - "1.26.1": - folder: "all" - "1.27.0": - folder: "all" - "1.30.1": - folder: "all" - "1.31.1": - folder: "all" - "1.40.1": - folder: "all" "2.15.1": folder: "2.x" "2.19.0": From fef1e6ebc075406afa7bd5252c14b15a1781b766 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 13 Nov 2024 19:12:12 +0200 Subject: [PATCH 3/3] at-spi2-core: update config.yml --- recipes/at-spi2-core/config.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/recipes/at-spi2-core/config.yml b/recipes/at-spi2-core/config.yml index c890631d2ad5f..2691a969437ba 100644 --- a/recipes/at-spi2-core/config.yml +++ b/recipes/at-spi2-core/config.yml @@ -1,16 +1,4 @@ versions: - "2.38.0": - folder: all - "2.39.1": - folder: all - "2.40.3": - folder: all - "2.42.0": - folder: all - "2.44.0": - folder: all - "2.44.1": - folder: all "2.46.0": folder: new "2.47.1":