jlec 14/09/17 08:33:56
Added: qhull-2012.1-64bit.patch qhull-2012.1-pc.patch
qhull.pc.in
Log:
media-libs/qhull: Import patches from fedora, bump to EAPI=5; drop old
(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1 media-libs/qhull/files/qhull-2012.1-64bit.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull-2012.1-64bit.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull-2012.1-64bit.patch?rev=1.1&content-type=text/plain
Index: qhull-2012.1-64bit.patch
===================================================================
src/libqhull/io.c | 4 ++--
src/libqhull/stat.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libqhull/io.c b/src/libqhull/io.c
index 09a0079..7ad4b35 100644
--- a/src/libqhull/io.c
+++ b/src/libqhull/io.c
@@ -68,8 +68,8 @@ void qh_produce_output2(void) {
qh_memstatistics(qh ferr);
d_1= sizeof(setT) + (qh hull_dim - 1) * SETelemsize;
qh_fprintf(qh ferr, 8040, "\
- size in bytes: merge %d ridge %d vertex %d facet %d\n\
- normal %d ridge vertices %d facet vertices or neighbors %d\n",
+ size in bytes: merge %zd ridge %zd vertex %zd facet %zd\n\
+ normal %d ridge vertices %d facet vertices or neighbors %zd\n",
(int)sizeof(mergeT), (int)sizeof(ridgeT),
(int)sizeof(vertexT), (int)sizeof(facetT),
qh normal_size, d_1, d_1 + SETelemsize);
diff --git a/src/libqhull/stat.c b/src/libqhull/stat.c
index 7dc60b9..5721130 100644
--- a/src/libqhull/stat.c
+++ b/src/libqhull/stat.c
@@ -472,7 +472,7 @@ void qh_initstatistics(void) {
qh_allstatI();
if (qhstat next > (int)sizeof(qhstat id)) {
qh_fprintf(qhmem.ferr, 6184, "qhull error (qh_initstatistics): increase
size of qhstat.id[].\n\
- qhstat.next %d should be <= sizeof(qhstat id) %d\n", qhstat next,
(int)sizeof(qhstat id));
+ qhstat.next %d should be <= sizeof(qhstat id) %zd\n", qhstat next,
(int)sizeof(qhstat id));
#if 0 /* for locating error, Znumridges should be duplicated */
for(i=0; i < ZEND; i++) {
int j;
1.1 media-libs/qhull/files/qhull-2012.1-pc.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull-2012.1-pc.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull-2012.1-pc.patch?rev=1.1&content-type=text/plain
Index: qhull-2012.1-pc.patch
===================================================================
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98dbc70..b323e10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,3 +430,7 @@ install(FILES html/qhull.man DESTINATION
${MAN_INSTALL_DIR} RENAME qhull
install(FILES html/rbox.man DESTINATION ${MAN_INSTALL_DIR} RENAME
rbox.1)
install(FILES ${doc_FILES} DESTINATION ${DOC_INSTALL_DIR})
install(DIRECTORY html/ DESTINATION ${DOC_INSTALL_DIR})
+
+
+configure_file("qhull.pc.in" "qhull.pc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qhull.pc" DESTINATION
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
1.1 media-libs/qhull/files/qhull.pc.in
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull.pc.in?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/qhull/files/qhull.pc.in?rev=1.1&content-type=text/plain
Index: qhull.pc.in
===================================================================
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
includedir=${exec_prefix}/include
libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
Name: qhull
Description: General dimension convex hull library
Version: @VERSION@
Requires:
Libs: -L${libdir} -lqhull -lm
Cflags: -I${includedir}
