Hello community, here is the log from the commit of package qhull for openSUSE:Factory checked in at Mon Dec 20 17:01:03 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ qhull/qhull.changes 2010-07-20 16:30:57.000000000 +0200 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Tue Jul 20 16:30:00 CEST 2010 - johannesobermayr@gmx.de + +- initial package + * next branch of git://gitorious.org/qhull/qhull.git +- susepatches.diff + * fix build breakage caused by serious compiler warnings calling whatdependson for head-i586 New: ---- qhull.changes qhull.spec qhull.tar.bz2 susepatches.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qhull.spec ++++++ # # spec file for package qhull (Version 2010.1.next.git20100318) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define soname 0 Name: qhull Version: 2010.1.next.git20100318 Release: 1 License: Other License(s), see package Group: System/Libraries Url: http://www.qhull.org Source0: qhull.tar.bz2 Patch: susepatches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake gcc-c++ Summary: Computing convex hulls, Delaunay triangulations and Voronoi diagrams %description Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, halfspace intersection about a point, furthest-site Delaunay triangulation, and furthest-site Voronoi diagram. The source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull implements the Quickhull algorithm for computing the convex hull. It handles roundoff errors from floating point arithmetic. It computes volumes, surface areas, and approximations to the convex hull. Qhull does not support constrained Delaunay triangulations, triangulation of non-convex surfaces, mesh generation of non-convex objects, or medium-sized inputs in 9-D and higher. %package devel License: Other License(s), see package Summary: Development and documentation files for qhull Requires: qhull = %version Group: Development/Libraries/Other %description devel Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, halfspace intersection about a point, furthest-site Delaunay triangulation, and furthest-site Voronoi diagram. The source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull implements the Quickhull algorithm for computing the convex hull. It handles roundoff errors from floating point arithmetic. It computes volumes, surface areas, and approximations to the convex hull. Qhull does not support constrained Delaunay triangulations, triangulation of non-convex surfaces, mesh generation of non-convex objects, or medium-sized inputs in 9-D and higher. %prep %setup -q -n %{name} %patch -p1 %build mkdir build cd build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" cmake -DCMAKE_INSTALL_PREFIX=%_prefix -DLIB_INSTALL_DIR=%_libdir .. make %{?jobs:-j%jobs} %install cd build make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT/%_libdir/*.a %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_bindir}/qconvex %{_bindir}/qdelaunay %{_bindir}/qhalf %{_bindir}/qhull %{_bindir}/qvoronoi %{_bindir}/rbox %{_libdir}/libqhull.so %files devel %defattr(-,root,root) %{_datadir}/doc/packages/qhull %{_includedir}/*.h %changelog ++++++ susepatches.diff ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 61c978e..1b2434a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,41 @@ project(qhull) -cmake_minimum_required(VERSION 2.4) -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) +cmake_minimum_required(VERSION 2.6) + + +set(QHULL_VERSION "2010.1.next") + +if(INCLUDE_INSTALL_DIR) +else() +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include) +endif() +if(LIB_INSTALL_DIR) +else() +set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) +endif() +if(BIN_INSTALL_DIR) +else() +set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) +endif() +if(DOC_INSTALL_DIR) +else() +set(DOC_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/packages/qhull) +endif() + +message(STATUS) +message(STATUS "========== qhull Build Information ==========") +message(STATUS "Build Version: ${QHULL_VERSION}") +message(STATUS "Install Prefix (CMAKE_INSTALL_PREFIX): ${CMAKE_INSTALL_PREFIX}") +message(STATUS "Binary Directory (BIN_INSTALL_DIR): ${BIN_INSTALL_DIR}") +message(STATUS "Library Directory (LIB_INSTALL_DIR): ${LIB_INSTALL_DIR}") +message(STATUS "Include Directory (INCLUDE_INSTALL_DIR): ${INCLUDE_INSTALL_DIR}") +message(STATUS "Documentation Directory (DOC_INSTALL_DIR): ${DOC_INSTALL_DIR}") +message(STATUS) +message(STATUS "To change any of these options, override them using -D{OPTION_NAME} on the commandline.") +message(STATUS "To build and install qhull, run \"make\" and \"make install\"") +message(STATUS) + add_subdirectory(src) -install(DIRECTORY html DESTINATION share/doc/qhull) + +install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 45e246e..e1b244d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,10 +28,10 @@ target_link_libraries(qhull m) if(UNIX) if(APPLE) set_target_properties(qhull PROPERTIES - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") + INSTALL_NAME_DIR "${LIB_INSTALL_DIR}") else(APPLE) set_target_properties(qhull PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" + INSTALL_RPATH "${LIB_INSTALL_DIR}" INSTALL_RPATH_USE_LINK_PATH TRUE BUILD_WITH_INSTALL_RPATH FALSE) endif(APPLE) @@ -67,7 +67,7 @@ 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) + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) +install(FILES libqhull.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/src/global.c b/src/global.c index 3c6141a..4c9f56c 100644 --- a/src/global.c +++ b/src/global.c @@ -614,7 +614,7 @@ void qh_initflags(char *command) { if (command <= &qh qhull_command[0] || command > &qh qhull_command[0] + sizeof(qh qhull_command)) { if (command != &qh qhull_command[0]) { *qh qhull_command= '\0'; - strncat( qh qhull_command, command, sizeof( qh qhull_command)); + strncat(qh qhull_command, command, sizeof(qh qhull_command)-strlen(qh qhull_command)-1); } while (*s && !isspace(*s)) /* skip program name */ s++; diff --git a/src/rboxlib.c b/src/rboxlib.c index 4f11d22..17d01ac 100644 --- a/src/rboxlib.c +++ b/src/rboxlib.c @@ -124,7 +124,7 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { } *command= '\0'; - strncat(command, rbox_command, sizeof(command)); + strncat(command, rbox_command, sizeof(command)-strlen(command)-1); while (*s && !isspace(*s)) /* skip program name */ s++; @@ -346,8 +346,8 @@ int qh_rboxpoints(FILE* fout, FILE* ferr, char* rbox_command) { } }else if (israndom) { seed= (int)time(&timedata); - sprintf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ - strncat(command, seedbuf, sizeof(command)); + printf(seedbuf, " t%d", seed); /* appends an extra t, not worth removing */ + strncat(command, seedbuf, sizeof(command)-strlen(command)-1); t= strstr(command, " t "); if (t) strcpy(t+1, t+3); /* remove " t " */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de