Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e0191f2f4c5e72e59fa9efbaf2a9a5a51939cee1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e0191f2f4c5e72e59fa9efbaf2a9a5a51939cee1)
  • Date: Thu, 15 Jul 2010 01:52:17 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

science/qhull/BUILD | 15 -------------
science/qhull/DEPENDS | 3 +-
science/qhull/DETAILS | 4 +--
science/qhull/HISTORY | 7 ++++++
science/qhull/INSTALL | 6 +----
science/qhull/PRE_BUILD | 3 ++
science/qhull/cmake.diff | 51
+++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 68 insertions(+), 21 deletions(-)

New commits:
commit e0191f2f4c5e72e59fa9efbaf2a9a5a51939cee1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qhull: => 2010.1

diff --git a/science/qhull/BUILD b/science/qhull/BUILD
index 5e1c8c6..e013b8d 100755
--- a/science/qhull/BUILD
+++ b/science/qhull/BUILD
@@ -1,14 +1 @@
-cd src &&
-
-sedit "s:BINDIR = /usr/local/bin:BINDIR = \${INSTALL_ROOT}/usr/bin:"
Makefile &&
-sedit "s:MANDIR = /usr/local/man/man1:MANDIR =
\${INSTALL_ROOT}/usr/share/man/man1:" Makefile &&
-
-echo "libqhull.so: \$(OBJS)" >> Makefile &&
-echo " c++ -shared -Xlinker -soname -Xlinker \$@ -o libqhull.so \$(OBJS)" >>
Makefile &&
-
-make &&
-make libqhull.so
-
-# Problem with cups and lpr, to be fixed later...
-#make doc
-
+cmake_build
diff --git a/science/qhull/DEPENDS b/science/qhull/DEPENDS
index d5cbd8d..323540b 100755
--- a/science/qhull/DEPENDS
+++ b/science/qhull/DEPENDS
@@ -1 +1,2 @@
-depends enscript
+##depends enscript
+depends cmake
diff --git a/science/qhull/DETAILS b/science/qhull/DETAILS
index 63a602f..6518096 100755
--- a/science/qhull/DETAILS
+++ b/science/qhull/DETAILS
@@ -1,9 +1,9 @@
SPELL=qhull
- VERSION=2003.1
+ VERSION=2010.1
+
SOURCE_HASH=sha512:aa87a6041f63e05418cefd73109c459909ef5860184496a881a46dc840de9b0182d65a88960ac3bfd1e770e9c64ee554916d02bf30d8039c82b8f8f6a889cc64
SOURCE=$SPELL-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.qhull.org/download/$SOURCE
-
SOURCE_HASH=sha512:98c384a54cb2cfcf1e3cf2d040617e22190bac5324e00e3456612d36fec0fe09260f37f10acc7c5af7e71ff7d0549f9910edee8e63b7945e768a3652bef42e0c
WEB_SITE=http://www.qhull.org/
ENTERED=20041114
LICENSE[0]=GPL
diff --git a/science/qhull/HISTORY b/science/qhull/HISTORY
index c47fac1..2e4c3a3 100644
--- a/science/qhull/HISTORY
+++ b/science/qhull/HISTORY
@@ -1,3 +1,10 @@
+2010-07-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2010.1
+ * DEPENDS: add cmake, remove enscript
+ * BUILD: use cmake_build
+ * INSTALL: use default_install
+ * PRE_BUILD,cmake.diff: added, for upstream patch
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/science/qhull/INSTALL b/science/qhull/INSTALL
index aa944fe..9d3b1c3 100755
--- a/science/qhull/INSTALL
+++ b/science/qhull/INSTALL
@@ -1,4 +1,2 @@
-make install &&
-cp libqhull.so /usr/lib &&
-mkdir /usr/include/qhull &&
-cp *.h /usr/include/qhull
+cd $SOURCE_DIRECTORY/build &&
+default_install
diff --git a/science/qhull/PRE_BUILD b/science/qhull/PRE_BUILD
new file mode 100755
index 0000000..1225451
--- /dev/null
+++ b/science/qhull/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/cmake.diff
diff --git a/science/qhull/cmake.diff b/science/qhull/cmake.diff
new file mode 100644
index 0000000..1cb745c
--- /dev/null
+++ b/science/qhull/cmake.diff
@@ -0,0 +1,51 @@
+diff -uNr qhull-2010.1/CMakeLists.txt qhull-2010.1.cp//CMakeLists.txt
+--- qhull-2010.1/CMakeLists.txt 2010-01-10 01:07:32.000000000 +0100
++++ qhull-2010.1.cp//CMakeLists.txt 2010-07-15 08:42:34.000000000 +0200
+@@ -6,3 +6,4 @@
+
+ add_subdirectory(src)
+
++install(DIRECTORY html DESTINATION share/doc/qhull)
+diff -uNr qhull-2010.1/src/CMakeLists.txt qhull-2010.1.cp//src/CMakeLists.txt
+--- qhull-2010.1/src/CMakeLists.txt 2010-01-10 01:07:32.000000000 +0100
++++ qhull-2010.1.cp//src/CMakeLists.txt 2010-07-15 08:42:46.000000000
+0200
+@@ -23,8 +23,21 @@
+
+ file(GLOB qhull_hdr *.h)
+
+-add_library(qhull ${qhull_src})
++add_library(qhull SHARED ${qhull_src})
+ target_link_libraries(qhull m)
++if(UNIX)
++ if(APPLE)
++ set_target_properties(qhull PROPERTIES
++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
++ else(APPLE)
++ set_target_properties(qhull PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
++ INSTALL_RPATH_USE_LINK_PATH TRUE
++ BUILD_WITH_INSTALL_RPATH FALSE)
++ endif(APPLE)
++endif(UNIX)
++add_library(qhullstatic STATIC ${qhull_src})
++set_property(TARGET qhullstatic PROPERTY OUTPUT_NAME "qhull")
+
+ set(qhullcmd_SOURCES unix.c)
+ set(rbox_SOURCES rbox.c)
+@@ -36,6 +49,7 @@
+
+ add_executable(qhullcmd ${qhullcmd_SOURCES})
+ target_link_libraries(qhullcmd qhull)
++set_property(TARGET qhullcmd PROPERTY OUTPUT_NAME "qhull")
+
+ add_executable(rbox ${rbox_SOURCES})
+ target_link_libraries(rbox qhull)
+@@ -52,3 +66,8 @@
+ add_executable(qhalf ${qhalf_SOURCES})
+ target_link_libraries(qhalf qhull)
+
++install(TARGETS qhull qhullstatic qhullcmd rbox qconvex qdelaunay qvoronoi
qhalf
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib)
++install(FILES libqhull.h DESTINATION include)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e0191f2f4c5e72e59fa9efbaf2a9a5a51939cee1), Treeve Jelbert, 07/15/2010

Archive powered by MHonArc 2.6.24.

Top of Page