From 404342672ef33a114264e60c2352790d9598a8a4 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 10 Jun 2022 12:49:28 +0000 Subject: [PATCH 01/18] libglvnd 1.4.0 --- recipes/libglvnd/all/conandata.yml | 4 + recipes/libglvnd/all/conanfile.py | 145 ++++++++++++++++++ .../libglvnd/all/test_package/CMakeLists.txt | 8 + .../libglvnd/all/test_package/conanfile.py | 17 ++ .../libglvnd/all/test_package/test_package.c | 17 ++ recipes/libglvnd/config.yml | 3 + 6 files changed, 194 insertions(+) create mode 100644 recipes/libglvnd/all/conandata.yml create mode 100644 recipes/libglvnd/all/conanfile.py create mode 100644 recipes/libglvnd/all/test_package/CMakeLists.txt create mode 100644 recipes/libglvnd/all/test_package/conanfile.py create mode 100644 recipes/libglvnd/all/test_package/test_package.c create mode 100644 recipes/libglvnd/config.yml diff --git a/recipes/libglvnd/all/conandata.yml b/recipes/libglvnd/all/conandata.yml new file mode 100644 index 0000000000000..77ef903a0a94d --- /dev/null +++ b/recipes/libglvnd/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "1.4.0": + url: "https://gitlab.freedesktop.org/glvnd/libglvnd/uploads/ca5bf4295beb39bb324f692c481ac8a1/libglvnd-1.4.0.tar.gz" + sha256: "c4a884503d2412dc1fa209613aa8a77193aeb7065b823fe1775dc8b6f3e45211" diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py new file mode 100644 index 0000000000000..f6e8b9373e05f --- /dev/null +++ b/recipes/libglvnd/all/conanfile.py @@ -0,0 +1,145 @@ +from conans import Meson, ConanFile, tools +from conans.errors import ConanInvalidConfiguration +import functools +import os + +required_conan_version = ">=1.45.0" + +class LibGlvndConan(ConanFile): + name = "libglvnd" + description = "The GL Vendor-Neutral Dispatch library" + license = "" # public domain ?! + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://gitlab.freedesktop.org/glvnd/libglvnde" + topics = ("gl", "vendor-neutral", "dispatch") + settings = "os", "arch", "compiler", "build_type" + options = { + "asm": [True, False], + "x11": [True, False], + "egl": [True, False], + "glx": [True, False], + "gles1": [True, False], + "gles2": [True, False], + "tls": [True, False], + "dispatch_tls": [True, False], + "headers": [True, False], + "entrypoint_patching": [True, False], + } + default_options = { + "asm" : True, + "x11": True, + "egl": True, + "glx": True, + "gles1": True, + "gles2": True, + "tls": True, + "dispatch_tls": True, + "headers": True, + "entrypoint_patching": True, + } + + generators = "pkg_config" + + + @property + def _source_subfolder(self): + return "source_subfolder" + + @property + def _build_subfolder(self): + return "build_subfolder" + + # don't use self.settings_build + @property + def _settings_build(self): + return getattr(self, "settings_build", self.settings) + + # don't use self.user_info_build + @property + def _user_info_build(self): + return getattr(self, "user_info_build", self.deps_user_info) + + def configure(self): + del self.settings.compiler.libcxx + del self.settings.compiler.cppstd + + def requirements(self): + if self.options.x11: + self.requires("xorg/system") + if self.options.glx: + self.requires("xorg-proto/2021.4") + + def validate(self): + if self.settings.os not in ['Linux', 'FreeBSD']: + raise ConanInvalidConfiguration("libglvnd is only compatible with Linux and FreeBSD") + + def build_requirements(self): + self.build_requires("meson/0.62.2") + self.build_requires("pkgconf/1.7.4") + + def source(self): + tools.get(**self.conan_data["sources"][self.version], + destination=self._source_subfolder, strip_root=True) + + @functools.lru_cache(1) + def _configure_meson(self): + meson = Meson(self) + defs = {} + defs["asm"] = self.options.asm + defs["x11"] = self.options.x11 + defs["egl"] = self.options.egl + defs["glx"] = self.options.glx + defs["gles1"] = self.options.gles1 + defs["gles2"] = self.options.gles2 + defs["tls"] = self.options.tls + defs["dispatch-tls"] = self.options.dispatch_tls + defs["headers"] = self.options.headers + defs["entrypoint-patching"] = self.options.entrypoint_patching + meson.configure(source_folder=self._source_subfolder, build_folder=self._build_subfolder) + return meson + + def build(self): + meson = self._configure_meson() + meson.build() + + def package(self): + meson = self._configure_meson() + meson.install() + + tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) + tools.rmdir(os.path.join(self.package_folder, "share")) + + def package_info(self): + self.cpp_info.components['gldispatch'].libs = ["GLdispatch"] + self.cpp_info.components['gldispatch'].system_libs.extend(["pthread", "dl"]) + + self.cpp_info.components['opengl'].libs = ["OpenGL"] + self.cpp_info.components['opengl'].requires.extend(["gldispatch"]) + self.cpp_info.components['opengl'].set_property("pkg_config_name", "opengl") + + if self.options.egl: + self.cpp_info.components['egl'].libs = ["EGL"] + self.cpp_info.components['egl'].system_libs.extend(["pthread", "dl", "m"]) + self.cpp_info.components['egl'].requires.extend(["xorg::x11", "gldispatch"]) + self.cpp_info.components['egl'].set_property("pkg_config_name", "egl") + + if self.options.glx: + self.cpp_info.components['glx'].libs = ["GLX"] + self.cpp_info.components['glx'].system_libs.extend(["dl"]) + self.cpp_info.components['glx'].requires.extend(["xorg::x11", "xorg-proto::glproto", "gldispatch"]) + self.cpp_info.components['glx'].set_property("pkg_config_name", "glx") + + self.cpp_info.components['gl'].libs = ["GL"] + self.cpp_info.components['gl'].system_libs.extend(["dl"]) + self.cpp_info.components['gl'].requires.extend(["xorg::x11", "glx", "gldispatch"]) + self.cpp_info.components['gl'].set_property("pkg_config_name", "gl") + + if self.options.gles1: + self.cpp_info.components['gles1'].libs = ["GLESv1_CM"] + self.cpp_info.components['gles1'].requires.extend(["gldispatch"]) + self.cpp_info.components['gles1'].set_property("pkg_config_name", "glesv1_cm") + + if self.options.gles2: + self.cpp_info.components['gles2'].libs = ["GLESv2"] + self.cpp_info.components['gles2'].requires.extend(["gldispatch"]) + self.cpp_info.components['gles2'].set_property("pkg_config_name", "glesv2") diff --git a/recipes/libglvnd/all/test_package/CMakeLists.txt b/recipes/libglvnd/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..34af13462f44f --- /dev/null +++ b/recipes/libglvnd/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +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/libglvnd/all/test_package/conanfile.py b/recipes/libglvnd/all/test_package/conanfile.py new file mode 100644 index 0000000000000..d4128b0450777 --- /dev/null +++ b/recipes/libglvnd/all/test_package/conanfile.py @@ -0,0 +1,17 @@ +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/libglvnd/all/test_package/test_package.c b/recipes/libglvnd/all/test_package/test_package.c new file mode 100644 index 0000000000000..7da8b927f842e --- /dev/null +++ b/recipes/libglvnd/all/test_package/test_package.c @@ -0,0 +1,17 @@ +#include + +#include + + +int main() +{ + const char * gl_vendor = (const char *) glGetString(GL_VENDOR); + const char * gl_renderer = (const char *) glGetString(GL_RENDERER); + const char * gl_version = (const char *) glGetString(GL_VERSION); + const char * gl_extensions = (const char *) glGetString(GL_EXTENSIONS); + printf( "GL_VENDOR: %s\n", gl_vendor ? gl_vendor : "(null)"); + printf( "GL_RENDERER: %s\n", gl_renderer ? gl_renderer : "(null)"); + printf( "GL_VERSION: %s\n", gl_version ? gl_version : "(null)"); + printf( "GL_EXTENSIONS: %s\n", gl_extensions ? gl_extensions : "(null)"); + return 0; +} diff --git a/recipes/libglvnd/config.yml b/recipes/libglvnd/config.yml new file mode 100644 index 0000000000000..eed35319fcea1 --- /dev/null +++ b/recipes/libglvnd/config.yml @@ -0,0 +1,3 @@ +versions: + "1.4.0": + folder: "all" From 1d5f81627ea6fb42ceac4f64e9e55b716d126ae9 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 10 Jun 2022 13:03:54 +0000 Subject: [PATCH 02/18] fix license --- recipes/libglvnd/all/conanfile.py | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index f6e8b9373e05f..75364c650d203 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -2,13 +2,14 @@ from conans.errors import ConanInvalidConfiguration import functools import os +import textwrap required_conan_version = ">=1.45.0" class LibGlvndConan(ConanFile): name = "libglvnd" description = "The GL Vendor-Neutral Dispatch library" - license = "" # public domain ?! + license = "custom" url = "https://github.com/conan-io/conan-center-index" homepage = "https://gitlab.freedesktop.org/glvnd/libglvnde" topics = ("gl", "vendor-neutral", "dispatch") @@ -109,6 +110,31 @@ def package(self): tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) tools.rmdir(os.path.join(self.package_folder, "share")) + tools.save(os.path.join(self.package_folder, "licenses", "LICENSE"), textwrap.dedent('''\ + Copyright (c) 2013, NVIDIA CORPORATION. + + 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 + unaltered in all copies or substantial portions of the Materials. + Any additions, deletions, or changes to the original source files + must be clearly indicated in accompanying documentation. + + 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. + ''')) + def package_info(self): self.cpp_info.components['gldispatch'].libs = ["GLdispatch"] self.cpp_info.components['gldispatch'].system_libs.extend(["pthread", "dl"]) From f6084dd0bc2743094626ed8875377ce6f4d42457 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Sat, 11 Jun 2022 13:50:58 +0200 Subject: [PATCH 03/18] Apply suggestions from code review Co-authored-by: Michael Keck --- recipes/libglvnd/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 75364c650d203..a51c8239e74dd 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -9,9 +9,9 @@ class LibGlvndConan(ConanFile): name = "libglvnd" description = "The GL Vendor-Neutral Dispatch library" - license = "custom" + license = "LicenseRef-LICENSE" url = "https://github.com/conan-io/conan-center-index" - homepage = "https://gitlab.freedesktop.org/glvnd/libglvnde" + homepage = "https://gitlab.freedesktop.org/glvnd/libglvnd" topics = ("gl", "vendor-neutral", "dispatch") settings = "os", "arch", "compiler", "build_type" options = { From a08ce063f726d0be0c133f79204712e09d5965cf Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 07:52:33 +0200 Subject: [PATCH 04/18] Update recipes/libglvnd/all/conanfile.py Co-authored-by: Chris Mc --- recipes/libglvnd/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index a51c8239e74dd..9b24146dec374 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -9,7 +9,7 @@ class LibGlvndConan(ConanFile): name = "libglvnd" description = "The GL Vendor-Neutral Dispatch library" - license = "LicenseRef-LICENSE" + license = "MIT" url = "https://github.com/conan-io/conan-center-index" homepage = "https://gitlab.freedesktop.org/glvnd/libglvnd" topics = ("gl", "vendor-neutral", "dispatch") From 78ae4ce124a6ae9ac41d3ede903e5ddbf57aa1fc Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 08:06:16 +0200 Subject: [PATCH 05/18] conan 2 compatible imports --- recipes/libglvnd/all/conanfile.py | 3 ++- recipes/libglvnd/all/test_package/conanfile.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 9b24146dec374..6191cdc9242d2 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -1,4 +1,5 @@ -from conans import Meson, ConanFile, tools +from conan import ConanFile +from conans import Meson, tools from conans.errors import ConanInvalidConfiguration import functools import os diff --git a/recipes/libglvnd/all/test_package/conanfile.py b/recipes/libglvnd/all/test_package/conanfile.py index d4128b0450777..7c87a693918ae 100644 --- a/recipes/libglvnd/all/test_package/conanfile.py +++ b/recipes/libglvnd/all/test_package/conanfile.py @@ -1,4 +1,6 @@ -from conans import ConanFile, CMake, tools +from conan import ConanFile +from conans import CMake +from conan.tools.build import cross_building import os @@ -12,6 +14,6 @@ def build(self): cmake.build() def test(self): - if not tools.cross_building(self): + if not cross_building(self): bin_path = os.path.join("bin", "test_package") self.run(bin_path, run_environment=True) From f179a25f3c86e2ccb6a1807af8df1fa0f604ae4a Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 08:39:49 +0200 Subject: [PATCH 06/18] migrate to conan V2 Meson integration --- recipes/libglvnd/all/conanfile.py | 51 +++++++++++++++---------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 6191cdc9242d2..cbfac349726e3 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -1,7 +1,7 @@ from conan import ConanFile -from conans import Meson, tools -from conans.errors import ConanInvalidConfiguration -import functools +from conan.tools.meson import Meson, MesonToolchain +from conan.tools.files import get, rmdir, save +from conan.errors import ConanInvalidConfiguration import os import textwrap @@ -40,7 +40,7 @@ class LibGlvndConan(ConanFile): "entrypoint_patching": True, } - generators = "pkg_config" + generators = "PkgConfigDeps" @property @@ -80,38 +80,37 @@ def build_requirements(self): self.build_requires("pkgconf/1.7.4") def source(self): - tools.get(**self.conan_data["sources"][self.version], + get(self, **self.conan_data["sources"][self.version], destination=self._source_subfolder, strip_root=True) - @functools.lru_cache(1) - def _configure_meson(self): - meson = Meson(self) - defs = {} - defs["asm"] = self.options.asm - defs["x11"] = self.options.x11 - defs["egl"] = self.options.egl - defs["glx"] = self.options.glx - defs["gles1"] = self.options.gles1 - defs["gles2"] = self.options.gles2 - defs["tls"] = self.options.tls - defs["dispatch-tls"] = self.options.dispatch_tls - defs["headers"] = self.options.headers - defs["entrypoint-patching"] = self.options.entrypoint_patching - meson.configure(source_folder=self._source_subfolder, build_folder=self._build_subfolder) - return meson + + def generate(self): + tc = MesonToolchain(self) + tc.project_options["asm"] = self.options.asm + tc.project_options["x11"] = self.options.x11 + tc.project_options["egl"] = self.options.egl + tc.project_options["glx"] = self.options.glx + tc.project_options["gles1"] = self.options.gles1 + tc.project_options["gles2"] = self.options.gles2 + tc.project_options["tls"] = self.options.tls + tc.project_options["dispatch-tls"] = self.options.dispatch_tls + tc.project_options["headers"] = self.options.headers + tc.project_options["entrypoint-patching"] = self.options.entrypoint_patching + tc.generate() def build(self): - meson = self._configure_meson() + meson = Meson(self) + meson.configure() meson.build() def package(self): - meson = self._configure_meson() + meson = Meson(self) meson.install() - tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) - tools.rmdir(os.path.join(self.package_folder, "share")) + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) + rmdir(self, os.path.join(self.package_folder, "share")) - tools.save(os.path.join(self.package_folder, "licenses", "LICENSE"), textwrap.dedent('''\ + save(self, os.path.join(self.package_folder, "licenses", "LICENSE"), textwrap.dedent('''\ Copyright (c) 2013, NVIDIA CORPORATION. Permission is hereby granted, free of charge, to any person obtaining a From f27a34400d49c091406f18abf5dfa75e52f42c5d Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 08:53:42 +0200 Subject: [PATCH 07/18] use layout --- recipes/libglvnd/all/conanfile.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index cbfac349726e3..0d3412b3aba82 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -2,6 +2,7 @@ from conan.tools.meson import Meson, MesonToolchain from conan.tools.files import get, rmdir, save from conan.errors import ConanInvalidConfiguration +from conan.tools.layout import basic_layout import os import textwrap @@ -42,15 +43,6 @@ class LibGlvndConan(ConanFile): generators = "PkgConfigDeps" - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - # don't use self.settings_build @property def _settings_build(self): @@ -79,9 +71,12 @@ def build_requirements(self): self.build_requires("meson/0.62.2") self.build_requires("pkgconf/1.7.4") + def layout(self): + basic_layout(self) + def source(self): get(self, **self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) + strip_root=True) def generate(self): From 05c7543e1994055ea39ceeba495242b5acae441c Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 08:58:50 +0200 Subject: [PATCH 08/18] Update conanfile.py --- recipes/libglvnd/all/conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 0d3412b3aba82..ead1194bb0374 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -81,16 +81,16 @@ def source(self): def generate(self): tc = MesonToolchain(self) - tc.project_options["asm"] = self.options.asm - tc.project_options["x11"] = self.options.x11 + tc.project_options["asm"] = "enabled" if self.options.asm else "disabled" + tc.project_options["x11"] = "enabled" if self.options.x11 else "disabled" tc.project_options["egl"] = self.options.egl - tc.project_options["glx"] = self.options.glx + tc.project_options["glx"] = "enabled" if self.options.glx else "disabled" tc.project_options["gles1"] = self.options.gles1 tc.project_options["gles2"] = self.options.gles2 tc.project_options["tls"] = self.options.tls tc.project_options["dispatch-tls"] = self.options.dispatch_tls tc.project_options["headers"] = self.options.headers - tc.project_options["entrypoint-patching"] = self.options.entrypoint_patching + tc.project_options["entrypoint-patching"] = "enabled" if self.options.entrypoint_patching else "disabled" tc.generate() def build(self): From cd5786ce65fac1de3bf1cc8204be1079d329df33 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 09:05:00 +0200 Subject: [PATCH 09/18] Update conanfile.py --- recipes/libglvnd/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index ead1194bb0374..920160062afd2 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -41,7 +41,7 @@ class LibGlvndConan(ConanFile): "entrypoint_patching": True, } - generators = "PkgConfigDeps" + generators = "pkg_config" # don't use self.settings_build @property From b9703d3ffc09ace734ad2b5b58314e3b10f8cdf3 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 09:15:04 +0200 Subject: [PATCH 10/18] Update conanfile.py --- recipes/libglvnd/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 920160062afd2..ead1194bb0374 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -41,7 +41,7 @@ class LibGlvndConan(ConanFile): "entrypoint_patching": True, } - generators = "pkg_config" + generators = "PkgConfigDeps" # don't use self.settings_build @property From ecabe17b76594997c98b49abf5d0a47f21b3aea8 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Fri, 15 Jul 2022 18:56:07 +0200 Subject: [PATCH 11/18] Update conanfile.py --- recipes/libglvnd/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index ead1194bb0374..a97fa264c8718 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -11,7 +11,7 @@ class LibGlvndConan(ConanFile): name = "libglvnd" description = "The GL Vendor-Neutral Dispatch library" - license = "MIT" + license = "LicenseRef-LICENSE" url = "https://github.com/conan-io/conan-center-index" homepage = "https://gitlab.freedesktop.org/glvnd/libglvnd" topics = ("gl", "vendor-neutral", "dispatch") From 199cf0187f67fb6b63d19c9d13dd1ae61bb4f6fe Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Jul 2022 13:02:05 +0200 Subject: [PATCH 12/18] Update conanfile.py --- recipes/libglvnd/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index a97fa264c8718..e88e095e9f835 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile from conan.tools.meson import Meson, MesonToolchain -from conan.tools.files import get, rmdir, save +from conan.tools.files import get, rmdir, save, rm from conan.errors import ConanInvalidConfiguration from conan.tools.layout import basic_layout import os @@ -102,7 +102,7 @@ def package(self): meson = Meson(self) meson.install() - rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) + rm(self, "*.pc", os.path.join(self.package_folder, "lib"), recursive=True) rmdir(self, os.path.join(self.package_folder, "share")) save(self, os.path.join(self.package_folder, "licenses", "LICENSE"), textwrap.dedent('''\ From b35ead6e9abf875c769d0dcf58a794f20234c477 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Jul 2022 13:26:19 +0200 Subject: [PATCH 13/18] gtk 4.7.1 --- recipes/libglvnd/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index e88e095e9f835..a97fa264c8718 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile from conan.tools.meson import Meson, MesonToolchain -from conan.tools.files import get, rmdir, save, rm +from conan.tools.files import get, rmdir, save from conan.errors import ConanInvalidConfiguration from conan.tools.layout import basic_layout import os @@ -102,7 +102,7 @@ def package(self): meson = Meson(self) meson.install() - rm(self, "*.pc", os.path.join(self.package_folder, "lib"), recursive=True) + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) rmdir(self, os.path.join(self.package_folder, "share")) save(self, os.path.join(self.package_folder, "licenses", "LICENSE"), textwrap.dedent('''\ From ef4763a9f472c6b29e691f4e0a364027f915d415 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Jul 2022 13:26:57 +0200 Subject: [PATCH 14/18] require conan 1.51.0 --- recipes/libglvnd/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index a97fa264c8718..28eefe6dfdef3 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -6,7 +6,7 @@ import os import textwrap -required_conan_version = ">=1.45.0" +required_conan_version = ">=1.51.0" class LibGlvndConan(ConanFile): name = "libglvnd" From a948f688caa22a3f45b8f4f9b8edd05a10e9e55d Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Jul 2022 13:39:42 +0200 Subject: [PATCH 15/18] white spaces --- recipes/libglvnd/all/conanfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 28eefe6dfdef3..dbe1b562d5e28 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -78,7 +78,6 @@ def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) - def generate(self): tc = MesonToolchain(self) tc.project_options["asm"] = "enabled" if self.options.asm else "disabled" @@ -159,7 +158,7 @@ def package_info(self): self.cpp_info.components['gles1'].libs = ["GLESv1_CM"] self.cpp_info.components['gles1'].requires.extend(["gldispatch"]) self.cpp_info.components['gles1'].set_property("pkg_config_name", "glesv1_cm") - + if self.options.gles2: self.cpp_info.components['gles2'].libs = ["GLESv2"] self.cpp_info.components['gles2'].requires.extend(["gldispatch"]) From 365ef89efeb92fd29e3b0643b86194b84d1ec8b4 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Jul 2022 13:45:02 +0200 Subject: [PATCH 16/18] Update conanfile.py --- recipes/libglvnd/all/test_package/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/test_package/conanfile.py b/recipes/libglvnd/all/test_package/conanfile.py index 7c87a693918ae..8b7f471a280d5 100644 --- a/recipes/libglvnd/all/test_package/conanfile.py +++ b/recipes/libglvnd/all/test_package/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile -from conans import CMake from conan.tools.build import cross_building +from conans import CMake import os From 1bf5efcfc677afbd9bcfa6e79a5aabe74d884f52 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Jul 2022 13:54:49 +0200 Subject: [PATCH 17/18] Update conanfile.py --- recipes/libglvnd/all/conanfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index dbe1b562d5e28..44415a65010f3 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -6,7 +6,7 @@ import os import textwrap -required_conan_version = ">=1.51.0" +required_conan_version = ">=1.49.0" class LibGlvndConan(ConanFile): name = "libglvnd" @@ -90,6 +90,7 @@ def generate(self): tc.project_options["dispatch-tls"] = self.options.dispatch_tls tc.project_options["headers"] = self.options.headers tc.project_options["entrypoint-patching"] = "enabled" if self.options.entrypoint_patching else "disabled" + tc.project_options["libdir"] = "lib" tc.generate() def build(self): From c6166c70cd6e37f413369687afc24a5c3e4b539c Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Mon, 18 Jul 2022 12:30:26 +0000 Subject: [PATCH 18/18] require conan 1.50.0 --- recipes/libglvnd/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libglvnd/all/conanfile.py b/recipes/libglvnd/all/conanfile.py index 44415a65010f3..920477bf7faff 100644 --- a/recipes/libglvnd/all/conanfile.py +++ b/recipes/libglvnd/all/conanfile.py @@ -6,7 +6,7 @@ import os import textwrap -required_conan_version = ">=1.49.0" +required_conan_version = ">=1.50.0" class LibGlvndConan(ConanFile): name = "libglvnd"