diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2018-12-17 12:25:07 +0100 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2018-12-17 13:15:43 +0100 |
commit | 2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7 (patch) | |
tree | f49da330babb9622540cf613f8949436b29e272d /media-gfx/simple-scan/files | |
parent | media-gfx/gnome-screenshot: 3.22.0 → 3.30.0 (diff) | |
download | gentoo-2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7.tar.gz gentoo-2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7.tar.bz2 gentoo-2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7.zip |
media-gfx/simple-scan: 3.24.1 → 3.30.2
Switch to meson build system.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
Diffstat (limited to 'media-gfx/simple-scan/files')
-rw-r--r-- | media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch b/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch new file mode 100644 index 000000000000..868ef9a76a1a --- /dev/null +++ b/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch @@ -0,0 +1,83 @@ +From 02845c57b2bf1b6170efb57c59db5ea0a2b60091 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Wed, 30 May 2018 08:44:18 +0200 +Subject: [PATCH] Add control for optional dependencies + +--- + meson.build | 18 ++++++++++++++---- + meson_options.txt | 3 +++ + src/meson.build | 12 ++++++++---- + 3 files changed, 25 insertions(+), 8 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index cd2e452..f39ca51 100644 +--- a/meson.build ++++ b/meson.build +@@ -25,10 +25,20 @@ zlib_dep = dependency ('zlib') + cairo_dep = dependency ('cairo') + gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0') + gusb_dep = dependency ('gusb', version: '>= 0.2.7') +-colord_dep = dependency ('colord', required: false) +-packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false) +-webp_dep = dependency ('libwebp', required: false) +-webpmux_dep = dependency ('libwebpmux', required: false) ++ ++if get_option('colord') ++ colord_dep = dependency ('colord') ++endif ++ ++if get_option('packagekit') ++ packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5') ++endif ++ ++if get_option('webp') ++ webp_dep = dependency ('libwebp') ++ webpmux_dep = dependency ('libwebpmux') ++endif ++ + sane_dep = dependency ('sane-backends') + msgfmt = find_program ('msgfmt') + itstool = find_program ('itstool') +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..570ecdd +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,3 @@ ++option('colord', type: 'boolean', value: false) ++option('packagekit', type: 'boolean', value: false) ++option('webp', type: 'boolean', value: false) +diff --git a/src/meson.build b/src/meson.build +index 9e40e42..83ca3a9 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -4,17 +4,21 @@ resources = gnome.compile_resources ('resources', 'simple-scan.gresource.xml', + + vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ] + dependencies = [ glib_dep, gtk_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ] +-if colord_dep.found () ++if get_option('colord') + vala_args += [ '-D', 'HAVE_COLORD' ] + dependencies += colord_dep + endif +-if packagekit_dep.found () ++if get_option('packagekit') + vala_args += [ '-D', 'HAVE_PACKAGEKIT' ] + dependencies += packagekit_dep + endif +-if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord ++if get_option('webp') + vala_args += [ '-D', 'HAVE_WEBP' ] +- dependencies += [ webp_dep, webpmux_dep ] ++ dependencies += [ webp_dep ] ++ # Webpmux only required if colord ++ if get_option('colord') ++ dependencies += [ webpmux_dep ] ++ endif + endif + + simple_scan = executable ('simple-scan', +-- +2.17.0 + |