Skip to content

Commit 94d8a7d

Browse files
jcupittjcupitt
committed
tried (and failed) to build against ubuntu nifti
the ubuntu cmake dev files for nifti seem to be broken, and I can't get meson to add the dependency manually
1 parent 07edfe3 commit 94d8a7d

File tree

3 files changed

+61
-3
lines changed

3 files changed

+61
-3
lines changed

‎libvips/include/vips/enumtypes.h

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,115 +6,164 @@
66

77
G_BEGIN_DECLS
88
/* enumerations from "../../../libvips/include/vips/arithmetic.h" */
9+
VIPS_API
910
GType vips_operation_math_get_type (void) G_GNUC_CONST;
1011
#define VIPS_TYPE_OPERATION_MATH (vips_operation_math_get_type())
12+
VIPS_API
1113
GType vips_operation_math2_get_type (void) G_GNUC_CONST;
1214
#define VIPS_TYPE_OPERATION_MATH2 (vips_operation_math2_get_type())
15+
VIPS_API
1316
GType vips_operation_round_get_type (void) G_GNUC_CONST;
1417
#define VIPS_TYPE_OPERATION_ROUND (vips_operation_round_get_type())
18+
VIPS_API
1519
GType vips_operation_relational_get_type (void) G_GNUC_CONST;
1620
#define VIPS_TYPE_OPERATION_RELATIONAL (vips_operation_relational_get_type())
21+
VIPS_API
1722
GType vips_operation_boolean_get_type (void) G_GNUC_CONST;
1823
#define VIPS_TYPE_OPERATION_BOOLEAN (vips_operation_boolean_get_type())
24+
VIPS_API
1925
GType vips_operation_complex_get_type (void) G_GNUC_CONST;
2026
#define VIPS_TYPE_OPERATION_COMPLEX (vips_operation_complex_get_type())
27+
VIPS_API
2128
GType vips_operation_complex2_get_type (void) G_GNUC_CONST;
2229
#define VIPS_TYPE_OPERATION_COMPLEX2 (vips_operation_complex2_get_type())
30+
VIPS_API
2331
GType vips_operation_complexget_get_type (void) G_GNUC_CONST;
2432
#define VIPS_TYPE_OPERATION_COMPLEXGET (vips_operation_complexget_get_type())
2533
/* enumerations from "../../../libvips/include/vips/basic.h" */
34+
VIPS_API
2635
GType vips_precision_get_type (void) G_GNUC_CONST;
2736
#define VIPS_TYPE_PRECISION (vips_precision_get_type())
2837
/* enumerations from "../../../libvips/include/vips/colour.h" */
38+
VIPS_API
2939
GType vips_intent_get_type (void) G_GNUC_CONST;
3040
#define VIPS_TYPE_INTENT (vips_intent_get_type())
41+
VIPS_API
3142
GType vips_pcs_get_type (void) G_GNUC_CONST;
3243
#define VIPS_TYPE_PCS (vips_pcs_get_type())
3344
/* enumerations from "../../../libvips/include/vips/conversion.h" */
45+
VIPS_API
3446
GType vips_extend_get_type (void) G_GNUC_CONST;
3547
#define VIPS_TYPE_EXTEND (vips_extend_get_type())
48+
VIPS_API
3649
GType vips_compass_direction_get_type (void) G_GNUC_CONST;
3750
#define VIPS_TYPE_COMPASS_DIRECTION (vips_compass_direction_get_type())
51+
VIPS_API
3852
GType vips_direction_get_type (void) G_GNUC_CONST;
3953
#define VIPS_TYPE_DIRECTION (vips_direction_get_type())
54+
VIPS_API
4055
GType vips_align_get_type (void) G_GNUC_CONST;
4156
#define VIPS_TYPE_ALIGN (vips_align_get_type())
57+
VIPS_API
4258
GType vips_angle_get_type (void) G_GNUC_CONST;
4359
#define VIPS_TYPE_ANGLE (vips_angle_get_type())
60+
VIPS_API
4461
GType vips_angle45_get_type (void) G_GNUC_CONST;
4562
#define VIPS_TYPE_ANGLE45 (vips_angle45_get_type())
63+
VIPS_API
4664
GType vips_interesting_get_type (void) G_GNUC_CONST;
4765
#define VIPS_TYPE_INTERESTING (vips_interesting_get_type())
66+
VIPS_API
4867
GType vips_blend_mode_get_type (void) G_GNUC_CONST;
4968
#define VIPS_TYPE_BLEND_MODE (vips_blend_mode_get_type())
5069
/* enumerations from "../../../libvips/include/vips/convolution.h" */
70+
VIPS_API
5171
GType vips_combine_get_type (void) G_GNUC_CONST;
5272
#define VIPS_TYPE_COMBINE (vips_combine_get_type())
5373
/* enumerations from "../../../libvips/include/vips/draw.h" */
74+
VIPS_API
5475
GType vips_combine_mode_get_type (void) G_GNUC_CONST;
5576
#define VIPS_TYPE_COMBINE_MODE (vips_combine_mode_get_type())
5677
/* enumerations from "../../../libvips/include/vips/foreign.h" */
78+
VIPS_API
5779
GType vips_foreign_flags_get_type (void) G_GNUC_CONST;
5880
#define VIPS_TYPE_FOREIGN_FLAGS (vips_foreign_flags_get_type())
81+
VIPS_API
5982
GType vips_fail_on_get_type (void) G_GNUC_CONST;
6083
#define VIPS_TYPE_FAIL_ON (vips_fail_on_get_type())
84+
VIPS_API
6185
GType vips_saveable_get_type (void) G_GNUC_CONST;
6286
#define VIPS_TYPE_SAVEABLE (vips_saveable_get_type())
87+
VIPS_API
6388
GType vips_foreign_subsample_get_type (void) G_GNUC_CONST;
6489
#define VIPS_TYPE_FOREIGN_SUBSAMPLE (vips_foreign_subsample_get_type())
90+
VIPS_API
6591
GType vips_foreign_jpeg_subsample_get_type (void) G_GNUC_CONST;
6692
#define VIPS_TYPE_FOREIGN_JPEG_SUBSAMPLE (vips_foreign_jpeg_subsample_get_type())
93+
VIPS_API
6794
GType vips_foreign_webp_preset_get_type (void) G_GNUC_CONST;
6895
#define VIPS_TYPE_FOREIGN_WEBP_PRESET (vips_foreign_webp_preset_get_type())
96+
VIPS_API
6997
GType vips_foreign_tiff_compression_get_type (void) G_GNUC_CONST;
7098
#define VIPS_TYPE_FOREIGN_TIFF_COMPRESSION (vips_foreign_tiff_compression_get_type())
99+
VIPS_API
71100
GType vips_foreign_tiff_predictor_get_type (void) G_GNUC_CONST;
72101
#define VIPS_TYPE_FOREIGN_TIFF_PREDICTOR (vips_foreign_tiff_predictor_get_type())
102+
VIPS_API
73103
GType vips_foreign_tiff_resunit_get_type (void) G_GNUC_CONST;
74104
#define VIPS_TYPE_FOREIGN_TIFF_RESUNIT (vips_foreign_tiff_resunit_get_type())
105+
VIPS_API
75106
GType vips_foreign_png_filter_get_type (void) G_GNUC_CONST;
76107
#define VIPS_TYPE_FOREIGN_PNG_FILTER (vips_foreign_png_filter_get_type())
108+
VIPS_API
77109
GType vips_foreign_ppm_format_get_type (void) G_GNUC_CONST;
78110
#define VIPS_TYPE_FOREIGN_PPM_FORMAT (vips_foreign_ppm_format_get_type())
111+
VIPS_API
79112
GType vips_foreign_dz_layout_get_type (void) G_GNUC_CONST;
80113
#define VIPS_TYPE_FOREIGN_DZ_LAYOUT (vips_foreign_dz_layout_get_type())
114+
VIPS_API
81115
GType vips_foreign_dz_depth_get_type (void) G_GNUC_CONST;
82116
#define VIPS_TYPE_FOREIGN_DZ_DEPTH (vips_foreign_dz_depth_get_type())
117+
VIPS_API
83118
GType vips_foreign_dz_container_get_type (void) G_GNUC_CONST;
84119
#define VIPS_TYPE_FOREIGN_DZ_CONTAINER (vips_foreign_dz_container_get_type())
120+
VIPS_API
85121
GType vips_foreign_heif_compression_get_type (void) G_GNUC_CONST;
86122
#define VIPS_TYPE_FOREIGN_HEIF_COMPRESSION (vips_foreign_heif_compression_get_type())
87123
/* enumerations from "../../../libvips/include/vips/image.h" */
124+
VIPS_API
88125
GType vips_demand_style_get_type (void) G_GNUC_CONST;
89126
#define VIPS_TYPE_DEMAND_STYLE (vips_demand_style_get_type())
127+
VIPS_API
90128
GType vips_image_type_get_type (void) G_GNUC_CONST;
91129
#define VIPS_TYPE_IMAGE_TYPE (vips_image_type_get_type())
130+
VIPS_API
92131
GType vips_interpretation_get_type (void) G_GNUC_CONST;
93132
#define VIPS_TYPE_INTERPRETATION (vips_interpretation_get_type())
133+
VIPS_API
94134
GType vips_band_format_get_type (void) G_GNUC_CONST;
95135
#define VIPS_TYPE_BAND_FORMAT (vips_band_format_get_type())
136+
VIPS_API
96137
GType vips_coding_get_type (void) G_GNUC_CONST;
97138
#define VIPS_TYPE_CODING (vips_coding_get_type())
139+
VIPS_API
98140
GType vips_access_get_type (void) G_GNUC_CONST;
99141
#define VIPS_TYPE_ACCESS (vips_access_get_type())
100142
/* enumerations from "../../../libvips/include/vips/morphology.h" */
143+
VIPS_API
101144
GType vips_operation_morphology_get_type (void) G_GNUC_CONST;
102145
#define VIPS_TYPE_OPERATION_MORPHOLOGY (vips_operation_morphology_get_type())
103146
/* enumerations from "../../../libvips/include/vips/object.h" */
147+
VIPS_API
104148
GType vips_argument_flags_get_type (void) G_GNUC_CONST;
105149
#define VIPS_TYPE_ARGUMENT_FLAGS (vips_argument_flags_get_type())
106150
/* enumerations from "../../../libvips/include/vips/operation.h" */
151+
VIPS_API
107152
GType vips_operation_flags_get_type (void) G_GNUC_CONST;
108153
#define VIPS_TYPE_OPERATION_FLAGS (vips_operation_flags_get_type())
109154
/* enumerations from "../../../libvips/include/vips/region.h" */
155+
VIPS_API
110156
GType vips_region_shrink_get_type (void) G_GNUC_CONST;
111157
#define VIPS_TYPE_REGION_SHRINK (vips_region_shrink_get_type())
112158
/* enumerations from "../../../libvips/include/vips/resample.h" */
159+
VIPS_API
113160
GType vips_kernel_get_type (void) G_GNUC_CONST;
114161
#define VIPS_TYPE_KERNEL (vips_kernel_get_type())
162+
VIPS_API
115163
GType vips_size_get_type (void) G_GNUC_CONST;
116164
#define VIPS_TYPE_SIZE (vips_size_get_type())
117165
/* enumerations from "../../../libvips/include/vips/util.h" */
166+
VIPS_API
118167
GType vips_token_get_type (void) G_GNUC_CONST;
119168
#define VIPS_TYPE_TOKEN (vips_token_get_type())
120169
G_END_DECLS

‎libvips/iofuncs/enumtypes.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
/* auto-generated enums for vips introspection */
55

6+
#ifdef HAVE_CONFIG_H
7+
#include <config.h>
8+
#endif /*HAVE_CONFIG_H*/
69
#include <vips/vips.h>
710
/* enumerations from "../../libvips/include/vips/arithmetic.h" */
811
GType

‎meson.build

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,11 +481,17 @@ elif libpoppler_dep.found() and cairo_dep.found()
481481
cfg_var.set('HAVE_POPPLER', '1')
482482
endif
483483

484-
# niftiio.pc is not always present, so fallback to CMake's find_package() functionally
484+
# niftiio.pc is not always present, so fall back to CMake's find_package()
485+
# functionality
486+
# cmake find fails on ubuntu due to /usr/lib/x86_64-linux-gnu madness, so it's
487+
# simplest to create a libnifti.pc in this case
485488
# TODO: simplify this when requiring meson>=0.60.0
486-
libnifti_dep = dependency('niftiio', required: false)
489+
libnifti_dep = dependency('niftiio', required: get_option('nifti'))
487490
if not libnifti_dep.found()
488-
libnifti_dep = dependency('NIFTI', method: 'cmake', modules: ['NIFTI::niftiio'], required: get_option('nifti'))
491+
libnifti_dep = dependency('NIFTI',
492+
method: 'cmake',
493+
modules: ['NIFTI::niftiio'],
494+
required: get_option('nifti'))
489495
endif
490496
if not get_option('nifti').disabled() and libnifti_dep.found()
491497
libvips_deps += libnifti_dep

0 commit comments

Comments
 (0)