r46298 - in /packages/gmsh-tetgen/trunk/debian: changelog control patches/netgen.patch patches/series
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Sep 20 13:34:12 UTC 2013
Author: trophime-guest
Date: Fri Sep 20 13:34:11 2013
New Revision: 46298
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46298
Log:
use libnglib instead of contrib/Netgen/nglib
Added:
packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
Modified:
packages/gmsh-tetgen/trunk/debian/changelog
packages/gmsh-tetgen/trunk/debian/control
packages/gmsh-tetgen/trunk/debian/patches/series
Modified: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=46298&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (original)
+++ packages/gmsh-tetgen/trunk/debian/changelog Fri Sep 20 13:34:11 2013
@@ -1,10 +1,12 @@
-gmsh-tetgen (2.8.3~svn16710-1) unstable; urgency=low
+gmsh-tetgen (2.8.3~svn16739-2) unstable; urgency=low
- * Upgrade to petsc/slepc 3.4.2
- * New upstream release
- * debian/control: update vcs urls
+ * Update to latest svn
+ * debian/control
+ - use libnglib instead of contrib/netgen
+ - upgrade to petsc/slepc 3.4.2
+ - update vcs urls
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Fri, 13 Sep 2013 18:10:31 +0200
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Wed, 18 Sep 2013 10:44:28 +0200
gmsh-tetgen (2.6.2~svn14476-2) unstable; urgency=low
Modified: packages/gmsh-tetgen/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/control?rev=46298&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/control (original)
+++ packages/gmsh-tetgen/trunk/debian/control Fri Sep 20 13:34:11 2013
@@ -20,7 +20,9 @@
libpetsc3.4.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x !powerpcspe],
libslepc3.4.2-dev [!kfreebsd-amd64 !kfreebsd-i386 !armel !armhf !s390x !powerpcspe],
javahelper, default-jdk,
- libpoppler-cpp-dev
+ libpoppler-cpp-dev,
+ libnglib-dev, netgen-headers,
+ libmmg3dlib4.0-4.0-dev
Standards-Version: 3.9.4
DM-Upload-Allowed: yes
X-Python-Version: current
Added: packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/netgen.patch?rev=46298&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch (added)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch Fri Sep 20 13:34:11 2013
@@ -0,0 +1,134 @@
+Index: gmsh-tetgen-2.8.3~svn16739/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.8.3~svn16739.orig/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
++++ gmsh-tetgen-2.8.3~svn16739/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
+@@ -689,10 +689,30 @@
+ endif(ENABLE_BLOSSOM)
+
+ if(ENABLE_NETGEN)
++ FIND_LIBRARY( NGLIB_LIB nglib PATH_SUFFIXES lib)
++ find_path(NGLIB_INC nglib.h PATH_SUFFIXES src include)
++ if(NGLIB_LIB AND NGLIB_INC)
++ list(APPEND EXTERNAL_LIBRARIES ${NGLIB_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${NGLIB_INC})
++ else(NGLIB_LIB AND NGLIB_INC)
++ message(STATUS "System NGLIB not found: using contrib/Negen/nglib instead")
++ endif(NGLIB_LIB AND NGLIB_INC)
++
+ add_subdirectory(contrib/Netgen)
+- include_directories(contrib/Netgen contrib/Netgen/libsrc/include
+- contrib/Netgen/nglib)
++ if(NGLIB_LIB AND NGLIB_INC)
++ # to get contrib/Netgen/nglib_gmsh.cpp to compile
++ include_directories(/usr/share/netgen/libsrc/include)
++ include_directories(/usr/share/netgen/libsrc/linalg)
++ include_directories(/usr/share/netgen/libsrc/meshing)
++
++ include_directories(contrib/Netgen)
++ else(NGLIB_LIB AND NGLIB_INC)
++ include_directories(contrib/Netgen contrib/Netgen/libsrc/include
++ contrib/Netgen/nglib)
++ endif(NGLIB_LIB AND NGLIB_INC)
++
+ set_config_option(HAVE_NETGEN "Netgen")
++ # is this really required if nglib is found???
+ add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
+ endif(ENABLE_NETGEN)
+
+@@ -994,12 +1014,17 @@
+ include_directories(contrib/SGEOM)
+ add_definitions(-DSGEOMGEOMETRY)
+ set_config_option(HAVE_SGEOM "SGEOM")
+- elseif(ENABLE_SALOME)
++ elseif(ENABLE_SALOME AND NOT NGLIB_LIB)
+ add_subdirectory(contrib/Salome)
+ include_directories(contrib/Salome)
+ add_definitions(-DOCCGEOMETRY)
+ set_config_option(HAVE_SALOME "Salome")
+ endif(ENABLE_SGEOM)
++ if(NGLIB_LIB AND NGLIB_INC)
++ # should check if a specific header exist
++ include_directories(/usr/share/netgen/libsrc/occ)
++ set_config_option(HAVE_SALOME "Salome")
++ endif(NGLIB_LIB AND NGLIB_INC)
+ endif(HAVE_OCC)
+ endif(ENABLE_OCC)
+
+Index: gmsh-tetgen-2.8.3~svn16739/contrib/Netgen/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.8.3~svn16739.orig/contrib/Netgen/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
++++ gmsh-tetgen-2.8.3~svn16739/contrib/Netgen/CMakeLists.txt 2013-09-20 13:28:02.000000000 +0200
+@@ -3,38 +3,42 @@
+ # See the LICENSE.txt file for license information. Please report all
+ # bugs and problems to the public mailing list <gmsh at geuz.org>.
+
+-set(gen libsrc/general)
+-set(lin libsrc/linalg)
+-set(gpr libsrc/gprim)
+-set(mes libsrc/meshing)
+-set(opt libsrc/opti)
++if(NGLIB_LIB AND NGLIB_INC)
++ set(SRC nglib_gmsh.cpp)
++else(NGLIB_LIB AND NGLIB_INC)
++ set(gen libsrc/general)
++ set(lin libsrc/linalg)
++ set(gpr libsrc/gprim)
++ set(mes libsrc/meshing)
++ set(opt libsrc/opti)
+
+-set(SRC
+- nglib_gmsh.cpp
+- ${gen}/array.cpp ${gen}/bitarray.cpp ${gen}/hashtabl.cpp
+- ${gen}/symbolta.cpp ${gen}/table.cpp ${gen}/flags.cpp
+- ${gen}/spbita2d.cpp ${gen}/seti.cpp ${gen}/optmem.cpp ${gen}/sort.cpp
+- ${gen}/mystring.cpp ${gen}/parthreads.cpp
+- ${gen}/dynamicmem.cpp ${gen}/ngexception.cpp ${gen}/profiler.cpp
+- ${lin}/densemat.cpp ${lin}/polynomial.cpp ${lin}/bfgs.cpp
+- ${lin}/linopt.cpp ${lin}/linsearch.cpp
+- ${gpr}/geom2d.cpp ${gpr}/geom3d.cpp ${gpr}/geomtest3d.cpp ${gpr}/adtree.cpp
+- ${gpr}/transform3d.cpp ${gpr}/geomfuncs.cpp
+- ${mes}/meshclass.cpp ${mes}/adfront2.cpp ${mes}/adfront3.cpp
+- ${mes}/geomsearch.cpp ${mes}/global.cpp ${mes}/meshtool.cpp
+- ${mes}/netrule2.cpp ${mes}/netrule3.cpp ${mes}/parser2.cpp
+- ${mes}/parser3.cpp ${mes}/ruler2.cpp ${mes}/ruler3.cpp
+- ${mes}/meshtype.cpp ${mes}/improve2.cpp ${mes}/smoothing2.5.cpp
+- ${mes}/smoothing2.cpp ${mes}/improve3.cpp ${mes}/smoothing3.cpp
+- ${mes}/improve2gen.cpp ${mes}/meshing2.cpp ${mes}/meshing3.cpp
+- ${mes}/localh.cpp ${mes}/delaunay.cpp ${mes}/topology.cpp
+- ${mes}/clusters.cpp ${mes}/tetrarls.cpp ${mes}/triarls.cpp
+- ${mes}/quadrls.cpp ${mes}/meshfunc.cpp
+- ${mes}/refine.cpp ${mes}/bisect.cpp ${mes}/boundarylayer.cpp
+- ${mes}/specials.cpp ${mes}/msghandler.cpp ${mes}/pyramidrls.cpp
+- ${mes}/pyramid2rls.cpp ${mes}/prism2rls.cpp ${mes}/curvedelems.cpp
+- ${mes}/validate.cpp ${mes}/basegeom.cpp
+-)
++ set(SRC
++ nglib_gmsh.cpp
++ ${gen}/array.cpp ${gen}/bitarray.cpp ${gen}/hashtabl.cpp
++ ${gen}/symbolta.cpp ${gen}/table.cpp ${gen}/flags.cpp
++ ${gen}/spbita2d.cpp ${gen}/seti.cpp ${gen}/optmem.cpp ${gen}/sort.cpp
++ ${gen}/mystring.cpp ${gen}/parthreads.cpp
++ ${gen}/dynamicmem.cpp ${gen}/ngexception.cpp ${gen}/profiler.cpp
++ ${lin}/densemat.cpp ${lin}/polynomial.cpp ${lin}/bfgs.cpp
++ ${lin}/linopt.cpp ${lin}/linsearch.cpp
++ ${gpr}/geom2d.cpp ${gpr}/geom3d.cpp ${gpr}/geomtest3d.cpp ${gpr}/adtree.cpp
++ ${gpr}/transform3d.cpp ${gpr}/geomfuncs.cpp
++ ${mes}/meshclass.cpp ${mes}/adfront2.cpp ${mes}/adfront3.cpp
++ ${mes}/geomsearch.cpp ${mes}/global.cpp ${mes}/meshtool.cpp
++ ${mes}/netrule2.cpp ${mes}/netrule3.cpp ${mes}/parser2.cpp
++ ${mes}/parser3.cpp ${mes}/ruler2.cpp ${mes}/ruler3.cpp
++ ${mes}/meshtype.cpp ${mes}/improve2.cpp ${mes}/smoothing2.5.cpp
++ ${mes}/smoothing2.cpp ${mes}/improve3.cpp ${mes}/smoothing3.cpp
++ ${mes}/improve2gen.cpp ${mes}/meshing2.cpp ${mes}/meshing3.cpp
++ ${mes}/localh.cpp ${mes}/delaunay.cpp ${mes}/topology.cpp
++ ${mes}/clusters.cpp ${mes}/tetrarls.cpp ${mes}/triarls.cpp
++ ${mes}/quadrls.cpp ${mes}/meshfunc.cpp
++ ${mes}/refine.cpp ${mes}/bisect.cpp ${mes}/boundarylayer.cpp
++ ${mes}/specials.cpp ${mes}/msghandler.cpp ${mes}/pyramidrls.cpp
++ ${mes}/pyramid2rls.cpp ${mes}/prism2rls.cpp ${mes}/curvedelems.cpp
++ ${mes}/validate.cpp ${mes}/basegeom.cpp
++ )
++endif(NGLIB_LIB AND NGLIB_INC)
+
+ file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
+ append_gmsh_src(contrib/Netgen "${SRC};${HDR}")
Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=46298&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Fri Sep 20 13:34:11 2013
@@ -15,3 +15,4 @@
#texinfo.patch
#fix_install.patch
#wrapper_java.patch
+netgen.patch
More information about the debian-science-commits
mailing list