GNOME.org
 

[gimp/meson: 576/805] Backport autotools changes to meson.

commit 33834ac919d79c2d4e56b09dcd89b800a023c0ab
Author: Félix Piédallu <felix piedallu me>
Date:   Tue Jan 9 14:54:44 2018 +0100

    Backport autotools changes to meson.

 app/actions/meson.build           |    2 ++
 app/config/meson.build            |    2 +-
 app/display/meson.build           |    1 +
 app/operations/meson.build        |    1 +
 app/propgui/meson.build           |    1 +
 app/widgets/meson.build           |    2 ++
 icons/meson.build                 |   27 +++++++++++++++++++++++++++
 libgimpwidgets/meson.build        |   19 +++++++++++--------
 menus/meson.build                 |    1 +
 meson.build                       |   28 ++++++++++++++++------------
 {tools/pdbgen => pdb}/meson.build |    0
 plug-ins/screenshot/meson.build   |    8 +++++---
 12 files changed, 68 insertions(+), 24 deletions(-)
---
diff --git a/app/actions/meson.build b/app/actions/meson.build
index d9322fe..0f81ce1 100644
--- a/app/actions/meson.build
+++ b/app/actions/meson.build
@@ -12,6 +12,8 @@ libappactions_sources = [
   'context-commands.c',
   'cursor-info-actions.c',
   'cursor-info-commands.c',
+  'dashboard-actions.c',
+  'dashboard-commands.c',
   'data-commands.c',
   'data-editor-commands.c',
   'debug-actions.c',
diff --git a/app/config/meson.build b/app/config/meson.build
index 4e01afa..d80321b 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -35,7 +35,7 @@ libappconfig = static_library('appconfig',
     '-DDATADIR="'+ join_paths(prefix, gimpdatadir) +'"',
   ],
   dependencies: [
-    cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2,
+    cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2, libmypaint
   ],
 )
 
diff --git a/app/display/meson.build b/app/display/meson.build
index 61a5f68..bc8f763 100644
--- a/app/display/meson.build
+++ b/app/display/meson.build
@@ -68,6 +68,7 @@ libappdisplay_sources = [
   'gimpdisplayshell-title.c',
   'gimpdisplayshell-tool-events.c',
   'gimpdisplayshell-transform.c',
+  'gimpdisplayshell-utils.c',
   'gimpdisplayshell.c',
   'gimpdisplayxfer.c',
   'gimpimagewindow.c',
diff --git a/app/operations/meson.build b/app/operations/meson.build
index ed6869d..cf381de 100644
--- a/app/operations/meson.build
+++ b/app/operations/meson.build
@@ -19,6 +19,7 @@ libappoperations_sources = [
   'gimpoperationblend.c',
   'gimpoperationborder.c',
   'gimpoperationbrightnesscontrast.c',
+  'gimpoperationbuffersourcevalidate.c',
   'gimpoperationcagecoefcalc.c',
   'gimpoperationcagetransform.c',
   'gimpoperationcolorbalance.c',
diff --git a/app/propgui/meson.build b/app/propgui/meson.build
index 6244f99..c38490f 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-shadows-highlights.c',
   'gimppropgui-spiral.c',
   'gimppropgui-supernova.c',
   'gimppropgui-utils.c',
diff --git a/app/widgets/meson.build b/app/widgets/meson.build
index 0bafba1..1bdd120 100644
--- a/app/widgets/meson.build
+++ b/app/widgets/meson.build
@@ -59,6 +59,7 @@ libappwidgets_sources = [
   'gimpcontrollerwheel.c',
   'gimpcursor.c',
   'gimpcurveview.c',
+  'gimpdashboard.c',
   'gimpdasheditor.c',
   'gimpdataeditor.c',
   'gimpdatafactoryview.c',
@@ -125,6 +126,7 @@ libappwidgets_sources = [
   'gimpmenufactory.c',
   'gimpmessagebox.c',
   'gimpmessagedialog.c',
+  'gimpmeter.c',
   'gimpnavigationview.c',
   'gimpopendialog.c',
   'gimpoverlaybox.c',
diff --git a/icons/meson.build b/icons/meson.build
index c83bf11..3449997 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -84,6 +84,8 @@ icons_scalable = [
   'scalable/gimp-color-picker-black.svg',
   'scalable/gimp-color-picker-gray.svg',
   'scalable/gimp-color-picker-white.svg',
+  'scalable/gimp-color-space-linear.svg',
+  'scalable/gimp-color-space-perceptual.svg',
   'scalable/gimp-color-triangle.svg',
   'scalable/gimp-color-water.svg',
   'scalable/gimp-colormap.svg',
@@ -98,12 +100,14 @@ icons_scalable = [
   'scalable/gimp-cursor.svg',
   'scalable/gimp-curve-free.svg',
   'scalable/gimp-curve-smooth.svg',
+  'scalable/gimp-dashboard.svg',
   'scalable/gimp-default-colors.svg',
   'scalable/gimp-device-status.svg',
   'scalable/gimp-display-filter-colorblind.svg',
   'scalable/gimp-display-filter-contrast.svg',
   'scalable/gimp-display-filter-gamma.svg',
   'scalable/gimp-display-filter-lcms.svg',
+  'scalable/gimp-display-filter-clip-warning.svg',
   'scalable/gimp-display-filter-proof.svg',
   'scalable/gimp-display-filter.svg',
   'scalable/gimp-display.svg',
@@ -205,6 +209,9 @@ icons_scalable = [
   'scalable/gimp-prefs-image-windows-snapping.svg',
   'scalable/gimp-prefs-image-windows.svg',
   'scalable/gimp-prefs-import-export.svg',
+  'scalable/gimp-tool-color-temperature.svg',
+  'scalable/gimp-tool-exposure.svg',
+  'scalable/gimp-tool-shadows-highlights.svg',
   'scalable/gimp-prefs-input-devices.svg',
   'scalable/gimp-prefs-interface.svg',
   'scalable/gimp-prefs-new-image.svg',
@@ -338,6 +345,10 @@ icons_24vector = [
   '24/gimp-channel.svg',
   '24/gimp-channels.svg',
   '24/gimp-char-picker.svg',
+  '24/gimp-color-space-linear.png',
+  '24/gimp-color-space-linear.svg',
+  '24/gimp-color-space-perceptual.png',
+  '24/gimp-color-space-perceptual.svg',
   '24/gimp-colormap.svg',
   '24/gimp-controller-keyboard.svg',
   '24/gimp-controller-linux-input.svg',
@@ -345,7 +356,10 @@ icons_24vector = [
   '24/gimp-controller-wheel.svg',
   '24/gimp-controller.svg',
   '24/gimp-cursor.svg',
+  '24/gimp-dashboard.png',
   '24/gimp-device-status.svg',
+  '24/gimp-display-filter-clip-warning.png',
+  '24/gimp-display-filter-clip-warning.svg',
   '24/gimp-display-filter-colorblind.svg',
   '24/gimp-display-filter-contrast.svg',
   '24/gimp-display-filter-gamma.svg',
@@ -433,6 +447,7 @@ icons_24vector = [
   '24/gimp-tool-clone.svg',
   '24/gimp-tool-color-balance.svg',
   '24/gimp-tool-color-picker.svg',
+  '24/gimp-tool-color-temperature.png',
   '24/gimp-tool-colorize.svg',
   '24/gimp-tool-crop.svg',
   '24/gimp-tool-curves.svg',
@@ -440,6 +455,8 @@ icons_24vector = [
   '24/gimp-tool-dodge.svg',
   '24/gimp-tool-ellipse-select.svg',
   '24/gimp-tool-eraser.svg',
+  '24/gimp-tool-exposure.png',
+  '24/gimp-tool-exposure.svg',
   '24/gimp-tool-flip.svg',
   '24/gimp-tool-foreground-select.svg',
   '24/gimp-tool-free-select.svg',
@@ -465,6 +482,8 @@ icons_24vector = [
   '24/gimp-tool-rotate.svg',
   '24/gimp-tool-scale.svg',
   '24/gimp-tool-seamless-clone.svg',
+  '24/gimp-tool-shadows-highlights.png',
+  '24/gimp-tool-shadows-highlights.svg',
   '24/gimp-tool-shear.svg',
   '24/gimp-tool-smudge.svg',
   '24/gimp-tool-text.svg',
@@ -550,6 +569,7 @@ icons_16 = [
   '16/gtk-select-font.png',
   '16/gtk-yes.png',
 
+
   '16/gimp-anchor.png',
   '16/gimp-business-card.png',
   '16/gimp-cap-butt.png',
@@ -569,6 +589,8 @@ icons_16 = [
   '16/gimp-close-all.png',
   '16/gimp-color-cmyk.png',
   '16/gimp-color-pick-from-screen.png',
+  '16/gimp-color-space-linear.png',
+  '16/gimp-color-space-perceptual.png',
   '16/gimp-color-triangle.png',
   '16/gimp-color-water.png',
   '16/gimp-colormap.png',
@@ -583,7 +605,9 @@ icons_16 = [
   '16/gimp-cursor.png',
   '16/gimp-curve-free.png',
   '16/gimp-curve-smooth.png',
+  '16/gimp-dashboard.png',
   '16/gimp-device-status.png',
+  '16/gimp-display-filter-clip-warning.png',
   '16/gimp-display-filter-colorblind.png',
   '16/gimp-display-filter-contrast.png',
   '16/gimp-display-filter-gamma.png',
@@ -708,6 +732,7 @@ icons_16 = [
   '16/gimp-tool-clone.png',
   '16/gimp-tool-color-balance.png',
   '16/gimp-tool-color-picker.png',
+  '16/gimp-tool-color-temperature.png',
   '16/gimp-tool-colorize.png',
   '16/gimp-tool-crop.png',
   '16/gimp-tool-curves.png',
@@ -715,6 +740,7 @@ icons_16 = [
   '16/gimp-tool-dodge.png',
   '16/gimp-tool-ellipse-select.png',
   '16/gimp-tool-eraser.png',
+  '16/gimp-tool-exposure.png',
   '16/gimp-tool-flip.png',
   '16/gimp-tool-foreground-select.png',
   '16/gimp-tool-free-select.png',
@@ -741,6 +767,7 @@ icons_16 = [
   '16/gimp-tool-rotate.png',
   '16/gimp-tool-scale.png',
   '16/gimp-tool-seamless-clone.png',
+  '16/gimp-tool-shadows-highlights.png',
   '16/gimp-tool-shear.png',
   '16/gimp-tool-smudge.png',
   '16/gimp-tool-text.png',
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index 1ee1d2f..4b17e91 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -20,13 +20,6 @@ gimpwidgetsmarshal = gnome.genmarshal('gimpwidgetsmarshal',
   install_header: false,
 )
 
-if gtk_mac_integration_ok
-  gimppickbutton = 'gimppickbutton-quartz.c'
-else
-  gimppickbutton = 'gimppickbutton-default.c'
-endif
-
-
 libgimpwidgets_sources = [
   'gimp3migration.c',
   'gimpbrowser.c',
@@ -91,7 +84,6 @@ libgimpwidgets_sources = [
   'gimpzoommodel.c',
   gimpwidgetsenums,
   gimpwidgetsmarshal,
-  gimppickbutton,
   icons_imgs_sources,
 ]
 
@@ -177,6 +169,17 @@ if os_win32
   libgimpwidgets_lflags += '-lgdi32'
 endif
 
+if gtk_mac_integration_ok
+  libgimpwidgets_sources += [
+    'gimppickbutton-quartz.c',
+  ]
+else
+  libgimpwidgets_sources += [
+    'gimppickbutton-default.c',
+    'gimppickbutton-kwin.c',
+  ]
+endif
+
 
 libgimpwidgets = library('gimpwidgets-'+ api_version,
   libgimpwidgets_sources,
diff --git a/menus/meson.build b/menus/meson.build
index b7e147f..ef26223 100644
--- a/menus/meson.build
+++ b/menus/meson.build
@@ -7,6 +7,7 @@ menus_files = [
   'channels-menu.xml',
   'colormap-menu.xml',
   'cursor-info-menu.xml',
+  'dashboard-menu.xml',
   'documents-menu.xml',
   'dynamics-editor-menu.xml',
   'dynamics-menu.xml',
diff --git a/meson.build b/meson.build
index 8f43015..83f4322 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.7',
+project('gimp', ['c', 'cpp'], version : '2.9.9',
   meson_version : '>=0.40.0',
   default_options : [
     'sysconfdir=/etc',
@@ -126,7 +126,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.22'
+# gegl_minver       = '>=0.3.27'
 gegl_minver       = '>=0.3.20'
 gegl              = dependency('gegl-0.3',           version: gegl_minver)
 
@@ -136,8 +136,8 @@ gio               = dependency('gio-2.0')
 gio_specific_name = 'gio-' + (os_win32 ? 'windows-2.0' : 'unix-2.0')
 gio_specific      = dependency(gio_specific_name)
 
-glib              = dependency('glib-2.0',           version: '>=2.43.0')
-gobject           = dependency('gobject-2.0',        version: '>=2.43.0')
+glib              = dependency('glib-2.0',           version: '>=2.54.2')
+gobject           = dependency('gobject-2.0',        version: '>=2.54.2')
 gmodule           = dependency('gmodule-no-export-2.0')
 
 gtk2_minver       = '>=2.24.10'
@@ -146,6 +146,7 @@ gtk2              = dependency('gtk+-2.0',           version: gtk2_minver)
 harfbuzz          = dependency('harfbuzz',           version: '>=0.9.19')
 lcms              = dependency('lcms2',              version: '>=2.8')
 libmypaint        = dependency('libmypaint-1.3',     version: '>=1.3.0')
+libmypaint_brushes= dependency('mypaint-brushes-1.0')
 pangocairo        = dependency('pangocairo',         version: '>=1.29.4')
 rsvg              = dependency('librsvg-2.0',        version: '>=2.40.6')
 
@@ -447,10 +448,8 @@ if get_option('with-cairo-pdf')
   cairopdf = dependency('cairo-pdf', version: '>=1.12.2')
 endif
 
-# If both poppler and cairo-pdf are enabled then we have complete PDF support
-if have_poppler and have_cairopdf
-  MIMEtypes += 'application/pdf'
-endif
+# PDF import support is a granted feature.
+MIMEtypes += 'application/pdf'
 
 
 # libwmf2
@@ -700,7 +699,10 @@ gimp_mkenums_custom_target_commonargs = [
             '  };\n',
   '--dhead','  static const Gimp@Type@Desc descs[] =\n'+
             '  {',
-  '--dprod','    { @VALUENAME@, @valuedesc@, @valuehelp@ },',
+  '--dprod','    { @VALUENAME@, @valuedesc@, @valuehelp@ },@if (\'@valueabbrev@\' ne \'NULL\')@\n'+
+            '    /* Translators: this is an abbreviated version of @valueudesc@.\n'+
+            '       Keep it short. */\n'+
+            '    { @VALUENAME@, @valueabbrev@, NULL },@endif@',
   '--dtail','    { 0, NULL, NULL }\n'+
             '  };\n'+
             '\n'+
@@ -825,6 +827,7 @@ rootInclude = include_directories('.')
 # Tools (need libgimpbase now)
 subdir('libgimpbase')
 subdir('tools')
+subdir('pdb')
 
 # Translations
 subdir('po')
@@ -834,6 +837,7 @@ subdir('po-python')
 subdir('po-script-fu')
 subdir('po-tags')
 subdir('po-tips')
+subdir('po-windows-installer')
 
 # Data / Desktop / xml files
 subdir('cursors')
@@ -859,8 +863,9 @@ subdir('modules')
 subdir('plug-ins')
 subdir('app')
 
-subdir('tools/pdbgen')
-
+# subdir('build/windows/installer')
+# subdir('build/windows/installer/lang')
+# subdir('po-windows-installer')
 # subdir('build')
 # build/windows/gimp-plug-ins.rc
 # build/windows/gimp.rc
@@ -964,7 +969,6 @@ Optional Plug-Ins:
   MNG:                 @0@'''.format(have_libmng) +'''
   OpenEXR:             @0@'''.format(have_openexr) +'''
   WebP:                @0@'''.format(have_webp) +'''
-  PDF (import):        @0@'''.format(have_poppler) +'''
   PDF (export):        @0@'''.format(have_cairopdf) +'''
   Print:               @0@'''.format(have_print) +'''
   Python 2:            @0@'''.format(have_python) +'''
diff --git a/tools/pdbgen/meson.build b/pdb/meson.build
similarity index 100%
rename from tools/pdbgen/meson.build
rename to pdb/meson.build
diff --git a/plug-ins/screenshot/meson.build b/plug-ins/screenshot/meson.build
index 39a50eb..2d510ce 100644
--- a/plug-ins/screenshot/meson.build
+++ b/plug-ins/screenshot/meson.build
@@ -1,10 +1,12 @@
 plugin_screenshot_sources = [
-  'screenshot.c',
+  'screenshot-freedesktop.c',
   'screenshot-gnome-shell.c',
+  'screenshot-kwin.c',
   'screenshot-osx.c',
-  'screenshot-x11.c',
-  # 'screenshot-win32.rc',
   'screenshot-win32.c',
+  # 'screenshot-win32.rc',
+  'screenshot-x11.c',
+  'screenshot.c',
 ]
 
 screenshot = executable('screenshot',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]