From 07befceb8e6a7ac729ac1bb7490054b21e1970c4 Mon Sep 17 00:00:00 2001 From: Jared Duffey Date: Fri, 19 Jul 2024 17:05:30 -0400 Subject: [PATCH 01/11] Enable VTK_GUISupportQt and VTK_RenderingSupportQt for windows Signed-off-by: Jared Duffey --- recipe/bld-base.bat | 10 +++++++++- recipe/meta.yaml | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/recipe/bld-base.bat b/recipe/bld-base.bat index 6f791b8b..160511e3 100644 --- a/recipe/bld-base.bat +++ b/recipe/bld-base.bat @@ -1,3 +1,5 @@ +setlocal EnableDelayedExpansion + mkdir build cd build @@ -6,6 +8,11 @@ set "CXXFLAGS=-MD" set PYTHON_MAJOR_VERSION=%PY_VER:~0,1% +if "%build_variant%"=="qt" ( + set VTK_ARGS=!VTK_ARGS! -DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=YES + set VTK_ARGS=!VTK_ARGS! -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING=YES +) + cmake .. -G "Ninja" ^ -Wno-dev ^ -DCMAKE_BUILD_TYPE=Release ^ @@ -38,7 +45,8 @@ cmake .. -G "Ninja" ^ -DVTK_MODULE_USE_EXTERNAL_VTK_cgns:BOOL=OFF ^ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF ^ -DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF ^ - -DLZMA_LIBRARY="%LIBRARY_PREFIX%/lib/liblzma.lib" + -DLZMA_LIBRARY="%LIBRARY_PREFIX%/lib/liblzma.lib" ^ + !VTK_ARGS! if errorlevel 1 exit 1 ninja install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d70c7204..7d96501c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "9.3.1" %} -{% set build = 1 %} +{% set build = 2 %} {% set minor_version = ".".join(version.split(".")[:2]) %} From 503d74ceb2f6e351e5fd2561c36ea4bdf322a508 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:23:18 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.22.16.24.15 --- .scripts/build_steps.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 941c13d3..0467124c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -87,7 +87,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 From 7b0fe0a8b38de8d159a54f5127bc31221b165848 Mon Sep 17 00:00:00 2001 From: Jared Duffey Date: Mon, 26 Aug 2024 23:32:18 -0400 Subject: [PATCH 03/11] Added test to check that vtkGUISupportQt/vtkRenderingQt were built Signed-off-by: Jared Duffey --- recipe/meta.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7d96501c..1df6852e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -185,6 +185,7 @@ outputs: - vtkmodules.vtkInfovisCore - vtkmodules.vtkRenderingCore - vtkmodules.vtkViewsCore + - vtkmodules.vtkRenderingQt # [build_variant == "qt"] - vtkmodules.vtkRenderingVolume - vtkmodules.vtkInteractionWidgets - vtkmodules.vtkWebCore @@ -197,6 +198,15 @@ outputs: commands: - pip check + {% set vtk_qt_libs = [ + "vtkGUISupportQt", + "vtkRenderingQt" + ] %} + {% for vtk_lib in vtk_qt_libs %} + - test -f $PREFIX/lib/lib{{ vtk_lib }}-{{ minor_version }}${SHLIB_EXT} # [not win and (build_variant == "qt")] + - if not exist %PREFIX%\\Library\\lib\\{{ vtk_lib }}-{{ minor_version }}.lib exit 1 # [win and (build_variant == "qt")] + - if not exist %PREFIX%\\Library\\bin\\{{ vtk_lib }}-{{ minor_version }}.dll exit 1 # [win and (build_variant == "qt")] + {% endfor %} - name: vtk-io-ffmpeg build: From 166f6a445eaa588396c629bf6cc02c5f9d355e64 Mon Sep 17 00:00:00 2001 From: Jared Duffey Date: Tue, 27 Aug 2024 13:18:13 -0400 Subject: [PATCH 04/11] Fixed meta.yaml linting error Signed-off-by: Jared Duffey --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1df6852e..b9670d7c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -185,7 +185,7 @@ outputs: - vtkmodules.vtkInfovisCore - vtkmodules.vtkRenderingCore - vtkmodules.vtkViewsCore - - vtkmodules.vtkRenderingQt # [build_variant == "qt"] + - vtkmodules.vtkRenderingQt # [build_variant == "qt"] - vtkmodules.vtkRenderingVolume - vtkmodules.vtkInteractionWidgets - vtkmodules.vtkWebCore From 23f78606d1440c4f67bac6a2f0ef98a7af31a802 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 28 Aug 2024 20:13:41 +1000 Subject: [PATCH 05/11] Fix line spacing --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c0e61afb..196e5432 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,6 @@ {% set version = "9.3.1" %} {% set build = 5 %} + {% set minor_version = ".".join(version.split(".")[:2]) %} {% set build = build + 100 %} # [build_variant == "osmesa"] From cb2d74f6b8ce3a395cf321233f838c5dc267c89d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 28 Aug 2024 20:14:40 +1000 Subject: [PATCH 06/11] Use libEGL required on aarch64 with qt --- recipe/yum_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt index c85d6110..ea511822 100644 --- a/recipe/yum_requirements.txt +++ b/recipe/yum_requirements.txt @@ -1 +1,2 @@ mesa-libGL-devel +mesa-libEGL-devel From 968e1d6fda79f3c3c11664f5a4deca6919a833af Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:17:53 +0000 Subject: [PATCH 07/11] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.28.05.05.18 --- .scripts/build_steps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 0467124c..efef2704 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -54,7 +54,7 @@ ulimit -n 1024 # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. -/usr/bin/sudo -n yum install -y mesa-libGL-devel +/usr/bin/sudo -n yum install -y mesa-libGL-devel mesa-libEGL-devel From 43ce0e2e0d42eabd22d35b5631a80590079c990c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 29 Aug 2024 07:06:37 +1000 Subject: [PATCH 08/11] More fixes for ligEGL --- recipe/yum_requirements.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt index ea511822..372e2d8b 100644 --- a/recipe/yum_requirements.txt +++ b/recipe/yum_requirements.txt @@ -1,2 +1,7 @@ +mesa-libGL mesa-libGL-devel mesa-libEGL-devel +mesa-dri-drivers +libX11-devel +libglvnd-glx +libglvnd-egl From 456e617bb572e3f08836afbac45582486bcf3440 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 21:09:31 +0000 Subject: [PATCH 09/11] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.28.19.57.49 --- .azure-pipelines/azure-pipelines-linux.yml | 32 ------ .azure-pipelines/azure-pipelines-osx.yml | 12 --- .azure-pipelines/azure-pipelines-win.yml | 6 -- ...arianteglffmpeg6python3.8.____cpython.yaml | 83 ---------------- ...arianteglffmpeg7python3.8.____cpython.yaml | 83 ---------------- ...antosmesaffmpeg6python3.8.____cpython.yaml | 83 ---------------- ...antosmesaffmpeg7python3.8.____cpython.yaml | 83 ---------------- ...variantqtffmpeg6python3.8.____cpython.yaml | 83 ---------------- ...variantqtffmpeg7python3.8.____cpython.yaml | 83 ---------------- ..._aarch64_ffmpeg6python3.8.____cpython.yaml | 81 --------------- ..._aarch64_ffmpeg7python3.8.____cpython.yaml | 81 --------------- .../osx_64_ffmpeg6python3.8.____cpython.yaml | 72 -------------- .../osx_64_ffmpeg7python3.8.____cpython.yaml | 72 -------------- ...sx_arm64_ffmpeg6python3.8.____cpython.yaml | 72 -------------- ...sx_arm64_ffmpeg7python3.8.____cpython.yaml | 72 -------------- .../win_64_ffmpeg6python3.8.____cpython.yaml | 60 ------------ .../win_64_ffmpeg7python3.8.____cpython.yaml | 60 ------------ .scripts/build_steps.sh | 2 +- README.md | 98 ------------------- 19 files changed, 1 insertion(+), 1217 deletions(-) delete mode 100644 .ci_support/linux_64_build_varianteglffmpeg6python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_build_varianteglffmpeg7python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_build_variantosmesaffmpeg6python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_build_variantosmesaffmpeg7python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_build_variantqtffmpeg6python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_64_build_variantqtffmpeg7python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_ffmpeg6python3.8.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_ffmpeg7python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_ffmpeg6python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_64_ffmpeg7python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_ffmpeg6python3.8.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_ffmpeg7python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_ffmpeg6python3.8.____cpython.yaml delete mode 100644 .ci_support/win_64_ffmpeg7python3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 29d76e96..4f481931 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,10 +20,6 @@ jobs: CONFIG: linux_64_build_varianteglffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_varianteglffmpeg6python3.8.____cpython: - CONFIG: linux_64_build_varianteglffmpeg6python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_varianteglffmpeg6python3.9.____cpython: CONFIG: linux_64_build_varianteglffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -40,10 +36,6 @@ jobs: CONFIG: linux_64_build_varianteglffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_varianteglffmpeg7python3.8.____cpython: - CONFIG: linux_64_build_varianteglffmpeg7python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_varianteglffmpeg7python3.9.____cpython: CONFIG: linux_64_build_varianteglffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -60,10 +52,6 @@ jobs: CONFIG: linux_64_build_variantosmesaffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantosmesaffmpeg6python3.8.____cpython: - CONFIG: linux_64_build_variantosmesaffmpeg6python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_variantosmesaffmpeg6python3.9.____cpython: CONFIG: linux_64_build_variantosmesaffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -80,10 +68,6 @@ jobs: CONFIG: linux_64_build_variantosmesaffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantosmesaffmpeg7python3.8.____cpython: - CONFIG: linux_64_build_variantosmesaffmpeg7python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_variantosmesaffmpeg7python3.9.____cpython: CONFIG: linux_64_build_variantosmesaffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -100,10 +84,6 @@ jobs: CONFIG: linux_64_build_variantqtffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantqtffmpeg6python3.8.____cpython: - CONFIG: linux_64_build_variantqtffmpeg6python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_variantqtffmpeg6python3.9.____cpython: CONFIG: linux_64_build_variantqtffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -120,10 +100,6 @@ jobs: CONFIG: linux_64_build_variantqtffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_build_variantqtffmpeg7python3.8.____cpython: - CONFIG: linux_64_build_variantqtffmpeg7python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_variantqtffmpeg7python3.9.____cpython: CONFIG: linux_64_build_variantqtffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -140,10 +116,6 @@ jobs: CONFIG: linux_aarch64_ffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_ffmpeg6python3.8.____cpython: - CONFIG: linux_aarch64_ffmpeg6python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_ffmpeg6python3.9.____cpython: CONFIG: linux_aarch64_ffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -160,10 +132,6 @@ jobs: CONFIG: linux_aarch64_ffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_ffmpeg7python3.8.____cpython: - CONFIG: linux_aarch64_ffmpeg7python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_ffmpeg7python3.9.____cpython: CONFIG: linux_aarch64_ffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 82b09386..87f559ec 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -17,9 +17,6 @@ jobs: osx_64_ffmpeg6python3.12.____cpython: CONFIG: osx_64_ffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_ffmpeg6python3.8.____cpython: - CONFIG: osx_64_ffmpeg6python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_ffmpeg6python3.9.____cpython: CONFIG: osx_64_ffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -32,9 +29,6 @@ jobs: osx_64_ffmpeg7python3.12.____cpython: CONFIG: osx_64_ffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_ffmpeg7python3.8.____cpython: - CONFIG: osx_64_ffmpeg7python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_ffmpeg7python3.9.____cpython: CONFIG: osx_64_ffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -47,9 +41,6 @@ jobs: osx_arm64_ffmpeg6python3.12.____cpython: CONFIG: osx_arm64_ffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_ffmpeg6python3.8.____cpython: - CONFIG: osx_arm64_ffmpeg6python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_ffmpeg6python3.9.____cpython: CONFIG: osx_arm64_ffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -62,9 +53,6 @@ jobs: osx_arm64_ffmpeg7python3.12.____cpython: CONFIG: osx_arm64_ffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_ffmpeg7python3.8.____cpython: - CONFIG: osx_arm64_ffmpeg7python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_ffmpeg7python3.9.____cpython: CONFIG: osx_arm64_ffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6b826152..3f543e99 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,9 +17,6 @@ jobs: win_64_ffmpeg6python3.12.____cpython: CONFIG: win_64_ffmpeg6python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_ffmpeg6python3.8.____cpython: - CONFIG: win_64_ffmpeg6python3.8.____cpython - UPLOAD_PACKAGES: 'True' win_64_ffmpeg6python3.9.____cpython: CONFIG: win_64_ffmpeg6python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -32,9 +29,6 @@ jobs: win_64_ffmpeg7python3.12.____cpython: CONFIG: win_64_ffmpeg7python3.12.____cpython UPLOAD_PACKAGES: 'True' - win_64_ffmpeg7python3.8.____cpython: - CONFIG: win_64_ffmpeg7python3.8.____cpython - UPLOAD_PACKAGES: 'True' win_64_ffmpeg7python3.9.____cpython: CONFIG: win_64_ffmpeg7python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_build_varianteglffmpeg6python3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg6python3.8.____cpython.yaml deleted file mode 100644 index e92e2746..00000000 --- a/.ci_support/linux_64_build_varianteglffmpeg6python3.8.____cpython.yaml +++ /dev/null @@ -1,83 +0,0 @@ -build_variant: -- egl -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '6' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '13' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -- - cxx_compiler_version - - fortran_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_build_varianteglffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_64_build_varianteglffmpeg7python3.8.____cpython.yaml deleted file mode 100644 index 639ef532..00000000 --- a/.ci_support/linux_64_build_varianteglffmpeg7python3.8.____cpython.yaml +++ /dev/null @@ -1,83 +0,0 @@ -build_variant: -- egl -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '7' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '13' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -- - cxx_compiler_version - - fortran_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg6python3.8.____cpython.yaml deleted file mode 100644 index 4be2126d..00000000 --- a/.ci_support/linux_64_build_variantosmesaffmpeg6python3.8.____cpython.yaml +++ /dev/null @@ -1,83 +0,0 @@ -build_variant: -- osmesa -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '6' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '13' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -- - cxx_compiler_version - - fortran_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_64_build_variantosmesaffmpeg7python3.8.____cpython.yaml deleted file mode 100644 index 401274cb..00000000 --- a/.ci_support/linux_64_build_variantosmesaffmpeg7python3.8.____cpython.yaml +++ /dev/null @@ -1,83 +0,0 @@ -build_variant: -- osmesa -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '7' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '13' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -- - cxx_compiler_version - - fortran_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_build_variantqtffmpeg6python3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg6python3.8.____cpython.yaml deleted file mode 100644 index d8151504..00000000 --- a/.ci_support/linux_64_build_variantqtffmpeg6python3.8.____cpython.yaml +++ /dev/null @@ -1,83 +0,0 @@ -build_variant: -- qt -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '6' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '13' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -- - cxx_compiler_version - - fortran_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_build_variantqtffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_64_build_variantqtffmpeg7python3.8.____cpython.yaml deleted file mode 100644 index 1df0bcde..00000000 --- a/.ci_support/linux_64_build_variantqtffmpeg7python3.8.____cpython.yaml +++ /dev/null @@ -1,83 +0,0 @@ -build_variant: -- qt -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '7' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '13' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -- - cxx_compiler_version - - fortran_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_ffmpeg6python3.8.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg6python3.8.____cpython.yaml deleted file mode 100644 index ff4eb158..00000000 --- a/.ci_support/linux_aarch64_ffmpeg6python3.8.____cpython.yaml +++ /dev/null @@ -1,81 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -build_variant: -- qt -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '6' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-aarch64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -zlib: -- '1' diff --git a/.ci_support/linux_aarch64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/linux_aarch64_ffmpeg7python3.8.____cpython.yaml deleted file mode 100644 index 6371e8b7..00000000 --- a/.ci_support/linux_aarch64_ffmpeg7python3.8.____cpython.yaml +++ /dev/null @@ -1,81 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -build_variant: -- qt -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -expat: -- '2' -ffmpeg: -- '7' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libuuid: -- '2' -libxcb: -- '1.16' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- linux-aarch64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zip_keys: -- - c_stdlib_version - - cdt_name -zlib: -- '1' diff --git a/.ci_support/osx_64_ffmpeg6python3.8.____cpython.yaml b/.ci_support/osx_64_ffmpeg6python3.8.____cpython.yaml deleted file mode 100644 index 190a483d..00000000 --- a/.ci_support/osx_64_ffmpeg6python3.8.____cpython.yaml +++ /dev/null @@ -1,72 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -build_variant: -- qt -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -expat: -- '2' -ffmpeg: -- '6' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libxml2: -- '2' -lz4_c: -- 1.9.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- osx-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zlib: -- '1' diff --git a/.ci_support/osx_64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/osx_64_ffmpeg7python3.8.____cpython.yaml deleted file mode 100644 index 1955f072..00000000 --- a/.ci_support/osx_64_ffmpeg7python3.8.____cpython.yaml +++ /dev/null @@ -1,72 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -build_variant: -- qt -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -expat: -- '2' -ffmpeg: -- '7' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libxml2: -- '2' -lz4_c: -- 1.9.3 -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- osx-64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zlib: -- '1' diff --git a/.ci_support/osx_arm64_ffmpeg6python3.8.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg6python3.8.____cpython.yaml deleted file mode 100644 index 400ba75c..00000000 --- a/.ci_support/osx_arm64_ffmpeg6python3.8.____cpython.yaml +++ /dev/null @@ -1,72 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -build_variant: -- qt -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -expat: -- '2' -ffmpeg: -- '6' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libxml2: -- '2' -lz4_c: -- 1.9.3 -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- osx-arm64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zlib: -- '1' diff --git a/.ci_support/osx_arm64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/osx_arm64_ffmpeg7python3.8.____cpython.yaml deleted file mode 100644 index ad208138..00000000 --- a/.ci_support/osx_arm64_ffmpeg7python3.8.____cpython.yaml +++ /dev/null @@ -1,72 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -build_variant: -- qt -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -expat: -- '2' -ffmpeg: -- '7' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libxml2: -- '2' -lz4_c: -- 1.9.3 -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- osx-arm64 -tbb: -- '2021' -tbb_devel: -- '2021' -tk: -- '8.6' -vtk: -- 9.2.6 -zlib: -- '1' diff --git a/.ci_support/win_64_ffmpeg6python3.8.____cpython.yaml b/.ci_support/win_64_ffmpeg6python3.8.____cpython.yaml deleted file mode 100644 index b0431bd5..00000000 --- a/.ci_support/win_64_ffmpeg6python3.8.____cpython.yaml +++ /dev/null @@ -1,60 +0,0 @@ -build_variant: -- qt -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -expat: -- '2' -ffmpeg: -- '6' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- win-64 -tbb: -- '2021' -tbb_devel: -- '2021' -vtk: -- 9.2.6 -zlib: -- '1' diff --git a/.ci_support/win_64_ffmpeg7python3.8.____cpython.yaml b/.ci_support/win_64_ffmpeg7python3.8.____cpython.yaml deleted file mode 100644 index fe09ef90..00000000 --- a/.ci_support/win_64_ffmpeg7python3.8.____cpython.yaml +++ /dev/null @@ -1,60 +0,0 @@ -build_variant: -- qt -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -expat: -- '2' -ffmpeg: -- '7' -freetype: -- '2' -glew: -- '2.1' -hdf5: -- 1.14.3 -jsoncpp: -- 1.9.5 -libboost_headers: -- '1.86' -libjpeg_turbo: -- '3' -libnetcdf: -- 4.9.2 -libpng: -- '1.6' -libtiff: -- '4.6' -libxml2: -- '2' -lz4_c: -- 1.9.3 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -proj: -- '9.4' -pugixml: -- '1.14' -python: -- 3.8.* *_cpython -qt6_main: -- '6.7' -sqlite: -- '3' -target_platform: -- win-64 -tbb: -- '2021' -tbb_devel: -- '2021' -vtk: -- 9.2.6 -zlib: -- '1' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index efef2704..decb6424 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -54,7 +54,7 @@ ulimit -n 1024 # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. -/usr/bin/sudo -n yum install -y mesa-libGL-devel mesa-libEGL-devel +/usr/bin/sudo -n yum install -y mesa-libGL mesa-libGL-devel mesa-libEGL-devel mesa-dri-drivers libX11-devel libglvnd-glx libglvnd-egl diff --git a/README.md b/README.md index a18145f2..c64aceeb 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,6 @@ Current build status variant - - linux_64_build_varianteglffmpeg6python3.8.____cpython - - - variant - - linux_64_build_varianteglffmpeg6python3.9.____cpython @@ -87,13 +80,6 @@ Current build status variant - - linux_64_build_varianteglffmpeg7python3.8.____cpython - - - variant - - linux_64_build_varianteglffmpeg7python3.9.____cpython @@ -122,13 +108,6 @@ Current build status variant - - linux_64_build_variantosmesaffmpeg6python3.8.____cpython - - - variant - - linux_64_build_variantosmesaffmpeg6python3.9.____cpython @@ -157,13 +136,6 @@ Current build status variant - - linux_64_build_variantosmesaffmpeg7python3.8.____cpython - - - variant - - linux_64_build_variantosmesaffmpeg7python3.9.____cpython @@ -192,13 +164,6 @@ Current build status variant - - linux_64_build_variantqtffmpeg6python3.8.____cpython - - - variant - - linux_64_build_variantqtffmpeg6python3.9.____cpython @@ -227,13 +192,6 @@ Current build status variant - - linux_64_build_variantqtffmpeg7python3.8.____cpython - - - variant - - linux_64_build_variantqtffmpeg7python3.9.____cpython @@ -262,13 +220,6 @@ Current build status variant - - linux_aarch64_ffmpeg6python3.8.____cpython - - - variant - - linux_aarch64_ffmpeg6python3.9.____cpython @@ -297,13 +248,6 @@ Current build status variant - - linux_aarch64_ffmpeg7python3.8.____cpython - - - variant - - linux_aarch64_ffmpeg7python3.9.____cpython @@ -332,13 +276,6 @@ Current build status variant - - osx_64_ffmpeg6python3.8.____cpython - - - variant - - osx_64_ffmpeg6python3.9.____cpython @@ -367,13 +304,6 @@ Current build status variant - - osx_64_ffmpeg7python3.8.____cpython - - - variant - - osx_64_ffmpeg7python3.9.____cpython @@ -402,13 +332,6 @@ Current build status variant - - osx_arm64_ffmpeg6python3.8.____cpython - - - variant - - osx_arm64_ffmpeg6python3.9.____cpython @@ -437,13 +360,6 @@ Current build status variant - - osx_arm64_ffmpeg7python3.8.____cpython - - - variant - - osx_arm64_ffmpeg7python3.9.____cpython @@ -472,13 +388,6 @@ Current build status variant - - win_64_ffmpeg6python3.8.____cpython - - - variant - - win_64_ffmpeg6python3.9.____cpython @@ -507,13 +416,6 @@ Current build status variant - - win_64_ffmpeg7python3.8.____cpython - - - variant - - win_64_ffmpeg7python3.9.____cpython From 19c427427762b63672023e4eb2c823fba7e76eb7 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 29 Aug 2024 10:01:07 +1000 Subject: [PATCH 10/11] libglvnd-opengl --- recipe/yum_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt index 372e2d8b..fe1402be 100644 --- a/recipe/yum_requirements.txt +++ b/recipe/yum_requirements.txt @@ -5,3 +5,4 @@ mesa-dri-drivers libX11-devel libglvnd-glx libglvnd-egl +libglvnd-opengl From 7faac24c199bc576916a2f9ce7722a9ce2abd4a2 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 00:03:53 +0000 Subject: [PATCH 11/11] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.28.19.57.49 --- .scripts/build_steps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index decb6424..126db4e9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -54,7 +54,7 @@ ulimit -n 1024 # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. -/usr/bin/sudo -n yum install -y mesa-libGL mesa-libGL-devel mesa-libEGL-devel mesa-dri-drivers libX11-devel libglvnd-glx libglvnd-egl +/usr/bin/sudo -n yum install -y mesa-libGL mesa-libGL-devel mesa-libEGL-devel mesa-dri-drivers libX11-devel libglvnd-glx libglvnd-egl libglvnd-opengl