diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-03-28 21:31:07 +0200 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-03-28 21:32:44 +0200 |
| commit | 6b07203c63d31ecd1ac1beb61a7229347634dacf (patch) | |
| tree | c07b81f54a3337d6d08ace92e9738d375635298a /sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch | |
| parent | net-fs/samba: Added dev-perl/JSON to DEPEND (diff) | |
| download | gentoo-6b07203c63d31ecd1ac1beb61a7229347634dacf.tar.gz gentoo-6b07203c63d31ecd1ac1beb61a7229347634dacf.tar.bz2 gentoo-6b07203c63d31ecd1ac1beb61a7229347634dacf.zip | |
sci-visualization/gwyddion: add 2.60
Bug: https://bugs.gentoo.org/598682
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch')
| -rw-r--r-- | sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch new file mode 100644 index 000000000000..ac68ac0a2861 --- /dev/null +++ b/sci-visualization/gwyddion/files/gwyddion-2.60-automagic.patch @@ -0,0 +1,35 @@ +diff --git a/configure.ac b/configure.ac +index 5a7465a..cc5a54d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -660,11 +660,13 @@ AM_CONDITIONAL([HAVE_CXX],[test "x$have_cxx" != xno]) + ############################################################################# + # OpenEXR 2.x+ + # Optional. Used for HDR greyscale OpenEXR pixmap import/export. +-enable_exr=$have_cxx +-PKG_CHECK_MODULES(EXR, [OpenEXR >= 2.0], ++GWY_WITH([exr],,[build with OpenEXR support]) ++if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then ++ PKG_CHECK_MODULES(EXR, [OpenEXR], + [AC_DEFINE(HAVE_EXR,1, + [Define if we have the OpenEXR 2.x+ package.])], + [enable_exr=no]) ++fi + AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno]) + + ############################################################################# +@@ -679,10 +681,13 @@ AM_CONDITIONAL([HAVE_HDF5],[test "x$enable_hdf5" != xno]) + ############################################################################# + # CFITSIO + # Optional. Used for FITS image import. +-PKG_CHECK_MODULES(CFITSIO, [cfitsio], ++GWY_WITH([cfitsio],,[build with cfitsio support]) ++if test "x$enable_cfitsio" != "xno"; then ++ PKG_CHECK_MODULES(CFITSIO, [cfitsio], + [AC_DEFINE(HAVE_CFITSIO,1, + [Define if we have the cfitsio package.])], + [enable_cfitsio=no]) ++fi + AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno]) + + ############################################################################# |