[gimp] plug-ins: enable screenshot for non x11 targets in meson build.



commit 248d2e95b8e1c70fdb6d3b4bd133b7f3066ba280
Author: Jacob Boerema <jgboerema gmail com>
Date:   Fri Jul 31 09:46:17 2020 -0400

    plug-ins: enable screenshot for non x11 targets in meson build.
    
    This also removes screenshot as an option for the meson build
    since the autotools build doesn't have that option either.

 meson.build                     | 8 --------
 meson_options.txt               | 1 -
 plug-ins/screenshot/meson.build | 4 +---
 3 files changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5b2b9447df..0a4c26963b 100644
--- a/meson.build
+++ b/meson.build
@@ -619,14 +619,6 @@ have_print = get_option('print')
 
 have_doc_shooter= x11_target
 
-if get_option('screenshot').disabled()
-  have_screenshot = false
-elif get_option('screenshot').enabled() and not x11_target
-  error('Printing requires x libs')
-else
-  have_screenshot = x11_target
-endif
-
 ################################################################################
 # Plugins (optional dependencies)
 
diff --git a/meson_options.txt b/meson_options.txt
index 8b50e9ffc8..6c648e804b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -43,7 +43,6 @@ option('mng',               type: 'feature', value: 'auto', description: 'Mng su
 option('openexr',           type: 'feature', value: 'auto', description: 'Openexr support')
 option('png',               type: 'feature', value: 'auto', description: 'PNG support')
 option('print',             type: 'boolean', value: true,   description: 'Print support')
-option('screenshot',        type: 'feature', value: 'auto', description: 'Screensh')
 option('tiff',              type: 'feature', value: 'auto', description: 'TIFF support')
 option('vala-plugins',      type: 'feature', value: 'auto', description: 'Build VAPI and Vala plugins')
 option('webkit',            type: 'feature', value: 'auto', description: 'Help browser and webpage plugins')
diff --git a/plug-ins/screenshot/meson.build b/plug-ins/screenshot/meson.build
index 9909787025..b4c0e4eb63 100644
--- a/plug-ins/screenshot/meson.build
+++ b/plug-ins/screenshot/meson.build
@@ -1,4 +1,4 @@
-if have_screenshot
+plugin_name = 'screenshot'
 
 plugin_sources = [
   'screenshot-freedesktop.c',
@@ -24,5 +24,3 @@ screenshot = executable('screenshot',
   install: true,
   install_dir: gimpplugindir / 'plug-ins' / plugin_name,
 )
-
-endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]