From 493725b3edf359b5cc1ba731c81511563774d8c0 Mon Sep 17 00:00:00 2001 From: qwx Date: Tue, 24 Dec 2024 05:39:20 +0100 Subject: [PATCH] Update strangepg to 0.8.16, add osx and aarch64 support --- recipes/strangepg/build.sh | 13 +++++++--- recipes/strangepg/meta.yaml | 49 ++++++++++++++++++++--------------- recipes/strangepg/run_test.sh | 2 +- 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/recipes/strangepg/build.sh b/recipes/strangepg/build.sh index b120ae649490a8..5ff465738da65a 100644 --- a/recipes/strangepg/build.sh +++ b/recipes/strangepg/build.sh @@ -2,8 +2,15 @@ set -xe -export C_INCLUDE_PATH="${PREFIX}/include" -export LIBRARY_PATH="${PREFIX}/lib" -export LDLIBS="-ldl -lpthread" +OS=$(uname) +ARCH=$(uname -m) +if [[ ${OS} == "Linux" ]]; then + export C_INCLUDE_PATH="${PREFIX}/include" + export LIBRARY_PATH="${PREFIX}/lib" + export LDLIBS="-ldl -lpthread" + if [[ ${ARCH} == "aarch64" ]]; then + export GLES=1 + fi +fi make CC="${CC}" PREFIX="${PREFIX}" -j ${CPU_COUNT} install diff --git a/recipes/strangepg/meta.yaml b/recipes/strangepg/meta.yaml index d0c49df4a8b645..d301b4a45101ef 100644 --- a/recipes/strangepg/meta.yaml +++ b/recipes/strangepg/meta.yaml @@ -1,5 +1,5 @@ {% set name = "strangepg" %} -{% set version = "0.8.15" %} +{% set version = "0.8.16" %} package: name: {{ name }} @@ -7,11 +7,10 @@ package: source: url: https://github.com/qwx9/{{ name }}/archive/refs/tags/{{ version }}.tar.gz - sha256: 2393be1be300b0d9d3d252482277d9735b53fa7aa2156bcdad2215c3cc2ae093 + sha256: bd331051a496aa93deaca170a77c7a69bf0459fb53a2e577a84ac17236ef894d build: number: 0 - skip: True # [not linux] run_exports: - {{ pin_subpackage('strangepg', max_pin='x.x') }} @@ -19,29 +18,34 @@ requirements: build: - {{ compiler('c') }} - make - - {{ cdt('mesa-libgl-devel') }} - - {{ cdt('mesa-libegl-devel') }} - - {{ cdt('mesa-dri-drivers') }} - - {{ cdt('libdrm-devel') }} - - {{ cdt('libglvnd-glx') }} # [cdt_name != 'cos6'] + - {{ cdt('mesa-libgl-devel') }} # [linux] + - {{ cdt('mesa-dri-drivers') }} # [linux] + - {{ cdt('libdrm-devel') }} # [linux] + - {{ cdt('libglvnd-glx') }} # [linux and cdt_name != 'cos6'] + - {{ cdt('libglvnd-gles') }} # [linux and aarch64 and cdt_name != 'cos6'] host: - - xorg-libx11 - - xorg-libxcursor - - xorg-libxi + - libgles-devel # [linux and aarch64] + - xorg-fixesproto # [linux] + - xorg-inputproto # [linux] + - xorg-kbproto # [linux] + - xorg-libx11 # [linux] + - xorg-libxcursor # [linux] + - xorg-libxi # [linux] + - xorg-xproto # [linux] run: - - libxcb - - xorg-libx11 - - xorg-libxau - - xorg-libxcursor - - xorg-libxdmcp - - xorg-libxext - - xorg-libxfixes - - xorg-libxi - - xorg-libxrandr + - libxcb # [linux] + - xorg-libx11 # [linux] + - xorg-libxau # [linux] + - xorg-libxcursor # [linux] + - xorg-libxdmcp # [linux] + - xorg-libxext # [linux] + - xorg-libxfixes # [linux] + - xorg-libxi # [linux] + - xorg-libxrandr # [linux] test: source_files: - - cmd/main.awk + - test/frag10.gfa about: home: https://github.com/qwx9/{{ name }} @@ -52,6 +56,9 @@ about: dev-url: https://github.com/qwx9/{{ name }} extra: + additional-platforms: + - linux-aarch64 + - osx-arm64 recipe-maintainers: - qwx9 container: diff --git a/recipes/strangepg/run_test.sh b/recipes/strangepg/run_test.sh index 31a5f72a4ef429..0413d1ea90e870 100644 --- a/recipes/strangepg/run_test.sh +++ b/recipes/strangepg/run_test.sh @@ -2,4 +2,4 @@ # https://github.com/bioconda/bioconda-recipes/pull/29042#issuecomment-864465780 strangepg -h 2>/dev/null -strangepg /dev/mordor 2>/dev/null || [[ $? == 1 ]] +strangepg -D load test/frag10.gfa 2>/dev/null