From 09c534752c51e446ca1051b209d825bf3ef87b08 Mon Sep 17 00:00:00 2001 From: Kez Cleal <42997789+kcleal@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:52:00 +0100 Subject: [PATCH] Update GW to v1.1.1 (#51426) * Update meta.yaml * Update meta.yaml * Update meta.yaml * Update meta.yaml * Update meta.yaml * Update meta.yaml * Update meta.yaml * Update meta.yaml * Update build.sh * Update build.sh * Update meta.yaml * Update conda_build_config.yaml * Update conda_build_config.yaml * Update meta.yaml * Update conda_build_config.yaml * Update build.sh * Update conda_build_config.yaml * Does v1.1.0 build? * Update meta.yaml * Update meta.yaml * Update meta.yaml * Update conda_build_config.yaml * Update conda_build_config.yaml --- recipes/gw/build.sh | 9 ++++++--- recipes/gw/conda_build_config.yaml | 16 ++++++++++++---- recipes/gw/meta.yaml | 10 +++++++--- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/recipes/gw/build.sh b/recipes/gw/build.sh index 41ea8b9fe293b..04532b916b152 100644 --- a/recipes/gw/build.sh +++ b/recipes/gw/build.sh @@ -2,11 +2,14 @@ set -e # Get pre-compiled skia from jetbrains -USE_GL=1 make prep > /dev/null 2>&1 +USE_GL=1 make prep 2> /dev/null if [[ "$OSTYPE" != "darwin"* ]]; then - sed -i 's/-lEGL -lGLESv2/-lEGL -lGLESv2 -lGL -lGLX/' Makefile - sed -i 's/GLFW_EGL_CONTEXT_API/GLFW_NATIVE_CONTEXT_API/' src/plot_manager.cpp + sed -i.bak 's/-lEGL -lGLESv2/-lEGL -lGLESv2 -lGL -lGLX/' Makefile + sed -i.bak 's/GLFW_EGL_CONTEXT_API/GLFW_NATIVE_CONTEXT_API/' src/plot_manager.cpp + # Let conda set these + sed -i.bak 's/-mmacosx-version-min=10.15//g' Makefile + sed -i.bak 's/-mmacosx-version-min=11//g' Makefile fi # Set flags conditionally based on the OS type diff --git a/recipes/gw/conda_build_config.yaml b/recipes/gw/conda_build_config.yaml index 90ff7dab2c6f3..1fa9eba4fd39a 100644 --- a/recipes/gw/conda_build_config.yaml +++ b/recipes/gw/conda_build_config.yaml @@ -1,4 +1,12 @@ -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.15" # [osx and x86_64] -MACOSX_SDK_VERSION: # [osx and x86_64] - - "10.15" # [osx and x86_64] +#MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +# - "10.15" # [osx and x86_64] + +#MACOSX_SDK_VERSION: # [osx and x86_64] +# - "10.15" # [osx and x86_64] + +#CFLAGS: +# - "-mmacosx-version-min=10.15" # [osx and x86_64] +#CXXFLAGS: +# - "-mmacosx-version-min=10.15" # [osx and x86_64] +#LDFLAGS: +# - "-mmacosx-version-min=10.15" # [osx and x86_64] diff --git a/recipes/gw/meta.yaml b/recipes/gw/meta.yaml index decc50a9fcd20..43a534a6e6384 100644 --- a/recipes/gw/meta.yaml +++ b/recipes/gw/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "1.1.0" %} -{% set sha256 = "dc96521b8252bde02d9cc68bb3cee156c0469889d2783ee72682338d10657892" %} +{% set version = "1.1.1" %} +{% set sha256 = "5ac0430d9179d1a48938f24011c329fe807e72aba0c20eb191c566d129115f86" %} package: name: gw @@ -31,6 +31,7 @@ build: - zlib # [osx] - libuuid - libdeflate + skip: true # [osx and x86_64] requirements: build: @@ -72,7 +73,10 @@ requirements: test: commands: - - gw hg19 -b https://github.com/kcleal/gw/releases/download/v1.0.0/demo1.bam -r chr8:37047270-37055161 -n > test.png; ls -lh test.png + - which gw && ls -lh $(which gw) + - uname -a + - if [[ "$(uname)" == "Darwin" ]]; then file $(which gw); otool -L $(which gw); nm $(which gw); fi + - gw --version about: home: https://github.com/kcleal/gw