#2 Update to 0.0.23
Opened a year ago by orion. Modified 2 months ago
rpms/ orion/3Depict 0.0.23  into  rawhide

file modified
+1
@@ -17,3 +17,4 @@ 

  /3Depict-0.0.20.tar.gz

  /3Depict-0.0.21.tar.gz

  /3Depict-0.0.22.tar.gz

+ /3Depict-0.0.23.tar.gz

@@ -1,12 +0,0 @@ 

- diff -r 031db7992cf7 src/backend/filters/algorithms/convexHull.h

- --- src/backend/filters/algorithms/convexHull.h	Sun Feb 11 00:27:02 2018 +0000

- +++ src/backend/filters/algorithms/convexHull.h	Sun Feb 11 00:34:47 2018 +0000

- @@ -35,7 +35,7 @@

-  	#endif

-  	extern "C"

-  	{

- -		#include <qhull/qhull_a.h>

- +		#include <libqhull/qhull_a.h>

-  	}

-  	#ifdef __POWERPC__

-  		#pragma pop_macro("__POWERPC__")

@@ -1,25 +0,0 @@ 

- diff -r 419306b866c3 src/backend/filters/algorithms/spatial.cpp

- --- src/backend/filters/algorithms/spatial.cpp	Sun Aug 11 20:03:37 2019 +0100

- +++ src/backend/filters/algorithms/spatial.cpp	Sun Aug 11 20:05:06 2019 +0100

- @@ -26,7 +26,20 @@

-  #include <gsl/gsl_randist.h>

-  #include <gsl/gsl_multifit.h>

-  

- -#include <qhull/qhull_a.h>

- +//QHull library

- +//Build fix for qhull ; wx defines powerpc without

- +//assigning a value, causing build fail on powerpc

- +#ifdef __POWERPC__

- +	#pragma push_macro("__POWERPC__")

- +	#define __POWERPC__ 1

- +#endif

- +extern "C"

- +{

- +	#include <qhull/qhull_a.h>

- +}

- +#ifdef __POWERPC__

- +	#pragma pop_macro("__POWERPC__")

- +#endif

-  

-  using std::vector;

-  

@@ -1,21 +0,0 @@ 

- diff -r 13113574c8fc src/3Depict.cpp

- --- src/3Depict.cpp	Sun Aug 11 23:16:43 2019 +0100

- +++ src/3Depict.cpp	Sun Aug 11 23:17:35 2019 +0100

- @@ -76,6 +76,17 @@

-  

-  };

-  

- +//Wayland workaround - wx bug 17702

- +#ifdef __WXGTK3__

- +struct ForceX11 {

- +	ForceX11(){

- +		setenv("GDK_BACKEND","x11",1);

- +	}

- +};

- +

- +static struct ForceX11 forcex11;

- +#endif

- +

-  //Check version is in place because wxT is deprecated for wx 2.9

-  //Command line parameter table

-  static const wxCmdLineEntryDesc g_cmdLineDesc [] =

@@ -0,0 +1,11 @@ 

+ --- src/backend/filters/algorithms/convexHull.h.qhull	2020-05-31 04:03:07.000000000 -0600

+ +++ src/backend/filters/algorithms/convexHull.h	2022-10-05 21:51:00.554713947 -0600

+ @@ -39,7 +39,7 @@

+  #endif

+  extern "C"

+  {

+ -	#include <qhull/qhull_a.h>

+ +	#include <libqhull/qhull_a.h>

+  }

+  #ifdef __POWERPC__

+  	#pragma pop_macro("__POWERPC__")

@@ -0,0 +1,11 @@ 

+ diff -up 3Depict-0.0.23/src/backend/filters/spatialAnalysis.cpp.include 3Depict-0.0.23/src/backend/filters/spatialAnalysis.cpp

+ --- 3Depict-0.0.23/src/backend/filters/spatialAnalysis.cpp.include	2020-05-31 04:03:07.000000000 -0600

+ +++ 3Depict-0.0.23/src/backend/filters/spatialAnalysis.cpp	2023-01-14 17:18:42.535237197 -0700

+ @@ -16,6 +16,7 @@

+   *	along with this program.  If not, see <http://www.gnu.org/licenses/>.

+  */

+  #include <gsl/gsl_sf_gamma.h>

+ +#include <cstddef>

+  #include <gsl/gsl_spmatrix.h>

+  

+  #include "spatialAnalysis.h"

file modified
+22 -21
@@ -1,13 +1,15 @@ 

  Name:		3Depict

- Version:	0.0.22

- Release:	22%{?dist}

+ Version:	0.0.23

+ Release:	1%{?dist}

  Summary:	Valued 3D point cloud visualization and analysis

  

  

- License:	GPLv3+

+ License:	GPL-3.0-or-later

  URL:		http://threedepict.sourceforge.net

  Source0:	http://downloads.sourceforge.net/threedepict/%{name}-%{version}.tar.gz

- 

+ # File missing from tarball https://sourceforge.net/p/threedepict/tickets/2/

+ # https://sourceforge.net/p/threedepict/code/ci/default/tree/src/backend/stats/erfinv.h?format=raw

+ Source1:        erfinv.h

  

  #Mathgl for plotting

  BuildRequires:	gcc-c++
@@ -35,19 +37,16 @@ 

  BuildRequires: make

  

  #Fedora specific PDF dir.

- Patch0: %{name}-%{version}-manual-pdf-loc.patch

+ Patch0: %{name}-0.0.22-manual-pdf-loc.patch

  #Fedora specific font dir

- Patch1: %{name}-%{version}-font-path.patch

+ Patch1: %{name}-0.0.22-font-path.patch

  #Qhull dir has changed 

- Patch2: %{name}-%{version}-qhull.patch

- #Fix for PPC64 arch

- Patch3: %{name}-%{version}-qhull_ppc64le.patch

- 

- #wxGLCanvas not supported under wayland.

- # wx bug 17702

- Patch4: %{name}-%{version}-wayland.patch

+ Patch2: %{name}-0.0.23-qhull.patch

  # Fixes for wxWidgets 3.2 compatibility

- Patch5: %{name}-%{version}-wx3.2.patch

+ Patch3: %{name}-0.0.22-wx3.2.patch

+ # Add missing include

+ Patch4: %{name}-include.patch

+ 

  %description

  This software is designed to help users visualize and analyze 3D point clouds

  with an associated real value, in a fast and flexible fashion. It is 
@@ -57,15 +56,14 @@ 

  %prep

  

  %setup -q 

+ cp -a %SOURCE1 src/backend/stats/erfinv.h

  

  %patch0

  %patch1

  %patch2

- %patch3

- %patch4

- %patch5 -p1

+ %patch3 -p1

+ %patch4 -p1

  

- %if 0%{?fedora} > 24

  # Installation directory has changed

  sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \

    src/backend/filters/filterCommon.h \
@@ -73,15 +71,14 @@ 

    configure configure.ac

  # Avoid rerunning the autotools

  touch -r aclocal.m4 configure configure.ac

- %endif

  

  %build

  export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"

  %configure --disable-debug-checks --enable-openmp-parallel 

- make %{?_smp_mflags}

+ %make_build

  

  %install

- make install DESTDIR=%{buildroot}

+ %make_install

  

  # Install the textures

  mkdir -p %{buildroot}%{_datadir}/%{name}/textures
@@ -130,6 +127,10 @@ 

  

  

  %changelog

+ * Mon Mar 11 2024 Orion Poplawski <orion@nwra.com> - 0.0.23-1

+ - Update to 0.0.23

+ - Use SPDX License

+ 

  * Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.22-22

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

  

file added
+110
@@ -0,0 +1,110 @@ 

+ // This function computes the inverse of the error function

+ // `erf` in the C math library. The implementation is based

+ // on the rational approximation of Normal quantile function

+ // available from http://www.jstor.org/stable/2347330

+ //

+ // Author: Lakshay Garg <lakshayg@outlook.in>

+ // Licence : MIT

+ // Date: Jun 28, 2017

+ // Permission : "Feel free to use the code, I have updated it to include the MIT license." 13/4/19

+ 

+ #include <cmath>

+ #include <limits>

+ 

+ template <typename T>

+ T erfinv(T x) {

+ 

+ 	if (x < -1 || x > 1) {

+ 		return std::numeric_limits<T>::quiet_NaN();

+ 	} else if (x == 1.0) {

+ 		return std::numeric_limits<T>::infinity();

+ 	} else if (x == -1.0) {

+ 		return -std::numeric_limits<T>::infinity();

+ 	}

+ 

+ 	const T LN2 = 6.931471805599453094172321214581e-1;

+ 

+ 	const T A0 = 1.1975323115670912564578e0;

+ 	const T A1 = 4.7072688112383978012285e1;

+ 	const T A2 = 6.9706266534389598238465e2;

+ 	const T A3 = 4.8548868893843886794648e3;

+ 	const T A4 = 1.6235862515167575384252e4;

+ 	const T A5 = 2.3782041382114385731252e4;

+ 	const T A6 = 1.1819493347062294404278e4;

+ 	const T A7 = 8.8709406962545514830200e2;

+ 

+ 	const T B0 = 1.0000000000000000000e0;

+ 	const T B1 = 4.2313330701600911252e1;

+ 	const T B2 = 6.8718700749205790830e2;

+ 	const T B3 = 5.3941960214247511077e3;

+ 	const T B4 = 2.1213794301586595867e4;

+ 	const T B5 = 3.9307895800092710610e4;

+ 	const T B6 = 2.8729085735721942674e4;

+ 	const T B7 = 5.2264952788528545610e3;

+ 

+ 	const T C0 = 1.42343711074968357734e0;

+ 	const T C1 = 4.63033784615654529590e0;

+ 	const T C2 = 5.76949722146069140550e0;

+ 	const T C3 = 3.64784832476320460504e0;

+ 	const T C4 = 1.27045825245236838258e0;

+ 	const T C5 = 2.41780725177450611770e-1;

+ 	const T C6 = 2.27238449892691845833e-2;

+ 	const T C7 = 7.74545014278341407640e-4;

+ 

+ 	const T D0 = 1.4142135623730950488016887e0;

+ 	const T D1 = 2.9036514445419946173133295e0;

+ 	const T D2 = 2.3707661626024532365971225e0;

+ 	const T D3 = 9.7547832001787427186894837e-1;

+ 	const T D4 = 2.0945065210512749128288442e-1;

+ 	const T D5 = 2.1494160384252876777097297e-2;

+ 	const T D6 = 7.7441459065157709165577218e-4;

+ 	const T D7 = 1.4859850019840355905497876e-9;

+ 

+ 	const T E0 = 6.65790464350110377720e0;

+ 	const T E1 = 5.46378491116411436990e0;

+ 	const T E2 = 1.78482653991729133580e0;

+ 	const T E3 = 2.96560571828504891230e-1;

+ 	const T E4 = 2.65321895265761230930e-2;

+ 	const T E5 = 1.24266094738807843860e-3;

+ 	const T E6 = 2.71155556874348757815e-5;

+ 	const T E7 = 2.01033439929228813265e-7;

+ 

+ 	const T F0 = 1.414213562373095048801689e0;

+ 	const T F1 = 8.482908416595164588112026e-1;

+ 	const T F2 = 1.936480946950659106176712e-1;

+ 	const T F3 = 2.103693768272068968719679e-2;

+ 	const T F4 = 1.112800997078859844711555e-3;

+ 	const T F5 = 2.611088405080593625138020e-5;

+ 	const T F6 = 2.010321207683943062279931e-7;

+ 	const T F7 = 2.891024605872965461538222e-15;

+ 

+ 	T abs_x = abs(x);

+ 

+ 	if (abs_x <= 0.85) {

+ 		T r =  0.180625 - 0.25 * x * x;

+ 		T num = (((((((A7 * r + A6) * r + A5) * r + A4) * r + A3) * r + A2) * r + A1) * r + A0);

+ 		T den = (((((((B7 * r + B6) * r + B5) * r + B4) * r + B3) * r + B2) * r + B1) * r + B0);

+ 		return x * num / den;

+ 	}

+ 

+ 	T r = sqrt(LN2 - log(1.0 - abs_x));

+ 

+ 	T num, den;

+ 	if (r <= 5.0) {

+ 		r = r - 1.6;

+ 		num = (((((((C7 * r + C6) * r + C5) * r + C4) * r + C3) * r + C2) * r + C1) * r + C0);

+ 		den = (((((((D7 * r + D6) * r + D5) * r + D4) * r + D3) * r + D2) * r + D1) * r + D0);

+ 	} else {

+ 		r = r - 5.0;

+ 		num = (((((((E7 * r + E6) * r + E5) * r + E4) * r + E3) * r + E2) * r + E1) * r + E0);

+ 		den = (((((((F7 * r + F6) * r + F5) * r + F4) * r + F3) * r + F2) * r + F1) * r + F0);

+ 	}

+ 

+ 	if (x < 0) {

+ 		return -num / den;

+ 	} else {

+ 		return num / den;

+ 	}

+ 

+ }

+ 

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (3Depict-0.0.22.tar.gz) = 41659b44b089aa61e0d517bacc4a4509cac3ba2d168bdd952d29e4b1f296f8ba97e547482a12da0a0c6936e37fc8421428baa9c4eb1dc82527635802944ab47c

+ SHA512 (3Depict-0.0.23.tar.gz) = d51fcd922750d53fdb2cdc927cbcccf5016b1adc0a49861faa85c29a7e0e2d4834af9775fc5a429146fc0011cbd50801eab49fb28360615fc0e98d0932f25d65