GNOME.org
 

[gimp/meson: 290/291] Backport master modifications to meson

commit 507cada6b73f304d86409ff22e796a7d6aad8a76
Author: Salamandar <felix piedallu me>
Date:   Thu Mar 29 12:13:20 2018 +0200

    Backport master modifications to meson

 app-tools/meson.build                    |   14 ++++++++++++++
 app/core/meson.build                     |    2 ++
 app/operations/meson.build               |    1 -
 app/propgui/meson.build                  |    1 +
 app/widgets/meson.build                  |    1 +
 build/windows/installer/lang/meson.build |    1 +
 icons/meson.build                        |    6 ++++++
 libgimp/meson.build                      |    1 +
 meson.build                              |   23 +++++++++++++++--------
 meson_options.txt                        |    2 +-
 plug-ins/common/meson.build              |    2 +-
 11 files changed, 43 insertions(+), 11 deletions(-)
---
diff --git a/app-tools/meson.build b/app-tools/meson.build
new file mode 100644
index 0000000..6175b05
--- /dev/null
+++ b/app-tools/meson.build
@@ -0,0 +1,14 @@
+
+gimp_debug_tool = executable('gimp-debug-tool',
+  'gimp-debug-tool.c',
+  include_directories: rootInclude,
+  dependencies: [
+    gio,
+    gegl,
+    gtk2,
+  ],
+  link_with: [
+    libapp,
+    libappwidgets,
+  ],
+)
diff --git a/app/core/meson.build b/app/core/meson.build
index 0bca8db..f02fbf6 100644
--- a/app/core/meson.build
+++ b/app/core/meson.build
@@ -28,6 +28,7 @@ libappcore_sources = [
   'gimp-modules.c',
   'gimp-palettes.c',
   'gimp-parasites.c',
+  'gimp-spawn.c',
   'gimp-tags.c',
   'gimp-templates.c',
   'gimp-transform-resize.c',
@@ -161,6 +162,7 @@ libappcore_sources = [
   'gimpmybrush-load.c',
   'gimpmybrush.c',
   'gimpobject.c',
+  'gimpobjectqueue.c',
   'gimppaintinfo.c',
   'gimppalette-import.c',
   'gimppalette-load.c',
diff --git a/app/operations/meson.build b/app/operations/meson.build
index cf381de..5abcc09 100644
--- a/app/operations/meson.build
+++ b/app/operations/meson.build
@@ -40,7 +40,6 @@ libappoperations_sources = [
   'gimpoperationscalarmultiply.c',
   'gimpoperationsemiflatten.c',
   'gimpoperationsetalpha.c',
-  'gimpoperationshapeburst.c',
   'gimpoperationshrink.c',
   'gimpoperationthreshold.c',
   'gimpoperationthresholdalpha.c',
diff --git a/app/propgui/meson.build b/app/propgui/meson.build
index 1c64c73..035780e 100644
--- a/app/propgui/meson.build
+++ b/app/propgui/meson.build
@@ -8,6 +8,7 @@ libapppropgui_sources = [
   'gimppropgui-eval.c',
   'gimppropgui-generic.c',
   'gimppropgui-hue-saturation.c',
+  'gimppropgui-recursive-transform.c',
   'gimppropgui-shadows-highlights.c',
   'gimppropgui-spiral.c',
   'gimppropgui-supernova.c',
diff --git a/app/widgets/meson.build b/app/widgets/meson.build
index 1a910d6..b9e2276 100644
--- a/app/widgets/meson.build
+++ b/app/widgets/meson.build
@@ -104,6 +104,7 @@ libappwidgets_sources = [
   'gimpgrideditor.c',
   'gimphandlebar.c',
   'gimphelp.c',
+  'gimphighlightablebutton.c',
   'gimphistogrambox.c',
   'gimphistogrameditor.c',
   'gimphistogramview.c',
diff --git a/build/windows/installer/lang/meson.build b/build/windows/installer/lang/meson.build
index 6a42a06..0b48c83 100644
--- a/build/windows/installer/lang/meson.build
+++ b/build/windows/installer/lang/meson.build
@@ -27,6 +27,7 @@ languages = [
   [ 'id',   '[id]',     'ISO-8859-1',   ],
   [ 'is',   '[is]',     'WINDOWS-1252', ],
   [ 'it',   '[it]',     'WINDOWS-1252', ],
+  [ 'lv',   '[lv]',     'ISO-8859-13',  ],
   [ 'nl',   '[nl]',     'WINDOWS-1252', ],
   [ 'pl',   '[pl]',     'WINDOWS-1250', ],
   [ 'pt_BR','[pt_BR]',  'WINDOWS-1252', ],
diff --git a/icons/meson.build b/icons/meson.build
index ec93c7d..49208d6 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -23,6 +23,7 @@ vector_scalable = [
   'scalable/format-justify-left.svg',
   'scalable/format-justify-right.svg',
   'scalable/gimp-anchor.svg',
+  'scalable/gimp-attach.svg',
   'scalable/gimp-business-card.svg',
   'scalable/gimp-cap-butt.svg',
   'scalable/gimp-cap-round.svg',
@@ -63,6 +64,7 @@ vector_scalable = [
   'scalable/gimp-curve-smooth.svg',
   'scalable/gimp-dashboard.svg',
   'scalable/gimp-default-colors.svg',
+  'scalable/gimp-detach.svg',
   'scalable/gimp-device-status.svg',
   'scalable/gimp-display-filter-clip-warning.svg',
   'scalable/gimp-display-filter-colorblind.svg',
@@ -490,8 +492,10 @@ vector_24 = [
   '24/media-optical.svg',
 ]
 bitmap_12 = [
+  '12/gimp-attach.png',
   '12/gimp-close.png',
   '12/gimp-default-colors.png',
+  '12/gimp-detach.png',
   '12/gimp-linked.png',
   '12/gimp-menu-left.png',
   '12/gimp-menu-right.png',
@@ -841,6 +845,7 @@ bitmap_22 = [
 bitmap_24 = [
   '24/dialog-information.png',
   '24/document-print.png',
+  '24/gimp-attach.png',
   '24/gimp-business-card.png',
   '24/gimp-center.png',
   '24/gimp-channel-alpha.png',
@@ -858,6 +863,7 @@ bitmap_24 = [
   '24/gimp-controller-wheel.png',
   '24/gimp-controller.png',
   '24/gimp-cursor.png',
+  '24/gimp-detach.png',
   '24/gimp-device-status.png',
   '24/gimp-display-filter-colorblind.png',
   '24/gimp-display-filter-contrast.png',
diff --git a/libgimp/meson.build b/libgimp/meson.build
index a306f6f..5c5588d 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -6,6 +6,7 @@ gimpenums_notail = custom_target('gimpenums.c.notail',
     gimp_mkenums,
     '--fhead','#include "config.h"\n'
             + '#include <gio/gio.h>\n'
+            + '#include <gegl.h>\n'
             + '#undef GIMP_DISABLE_DEPRECATED\n'
             + '#include "libgimpbase/gimpbase.h"\n'
             + '#include "libgimpbase/gimpbase-private.h"\n'
diff --git a/meson.build b/meson.build
index 8cf7596..535b32b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # Meson build file
 
 # http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP
-project('gimp', ['c', 'cpp'], version: '2.9.9',
+project('gimp', ['c', 'cpp'], version: '2.10.0',
   meson_version: '>=0.44.0',
   default_options: [
     'sysconfdir=/etc',
@@ -41,6 +41,9 @@ app_version   = '@0@.@1@'.format(major_version, minor_version)
 user_version  = '@0@.@1@'.format(major_version, minor_version)
 gimp_version  = '@0@.@1@.@2@'.format(major_version, minor_version, micro_version)
 
+# Override for Release-candidates
+gimp_version  = gimp_version + '-RC1'
+
 gimp_command  = 'gimp-' + app_version
 gimp_api_name = 'gimp-' + api_version
 package_string  = prettyname + ' ' + gimp_version
@@ -234,7 +237,7 @@ math              = cc.find_library('m')
 
 atk               = dependency('atk',                version: '>=2.2.0')
 
-babl_minver       = '>=0.1.42'
+babl_minver       = '>=0.1.44'
 babl              = dependency('babl',               version: babl_minver)
 
 cairo_minver      = '>=1.12.2'
@@ -242,7 +245,7 @@ cairo             = dependency('cairo',              version: cairo_minver)
 
 dbus_glib         = dependency('dbus-glib-1')
 
-fontconfig_minver = platform_win32 ? '>=2.11.1'         : '>=2.2.0'
+fontconfig_minver = '>=2.12.4'
 # fontconfig_name   = platform_win32 ? 'fontconfig_win32' : 'fontconfig'
 fontconfig_name   = 'fontconfig'
 fontconfig        = dependency(fontconfig_name,      version: fontconfig_minver)
@@ -252,7 +255,7 @@ freetype2         = dependency('freetype2',          version: '>=2.1.7')
 gdk_pixbuf_minver = '>=2.30.8'
 gdk_pixbuf        = dependency('gdk-pixbuf-2.0',     version: gdk_pixbuf_minver)
 
-gegl_minver       = '>=0.3.29'
+gegl_minver       = '>=0.3.30'
 gegl              = dependency('gegl-0.3',           version: gegl_minver)
 
 gexiv2            = dependency('gexiv2',             version: '>=0.10.6')
@@ -560,11 +563,11 @@ else
 endif
 
 
-if get_option('with-jasper')
-  jasper = cc.find_library('jasper')
+if get_option('with-jpeg2000')
+  openjpeg = dependency('libopenjp2', version: '>=2.1.0')
   MIMEtypes += [ 'image/jp2', 'image/jpeg2000', 'image/jpx', ]
 else
-  jasper =
+  openjpeg = dependency('', required: false)
 endif
 
 
@@ -989,6 +992,7 @@ foreach fn : [
     'isfinite',
     'mmap',
     'rint',
+    'vfork',
     'vprintf',
   ]
   macro_name = 'HAVE_' + fn.to_upper().underscorify()
@@ -1001,6 +1005,7 @@ foreach header : [
     'alloca.h',
     'dlfcn.h',
     'execinfo.h',
+    'fcntl.h',
     'ieeefp.h',
     'inttypes.h',
     'locale.h',
@@ -1014,6 +1019,7 @@ foreach header : [
     'string.h',
     'strings.h',
     'sys/param.h',
+    # 'sys/prctl.h',
     'sys/select.h',
     'sys/stat.h',
     'sys/time.h',
@@ -1452,6 +1458,7 @@ subdir('modules')
 subdir('plug-ins')
 subdir('app')
 subdir('pdb')
+subdir('app-tools')
 
 # Docs
 subdir('devel-docs')
@@ -1473,7 +1480,7 @@ Optional Plug-Ins:
   Ascii Art:           @0@'''.format(libaa.found()) +'''
   Ghostscript:         @0@'''.format(ghostscript.found()) +'''
   Help Browser:        @0@'''.format(webkit.found()) +'''
-  JPEG 2000:           @0@'''.format(jasper.found()) +'''
+  JPEG 2000:           @0@'''.format(openjpeg.found()) +'''
   MNG:                 @0@'''.format(libmng.found()) +'''
   OpenEXR:             @0@'''.format(openexr.found()) +'''
   WebP:                @0@'''.format(webp.found()) +'''
diff --git a/meson_options.txt b/meson_options.txt
index 4b9ec84..b595c87 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,7 +13,7 @@ option('with-directx-sdk',  type: 'string',  value: '',   description: 'Prefix w
 option('with-ghostscript',  type: 'boolean', value: true, description: 'Ghostscript support')
 option('with-gtk-doc',      type: 'boolean', value: true, description: 'Build developer documentation for 
app')
 option('with-gudev',        type: 'boolean', value: true, description: 'Gudev support')
-option('with-jasper',       type: 'boolean', value: true, description: 'Jpeg-2000 support')
+option('with-jpeg2000',     type: 'boolean', value: true, description: 'Jpeg-2000 support')
 option('with-linux-input',  type: 'boolean', value: true, description: 'Linux input event controller module')
 option('with-mng',          type: 'boolean', value: true, description: 'Mng support')
 option('with-openexr',      type: 'boolean', value: true, description: 'Openexr support')
diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
index cacfc21..a33238c 100644
--- a/plug-ins/common/meson.build
+++ b/plug-ins/common/meson.build
@@ -193,7 +193,7 @@ common_exes_list = [
   [
     'file-jp2-load',
     [ 'file-jp2-load.c', ],
-    [ gtk2, gegl, gdk_pixbuf, jasper, ],
+    [ gtk2, gegl, gdk_pixbuf, openjpeg, ],
   ],
   [
     'file-mng',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]