[gimp] plug-ins: link file-compressor against GIO
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: link file-compressor against GIO
- Date: Sun, 5 Jun 2016 20:11:59 +0000 (UTC)
commit 372a985d2b1813dfbd1ecaa4547f34109c859c8e
Author: Michael Natterer <mitch gimp org>
Date: Sun Jun 5 22:08:49 2016 +0200
plug-ins: link file-compressor against GIO
mkgen.pl: add support for "gio => 1" in plug-in-desf.pl,
Regenerate Makefile.am
plug-ins/common/Makefile.am | 1 +
plug-ins/common/mkgen.pl | 9 +++++++--
plug-ins/common/plugin-defs.pl | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index 4316218..5bed4ba 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -637,6 +637,7 @@ file_compressor_LDADD = \
$(libgimpbase) \
$(CAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \
+ $(GIO_LIBS) \
$(LZMA_LIBS) \
$(BZIP2_LIBS) \
$(Z_LIBS) \
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index 9f3989a..baff1e7 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -141,9 +141,14 @@ foreach (sort keys %plugins) {
my $glib;
if (exists $plugins{$_}->{ui}) {
- $glib = "\$(GTK_LIBS)\t\t\\"
+ $glib = "\$(GTK_LIBS)\t\t\\";
} else {
- $glib = "\$(CAIRO_LIBS)\t\t\\\n\t\$(GDK_PIXBUF_LIBS)\t\\"
+ $glib = "\$(CAIRO_LIBS)\t\t\\\n\t\$(GDK_PIXBUF_LIBS)\t\\";
+
+ if (exists $plugins{$_}->{gio} &&
+ ! exists $plugins{$_}->{gegl}) {
+ $glib .= "\n\t\$(GIO_LIBS)\t\t\\";
+ }
}
if (exists $plugins{$_}->{gegl}) {
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 568c5fe..5346f87 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -27,7 +27,7 @@
'file-aa' => { ui => 1, gegl => 1, optional => 1, libs => 'AA_LIBS' },
'file-cel' => { ui => 1, gegl => 1 },
'file-csource' => { ui => 1, gegl => 1 },
- 'file-compressor' => { libdep => 'Z:BZIP2:LZMA', cflags => 'LZMA_CFLAGS' },
+ 'file-compressor' => { gio => 1, libdep => 'Z:BZIP2:LZMA', cflags => 'LZMA_CFLAGS' },
'file-desktop-link' => {},
'file-dicom' => { ui => 1, gegl => 1, cflags => '-fno-strict-aliasing' },
'file-gbr' => { ui => 1, gegl => 1 },
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]