[gimp/meson: 570/805] Activate plug-ins. Fix plug-ins, missing dependencies, lib renames.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 570/805] Activate plug-ins. Fix plug-ins, missing dependencies, lib renames.
- Date: Fri, 2 Feb 2018 15:21:11 +0000 (UTC)
commit e393f79f0d9f836db29fa55b0e1a330e96147e74
Author: Félix Piédallu <felix piedallu me>
Date: Tue Jan 9 12:05:35 2018 +0100
Activate plug-ins. Fix plug-ins, missing dependencies, lib renames.
meson.build | 8 ++--
plug-ins/common/meson.build | 28 +++++++++-------
plug-ins/file-ico/meson.build | 2 +-
plug-ins/file-jpeg/meson.build | 1 -
plug-ins/file-psd/meson.build | 2 +-
plug-ins/file-raw/meson.build | 55 ++++++++++++++++++++------------
plug-ins/file-tiff/meson.build | 2 +-
plug-ins/flame/meson.build | 2 +-
plug-ins/fractal-explorer/meson.build | 2 +-
plug-ins/gfig/meson.build | 2 +-
plug-ins/gimpressionist/meson.build | 2 +-
plug-ins/gradient-flare/meson.build | 2 +-
plug-ins/ifs-compose/meson.build | 2 +-
plug-ins/imagemap/images/meson.build | 30 ++++++++++++++++++
plug-ins/imagemap/meson.build | 4 ++-
plug-ins/lighting/meson.build | 2 +-
plug-ins/map-object/meson.build | 2 +-
plug-ins/pagecurl/meson.build | 2 +-
18 files changed, 99 insertions(+), 51 deletions(-)
---
diff --git a/meson.build b/meson.build
index e2faf84..8f43015 100644
--- a/meson.build
+++ b/meson.build
@@ -362,7 +362,7 @@ endif
bz2 = cc.find_library('bz2', required: false)
# LZma support
-lzma = dependency('liblzma', version: '>=5.0.0', required: false)
+liblzma = dependency('liblzma', version: '>=5.0.0', required: false)
# Ghostscript / Postscript support
have_ghostscript = false
@@ -397,7 +397,7 @@ endif
have_libxpm = false
if get_option('with-xpm')
have_libxpm = true
- libpng = dependency('xpm')
+ libxpm = dependency('xpm')
MIMEtypes += 'image/x-xpixmap'
endif
@@ -457,7 +457,7 @@ endif
have_wmf = false
if get_option('with-wmf')
have_wmf = true
- wmf = cc.find_library('wmf')
+ wmf = [ cc.find_library('wmf'), cc.find_library('wmflite') ]
wmf_version = run_command('libwmf-config', '--version').stdout().strip()
if not wmf_version.version_compare('>=0.2.8')
error('libwmf version is too old (' + wmf_version + ', 0.2.8 required)')
@@ -856,7 +856,7 @@ subdir('libgimp')
# Executables, plugins
subdir('modules')
-# subdir('plug-ins')
+subdir('plug-ins')
subdir('app')
subdir('tools/pdbgen')
diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
index 4910d4d..1b883ce 100644
--- a/plug-ins/common/meson.build
+++ b/plug-ins/common/meson.build
@@ -134,7 +134,7 @@ common_exes_list = [
[
'file-compressor',
[ 'file-compressor.c', ],
- [ gdk_pixbuf, cairo, gio, liblzma, bz2, zlib, ],
+ [ gegl, gdk_pixbuf, cairo, gio, liblzma, bz2, zlib, ],
],
[
'file-csource',
@@ -194,12 +194,12 @@ common_exes_list = [
[
'file-jp2-load',
[ 'file-jp2-load.c', ],
- [ gtk2, gegl, gdk_pixbuf, jp2, ],
+ [ gtk2, gegl, gdk_pixbuf, jasper, ],
],
[
'file-mng',
[ 'file-mng.c', ],
- [ gtk2, gegl, libmng, ],
+ [ gtk2, gegl, libmng, libpng, ],
],
[
'file-pat',
@@ -239,7 +239,7 @@ common_exes_list = [
[
'file-ps',
[ 'file-ps.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk2, gegl, gdk_pixbuf, ghostscript, ],
],
[
'file-psp',
@@ -259,7 +259,7 @@ common_exes_list = [
[
'file-svg',
[ 'file-svg.c', ],
- [ gtk2, rsvg, ],
+ [ gtk2, gegl, rsvg, ],
],
[
'file-tga',
@@ -284,7 +284,7 @@ common_exes_list = [
[
'file-xpm',
[ 'file-xpm.c', ],
- [ gtk2, gegl, xpm, ],
+ [ gtk2, gegl, libxpm, ],
],
[
'file-xwd',
@@ -456,13 +456,17 @@ common_exes_list = [
[ 'web-browser.c', ],
[ gtk2, gegl, gdk_pixbuf, ],
],
- [
- 'web-page',
- [ 'web-page.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
- ]
]
+if have_webkit
+ common_exes_list += [
+ [
+ 'web-page',
+ [ 'web-page.c', ],
+ [ gtk2, gegl, gdk_pixbuf, webkit, ],
+ ]
+ ]
+endif
foreach exe : common_exes_list
exe_name = exe[0]
exe_sources = exe[1]
@@ -480,7 +484,7 @@ foreach exe : common_exes_list
libgimpui,
libgimpwidgets,
],
- dependencies: exe_deps,
+ dependencies: [ exe_deps, math ],
install: true,
install_dir: join_paths(gimpplugindir, 'plug-ins'),
)
diff --git a/plug-ins/file-ico/meson.build b/plug-ins/file-ico/meson.build
index c9551ad..d02a35d 100644
--- a/plug-ins/file-ico/meson.build
+++ b/plug-ins/file-ico/meson.build
@@ -9,7 +9,7 @@ file_ico = executable('file-ico',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, libpng,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-jpeg/meson.build b/plug-ins/file-jpeg/meson.build
index 5af0696..a8c985d 100644
--- a/plug-ins/file-jpeg/meson.build
+++ b/plug-ins/file-jpeg/meson.build
@@ -8,7 +8,6 @@ file_jpeg = executable('file-jpeg',
'jpeg-save.c',
'jpeg-settings.c',
'jpeg.c',
- 'jpegqual.c',
],
include_directories: [ rootInclude, ],
dependencies: [
diff --git a/plug-ins/file-psd/meson.build b/plug-ins/file-psd/meson.build
index af3fbfa..b962f70 100644
--- a/plug-ins/file-psd/meson.build
+++ b/plug-ins/file-psd/meson.build
@@ -12,7 +12,7 @@ file_psd = executable('file-psd',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl
+ gtk2, gegl, libjpeg, math, zlib,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-raw/meson.build b/plug-ins/file-raw/meson.build
index 2fcff6a..bbcf1e4 100644
--- a/plug-ins/file-raw/meson.build
+++ b/plug-ins/file-raw/meson.build
@@ -1,25 +1,38 @@
# TODO file-raw.rc.o
-file_raw = executable('file-raw',
- [
- 'file-darktable.c',
- 'file-raw-placeholder.c',
- 'file-raw-utils.c',
- 'file-rawtherapee.c',
- ],
- include_directories: [ rootInclude, ],
- dependencies: [
- gtk2, gegl,
- ],
- link_with: [
- libgimp,
- libgimpbase,
- libgimpcolor,
- libgimpconfig,
- libgimpmath,
- libgimpui,
- libgimpwidgets,
+file_raw_exes = [
+ 'file-darktable',
+ 'file-raw-placeholder',
+ 'file-rawtherapee',
+]
+
+foreach file_raw_exename : file_raw_exes
+ file_raw = executable(file_raw_exename,
+ [
+ file_raw_exename +'.c',
+ 'file-raw-utils.c',
+ ],
+ include_directories: [ rootInclude, ],
+ dependencies: [
+ gtk2, gegl,
+ ],
+ link_with: [
+ libgimp,
+ libgimpbase,
+ libgimpcolor,
+ libgimpconfig,
+ libgimpmath,
+ libgimpui,
+ libgimpwidgets,
+ ],
+ install: true,
+ install_dir: join_paths(gimpplugindir, 'plug-ins'),
+ )
+endforeach
+
+install_data([
+ 'file-darktable-export-on-exit.lua',
+ 'file-darktable-get-size.lua',
],
- install: true,
- install_dir: join_paths(gimpplugindir, 'plug-ins'),
+ install_dir: join_paths(prefix, gimpplugindir, 'plug-ins'),
)
diff --git a/plug-ins/file-tiff/meson.build b/plug-ins/file-tiff/meson.build
index cff5fed..d336a1e 100644
--- a/plug-ins/file-tiff/meson.build
+++ b/plug-ins/file-tiff/meson.build
@@ -9,7 +9,7 @@ file_tiff = executable('file-tiff',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, gexiv2, webp,
+ gtk2, gegl, gexiv2, webp, libtiff,
],
link_with: [
libgimp,
diff --git a/plug-ins/flame/meson.build b/plug-ins/flame/meson.build
index ea83978..77dfdf0 100644
--- a/plug-ins/flame/meson.build
+++ b/plug-ins/flame/meson.build
@@ -9,7 +9,7 @@ flame = executable('flame',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/fractal-explorer/meson.build b/plug-ins/fractal-explorer/meson.build
index 4088cb9..fe32116 100644
--- a/plug-ins/fractal-explorer/meson.build
+++ b/plug-ins/fractal-explorer/meson.build
@@ -7,7 +7,7 @@ fractal_explorer = executable('fractal-explorer',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/gfig/meson.build b/plug-ins/gfig/meson.build
index 433ec66..5f77ce4 100644
--- a/plug-ins/gfig/meson.build
+++ b/plug-ins/gfig/meson.build
@@ -23,7 +23,7 @@ gfig = executable('gfig',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/gimpressionist/meson.build b/plug-ins/gimpressionist/meson.build
index 54bd645..d743a2f 100644
--- a/plug-ins/gimpressionist/meson.build
+++ b/plug-ins/gimpressionist/meson.build
@@ -23,7 +23,7 @@ gimpressionist = executable('gimpressionist',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index 0808f04..826b005 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -6,7 +6,7 @@ gradient_flare = executable('gradient-flare',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/ifs-compose/meson.build b/plug-ins/ifs-compose/meson.build
index b512702..6d9c83a 100644
--- a/plug-ins/ifs-compose/meson.build
+++ b/plug-ins/ifs-compose/meson.build
@@ -8,7 +8,7 @@ ifs_compose = executable('if-compose',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/imagemap/images/meson.build b/plug-ins/imagemap/images/meson.build
new file mode 100644
index 0000000..9200f55
--- /dev/null
+++ b/plug-ins/imagemap/images/meson.build
@@ -0,0 +1,30 @@
+stock_images = [
+ 'stock-circle',
+ 'stock-coord',
+ 'stock-dimension',
+ 'stock-java',
+ 'stock-polygon',
+ 'stock-rectangle',
+ 'stock-to-back',
+ 'stock-to-front',
+]
+
+stock_icons_list = []
+foreach image_name : stock_images
+ stock_icons_list += [
+ image_name.underscorify(),
+ join_paths(meson.current_source_dir(), image_name + '.png'),
+ ]
+endforeach
+
+imap_stock_pixbuf_h = custom_target('imap-stock-pixbufs.h',
+ input : [],
+ output: [ 'imap-stock-pixbufs.h' ],
+ command: [
+ 'gdk-pixbuf-csource',
+ '--raw',
+ '--build-list',
+ stock_icons_list,
+ ],
+ capture: true,
+)
diff --git a/plug-ins/imagemap/meson.build b/plug-ins/imagemap/meson.build
index da9293e..2fdb3dd 100644
--- a/plug-ins/imagemap/meson.build
+++ b/plug-ins/imagemap/meson.build
@@ -1,3 +1,4 @@
+subdir('images')
# TODO imagemap.rc.o
imagemap = executable('imagemap',
@@ -65,10 +66,11 @@ imagemap = executable('imagemap',
'imap_string.c',
'imap_table.c',
'imap_taglist.c',
+ imap_stock_pixbuf_h,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/lighting/meson.build b/plug-ins/lighting/meson.build
index 378fb06..bb9a43a 100644
--- a/plug-ins/lighting/meson.build
+++ b/plug-ins/lighting/meson.build
@@ -14,7 +14,7 @@ lighting = executable('lighting',
],
include_directories: [ rootInclude, include_directories('.'), ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/map-object/meson.build b/plug-ins/map-object/meson.build
index 1264798..9ac9c46 100644
--- a/plug-ins/map-object/meson.build
+++ b/plug-ins/map-object/meson.build
@@ -13,7 +13,7 @@ map_object = executable('map-object',
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/pagecurl/meson.build b/plug-ins/pagecurl/meson.build
index 8d3a474..261235f 100644
--- a/plug-ins/pagecurl/meson.build
+++ b/plug-ins/pagecurl/meson.build
@@ -39,7 +39,7 @@ pagecurl = executable('pagecurl',
plugin_pagecurl_sources,
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk2, gegl, math,
],
link_with: [
libgimp,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]