summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-25 20:16:47 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-01-25 20:16:47 +0000
commit8ec6e28b7cc568a8bb636de90b2dd10f19db2be3 (patch)
tree4766c307114408c9d64ff1415f024dbf7c1bce7e
parentc6349ffd602b8ebc6d8f35b437eb7c0260ef5591 (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--README1
-rw-r--r--src/lib/evas/meson.build2
2 files changed, 3 insertions, 0 deletions
diff --git a/README b/README
index 4277061ad0..6efd9a4da5 100644
--- a/README
+++ b/README
@@ -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')
8tiff = dependency('libtiff-4', required: get_option('evas-loaders-disabler').contains('tiff') == false) 8tiff = dependency('libtiff-4', required: get_option('evas-loaders-disabler').contains('tiff') == false)
9giflib = cc.find_library('gif') 9giflib = cc.find_library('gif')
10webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false) 10webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false)
11libopenjp2 = dependency('libopenjp2', required: get_option('evas-loaders-disabler').contains('jp2k') == false)
11 12
12evas_image_loaders_file = [ 13evas_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', []],