meson: add missing includes

Also make video support properly optional.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 6621332)

Author: neheb

include/meson.build

@@ -43,12 +43,17 @@ headers = files(
   'exiv2/xmpsidecar.hpp',
 )
 
-headers += exiv_conf
-headers += cfile
+if get_option('video')
+  headers += files('exiv2/asfvideo.hpp', 'exiv2/matroskavideo.hpp', 'exiv2/quicktimevideo.hpp', 'exiv2/riffvideo.hpp')
+endif
+
 if zlib_dep.found()
   headers += files('exiv2/pngimage.hpp')
 endif
 
+headers += exiv_conf
+headers += cfile
+
 install_headers(
   headers,
   subdir: 'exiv2',

src/meson.build

@@ -1,5 +1,4 @@
 base_lib = files(
-  'asfvideo.cpp',
   'basicio.cpp',
   'bmffimage.cpp',
   'bmpimage.cpp',
@@ -17,7 +16,6 @@ base_lib = files(
   'iptc.cpp',
   'jp2image.cpp',
   'jpgimage.cpp',
-  'matroskavideo.cpp',
   'metadatum.cpp',
   'mrwimage.cpp',
   'orfimage.cpp',
@@ -27,9 +25,7 @@ base_lib = files(
   'preview.cpp',
   'properties.cpp',
   'psdimage.cpp',
-  'quicktimevideo.cpp',
   'rafimage.cpp',
-  'riffvideo.cpp',
   'rw2image.cpp',
   'tags.cpp',
   'tgaimage.cpp',
@@ -42,6 +38,10 @@ base_lib = files(
   'xmpsidecar.cpp',
 )
 
+if get_option('video')
+  base_lib += files('asfvideo.cpp', 'matroskavideo.cpp', 'quicktimevideo.cpp', 'riffvideo.cpp')
+endif
+
 int_lib = files(
   'canonmn_int.cpp',
   'casiomn_int.cpp',