Mercurial > mxe-octave
annotate src/of-fits-2-fixes.patch @ 5499:be0a7ce498e6
Update mesa to version 20.0.8 (bug #58689).
* src/mesa.mk: Update version and checksum. Add build-meson to dependecies.
Update build rule to use meson and ninja as the build tools.
* src/mesa-1-meson.patch: Add new patch.
* src/mesa-1-fixes.patch: Remove old patch for the scons rule that is no longer
needed.
* dist-files.mk: Update file list.
* src/build-mako.mk: Depend on and use python3.
* src/build-markupsafe.mk: Depend on and use python3.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 05 Jul 2020 20:58:57 +0200 |
parents | 00e61c4a5657 |
children |
rev | line source |
---|---|
4653
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 diff -uNr a/src/read_fits_image.cc b/src/read_fits_image.cc |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 --- a/src/read_fits_image.cc 2015-06-11 07:19:38.000000000 -0400 |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 +++ b/src/read_fits_image.cc 2018-04-09 14:31:49.259838178 -0400 |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 @@ -194,7 +194,7 @@ |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 return true; |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 } |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 double val = args(1).double_value(); |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 - if( (D_NINT( val ) != val) || (val < 0) ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 + if( (octave::math::x_nint( val ) != val) || (val < 0) ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 { |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 error( "read_fits_image: second argument must be a non-negative scalar integer value" ); |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 return true; |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 diff -uNr a/src/save_fits_image.cc b/src/save_fits_image.cc |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 --- a/src/save_fits_image.cc 2015-06-11 07:19:38.000000000 -0400 |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 +++ b/src/save_fits_image.cc 2018-04-09 14:31:37.948365332 -0400 |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 @@ -81,7 +81,7 @@ |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 else if( args(2).is_scalar_type() ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 { |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 double val = args(2).double_value(); |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 - if( (D_NINT( val ) == val) ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 + if( (octave::math::x_nint( val ) == val) ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 { |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 if( BYTE_IMG == val ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 bitperpixel = BYTE_IMG; |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 diff -uNr a/src/save_fits_image_multi_ext.cc b/src/save_fits_image_multi_ext.cc |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 --- a/src/save_fits_image_multi_ext.cc 2015-06-11 07:19:38.000000000 -0400 |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 +++ b/src/save_fits_image_multi_ext.cc 2018-04-09 14:34:46.915556809 -0400 |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 @@ -78,7 +78,7 @@ |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 else if( args(2).is_scalar_type() ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 { |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 double val = args(2).double_value(); |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 - if( (D_NINT( val ) == val) ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 + if( (octave::math::x_nint( val ) == val) ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 { |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 if( BYTE_IMG == val ) |
00e61c4a5657
fixes for package build errors due to API changes
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 bitperpixel = BYTE_IMG; |