From a80fa9532bdbca598934df4d93c4280e64f8ad7b Mon Sep 17 00:00:00 2001 From: Philippe Bordron Date: Wed, 11 Dec 2024 17:54:19 +0100 Subject: [PATCH 1/7] Add gfaviz --- recipes/gfaviz/meta.yaml | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 recipes/gfaviz/meta.yaml diff --git a/recipes/gfaviz/meta.yaml b/recipes/gfaviz/meta.yaml new file mode 100644 index 0000000000000..546b9b9c60a84 --- /dev/null +++ b/recipes/gfaviz/meta.yaml @@ -0,0 +1,45 @@ +{% set name = "gfaviz" %} +{% set version="1.0.0" %} +{% set hash="4bc4327dd182812a9cfd53a39632bf41f461170e142df62ebbd0ba441239a6d4" %} + +package: + name: {{ name }} + version: {{ version }} + +build: + number: 0 + skip: True # [ windows ] + script: + - qmake + - make + - mkdir -p {{ PREFIX }}/bin + - cp {{ SRC_DIR }}/gfaviz.app/Contents/MacOS/gfaviz {{ PREFIX }}/bin/ # [ osx ] + - cp {{ SRC_DIR }}/gfaviz {{ PREFIX }}/bin/ # [ linux ] + +source: + url: https://github.com/ggonnella/gfaviz/archive/refs/tags/v{{ version }}.tar.gz + sha256: {{ hash }} + + +requirements: + build: + - {{ compiler('cxx') }} + - qt=5 + - libgl-devel # [ linux ] + run: + - qt=5 + +test: + commands: + - gfaviz --no-gui + - gfaviz --help + +about: + home: https://github.com/ggonnella/gfaviz + license: ISC + license_file: LICENSE.txt + summary: GfaViz is a graphical interactive tool for the visualization of sequence graphs in GFA format. It supports both the GFA1 and GFA2 formats. + +extra: + recipe-maintainers: + - pbordron From caaf8f84a37db0ab01296b77aa6be16e10e3a406 Mon Sep 17 00:00:00 2001 From: Philippe Bordron Date: Wed, 11 Dec 2024 21:32:33 +0100 Subject: [PATCH 2/7] fix run_exports --- recipes/gfaviz/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/gfaviz/meta.yaml b/recipes/gfaviz/meta.yaml index 546b9b9c60a84..7efb20987b488 100644 --- a/recipes/gfaviz/meta.yaml +++ b/recipes/gfaviz/meta.yaml @@ -9,6 +9,8 @@ package: build: number: 0 skip: True # [ windows ] + run_exports: + - {{ pin_subpackage(name, max_pin="x") }} script: - qmake - make From c0e6309d9a4f4172ed3f7d051e7bcf81ee313e0a Mon Sep 17 00:00:00 2001 From: Philippe Bordron Date: Wed, 11 Dec 2024 21:52:05 +0100 Subject: [PATCH 3/7] fix linter --- recipes/gfaviz/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/gfaviz/meta.yaml b/recipes/gfaviz/meta.yaml index 7efb20987b488..0d8901e7c8cae 100644 --- a/recipes/gfaviz/meta.yaml +++ b/recipes/gfaviz/meta.yaml @@ -26,10 +26,10 @@ source: requirements: build: - {{ compiler('cxx') }} - - qt=5 + - qt =5 - libgl-devel # [ linux ] run: - - qt=5 + - qt =5 test: commands: From c5adc5c07b3b5792423a3ab025af5d2179e4e101 Mon Sep 17 00:00:00 2001 From: Philippe Bordron Date: Wed, 11 Dec 2024 22:18:59 +0100 Subject: [PATCH 4/7] pin qt-5 exactly --- recipes/gfaviz/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/gfaviz/meta.yaml b/recipes/gfaviz/meta.yaml index 0d8901e7c8cae..a8a086a4685cf 100644 --- a/recipes/gfaviz/meta.yaml +++ b/recipes/gfaviz/meta.yaml @@ -29,7 +29,8 @@ requirements: - qt =5 - libgl-devel # [ linux ] run: - - qt =5 +# - qt =5 + - {{ pin_compatible('qt', max_pin='x.x.x') }} test: commands: From 456a6bce30311c46da7bfffad992750021540ff6 Mon Sep 17 00:00:00 2001 From: Philippe Bordron Date: Thu, 12 Dec 2024 11:26:54 +0100 Subject: [PATCH 5/7] fix qmake g++ not found error --- recipes/gfaviz/build.sh | 18 ++++++++++++++++++ recipes/gfaviz/meta.yaml | 26 ++++++++++++-------------- 2 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 recipes/gfaviz/build.sh diff --git a/recipes/gfaviz/build.sh b/recipes/gfaviz/build.sh new file mode 100644 index 0000000000000..0d5321e975b63 --- /dev/null +++ b/recipes/gfaviz/build.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +#qmake bugfix: qmake fails if there is no g++ executable available, even if QMAKE_CXX is explicitly set +ln -s $CXX $BUILD_PREFIX/bin/g++ +export PATH=$BUILD_PREFIX/bin/:$PATH + +qmake +make +mkdir -p "${PREFIX}/bin" + +#if [ -z ${MACOSX_DEPLOYMENT_TARGET+x} ]; then + +# Install part +if [ "$(uname)" = "Darwin" ]; then + cp "${SRC_DIR}/gfaviz.app/Contents/MacOS/gfaviz" "${PREFIX}/bin/" # [ osx ] +else + cp "${SRC_DIR}/gfaviz" "${PREFIX}/bin/" # [ linux ] +fi diff --git a/recipes/gfaviz/meta.yaml b/recipes/gfaviz/meta.yaml index a8a086a4685cf..baa67240ef88e 100644 --- a/recipes/gfaviz/meta.yaml +++ b/recipes/gfaviz/meta.yaml @@ -3,39 +3,32 @@ {% set hash="4bc4327dd182812a9cfd53a39632bf41f461170e142df62ebbd0ba441239a6d4" %} package: - name: {{ name }} + name: {{ name|lower }} version: {{ version }} build: number: 0 - skip: True # [ windows ] run_exports: - {{ pin_subpackage(name, max_pin="x") }} - script: - - qmake - - make - - mkdir -p {{ PREFIX }}/bin - - cp {{ SRC_DIR }}/gfaviz.app/Contents/MacOS/gfaviz {{ PREFIX }}/bin/ # [ osx ] - - cp {{ SRC_DIR }}/gfaviz {{ PREFIX }}/bin/ # [ linux ] source: url: https://github.com/ggonnella/gfaviz/archive/refs/tags/v{{ version }}.tar.gz sha256: {{ hash }} - requirements: build: - {{ compiler('cxx') }} - - qt =5 + - make + host: + - qt-main =5 - libgl-devel # [ linux ] run: -# - qt =5 - - {{ pin_compatible('qt', max_pin='x.x.x') }} + - {{ pin_compatible('qt-main', max_pin='x.x.x') }} test: commands: - - gfaviz --no-gui - - gfaviz --help + - which gfaviz +# - gfaviz --help about: home: https://github.com/ggonnella/gfaviz @@ -44,5 +37,10 @@ about: summary: GfaViz is a graphical interactive tool for the visualization of sequence graphs in GFA format. It supports both the GFA1 and GFA2 formats. extra: + container: + # needed for libGL + extended-base: true + identifiers: + - doi:10.1093/bioinformatics/bty1046 recipe-maintainers: - pbordron From caaa93d205bed849b56afbd0c8cba93d3f3fb7d1 Mon Sep 17 00:00:00 2001 From: Philippe Bordron Date: Thu, 12 Dec 2024 16:39:43 +0100 Subject: [PATCH 6/7] fix display export for test --- recipes/gfaviz/build.sh | 9 ++++----- recipes/gfaviz/meta.yaml | 5 ----- recipes/gfaviz/run_test.sh | 3 +++ 3 files changed, 7 insertions(+), 10 deletions(-) create mode 100755 recipes/gfaviz/run_test.sh diff --git a/recipes/gfaviz/build.sh b/recipes/gfaviz/build.sh index 0d5321e975b63..dc87d2da8f4bd 100644 --- a/recipes/gfaviz/build.sh +++ b/recipes/gfaviz/build.sh @@ -4,15 +4,14 @@ ln -s $CXX $BUILD_PREFIX/bin/g++ export PATH=$BUILD_PREFIX/bin/:$PATH +# Build part qmake make -mkdir -p "${PREFIX}/bin" - -#if [ -z ${MACOSX_DEPLOYMENT_TARGET+x} ]; then # Install part +mkdir -p "${PREFIX}/bin" if [ "$(uname)" = "Darwin" ]; then - cp "${SRC_DIR}/gfaviz.app/Contents/MacOS/gfaviz" "${PREFIX}/bin/" # [ osx ] + cp "${SRC_DIR}/gfaviz.app/Contents/MacOS/gfaviz" "${PREFIX}/bin/" else - cp "${SRC_DIR}/gfaviz" "${PREFIX}/bin/" # [ linux ] + cp "${SRC_DIR}/gfaviz" "${PREFIX}/bin/" fi diff --git a/recipes/gfaviz/meta.yaml b/recipes/gfaviz/meta.yaml index baa67240ef88e..37da5f43586e0 100644 --- a/recipes/gfaviz/meta.yaml +++ b/recipes/gfaviz/meta.yaml @@ -25,11 +25,6 @@ requirements: run: - {{ pin_compatible('qt-main', max_pin='x.x.x') }} -test: - commands: - - which gfaviz -# - gfaviz --help - about: home: https://github.com/ggonnella/gfaviz license: ISC diff --git a/recipes/gfaviz/run_test.sh b/recipes/gfaviz/run_test.sh new file mode 100755 index 0000000000000..ca1ab8c230c36 --- /dev/null +++ b/recipes/gfaviz/run_test.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +DISPLAY=:0.0 gfaviz --help From bbe2ae76b784be24145faff1f4345bb03a3ad9e0 Mon Sep 17 00:00:00 2001 From: Philippe Bordron Date: Fri, 13 Dec 2024 06:35:38 +0100 Subject: [PATCH 7/7] revert test as attaching display fails --- recipes/gfaviz/meta.yaml | 7 +++++++ recipes/gfaviz/run_test.sh | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) delete mode 100755 recipes/gfaviz/run_test.sh diff --git a/recipes/gfaviz/meta.yaml b/recipes/gfaviz/meta.yaml index 37da5f43586e0..c626038601444 100644 --- a/recipes/gfaviz/meta.yaml +++ b/recipes/gfaviz/meta.yaml @@ -25,6 +25,10 @@ requirements: run: - {{ pin_compatible('qt-main', max_pin='x.x.x') }} +test: + commands: + - which gfaviz + about: home: https://github.com/ggonnella/gfaviz license: ISC @@ -32,6 +36,9 @@ about: summary: GfaViz is a graphical interactive tool for the visualization of sequence graphs in GFA format. It supports both the GFA1 and GFA2 formats. extra: + additional-platforms: + - linux-aarch64 + - osx-arm64 container: # needed for libGL extended-base: true diff --git a/recipes/gfaviz/run_test.sh b/recipes/gfaviz/run_test.sh deleted file mode 100755 index ca1ab8c230c36..0000000000000 --- a/recipes/gfaviz/run_test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -DISPLAY=:0.0 gfaviz --help