Mercurial > mxe-octave

changeset 4874:c4e929fb081d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update qhull to 2015.2 * dist-files.mk: remove ref to qhull-2-fixes.patch * src/qhull-2-fixes.patch: removed * src/qhull-1-fixes.patch: update patch * src/qhull.mk: update version,checksum, update and build rule
author John Donoghue
date Tue, 30 Oct 2018 16:29:41 -0400
parents 5454d33ef781
children 2f71fe267c37
files dist-files.mk src/qhull-1-fixes.patch src/qhull-2-fixes.patch src/qhull.mk
diffstat 4 files changed, 35 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Oct 30 15:24:43 2018 -0400
+++ b/dist-files.mk	Tue Oct 30 16:29:41 2018 -0400
@@ -597,7 +597,6 @@
   qdbm-test.c \
   qdbm.mk \
   qhull-1-fixes.patch \
-  qhull-2-fixes.patch \
   qhull.mk \
   qjson-1-static.patch \
   qjson.mk \
--- a/src/qhull-1-fixes.patch	Tue Oct 30 15:24:43 2018 -0400
+++ b/src/qhull-1-fixes.patch	Tue Oct 30 16:29:41 2018 -0400
@@ -1,17 +1,22 @@
-From the Debian QHull package.
+From: Rafael Laboissiere <rafael@debian.org>
+Date: Wed, 25 Sep 2002 10:39:30 +0200
+Subject: QHpointer
 
 Access globals via a pointer to allocated memory.
-
- -- Rafael Laboissiere <rafael@debian.org>  Wed, 25 Sep 2002 10:39:30 +0200
+---
+ src/libqhull/user.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
---- qhull-orig/src/user.h	2002-04-29 11:01:46.000000000 +0200
-+++ qhull/src/user.h	2004-02-02 11:04:47.000000000 +0100
-@@ -509,7 +509,7 @@
-   see:
-     user_eg.c for an example
- */
+diff --git a/src/libqhull/user.h b/src/libqhull/user.h
+index 523aa7b..2438f28 100644
+--- a/src/libqhull/user.h
++++ b/src/libqhull/user.h
+@@ -609,7 +609,7 @@ stop after qh_JOGGLEmaxretry attempts
+ #error QH6207 Qhull error: Use qh_QHpointer_dllimport instead of qh_dllimport with qh_QHpointer
+ #endif
+ #else
 -#define qh_QHpointer 0
 +#define qh_QHpointer 1
- #if 0  /* sample code */
-     qhT *oldqhA, *oldqhB;
- 
+ #if qh_QHpointer_dllimport
+ #error QH6234 Qhull error: Use qh_dllimport instead of qh_QHpointer_dllimport when qh_QHpointer is not defined
+ #endif
--- a/src/qhull-2-fixes.patch	Tue Oct 30 15:24:43 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-diff -rNu a/configure.ac b/configure.ac
---- a/configure.ac	2009-06-11 15:41:03.000000000 -0400
-+++ b/configure.ac	2013-01-07 18:05:58.439590407 -0500
-@@ -8,10 +8,10 @@
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
- 
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- 
- AC_PROG_CC
--AC_PROG_LIBTOOL
-+LT_INIT([win32-dll])
- 
- AC_CONFIG_FILES([
-   Makefile 
-diff -rNu a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am	2009-06-11 15:41:03.000000000 -0400
-+++ b/src/Makefile.am	2013-01-07 17:58:04.327616699 -0500
-@@ -23,7 +23,7 @@
-   mem.c
- 
- # how:
--libqhull_la_LDFLAGS = -version-info 5:0:0 -lm
-+libqhull_la_LDFLAGS = -no-undefined -version-info 5:0:0 -lm
- 
- ### Utility programs
- 
--- a/src/qhull.mk	Tue Oct 30 15:24:43 2018 -0400
+++ b/src/qhull.mk	Tue Oct 30 16:29:41 2018 -0400
@@ -3,30 +3,32 @@
 
 PKG             := qhull
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2009.1
-$(PKG)_CHECKSUM := 108d59efa60b2ebaf94b121414c8f8b7b76a7409
+$(PKG)_VERSION  := 2015.2
+$(PKG)_CHECKSUM := 0dd03e0232124c81c696fac60db71ca7327eb16e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := qhull-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://download.savannah.gnu.org/releases/qhull/$($(PKG)_FILE)
+$(PKG)_URL      := https://github.com/qhull/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     :=
 
-ifeq ($(ENABLE_QHULL_NO_STRICT_ALIASING_FLAG),yes)
-  $(PKG)_CONFIGURE_CFLAGS := CFLAGS="-O2 -g -fno-strict-aliasing"
+$(PKG)_CMAKE_OPTS :=
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" 
+  endif
 endif
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package qhull.' >&2;
-    echo $(qhull_VERSION)
+    $(WGET) -q -O- 'https://github.com/qhull/qhull/tags' | \
+    $(SED) -n 's|.*releases/tag/\([0-9][^"]*\).*|\1|p' | $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && aclocal && libtoolize && autoreconf
-    mkdir '$(1)/.build'
-    cd '$(1)/.build' && '$(1)/configure' \
-        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
-        $($(PKG)_CONFIGURE_CFLAGS) \
-        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' $(MXE_DISABLE_DOCS)
+    mkdir '$(1)/../.build'
+    cd '$(1)/../.build' && cmake \
+        $($(PKG)_CMAKE_OPTS) \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'  \
+        ../$($(PKG)_SUBDIR)
+    make -C $(1)/../.build -j $(JOBS) 
+    make -C $(1)/../.build -j 1 install DESTDIR=$(3)
 endef