diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2020-01-25 20:16:47 +0000 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2020-01-25 20:16:47 +0000 |
commit | 8ec6e28b7cc568a8bb636de90b2dd10f19db2be3 (patch) | |
tree | 4766c307114408c9d64ff1415f024dbf7c1bce7e | |
parent | c6349ffd602b8ebc6d8f35b437eb7c0260ef5591 (diff) |
evas - loaders - jp2k - re-enable in the build after it was lost
it seems to have been forgotten. bring it back to building again
@fix
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | src/lib/evas/meson.build | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -426,6 +426,7 @@ Required by default: | |||
426 | 426 | ||
427 | * libpng | 427 | * libpng |
428 | * libjpeg | 428 | * libjpeg |
429 | * openjpeg2 | ||
429 | * gstreamer (Ensure all codecs you want are installed.) | 430 | * gstreamer (Ensure all codecs you want are installed.) |
430 | * zlib | 431 | * zlib |
431 | * luajit (lua 5.1 or 5.2 support optional) | 432 | * luajit (lua 5.1 or 5.2 support optional) |
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index d2202389b6..94f81ae0a5 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build | |||
@@ -8,6 +8,7 @@ png = dependency('libpng') | |||
8 | tiff = dependency('libtiff-4', required: get_option('evas-loaders-disabler').contains('tiff') == false) | 8 | tiff = dependency('libtiff-4', required: get_option('evas-loaders-disabler').contains('tiff') == false) |
9 | giflib = cc.find_library('gif') | 9 | giflib = cc.find_library('gif') |
10 | webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false) | 10 | webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false) |
11 | libopenjp2 = dependency('libopenjp2', required: get_option('evas-loaders-disabler').contains('jp2k') == false) | ||
11 | 12 | ||
12 | evas_image_loaders_file = [ | 13 | evas_image_loaders_file = [ |
13 | ['bmp', 'shared', []], | 14 | ['bmp', 'shared', []], |
@@ -16,6 +17,7 @@ evas_image_loaders_file = [ | |||
16 | ['gif', 'shared', [giflib]], | 17 | ['gif', 'shared', [giflib]], |
17 | ['ico', 'shared', []], | 18 | ['ico', 'shared', []], |
18 | ['jpeg', 'static', [jpeg]], | 19 | ['jpeg', 'static', [jpeg]], |
20 | ['jp2k', 'shared', [libopenjp2]], | ||
19 | ['pmaps', 'shared', []], | 21 | ['pmaps', 'shared', []], |
20 | ['png', 'static', [png]], | 22 | ['png', 'static', [png]], |
21 | ['psd', 'shared', []], | 23 | ['psd', 'shared', []], |