diff options
Diffstat (limited to 'sci-visualization/gr')
| -rw-r--r-- | sci-visualization/gr/Manifest | 3 | ||||
| -rw-r--r-- | sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch | 21 | ||||
| -rw-r--r-- | sci-visualization/gr/files/gr-0.53.0-musl.patch | 29 | ||||
| -rw-r--r-- | sci-visualization/gr/gr-0.72.4.ebuild (renamed from sci-visualization/gr/gr-0.50.0-r2.ebuild) | 23 | ||||
| -rw-r--r-- | sci-visualization/gr/gr-0.73.3.ebuild | 85 | ||||
| -rw-r--r-- | sci-visualization/gr/metadata.xml | 8 |
6 files changed, 140 insertions, 29 deletions
diff --git a/sci-visualization/gr/Manifest b/sci-visualization/gr/Manifest index 5101eb04b361..83af848e109d 100644 --- a/sci-visualization/gr/Manifest +++ b/sci-visualization/gr/Manifest @@ -1 +1,2 @@ -DIST gr-0.50.0.tar.gz 8612608 BLAKE2B 70f4a3c6ce1dac8556646a1632667e6e464a5048f3c44fb689709e3e8218e8d7375db6ff8ce73e11dbeda559fb27c83b7f2b42f0ab518df9b464c8443748c30e SHA512 34ca077ae729e6eda0e5df7046811c77d717f3ef0e34203d6ab3a7f4b67b3aa058a68b9b2d7d78adc8b2f0830a0298778198a6499bd3d6e5697e4b7270cb648a +DIST gr-0.72.4.tar.gz 9067899 BLAKE2B 827c80dbfc3483abe4af217c06549c64aa134446e831a5d7fab3906a3aac7bb23b66f8b98674220ff1b6fbd5fad60b9a8e7f7361a27370c033d9375a18f63234 SHA512 4ae1aae6854995ae58327d41930cedd96ef973ce65467f48f24d9985b27b5af2aa0eb6832a801b46e6fa71cade99117957c96738cb000306b0574b0e471692fb +DIST gr-0.73.3.tar.gz 10076655 BLAKE2B 13bd461b39a86473290912f5a9ba5a4b5ea3ffc8865f6909aad1fc92acf6d39fdb12910e2bf0f8108b7bef1016652515c6cc188db0b98dd052459400b30895ba SHA512 f45daefd880eec9380a2a31f1cd3b124469c1d33c34a9d13a3718b1978da507620b6f7cc025dd20be81a70f52537dbb4537548d8cc32e133693d9b7ae2f476e5 diff --git a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch deleted file mode 100644 index 800492350cc6..000000000000 --- a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 20204e37d8411b19b69a7ee5c776035c07f7175d Mon Sep 17 00:00:00 2001 -From: Sutou Kouhei <kou@clear-code.com> -Date: Sun, 31 May 2020 11:56:51 +0900 -Subject: [PATCH] Include QPainterPath explicitly for Qt 5.15.0 - ---- - lib/gks/plugin/qt5plugin.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/gks/plugin/qt5plugin.cxx b/lib/gks/plugin/qt5plugin.cxx -index de9cd3d2..301d7fb9 100644 ---- a/lib/gks/plugin/qt5plugin.cxx -+++ b/lib/gks/plugin/qt5plugin.cxx -@@ -6,6 +6,7 @@ - - #include <QtWidgets/QWidget> - #include <QtGui/QPainter> -+#include <QtGui/QPainterPath> - #include <QtGui/QImage> - #include <QtGui/QGuiApplication> - #include <QtGui/QScreen> diff --git a/sci-visualization/gr/files/gr-0.53.0-musl.patch b/sci-visualization/gr/files/gr-0.53.0-musl.patch new file mode 100644 index 000000000000..5b7f55828583 --- /dev/null +++ b/sci-visualization/gr/files/gr-0.53.0-musl.patch @@ -0,0 +1,29 @@ +From 205a70fdbd69d7877994e7aea5cec6eab79236b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> +Date: Sat, 26 Feb 2022 19:38:20 +0100 +Subject: [PATCH] Fix build with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> +--- + lib/gks/io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gks/io.c b/lib/gks/io.c +index 669dd81f..50fde2c4 100644 +--- a/lib/gks/io.c ++++ b/lib/gks/io.c +@@ -11,7 +11,7 @@ + #include <io.h> + #endif + +-#if defined(cray) || defined(__SVR4) || defined(_WIN32) ++#if defined(cray) || defined(__SVR4) || defined(_WIN32) || !defined(__GLIBC__) + #include <fcntl.h> + #else + #include <sys/file.h> +-- +2.34.1 + diff --git a/sci-visualization/gr/gr-0.50.0-r2.ebuild b/sci-visualization/gr/gr-0.72.4.ebuild index 07a5b52c9081..51aaeb29fc39 100644 --- a/sci-visualization/gr/gr-0.50.0-r2.ebuild +++ b/sci-visualization/gr/gr-0.72.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -12,7 +12,7 @@ SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cairo ffmpeg postscript tiff truetype" +IUSE="agg cairo ffmpeg postscript tiff truetype" DEPEND=" dev-qt/qtgui:5 @@ -21,24 +21,34 @@ DEPEND=" media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/qhull:= + net-libs/zeromq sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXt + agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) ffmpeg? ( media-video/ffmpeg:= ) postscript? ( app-text/ghostscript-gpl ) - tiff? ( media-libs/tiff ) + tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype ) " RDEPEND="${DEPEND}" BDEPEND="" PATCHES=( - "${FILESDIR}/${P}-qt-5.15.patch" + "${FILESDIR}/${PN}-0.53.0-musl.patch" ) +REQUIRED_USE="cairo? ( truetype )" + src_configure() { + if use agg ; then + mycmakeargs+=( -DAGG_LIBRARY=libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 ) + else + mycmakeargs+=( -DAGG_LIBRARY= ) + fi + use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= ) use postscript || mycmakeargs+=( -DGS_LIBRARY= ) use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= ) @@ -48,6 +58,7 @@ src_configure() { # todo: X11 automagic mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr ) + mycmakeargs+=( -DCMAKE_INSTALL_LIBDIR=lib ) # # I need to have a serious conversation with upstream. # * The main consumer of this package is dev-lang/julia. @@ -55,7 +66,7 @@ src_configure() { # not find it anymore. # * I can't patch julia, since the corresponding scripts are # downloaded at runtime from its package registry ... - # + # * See bug 882619 in addition. cmake_src_configure } diff --git a/sci-visualization/gr/gr-0.73.3.ebuild b/sci-visualization/gr/gr-0.73.3.ebuild new file mode 100644 index 000000000000..07d5cc654cae --- /dev/null +++ b/sci-visualization/gr/gr-0.73.3.ebuild @@ -0,0 +1,85 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Universal framework for cross-platform visualization applications" +HOMEPAGE="https://gr-framework.org/" +SRC_URI="https://github.com/sciapp/gr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="agg cairo ffmpeg postscript tiff truetype" + +DEPEND=" + dev-qt/qtgui:= + media-libs/fontconfig + media-libs/glfw + media-libs/libjpeg-turbo:= + media-libs/libpng:= + media-libs/qhull:= + net-libs/zeromq + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXt + agg? ( x11-libs/agg ) + cairo? ( x11-libs/cairo ) + ffmpeg? ( media-video/ffmpeg:= ) + postscript? ( app-text/ghostscript-gpl ) + tiff? ( media-libs/tiff:= ) + truetype? ( media-libs/freetype ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.53.0-musl.patch" +) + +REQUIRED_USE="cairo? ( truetype )" + +src_configure() { + if use agg ; then + mycmakeargs+=( -DAGG_LIBRARY=libagg.so -DAGG_INCLUDE_DIR=/usr/include/agg2 ) + else + mycmakeargs+=( -DAGG_LIBRARY= ) + fi + + use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= ) + use postscript || mycmakeargs+=( -DGS_LIBRARY= ) + use ffmpeg || mycmakeargs+=( -DFFMPEG_INCLUDE_DIR= ) + use truetype || mycmakeargs+=( -DFREETYPE_LIBRARY= ) + use tiff || mycmakeargs+=( -DTIFF_LIBRARY= ) + + # todo: X11 automagic + + mycmakeargs+=( -DCMAKE_INSTALL_PREFIX=/usr/gr ) + mycmakeargs+=( -DCMAKE_INSTALL_LIBDIR=lib ) + # + # I need to have a serious conversation with upstream. + # * The main consumer of this package is dev-lang/julia. + # * If I patch gr to install in standard locations, julia does + # not find it anymore. + # * I can't patch julia, since the corresponding scripts are + # downloaded at runtime from its package registry ... + # * See bug 882619 in addition. + + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${ED}" -name '*.a' -delete + + echo "GRDIR=/usr/gr" > "${T}/99gr" + echo "LDPATH=/usr/gr/$(get_libdir)" >> "${T}/99gr" + doenvd "${T}/99gr" + + [[ -f "${ED}/usr/gr/bin/gksqt" ]] && dosym ../gr/bin/gksqt /usr/bin/gksqt + + elog "${P} relies on the environment variable GRDIR. If you want to use it in a running shell," + elog "e.g. with dev-lang/julia, then run \"source /etc/profile\" first." +} diff --git a/sci-visualization/gr/metadata.xml b/sci-visualization/gr/metadata.xml index 80a71f597854..6f8d524de19b 100644 --- a/sci-visualization/gr/metadata.xml +++ b/sci-visualization/gr/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dilfridge@gentoo.org</email> <name>Andreas K. Huettel</name> </maintainer> + <use> + <flag name="agg">Enable the libagg anti-grain rendering engine</flag> + </use> + <upstream> + <remote-id type="github">sciapp/gr</remote-id> + </upstream> </pkgmetadata> |