packages: qhull/qhull-cmake.patch, qhull/qhull.spec - updated to 2012.1 - u...
qboosh
qboosh at pld-linux.org
Sun Feb 26 20:54:13 CET 2012
Author: qboosh Date: Sun Feb 26 19:54:13 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2012.1
- updated cmake patch
---- Files affected:
packages/qhull:
qhull-cmake.patch (1.2 -> 1.3) , qhull.spec (1.9 -> 1.10)
---- Diffs:
================================================================
Index: packages/qhull/qhull-cmake.patch
diff -u packages/qhull/qhull-cmake.patch:1.2 packages/qhull/qhull-cmake.patch:1.3
--- packages/qhull/qhull-cmake.patch:1.2 Tue Jul 5 18:33:38 2011
+++ packages/qhull/qhull-cmake.patch Sun Feb 26 20:54:08 2012
@@ -1,41 +1,33 @@
---- qhull-2011.1/CMakeLists.txt.orig 2011-05-19 03:53:36.000000000 +0200
-+++ qhull-2011.1/CMakeLists.txt 2011-07-05 17:58:55.111627041 +0200
-@@ -166,21 +166,23 @@
+--- qhull-2012.1/CMakeLists.txt.orig 2012-02-22 04:38:47.000000000 +0100
++++ qhull-2012.1/CMakeLists.txt 2012-02-26 09:01:36.040986288 +0100
+@@ -226,13 +226,15 @@
+ include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/libqhull)
- string(REGEX MATCH "[^.]+" qhull_MAJOR "${qhull_VERSION}")
if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug")
- set(qhull_CPP qhullcpp_d)
-- set(qhull_SHARED qhull_d${qhull_MAJOR})
+ set(qhull_CPP_SHARED qhullcpp_d)
+ set(qhull_CPP_STATIC qhullcppstatic_d)
-+ set(qhull_SHARED qhull_d)
+ set(qhull_SHARED qhull_d)
+ set(qhull_SHAREDP qhull_pd)
set(qhull_STATIC qhullstatic_d)
set(qhull_STATICP qhullstatic_pd)
else()
- set(qhull_CPP qhullcpp)
-- set(qhull_SHARED qhull${qhull_MAJOR})
+ set(qhull_CPP_SHARED qhullcpp)
+ set(qhull_CPP_STATIC qhullcppstatic)
-+ set(qhull_SHARED qhull)
+ set(qhull_SHARED libqhull) # Avoid name conflict with qhull executable
+ set(qhull_SHAREDP qhull_p)
set(qhull_STATIC qhullstatic)
- set(qhull_STATICP qhullstatic_p)
- endif()
+@@ -241,7 +243,7 @@
set(
- qhull_TARGETS
-- ${qhull_CPP} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP}
-- qhull rbox qconvex qdelaunay qvoronoi qhalf
-+ ${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_SHARED} ${qhull_STATIC} ${qhull_STATICP}
-+ qhullprog rbox qconvex qdelaunay qvoronoi qhalf
- user_eg user_eg2 user_eg3
+ qhull_TARGETS_INSTALL
+- ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICP} ${qhull_SHARED} ${qhull_SHAREDP}
++ ${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_STATIC} ${qhull_STATICP} ${qhull_SHARED} ${qhull_SHAREDP}
+ qhull rbox qconvex qdelaunay qvoronoi qhalf
)
-
-@@ -193,21 +195,18 @@
- src/libqhull/qhull-exports.def)
- set_target_properties(${qhull_SHARED} PROPERTIES
- COMPILE_DEFINITIONS "qh_QHpointer"
-- VERSION ${qhull_VERSION})
-+ VERSION ${qhull_VERSION} SOVERSION ${qhull_MAJOR})
+ set(
+@@ -272,15 +274,6 @@
if(UNIX)
target_link_libraries(${qhull_SHARED} m)
@@ -50,16 +42,32 @@
- endif()
endif(UNIX)
+ # ---------------------------------------
+@@ -296,17 +289,14 @@
+
+ if(UNIX)
+ target_link_libraries(${qhull_SHAREDP} m)
+- if(APPLE)
+- set_target_properties(${qhull_SHAREDP} PROPERTIES
+- INSTALL_NAME_DIR "${LIB_INSTALL_DIR}")
+- else()
+- set_target_properties(${qhull_SHAREDP} PROPERTIES
+- INSTALL_RPATH "${LIB_INSTALL_DIR}"
+- INSTALL_RPATH_USE_LINK_PATH TRUE
+- BUILD_WITH_INSTALL_RPATH FALSE)
+- endif()
+ endif(UNIX)
+
+add_library(${qhull_CPP_SHARED} SHARED ${libqhullcpp_SOURCES})
+set_target_properties(${qhull_CPP_SHARED} PROPERTIES
+ COMPILE_DEFINITIONS "qh_QHpointer"
-+ VERSION ${qhull_VERSION} SOVERSION ${qhull_MAJOR})
++ SOVERSION ${qhull_SOVERSION})
+target_link_libraries(${qhull_CPP_SHARED} ${qhull_SHARED})
+
# ---------------------------------------
# Define static libraries qhullstatic and qhullstatic_p (qh_QHpointer)
# ---------------------------------------
-@@ -230,8 +229,8 @@
+@@ -329,8 +319,8 @@
# Define C++ static library qhullcpp (qh_QHpointer)
# ---------------------------------------
@@ -70,76 +78,59 @@
COMPILE_DEFINITIONS "qh_QHpointer"
VERSION ${qhull_VERSION})
-@@ -252,40 +251,27 @@
- set(user_eg_DEFINES qh_QHpointer)
+@@ -354,22 +344,22 @@
endif()
--add_executable(qhull ${qhull_SOURCES})
+ add_executable(qhull ${qhull_SOURCES})
-target_link_libraries(qhull ${qhull_STATIC})
--set_target_properties(qhull PROPERTIES
-- VERSION ${qhull_VERSION})
-+add_executable(qhullprog ${qhull_SOURCES})
-+target_link_libraries(qhullprog ${qhull_STATIC} m)
-+set_target_properties(qhullprog PROPERTIES OUTPUT_NAME qhull)
++target_link_libraries(qhull ${qhull_STATIC} m)
add_executable(rbox ${rbox_SOURCES})
-target_link_libraries(rbox ${qhull_STATIC})
--set_target_properties(rbox PROPERTIES
-- VERSION ${qhull_VERSION})
+target_link_libraries(rbox ${qhull_STATIC} m)
add_executable(qconvex ${qconvex_SOURCES})
-target_link_libraries(qconvex ${qhull_STATIC})
--set_target_properties(qconvex PROPERTIES
-- VERSION ${qhull_VERSION})
+target_link_libraries(qconvex ${qhull_STATIC} m)
add_executable(qdelaunay ${qdelaunay_SOURCES})
-target_link_libraries(qdelaunay ${qhull_STATIC})
--set_target_properties(qdelaunay PROPERTIES
-- VERSION ${qhull_VERSION})
+target_link_libraries(qdelaunay ${qhull_STATIC} m)
add_executable(qvoronoi ${qvoronoi_SOURCES})
-target_link_libraries(qvoronoi ${qhull_STATIC})
--set_target_properties(qvoronoi PROPERTIES
-- VERSION ${qhull_VERSION})
+target_link_libraries(qvoronoi ${qhull_STATIC} m)
add_executable(qhalf ${qhalf_SOURCES})
-target_link_libraries(qhalf ${qhull_STATIC})
--set_target_properties(qhalf PROPERTIES
-- VERSION ${qhull_VERSION})
+target_link_libraries(qhalf ${qhull_STATIC} m)
- add_executable(user_eg2 ${user_eg2_SOURCES})
--target_link_libraries(user_eg2 ${qhull_STATIC})
--set_target_properties(user_eg2 PROPERTIES
-- VERSION ${qhull_VERSION})
-+target_link_libraries(user_eg2 ${qhull_STATIC} m)
-
# ---------------------------------------
- # Define qhull executables linked to qhull shared library
-@@ -297,8 +283,7 @@
+ # Define testqset linked to qset.o and mem.o
+@@ -385,7 +375,7 @@
+
+ add_executable(user_eg ${user_eg_SOURCES})
# user_eg may be linked to qhull_STATIC if user_eg_DEFINES is removed
- target_link_libraries(user_eg ${qhull_SHARED})
+-target_link_libraries(user_eg ${qhull_SHAREDP})
++target_link_libraries(user_eg ${qhull_SHAREDP} m)
set_target_properties(user_eg PROPERTIES
-- COMPILE_DEFINITIONS "${user_eg_DEFINES}"
-- VERSION ${qhull_VERSION})
-+ COMPILE_DEFINITIONS "${user_eg_DEFINES}")
+ COMPILE_DEFINITIONS "${user_eg_DEFINES}")
+@@ -394,7 +384,7 @@
# ---------------------------------------
- # Define qhull executables linked to qhullstatic_p and qhullcpp static library
-@@ -312,10 +297,9 @@
+
+ add_executable(user_eg2 ${user_eg2_SOURCES})
+-target_link_libraries(user_eg2 ${qhull_SHARED})
++target_link_libraries(user_eg2 ${qhull_SHARED} m)
+ set_target_properties(user_eg2 PROPERTIES
+ COMPILE_DEFINITIONS "${user_eg2_DEFINES}")
+
+@@ -410,7 +400,7 @@
add_executable(user_eg3 ${user_eg3_SOURCES})
# qhull_STATICP must be last, otherwise qh_fprintf,etc. are not loaded from qhull_CPP
-target_link_libraries(user_eg3 ${qhull_CPP} ${qhull_STATICP})
+target_link_libraries(user_eg3 ${qhull_CPP_SHARED} ${qhull_SHARED})
set_target_properties(user_eg3 PROPERTIES
-- COMPILE_DEFINITIONS "qh_QHpointer"
-- VERSION ${qhull_VERSION})
-+ COMPILE_DEFINITIONS "qh_QHpointer")
+ COMPILE_DEFINITIONS "qh_QHpointer")
- # ---------------------------------------
- # Define install
================================================================
Index: packages/qhull/qhull.spec
diff -u packages/qhull/qhull.spec:1.9 packages/qhull/qhull.spec:1.10
--- packages/qhull/qhull.spec:1.9 Thu Dec 1 20:55:42 2011
+++ packages/qhull/qhull.spec Sun Feb 26 20:54:08 2012
@@ -2,12 +2,12 @@
Summary: Qhull - convex hulls, triangulations and related computations
Summary(pl.UTF-8): Qhull - obliczanie powłok wypukłych, triangulacji i powiązanych rzeczy
Name: qhull
-Version: 2011.2
+Version: 2012.1
Release: 1
License: distributable (see COPYING.txt)
Group: Libraries
Source0: http://www.qhull.org/download/%{name}-%{version}-src.tgz
-# Source0-md5: 4f4bac7769a5b1e0c6470ea457e2d4d2
+# Source0-md5: d0f978c0d8dfb2e919caefa56ea2953c
Patch0: %{name}-cmake.patch
URL: http://www.qhull.org/
BuildRequires: cmake >= 2.6
@@ -107,8 +107,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/packages
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/user_eg*
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/qhull
%clean
rm -rf $RPM_BUILD_ROOT
@@ -125,15 +124,16 @@
%attr(755,root,root) %{_bindir}/qhull
%attr(755,root,root) %{_bindir}/qvoronoi
%attr(755,root,root) %{_bindir}/rbox
-%attr(755,root,root) %{_libdir}/libqhull.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqhull.so.6
+%attr(755,root,root) %{_libdir}/libqhull.so.6
+%attr(755,root,root) %{_libdir}/libqhull_p.so.6
%{_mandir}/man1/qhull.1*
%{_mandir}/man1/rbox.1*
%files devel
%defattr(644,root,root,755)
-%doc html/*.{htm,gif}
+%doc html/*.{htm,gif,jpg}
%attr(755,root,root) %{_libdir}/libqhull.so
+%attr(755,root,root) %{_libdir}/libqhull_p.so
%{_includedir}/libqhull
%files static
@@ -143,14 +143,12 @@
%files c++
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libqhullcpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqhullcpp.so.6
+%attr(755,root,root) %{_libdir}/libqhullcpp.so.6
%files c++-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libqhullcpp.so
%{_includedir}/libqhullcpp
-%{_includedir}/road
%files c++-static
%defattr(644,root,root,755)
@@ -162,6 +160,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2012/02/26 19:54:08 qboosh
+- updated to 2012.1
+- updated cmake patch
+
Revision 1.9 2011/12/01 19:55:42 qboosh
- updated to 2011.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qhull/qhull-cmake.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qhull/qhull.spec?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list