Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libctl for openSUSE:Factory checked in at 2022-02-11 23:07:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libctl (Old) and /work/SRC/openSUSE:Factory/.libctl.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libctl" Fri Feb 11 23:07:32 2022 rev:5 rq:953786 version:4.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libctl/libctl.changes 2020-08-17 16:42:14.297836512 +0200 +++ /work/SRC/openSUSE:Factory/.libctl.new.1956/libctl.changes 2022-02-11 23:09:05.234890046 +0100 @@ -1,0 +2,9 @@ +Tue Feb 8 20:07:55 UTC 2022 - Stefan Br??ns <[email protected]> + +- update to 4.5.1: + * Ignore duplicate consecutive prism vertices (#60). + * Memory bug fixes (#58, #59). +- Fix library SOVERSION in package name. +- Also update homepage URL. + +------------------------------------------------------------------- Old: ---- libctl-4.5.0.tar.gz New: ---- libctl-4.5.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libctl.spec ++++++ --- /var/tmp/diff_new_pack.4nHpkK/_old 2022-02-11 23:09:06.266893030 +0100 +++ /var/tmp/diff_new_pack.4nHpkK/_new 2022-02-11 23:09:06.270893041 +0100 @@ -1,7 +1,7 @@ # # spec file for package libctl # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: libctl -Version: 4.5.0 +Version: 4.5.1 Release: 0 -%define somajor 5 +%define somajor 7 Summary: A guile Library for Scientific Simulations License: GPL-2.0-or-later Group: Development/Libraries/Other -URL: http://ab-initio.mit.edu/wiki/index.php/Libctl +URL: https://libctl.readthedocs.io/en/latest/ Source0: https://github.com/NanoComp/libctl/releases/download/v%{version}/libctl-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake @@ -32,7 +32,6 @@ BuildRequires: libtool BuildRequires: nlopt-devel BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libctl is a free Guile-based library implementing flexible control files @@ -42,6 +41,8 @@ %package -n %{name}%{somajor} Summary: A guile Library for Scientific Simulations Group: System/Libraries +# Missed SOVERSION bump +Conflicts: libctl5 <= 4.5.0 %description -n %{name}%{somajor} libctl is a free Guile-based library implementing flexible control files @@ -86,7 +87,7 @@ find %{buildroot} -type f -name "*.la" -delete -print install -d %{buildroot}%{_docdir}/%{name}/ -install -m 644 {AUTHORS,COPYING,NEWS.md,README.md} %{buildroot}%{_docdir}/%{name}/ +install -m 644 {AUTHORS,NEWS.md,README.md} %{buildroot}%{_docdir}/%{name}/ cp -r doc/ %{buildroot}%{_docdir}/%{name}/ %post -n %{name}%{somajor} -p /sbin/ldconfig @@ -94,11 +95,10 @@ %postun -n %{name}%{somajor} -p /sbin/ldconfig %files -n %{name}%{somajor} -%defattr(-,root,root) +%license COPYING %{_libdir}/libctl*.so.* %files devel -%defattr(-,root,root) %{_bindir}/gen-ctl-io %{_libdir}/libctl*.so %{_datadir}/libctl/ @@ -106,7 +106,6 @@ %{_mandir}/man1/gen-ctl-io.1* %files doc -%defattr(-,root,root) %{_docdir}/%{name}/ %changelog ++++++ libctl-4.5.0.tar.gz -> libctl-4.5.1.tar.gz ++++++ ++++ 17439 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/COPYRIGHT new/libctl-4.5.1/COPYRIGHT --- old/libctl-4.5.0/COPYRIGHT 2020-02-11 21:43:06.000000000 +0100 +++ new/libctl-4.5.1/COPYRIGHT 2022-02-02 03:46:34.000000000 +0100 @@ -1,5 +1,5 @@ -/* libctl: flexible Guile-based control files for scientific software - * Copyright (C) 1998-2020 Massachusetts Institute of Technology and Steven G. Johnson +/* libctl: flexible Guile-based control files for scientific software + * Copyright (C) 1998-2022 Massachusetts Institute of Technology and Steven G. Johnson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -10,7 +10,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/NEWS.md new/libctl-4.5.1/NEWS.md --- old/libctl-4.5.0/NEWS.md 2020-02-19 19:34:12.000000000 +0100 +++ new/libctl-4.5.1/NEWS.md 2022-02-02 03:46:01.000000000 +0100 @@ -1,5 +1,13 @@ # Libctl Release Notes +## libctl 4.5.1 + +2/1/22 + +* Ignore duplicate consecutive prism vertices (#60). + +* Memory bug fixes (#58, #59). + ## libctl 4.5.0 2/19/20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/compile new/libctl-4.5.1/compile --- old/libctl-4.5.0/compile 2018-03-11 23:12:29.000000000 +0100 +++ new/libctl-4.5.1/compile 2020-11-19 05:09:26.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/config.h.in new/libctl-4.5.1/config.h.in --- old/libctl-4.5.0/config.h.in 2020-02-18 16:36:34.000000000 +0100 +++ new/libctl-4.5.1/config.h.in 2022-02-02 03:47:39.000000000 +0100 @@ -74,9 +74,6 @@ /* Define to 1 if you have the `readline' library (-lreadline). */ #undef HAVE_LIBREADLINE -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the <nlopt.h> header file. */ #undef HAVE_NLOPT_H @@ -110,6 +107,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -164,7 +164,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Version number of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/configure.ac new/libctl-4.5.1/configure.ac --- old/libctl-4.5.0/configure.ac 2020-02-18 16:34:29.000000000 +0100 +++ new/libctl-4.5.1/configure.ac 2022-02-02 03:46:16.000000000 +0100 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(libctl, 4.5.0, [email protected]) +AC_INIT([libctl],[4.5.1],[[email protected]]) AC_CONFIG_SRCDIR([src/ctl.c]) AC_CONFIG_HEADERS([config.h src/ctl.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -8,12 +8,12 @@ # Shared-library version number; indicates api compatibility, and is # not the same as the "public" version number. (Don't worry about this # except for public releases.) -SHARED_VERSION_INFO="10:0:3" # CURRENT:REVISION:AGE +SHARED_VERSION_INFO="10:1:3" # CURRENT:REVISION:AGE AM_INIT_AUTOMAKE([foreign]) AC_SUBST(SHARED_VERSION_INFO) -AM_ENABLE_SHARED(no) dnl shared libs cause too many headaches to be default -AC_PROG_LIBTOOL +AC_ENABLE_SHARED([no]) dnl shared libs cause too many headaches to be default +LT_INIT ########################################################################### @@ -50,14 +50,11 @@ AC_DEFINE(DEBUG, 1, [Define to enable debugging checks.]) fi -# Checks for header files. -AC_HEADER_STDC - ########################################################################### # Find Guile library, flags, etcetera: -AC_ARG_WITH(guile, [AC_HELP_STRING([--without-guile],[disable use of Guile])], +AC_ARG_WITH(guile, [AS_HELP_STRING([--without-guile],[disable use of Guile])], with_guile=$withval, with_guile=yes) if test x"$with_guile" = xyes; then @@ -118,78 +115,78 @@ AC_MSG_CHECKING([for modern non-gh interface]) ok=yes -AC_TRY_LINK([#include <libguile.h> -], [scm_from_double(0.0);scm_from_int(0);scm_boot_guile(0,0,0,0);scm_c_define_gsubr(0,0,0,0,0);], [AC_DEFINE(HAVE_NO_GH, 1, [Define if we can avoid the gh interface])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libguile.h> +]], [[scm_from_double(0.0);scm_from_int(0);scm_boot_guile(0,0,0,0);scm_c_define_gsubr(0,0,0,0,0);]])],[AC_DEFINE(HAVE_NO_GH, 1, [Define if we can avoid the gh interface])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for gh_enter]) ok=yes -AC_TRY_LINK([#include <guile/gh.h> -], [gh_enter(0,0,0);], [AC_DEFINE(HAVE_GH_ENTER, 1, [Define if we have gh_enter.])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <guile/gh.h> +]], [[gh_enter(0,0,0);]])],[AC_DEFINE(HAVE_GH_ENTER, 1, [Define if we have gh_enter.])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for gh_eval_str]) ok=yes -AC_TRY_LINK([#include <guile/gh.h> -], [gh_eval_str(0);], [AC_DEFINE(HAVE_GH_EVAL_STR, 1, [Define if we have gh_eval_str.])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <guile/gh.h> +]], [[gh_eval_str(0);]])],[AC_DEFINE(HAVE_GH_EVAL_STR, 1, [Define if we have gh_eval_str.])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for gh_load]) ok=yes -AC_TRY_LINK([#include <guile/gh.h> -], [gh_load(0);], [AC_DEFINE(HAVE_GH_LOAD, 1, [Define if we have gh_load.])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <guile/gh.h> +]], [[gh_load(0);]])],[AC_DEFINE(HAVE_GH_LOAD, 1, [Define if we have gh_load.])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for gh_bool2scm]) ok=yes -AC_TRY_LINK([#include <guile/gh.h> -], [gh_bool2scm(0);], [AC_DEFINE(HAVE_GH_BOOL2SCM, 1, [Define if we have gh_bool2scm])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <guile/gh.h> +]], [[gh_bool2scm(0);]])],[AC_DEFINE(HAVE_GH_BOOL2SCM, 1, [Define if we have gh_bool2scm])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for gh_vector_ref]) ok=yes -AC_TRY_LINK([#include <guile/gh.h> -], [gh_vector_ref(0,0);], [AC_DEFINE(HAVE_GH_VECTOR_REF, 1, [Define if we have gh_vector_ref])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <guile/gh.h> +]], [[gh_vector_ref(0,0);]])],[AC_DEFINE(HAVE_GH_VECTOR_REF, 1, [Define if we have gh_vector_ref])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for gh_list_ref]) ok=yes -AC_TRY_LINK([#include <guile/gh.h> -], [gh_list_ref(0,0);], [AC_DEFINE(HAVE_GH_LIST_REF, 1, [Define if we have gh_list_ref])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <guile/gh.h> +]], [[gh_list_ref(0,0);]])],[AC_DEFINE(HAVE_GH_LIST_REF, 1, [Define if we have gh_list_ref])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for gh_length]) ok=yes -AC_TRY_LINK([#include <guile/gh.h> -], [gh_length(0);], [AC_DEFINE(HAVE_GH_LENGTH, 1, [Define if we have gh_length])], ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <guile/gh.h> +]], [[gh_length(0);]])],[AC_DEFINE(HAVE_GH_LENGTH, 1, [Define if we have gh_length])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([for scm_flush_all_ports]) ok=yes -AC_TRY_LINK([#if defined(HAVE_LIBGUILE_H) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if defined(HAVE_LIBGUILE_H) # include <libguile.h> #else # include <guile/gh.h> #endif -], [scm_flush_all_ports();], [AC_DEFINE(HAVE_SCM_FLUSH_ALL_PORTS, 1, [Define if we have scm_flush_all_ports])], ok=no) +]], [[scm_flush_all_ports();]])],[AC_DEFINE(HAVE_SCM_FLUSH_ALL_PORTS, 1, [Define if we have scm_flush_all_ports])],[ok=no]) AC_MSG_RESULT($ok) AC_CHECK_FUNCS(scm_make_complex scm_c_make_rectangular scm_variable_set_x scm_c_lookup scm_c_make_vector scm_variable_ref) AC_MSG_CHECKING([for SCM_COMPLEXP]) ok=yes -AC_TRY_LINK([#if defined(HAVE_LIBGUILE_H) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if defined(HAVE_LIBGUILE_H) # include <libguile.h> #else # include <guile/gh.h> #endif -], [SCM x; SCM_COMPLEXP(x);], [AC_DEFINE(HAVE_SCM_COMPLEXP, 1, [Define if we have SCM_COMPLEXP])], ok=no) +]], [[SCM x; SCM_COMPLEXP(x);]])],[AC_DEFINE(HAVE_SCM_COMPLEXP, 1, [Define if we have SCM_COMPLEXP])],[ok=no]) AC_MSG_RESULT($ok) AC_MSG_CHECKING([whether gh_lookup works properly]) ok=yes -AC_TRY_RUN([ +AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdlib.h> #include <guile/gh.h> void main_entry(int argc, char *argv[]) @@ -203,7 +200,7 @@ gh_enter (argc, argv, main_entry); return EXIT_SUCCESS; } -], [AC_DEFINE(GH_LOOKUP_OK, 1, [Define if gh_lookup works])], ok=no, ok=no) +]])],[AC_DEFINE(GH_LOOKUP_OK, 1, [Define if gh_lookup works])],[ok=no],[ok=no]) AC_MSG_RESULT($ok) fi # with_guile @@ -228,8 +225,7 @@ AC_CACHE_CHECK([for C complex keyword], acx_cv_c_complex, [acx_cv_c_complex=unsupported for acx_kw in complex _Complex __complex__; do - AC_TRY_COMPILE([#include <complex.h>], [float $acx_kw foo;], - [acx_cv_c_complex=$acx_kw; break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <complex.h>]], [[float $acx_kw foo;]])],[acx_cv_c_complex=$acx_kw; break],[]) done ]) @@ -239,7 +235,7 @@ AC_DEFINE([CTL_HAS_COMPLEX_INTEGRATION], [1], [If we have C99 complex nums]) fi -########################################################################### +##############################k############################################# # Check for nlopt, or at least its header, and extract Scheme constants AC_PROG_EGREP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/doc/docs/Installation.md new/libctl-4.5.1/doc/docs/Installation.md --- old/libctl-4.5.0/doc/docs/Installation.md 2019-03-21 18:39:48.000000000 +0100 +++ new/libctl-4.5.1/doc/docs/Installation.md 2021-11-22 23:29:52.000000000 +0100 @@ -85,6 +85,8 @@ - **Important:** Most Linux distributions come with Guile already installed. You can check by seeing whether you can run `guile --version` from the command line. In that case, do **not** install your own version of Guile from source — having two versions of Guile on the same system will cause problems. However, by default most distributions install only the Guile libraries and not the programming headers — to compile libctl, you should install the **guile-devel** or **guile-dev** package. +It is possible to compile libcti *without* having Guile on your system by passing `--without-guile` to the `configure` script. (Guile is not necessary to install the Python interface to Meep and MPB.) However, to do this, you must be building from an official `.tar.gz` package on the [releases page](https://github.com/NanoComp/libctl/releases); building directly from the libctl git repo requires Guile in order to generate certain source files. + ### Building From Source Here we provide instructions for building libctl from source on Ubuntu 16.04. Gzipped tarballs of stable versions are available on the [releases page](https://github.com/NanoComp/libctl/releases). @@ -131,4 +133,4 @@ in the `libctl` directory. And subsequently, if you are editing the sources you should include `--enable-maintainer-mode` whenever you reconfigure. To do this, however, you will need a number of additional packages beyond those listed above: -- GNU [autoconf](https://www.gnu.org/software/autoconf/autoconf.html), [automake](https://www.gnu.org/software/automake/), and [libtool](https://www.gnu.org/software/libtool/libtool.html) — these are used to create the Makefiles and configure scripts, and to build shared libraries. \ No newline at end of file +- GNU [autoconf](https://www.gnu.org/software/autoconf/autoconf.html), [automake](https://www.gnu.org/software/automake/), and [libtool](https://www.gnu.org/software/libtool/libtool.html) — these are used to create the Makefiles and configure scripts, and to build shared libraries. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/m4/libtool.m4 new/libctl-4.5.1/m4/libtool.m4 --- old/libctl-4.5.0/m4/libtool.m4 2019-07-02 22:23:37.000000000 +0200 +++ new/libctl-4.5.1/m4/libtool.m4 2021-06-14 16:46:58.000000000 +0200 @@ -1067,16 +1067,11 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) + darwin*) + case ${MACOSX_DEPLOYMENT_TARGET},$host in + 10.[[012]],*|,*powerpc*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + *) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/missing new/libctl-4.5.1/missing --- old/libctl-4.5.0/missing 2018-03-11 23:12:29.000000000 +0100 +++ new/libctl-4.5.1/missing 2020-11-19 05:09:26.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/test-driver new/libctl-4.5.1/test-driver --- old/libctl-4.5.0/test-driver 2018-03-11 23:12:29.000000000 +0100 +++ new/libctl-4.5.1/test-driver 2020-11-19 05:09:26.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,11 +42,13 @@ { cat <<END Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] + test-driver --test-name NAME --log-file PATH --trs-file PATH + [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + The '--test-name', '--log-file' and '--trs-file' options are mandatory. +See the GNU Automake documentation for information. END } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/utils/ctlgeom-types.h new/libctl-4.5.1/utils/ctlgeom-types.h --- old/libctl-4.5.0/utils/ctlgeom-types.h 2020-02-18 16:41:04.000000000 +0100 +++ new/libctl-4.5.1/utils/ctlgeom-types.h 2022-02-02 03:47:41.000000000 +0100 @@ -179,5 +179,5 @@ #ifndef LIBCTL_MAJOR_VERSION # define LIBCTL_MAJOR_VERSION 4 # define LIBCTL_MINOR_VERSION 5 -# define LIBCTL_BUGFIX_VERSION 0 +# define LIBCTL_BUGFIX_VERSION 1 #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/utils/geom.c new/libctl-4.5.1/utils/geom.c --- old/libctl-4.5.0/utils/geom.c 2020-02-18 16:24:31.000000000 +0100 +++ new/libctl-4.5.1/utils/geom.c 2022-02-02 03:44:10.000000000 +0100 @@ -1359,7 +1359,7 @@ if (t) { destroy_geom_box_tree(t->t1); destroy_geom_box_tree(t->t2); - if (t->nobjects && t->objects) FREE(t->objects); + if (t->objects) FREE(t->objects); FREE1(t); } } @@ -1977,11 +1977,11 @@ if (fabs(dot) < (1.0 - THRESH) * q01 * q02) return NON_INTERSECTING; else if (dot < 0.0) { - *s = 0.0; + if (s) *s = 0.0; return IN_SEGMENT; } else if ((u.x * q01x + u.y * q01y) < 0.0) { - *s = fmin(q01, q02) / sqrt(u.x * u.x + u.y * u.y); + if (s) *s = fmin(q01, q02) / sqrt(u.x * u.x + u.y * u.y); return ON_RAY; } return NON_INTERSECTING; @@ -2552,7 +2552,7 @@ /***************************************************************/ /* On entry, the only fields in o->prism that are assumed to */ -/* be initialized are: vertices, height, (optionally) */ +/* be initialized are: vertices, height, (optionally) */ /* axis, and sidewall_angle. If axis has not been initialized */ /* (i.e. it is set to its default value, which is the zero */ /* vector) then the prism axis is automatically computed as */ @@ -2570,6 +2570,20 @@ int num_vertices = prsm->vertices.num_items; CHECK(num_vertices >= 3, "fewer than 3 vertices in init_prism"); + // remove duplicate consecutive prism vertices + int i = 0; // last non-deleted vertex + for (int j = 1; j < num_vertices; ++j) { + if (!vector3_equal(vertices[i], vertices[j])) { + i += 1; + if (i < j) vertices[i] = vertices[j]; + } + } + num_vertices = i + 1 - vector3_equal(vertices[0], vertices[i]); + if (prsm->vertices.num_items != num_vertices) { + prsm->vertices.num_items = num_vertices; + vertices = (vector3 *)realloc(vertices, num_vertices * sizeof(vector3)); + } + // compute centroid of vertices vector3 centroid = {0.0, 0.0, 0.0}; int nv; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libctl-4.5.0/utils/nlopt-constants.scm new/libctl-4.5.1/utils/nlopt-constants.scm --- old/libctl-4.5.0/utils/nlopt-constants.scm 2019-07-03 21:18:14.000000000 +0200 +++ new/libctl-4.5.1/utils/nlopt-constants.scm 2020-05-15 03:53:24.000000000 +0200 @@ -1 +1,41 @@ ; AUTOMATICALLY GENERATED - DO NOT EDIT +(define NLOPT-GN-DIRECT 0) +(define NLOPT-GN-DIRECT-L 1) +(define NLOPT-GN-DIRECT-L-RAND 2) +(define NLOPT-GN-DIRECT-NOSCAL 3) +(define NLOPT-GN-DIRECT-L-NOSCAL 4) +(define NLOPT-GN-DIRECT-L-RAND-NOSCAL 5) +(define NLOPT-GN-ORIG-DIRECT 6) +(define NLOPT-GN-ORIG-DIRECT-L 7) +(define NLOPT-GD-STOGO 8) +(define NLOPT-GD-STOGO-RAND 9) +(define NLOPT-LD-LBFGS-NOCEDAL 10) +(define NLOPT-LD-LBFGS 11) +(define NLOPT-LN-PRAXIS 12) +(define NLOPT-LD-VAR1 13) +(define NLOPT-LD-VAR2 14) +(define NLOPT-LD-TNEWTON 15) +(define NLOPT-LD-TNEWTON-RESTART 16) +(define NLOPT-LD-TNEWTON-PRECOND 17) +(define NLOPT-LD-TNEWTON-PRECOND-RESTART 18) +(define NLOPT-GN-CRS2-LM 19) +(define NLOPT-GN-MLSL 20) +(define NLOPT-GD-MLSL 21) +(define NLOPT-GN-MLSL-LDS 22) +(define NLOPT-GD-MLSL-LDS 23) +(define NLOPT-LD-MMA 24) +(define NLOPT-LN-COBYLA 25) +(define NLOPT-LN-NEWUOA 26) +(define NLOPT-LN-NEWUOA-BOUND 27) +(define NLOPT-LN-NELDERMEAD 28) +(define NLOPT-LN-SBPLX 29) +(define NLOPT-LN-AUGLAG 30) +(define NLOPT-LD-AUGLAG 31) +(define NLOPT-LN-AUGLAG-EQ 32) +(define NLOPT-LD-AUGLAG-EQ 33) +(define NLOPT-LN-BOBYQA 34) +(define NLOPT-GN-ISRES 35) +(define NLOPT-LD-SLSQP 36) +(define NLOPT-LD-CCSAQ 37) +(define NLOPT-GN-ESCH 38) +(define NLOPT-GN-AGS 39)
