[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/, sci-libs/mathgl/files/
commit: b7e1372b7791f70b4f162a8ef5762c892633b4c7
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Nov 24 14:04:23 2023 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Nov 24 14:30:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e1372b
sci-libs/mathgl: add 8.0.1
Closes: https://bugs.gentoo.org/587150
Closes: https://bugs.gentoo.org/886468
Closes: https://bugs.gentoo.org/873457
Closes: https://bugs.gentoo.org/808713
Closes: https://bugs.gentoo.org/780318
Closes: https://bugs.gentoo.org/711154
Signed-off-by: Pacho Ramos gentoo.org>
sci-libs/mathgl/Manifest | 1 +
sci-libs/mathgl/files/mathgl-libharu2.4.patch | 25 +
sci-libs/mathgl/mathgl-8.0.1.ebuild | 145 ++
3 files changed, 171 insertions(+)
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index ed743f578265..9a1cf0f5c874 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,2 +1,3 @@
DIST STIX_font.tgz 2450541 BLAKE2B
f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c
SHA512
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B
11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf
SHA512
6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573
+DIST mathgl-8.0.1.tar.gz 23979834 BLAKE2B
275301c945ea15a38d1c75fd509c126425080b811403d5a8c8e864c8a975b914b5f0909bdc2c0de2feb84638ef0655694cd4d0c2aec8fb537c937147d81608c9
SHA512
1ff3023f1bbd7bfd84202777a0166a8d4255a020a07f3650b9858929345bc8a2ceea4db155d2c93ba32b762d2304474276290a9edac99fda70fb4b5bc12982c2
diff --git a/sci-libs/mathgl/files/mathgl-libharu2.4.patch
b/sci-libs/mathgl/files/mathgl-libharu2.4.patch
new file mode 100644
index ..fb0acb5da547
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-libharu2.4.patch
@@ -0,0 +1,25 @@
+diff -up mathgl-8.0.1/src/prc.cpp.libharu2.4 mathgl-8.0.1/src/prc.cpp
+--- mathgl-8.0.1/src/prc.cpp.libharu2.42022-01-11 13:48:53.0
-0700
mathgl-8.0.1/src/prc.cpp 2022-10-05 21:10:18.640050969 -0600
+@@ -36,6 +36,7 @@
+ #include
+ #include
+ #include
++#include
+ #endif // MGL_HAVE_PDF
+
+
+@@ -959,7 +960,12 @@ void MGL_EXPORT mgl_write_prc(HMGL gr, c
+ HPDF_U3D_SetDefault3DView(u3d, "DefaultView");
+
+ // Create annotation
+- annot = HPDF_Page_Create3DAnnot (page, rect, u3d );
++ annot
++#if HPDF_VERSION_ID >= 20400
++= HPDF_Page_Create3DAnnot (page, rect, HPDF_FALSE,
HPDF_FALSE, u3d, NULL);
++#else
++= HPDF_Page_Create3DAnnot (page, rect, u3d );
++#endif
+
+ // Enable toolbar
+ HPDF_Dict action = (HPDF_Dict)HPDF_Dict_GetItem (annot, "3DA",
HPDF_OCLASS_DICT);
diff --git a/sci-libs/mathgl/mathgl-8.0.1.ebuild
b/sci-libs/mathgl/mathgl-8.0.1.ebuild
new file mode 100644
index ..bc9909e31c95
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-8.0.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets multilib flag-o-matic xdg
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="https://mathgl.sourceforge.net;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/7.5.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf
+ png qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+ IUSE+=" l10n_${l}"
+done
+unset l
+
+RDEPEND="
+ virtual/opengl
+ fltk? ( x11-libs/fltk:1 )
+ gif? ( media-libs/giflib )
+ glut? ( media-libs/freeglut )
+ gsl? ( >=sci-libs/gsl-2:= )
+ hdf? ( sci-libs/hdf )
+ hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+ jpeg? ( virtual/jpeg:0 )
+ octave? ( >=sci-mathematics/octave-3.4.0 )
+ openmp? ( sys-cluster/openmpi )
+ pdf? ( media-libs/libharu )
+ png? ( media-libs/libpng:0 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/texi2html virtual/texi2dvi )
+ octave? ( dev-lang/swig )"
+
+REQUIRED_USE="
+ mpi? ( hdf5 )
+ openmp? ( !threads )
+ png? ( zlib )
+ pdf? ( png )"
+
+pkg_setup() {
+ use mpi && export CC=mpicc CXX=mpicxx
+}
+
+PATCHES=(
+ # From Fedora
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/, sci-libs/mathgl/files/
commit: e77c75e99ed8208c5eafdf74af09eb9631c8c160
Author: Jouni Kosonen tukesoft com>
AuthorDate: Mon Feb 19 16:05:27 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Apr 1 21:54:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77c75e9
sci-libs/mathgl: version bump to 2.4.1.
Closes: https://bugs.gentoo.org/596150
Closes: https://github.com/gentoo/gentoo/pull/7229
sci-libs/mathgl/Manifest | 1 +
sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch | 16 +++
sci-libs/mathgl/mathgl-2.4.1.ebuild| 180 +
3 files changed, 197 insertions(+)
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 4e77e01a129..f36f9767c84 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,2 +1,3 @@
DIST STIX_font.tgz 2450541 BLAKE2B
f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c
SHA512
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
DIST mathgl-2.3.4.tar.gz 21361705 BLAKE2B
652cae42ace83077c5e5add2164a99d9a4f0b76a95d9ddd9b5570c04e87ce06c6cf127af85c451f74c7aa59e411c02c970e5fea7ed501a690f6d1a1456dcbd9c
SHA512
2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d
+DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B
a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f
SHA512
10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d
diff --git a/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch
b/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch
new file mode 100644
index 000..4ce7bb73311
--- /dev/null
+++ b/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch
@@ -0,0 +1,16 @@
+diff --git a/src/canvas.cpp b/src/canvas.cpp
+index ba4ffededb9b..7ea755d18265 100644
+--- a/src/canvas.cpp
b/src/canvas.cpp
+@@ -1219,9 +1219,9 @@ void mglCanvas::Pop()
+ {
+ B = stack.back();
+ #if MGL_HAVE_PTHREAD
+- pthread_mutex_lock();
++ pthread_mutex_lock();
+ stack.pop_back();
+- pthread_mutex_unlock();
++ pthread_mutex_unlock();
+ #else
+ #pragma omp critical(stk)
+ stack.pop_back();
diff --git a/sci-libs/mathgl/mathgl-2.4.1.ebuild
b/sci-libs/mathgl/mathgl-2.4.1.ebuild
new file mode 100644
index 000..461956958f1
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.4.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.5.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+ png python qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+ IUSE+=" l10n_${l}"
+done
+unset l
+
+RDEPEND="
+ virtual/opengl
+ fltk? ( x11-libs/fltk:1 )
+ gif? ( media-libs/giflib )
+ glut? ( media-libs/freeglut )
+ gsl? ( >=sci-libs/gsl-2 )
+ hdf? ( sci-libs/hdf )
+ hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+ jpeg? ( virtual/jpeg:0 )
+ lua? ( >=dev-lang/lua-5.1:0 )
+ octave? ( >=sci-mathematics/octave-3.4.0 )
+ openmp? ( sys-cluster/openmpi )
+ pdf? ( media-libs/libharu )
+ png? ( media-libs/libpng:0 )
+ python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+ zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+ doc? ( app-text/texi2html virtual/texi2dvi )
+ octave? ( dev-lang/swig )
+ python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+ mpi? ( hdf5 )
+ openmp? ( !threads )
+ png? ( zlib )
+ pdf? ( png )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-mutex.patch
+)
+
+pkg_setup() {
+ use mpi && export CC=mpicc CXX=mpicxx
+ use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ default
+ if ! [[ -d "${S}"/fonts ]]; then
+ mkdir "${S}"/fonts || die
+ fi
+ cd "${S}"/fonts || die
+ unpack STIX_font.tgz
+}
+
+src_prepare() {
+ # fix for location of hdf headers
+ sed -i -e 's:hdf/::g' src/data_io.cpp || die
+ # bored of
[gentoo-commits] repo/gentoo:master commit in: sci-libs/mathgl/, sci-libs/mathgl/files/
commit: 6c4ffe5d0a8f296ab5cba6754d5e6a2c39ab55e7
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Nov 25 18:50:54 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Nov 25 18:56:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4ffe5d
sci-libs/mathgl: Drop old
Package-Manager: portage-2.3.2
sci-libs/mathgl/Manifest | 3 -
sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch | 65 -
sci-libs/mathgl/files/mathgl-2.3.3-gsl-2.patch | 25
sci-libs/mathgl/mathgl-2.1.3.1.ebuild | 149 -
sci-libs/mathgl/mathgl-2.1.3.ebuild| 147 -
sci-libs/mathgl/mathgl-2.3.3-r1.ebuild | 174 -
sci-libs/mathgl/mathgl-2.3.3.ebuild| 160 ---
7 files changed, 723 deletions(-)
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index f865dc1..c015411 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,5 +1,2 @@
DIST STIX_font.tgz 2450541 SHA256
6408290fd4a5267637a88507344a8f07b908ce72f46ef93d09e068fedb67e8fe SHA512
c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
WHIRLPOOL
912a280ad550040c961a84fe48cfa2bd9bbcbad6c539b6126b4cbb5f9673ddd4ad5cc9e0d053fcb20cc6c12e1203aeaa3a05cf07360b16e2e7cbb13c0c42cc1e
-DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256
a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512
c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc
WHIRLPOOL
3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
-DIST mathgl-2.1.3.tar.gz 5269347 SHA256
b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512
aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73
WHIRLPOOL
9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
-DIST mathgl-2.3.3.tar.gz 20888708 SHA256
324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512
8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2
WHIRLPOOL
e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942
DIST mathgl-2.3.4.tar.gz 21361705 SHA256
6e93cd9f640c5b6c9dac4ca56854612d4261b4eadd6c8aad6536965195f08c02 SHA512
2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d
WHIRLPOOL
cc7043ec2f6a84999de65ad3a5127564da3563644456d08c280d7f462dedf86e7cd5f28996f43e32300aa30adb730904c6cf6cb8f8e2c434402395af37f3ddc7
diff --git a/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch
b/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch
deleted file mode 100644
index cff2787..
--- a/sci-libs/mathgl/files/mathgl-2.1.3.1-x11.patch
+++ /dev/null
@@ -1,65 +0,0 @@
- CMakeLists.txt | 1 +
- json/CMakeLists.txt| 2 +-
- udav/CMakeLists.txt| 2 +-
- widgets/CMakeLists.txt | 4 ++--
- 4 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3364973..0c3a645 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -316,6 +316,7 @@ endif(enable-wx)
- if(enable-qt)
- set(MGL_HAVE_QT 1)
- FIND_PACKAGE(Qt4 4.8 REQUIRED QtCore QtGui QtNetwork QtWebKit)
-+ FIND_PACKAGE(X11)
- if(NOT QT4_FOUND)
- message(SEND_ERROR "Couldn't find Qt4 library.")
- endif(NOT QT4_FOUND)
-diff --git a/json/CMakeLists.txt b/json/CMakeLists.txt
-index 79d4716..0a53874 100644
a/json/CMakeLists.txt
-+++ b/json/CMakeLists.txt
-@@ -9,6 +9,6 @@ include_directories(${MathGL_BINARY_DIR}/json)
- qt4_wrap_ui(json_ui_src MainWindow.ui)
- qt4_wrap_cpp(json_moc_src ${json_moc_hdr} )
- add_executable(MglForJsTestBench ${json_src} ${json_moc_src} ${json_ui_src})
--target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES})
-+target_link_libraries(MglForJsTestBench mgl-qt ${QT_LIBRARIES}
${X11_LIBRARIES})
-
- endif(MGL_HAVE_QT)
-diff --git a/udav/CMakeLists.txt b/udav/CMakeLists.txt
-index 9a9c574..a1ff2df 100644
a/udav/CMakeLists.txt
-+++ b/udav/CMakeLists.txt
-@@ -27,7 +27,7 @@ qt4_add_resources(udav_rc_src ${udav_rc} )
- qt4_wrap_cpp(udav_moc_src ${udav_moc_hdr} )
- add_executable(udav ${udav_src} ${udav_moc_src} ${udav_rc_src})
- #set_target_properties(udav PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}
-pthread")
--target_link_libraries(udav mgl-qt ${QT_LIBRARIES})
-+target_link_libraries(udav mgl-qt ${QT_LIBRARIES} ${X11_LIBRARIES})
-
- if(MGL_HAVE_PTHREAD)
- target_link_libraries(udav ${CMAKE_THREAD_LIBS_INIT})
-diff --git
