* [gentoo-commits] proj/sci:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2012-02-08 10:48 Kacper Kowalik
0 siblings, 0 replies; 3+ messages in thread
From: Kacper Kowalik @ 2012-02-08 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 1e164de0ccd35a043fc51681478fd44d5abbe35c
Author: Michael Hammer <michael <AT> derhammer <DOT> net>
AuthorDate: Wed Feb 8 10:13:01 2012 +0000
Commit: Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 10:22:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1e164de0
Added gmsh-2.5.0-r1 to work with libpng-1.5. I also removed the 'png' and 'zlib' use flage as the two libraries are hard included in upstream code
Signed-off-by: Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail.com>
---
sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch | 10 +++
sci-libs/gmsh/gmsh-2.5.0-r1.ebuild | 96 +++++++++++++++++++++++
2 files changed, 106 insertions(+), 0 deletions(-)
diff --git a/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch b/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch
new file mode 100644
index 0000000..7920d99
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch
@@ -0,0 +1,10 @@
+--- a/Graphics/gl2png.cpp
++++ b/Graphics/gl2png.cpp
+@@ -16,6 +16,7 @@
+ #else
+
+ #include <png.h>
++#include <zlib.h>
+
+ #ifndef png_jmpbuf
+ # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
diff --git a/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild b/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
new file mode 100644
index 0000000..2f9f1ab
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities"
+HOMEPAGE="http://www.geuz.org/gmsh/"
+SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
+
+## gmsh comes with its own copies of (at least) metis, netgen and tetgen, therefore inform the user of their special licenses
+LICENSE="GPL-3 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+## cgns is not compiling ATM, maybe fix cgns lib first
+IUSE="blas cgns chaco doc examples jpeg lua med metis mpi netgen opencascade petsc taucs tetgen X"
+
+RDEPEND="virtual/fortran
+ X? ( x11-libs/fltk:1 )
+ blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+ cgns? ( sci-libs/cgnslib )
+ jpeg? ( virtual/jpeg )
+ lua? ( dev-lang/lua )
+ med? ( >=sci-libs/med-2.3.4 )
+ opencascade? ( sci-libs/opencascade )
+ petsc? ( sci-mathematics/petsc )
+ mpi? ( virtual/mpi[cxx] )
+ taucs? ( sci-libs/taucs )"
+
+# taucs needs metis enabled.
+# Wait for the REQUIRED_USE syntax in EAPI4.
+# http://www.gentoo.org/proj/en/council/meeting-logs/20101130-summary.txt
+
+DEPEND="${RDEPEND}
+ dev-util/cmake
+ media-libs/libpng
+ sys-libs/zlib
+ doc? ( virtual/latex-base )"
+
+S=${WORKDIR}/${P}-source
+
+pkg_setup() {
+ fortran-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-libpng-1.5.patch"
+}
+
+src_configure() {
+ local mycmakeargs=""
+
+ use blas && \
+ mycmakeargs="${mycmakeargs}
+ -DCMAKE_Fortran_COMPILER=$(tc-getF77)"
+
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_enable blas BLAS_LAPACK)
+ $(cmake-utils_use_enable cgns CGNS)
+ $(cmake-utils_use_enable chaco CHACO)
+ $(cmake-utils_use_enable X FLTK)
+ $(cmake-utils_use_enable X FL_TREE)
+ $(cmake-utils_use_enable X GRAPHICS)
+ $(cmake-utils_use_enable med MED)
+ $(cmake-utils_use_enable metis METIS)
+ $(cmake-utils_use_enable netgen NETGEN)
+ $(cmake-utils_use_enable taucs TAUCS)
+ $(cmake-utils_use_enable tetgen TETGEN)
+ $(cmake-utils_use_enable opencascade OCC)
+ $(cmake-utils_use_enable petsc PETSC)"
+# $(cmake-utils_use_enable tetgen TETGEN_NEW)
+
+ cmake-utils_src_configure ${mycmakeargs} \
+ || die "cmake configuration failed"
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # TODO: tutorials get installed twice ATM
+ if use doc ; then
+ cd "${CMAKE_BUILD_DIR}"
+ emake pdf || die "failed to build documentation"
+ cd "${S}"
+ dodoc doc/texinfo/gmsh.pdf
+ fi
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}
+ doins -r demos tutorial || die "failed to install examples"
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2012-11-12 18:05 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2012-11-12 18:05 UTC (permalink / raw
To: gentoo-commits
commit: bde6ca597dfdd77d93d7bc87628cf097f8f2da19
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 12 18:05:22 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 18:05:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bde6ca59
sci-libs/gmsh: Fix link problems with gold
Package-Manager: portage-2.2.0_alpha142
---
sci-libs/gmsh/ChangeLog | 6 +++++-
sci-libs/gmsh/files/gmsh-2.5.0-link.patch | 16 ++++++++++++++++
sci-libs/gmsh/gmsh-2.5.0-r1.ebuild | 4 +++-
sci-libs/gmsh/metadata.xml | 2 +-
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog
index d60c82f..5cc5d22 100644
--- a/sci-libs/gmsh/ChangeLog
+++ b/sci-libs/gmsh/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-libs/gmsh
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Nov 2012; Justin Lecher <jlec@gentoo.org> gmsh-2.5.0-r1.ebuild,
+ +files/gmsh-2.5.0-link.patch, metadata.xml:
+ Fix link problems with gold
+
24 Jun 2011; Justin Lecher <jlec@gentoo.org> gmsh-2.5.0.ebuild,
gmsh-9999.ebuild:
Streamlined fortran-2 eclass usage
diff --git a/sci-libs/gmsh/files/gmsh-2.5.0-link.patch b/sci-libs/gmsh/files/gmsh-2.5.0-link.patch
new file mode 100644
index 0000000..f019cae
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-2.5.0-link.patch
@@ -0,0 +1,16 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5549d6a..48a106d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -879,7 +879,7 @@ elseif(HAVE_QT)
+ else(HAVE_FLTK)
+ add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
+ endif(HAVE_FLTK)
+-target_link_libraries(gmsh ${LINK_LIBRARIES})
++target_link_libraries(gmsh ${LINK_LIBRARIES} -ldl)
+
+ # increase stack to 16Mb on Windows to avoid overflows in recursive
+ # tet classification for large 3D Delaunay grids
diff --git a/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild b/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
index 16b4c6b..8f95cc1 100644
--- a/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
+++ b/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild
@@ -37,7 +37,9 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P}-source
-PATCHES=( "${FILESDIR}/${P}-libpng-1.5.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-link.patch"
+ "${FILESDIR}/${P}-libpng-1.5.patch" )
REQUIRED_USE="taucs? ( metis )"
diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index ed97467..8a82a02 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
+ <herd>sci</herd>
<use>
<flag name="chaco"> Enables chaco partitioner support</flag>
<flag name="cgns"> Enables cgns output support</flag>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/
@ 2014-09-01 19:47 Jauhien Piatlicki
0 siblings, 0 replies; 3+ messages in thread
From: Jauhien Piatlicki @ 2014-09-01 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 030212b91690534d54e31b67da3e5ae78fae5ff4
Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 1 19:44:11 2014 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Mon Sep 1 19:44:11 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=030212b9
sci-libs/gmsh: remove old and live versions
old version is outdated and has problems with compilation
svn repo can not be accessed anonymously
---
sci-libs/gmsh/ChangeLog | 5 ++
sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch | 10 ---
sci-libs/gmsh/files/gmsh-2.5.0-link.patch | 16 -----
sci-libs/gmsh/gmsh-2.5.0-r2.ebuild | 95 -------------------------
sci-libs/gmsh/gmsh-9999.ebuild | 87 ----------------------
5 files changed, 5 insertions(+), 208 deletions(-)
diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog
index 97574bb..9d83124 100644
--- a/sci-libs/gmsh/ChangeLog
+++ b/sci-libs/gmsh/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 01 Sep 2014; Jauhien Piatlicki <jauhien@gentoo.org> -gmsh-2.5.0-r2.ebuild,
+ -gmsh-9999.ebuild, -files/gmsh-2.5.0-libpng-1.5.patch,
+ -files/gmsh-2.5.0-link.patch:
+ remove old and live versions
+
01 Sep 2014; Jauhien Piatlicki <jauhien@gentoo.org> gmsh-2.8.5.ebuild:
fix sci-mathematics/petsc dependency
diff --git a/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch b/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch
deleted file mode 100644
index 7920d99..0000000
--- a/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Graphics/gl2png.cpp
-+++ b/Graphics/gl2png.cpp
-@@ -16,6 +16,7 @@
- #else
-
- #include <png.h>
-+#include <zlib.h>
-
- #ifndef png_jmpbuf
- # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
diff --git a/sci-libs/gmsh/files/gmsh-2.5.0-link.patch b/sci-libs/gmsh/files/gmsh-2.5.0-link.patch
deleted file mode 100644
index f019cae..0000000
--- a/sci-libs/gmsh/files/gmsh-2.5.0-link.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5549d6a..48a106d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -879,7 +879,7 @@ elseif(HAVE_QT)
- else(HAVE_FLTK)
- add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
- endif(HAVE_FLTK)
--target_link_libraries(gmsh ${LINK_LIBRARIES})
-+target_link_libraries(gmsh ${LINK_LIBRARIES} -ldl)
-
- # increase stack to 16Mb on Windows to avoid overflows in recursive
- # tet classification for large 3D Delaunay grids
diff --git a/sci-libs/gmsh/gmsh-2.5.0-r2.ebuild b/sci-libs/gmsh/gmsh-2.5.0-r2.ebuild
deleted file mode 100644
index 25db3df..0000000
--- a/sci-libs/gmsh/gmsh-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils fortran-2 toolchain-funcs
-
-DESCRIPTION="3D finite element mesh generator with built-in pre- and post-processing facilities"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
-
-## gmsh comes with its own copies of (at least) metis, netgen and tetgen, therefore inform the user of their special licenses
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="blas cgns chaco doc examples jpeg lua med metis mpi netgen opencascade petsc taucs tetgen X"
-
-RDEPEND="
- media-libs/libpng
- sys-libs/zlib
- virtual/fortran
- virtual/glu
- virtual/opengl
- X? ( x11-libs/fltk:1[opengl] )
- blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
- cgns? ( sci-libs/cgnslib )
- jpeg? ( virtual/jpeg )
- lua? ( dev-lang/lua )
- med? ( >=sci-libs/med-2.3.4 )
- opencascade? ( sci-libs/opencascade )
- petsc? ( sci-mathematics/petsc )
- mpi? ( virtual/mpi[cxx] )
- taucs? ( sci-libs/taucs )
- "
-
-REQUIRED_USE="
- taucs? ( || ( metis ) )
- "
-
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
- "${FILESDIR}/${P}-link.patch"
- "${FILESDIR}/${P}-libpng-1.5.patch" )
-
-REQUIRED_USE="taucs? ( metis )"
-
-src_configure() {
- use blas && \
- myargs="-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
-
- mycmakeargs=(
- $(cmake-utils_use_enable blas BLAS_LAPACK)
- $(cmake-utils_use_enable cgns CGNS)
- $(cmake-utils_use_enable chaco CHACO)
- $(cmake-utils_use_enable X FLTK)
- $(cmake-utils_use_enable X FL_TREE)
- $(cmake-utils_use_enable X GRAPHICS)
- $(cmake-utils_use_enable med MED)
- $(cmake-utils_use_enable metis METIS)
- $(cmake-utils_use_enable netgen NETGEN)
- $(cmake-utils_use_enable taucs TAUCS)
- $(cmake-utils_use_enable tetgen TETGEN)
- $(cmake-utils_use_enable opencascade OCC)
- $(cmake-utils_use_enable petsc PETSC)
- ${myargs}
- )
-# $(cmake-utils_use_enable tetgen TETGEN_NEW)
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use doc ; then
- emake pdf -C "${CMAKE_BUILD_DIR}"
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- # TODO: tutorials get installed twice ATM
- use doc && dodoc doc/texinfo/gmsh.pdf
-
- if use examples ; then
- insinto /usr/share/doc/${PF}
- doins -r demos tutorial
- fi
-}
diff --git a/sci-libs/gmsh/gmsh-9999.ebuild b/sci-libs/gmsh/gmsh-9999.ebuild
deleted file mode 100644
index fb15737..0000000
--- a/sci-libs/gmsh/gmsh-9999.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic fortran-2 subversion toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-ESVN_REPO_URI="https://geuz.org/svn/gmsh/trunk"
-ESVN_USER="gmsh"
-ESVN_PASSWORD="gmsh"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS=""
-IUSE="blas cgns chaco doc examples jpeg med metis mpi opencascade png taucs X zlib"
-
-RDEPEND="
- virtual/fortran
- X? ( x11-libs/fltk:1 )
- blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
- cgns? ( sci-libs/cgnslib )
- jpeg? ( virtual/jpeg )
- med? ( >=sci-libs/med-2.3.4 )
- mpi? ( sys-cluster/openmpi[cxx] )
- opencascade? ( sci-libs/opencascade )
- png? ( media-libs/libpng )
- zlib? ( sys-libs/zlib )
- taucs? ( sci-libs/taucs )"
-
-DEPEND="${RDEPEND}
- dev-util/cmake
- dev-vcs/subversion
- doc? ( virtual/latex-base )"
-
-pkg_setup() {
- fortran-2_pkg_setup
- use taucs && ! use metis && \
- die "taucs USE flag requires metis USE flag to be enabled"
-}
-
-src_configure() {
- local mycmakeargs=""
-
- use blas && \
- mycmakeargs="${mycmakeargs}
- -DCMAKE_Fortran_COMPILER=$(tc-getF77)"
-
- mycmakeargs="${mycmakeargs}
- $(cmake-utils_use_enable blas BLAS_LAPACK)
- $(cmake-utils_use_enable cgns CGNS)
- $(cmake-utils_use_enable chaco CHACO)
- $(cmake-utils_use_enable X FLTK)
- $(cmake-utils_use_enable X FL_TREE)
- $(cmake-utils_use_enable X GRAPHICS)
- $(cmake-utils_use_enable med MED)
- $(cmake-utils_use_enable metis METIS)
- $(cmake-utils_use_enable taucs TAUCS)
- $(cmake-utils_use_enable opencascade OCC)"
-
-# I'm not sure if this is needed, but it seems to help in some circumstances
-# see http://bugs.gentoo.org/show_bug.cgi?id=195980#c18
- append-ldflags -ldl -lmpi
-
- cmake-utils_src_configure ${mycmakeargs} \
- || die "cmake configuration failed"
-}
-
-src_install() {
- cmake-utils_src_install
-
- cd "${WORKDIR}"/"${PF}"
-
- if use doc ; then
- cd ${CMAKE_BUILD_DIR}
- emake pdf || die "failed to build documentation"
- cd "${WORKDIR}"/"${PF}"
- dodoc doc/*.txt doc/texinfo/gmsh.pdf
- fi
-
- if use examples ; then
- insinto /usr/share/doc/${PF}
- doins -r demos tutorial || die "failed to install examples"
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-01 19:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-01 19:47 [gentoo-commits] proj/sci:master commit in: sci-libs/gmsh/, sci-libs/gmsh/files/ Jauhien Piatlicki
-- strict thread matches above, loose matches on Subject: below --
2012-11-12 18:05 Justin Lecher
2012-02-08 10:48 Kacper Kowalik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox