From 99e4bdbcf5925eafc5454dcb6e82072404f41447 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sun, 3 Dec 2023 15:03:24 +0700 Subject: [PATCH] R-rgl: update to 1.2.8, unbreak build on Sonoma See: https://trac.macports.org/ticket/68830 https://github.com/dmurdoch/rgl/issues/397 --- R/R-rgl/Portfile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/R/R-rgl/Portfile b/R/R-rgl/Portfile index d277ea0617d7a..f56ccd971385e 100644 --- a/R/R-rgl/Portfile +++ b/R/R-rgl/Portfile @@ -4,17 +4,17 @@ PortSystem 1.0 PortGroup R 1.0 # Revert to GitHub once updated there. -R.setup cran dmurdoch rgl 1.2.1 +R.setup cran dmurdoch rgl 1.2.8 revision 0 categories-append graphics maintainers {@barracuda156 gmail.com:vital.had} openmaintainer -license {GPL-2 GPL-3} +license GPL description 3D visualization using OpenGL long_description {*}${description} homepage https://dmurdoch.github.io/rgl -checksums rmd160 00683a2075306d67a7bf56e84aec20c1154e7ff4 \ - sha256 d12a3f35527f260f8d393ae842c7705df5656669a72907f78aa64a363c6dcb9b \ - size 2557027 +checksums rmd160 8168b41f80ac4c51c4f7b672941187e618885965 \ + sha256 e535e738702d0babe043c1fec3d358c7bfdfe202ad95d68971b28ad7a81717f4 \ + size 2557113 depends_build-append \ port:pkgconfig @@ -28,16 +28,24 @@ depends_lib-append port:freetype \ port:R-magrittr \ port:R-mime \ port:R-R6 \ - port:xorg-libX11 \ port:zlib -destroot.pre_args-append \ +# Enabling X11 breaks the build on Sonoma: +# https://trac.macports.org/ticket/68830 +# https://github.com/dmurdoch/rgl/issues/397 +if {(${os.platform} eq "darwin" && ${os.major} < 22) || ${os.platform} ne "darwin"} { + depends_lib-append \ + port:xorg-libX11 + + destroot.pre_args-append \ --configure-args=' \ --with-x \ --x-includes=${prefix}/include/X11 \ --x-libraries=${prefix}/lib \ ' +} +# TODO: implement tests, verify on PowerPC. # FIXME: https://github.com/dmurdoch/rgl/issues/317 if {${os.platform} eq "darwin" && ${os.major} < 11} { destroot.pre_args-append \