[gimp/meson: 85/127] Rename some py deps. Fix pygimp plugins.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 85/127] Rename some py deps. Fix pygimp plugins.
- Date: Fri, 2 Feb 2018 16:06:54 +0000 (UTC)
commit 5b2d044b1ba7b6d2b2f7ca4ce4614c949165cba1
Author: Félix Piédallu <felix piedallu me>
Date: Wed Jan 10 10:30:12 2018 +0100
Rename some py deps. Fix pygimp plugins.
meson.build | 7 ++-
plug-ins/pygimp/meson.build | 103 ++++++++++++++++++++++---------------------
2 files changed, 57 insertions(+), 53 deletions(-)
---
diff --git a/meson.build b/meson.build
index 1b07e46..e992848 100644
--- a/meson.build
+++ b/meson.build
@@ -547,9 +547,10 @@ if get_option('with-python')
python2 = find_program('python2')
pygtk2codegen = find_program('pygtk-codegen-2.0')
- libpy2 = dependency('python2', version: '>=2.5.0')
- pygtk2 = dependency('pygtk-2.0', version: '>=2.10.4')
- pycairo = dependency('pycairo', version: '>=1.0.2')
+ libpython2= dependency('python2', version: '>=2.5.0')
+ pygobject = dependency('pygobject-2.0', version: '>=2.10.4')
+ pygtk2 = dependency('pygtk-2.0', version: '>=2.10.4')
+ pycairo = dependency('pycairo', version: '>=1.0.2')
pygtk_defsdir = pygtk2.get_pkgconfig_variable('defsdir')
have_python = true
diff --git a/plug-ins/pygimp/meson.build b/plug-ins/pygimp/meson.build
index c5f3a1c..4bb70a6 100644
--- a/plug-ins/pygimp/meson.build
+++ b/plug-ins/pygimp/meson.build
@@ -1,23 +1,7 @@
subdir('doc')
subdir('plug-ins')
-
-#
-# .defs.c:
-# (cd $(srcdir) \
-# && $(PYGTK_CODEGEN) \
-# --override $*.override \
-# --register $(PYGTK_DEFSDIR)/gdk-types.defs \
-# --register $(PYGTK_DEFSDIR)/gtk-types.defs \
-# --register gimp-types.defs \
-# --register gimpcolor-types.defs \
-# --register gimpenums-types.defs \
-# --prefix $* $*.defs) > gen-$*.c \
-# && cp gen-$*.c $*.c \
-# && rm -f gen-$*.c
-
pwd = meson.current_source_dir()
-
pygtk_generator = generator(pygtk2codegen,
arguments: [
'--override', join_paths(pwd, '@BASENAME@.override'),
@@ -35,7 +19,8 @@ pygtk_generator = generator(pygtk2codegen,
python_so_libs = [
- [ 'gimp', [
+ [ 'gimp',
+ [
'gimpmodule.c',
'pygimp-display.c',
'pygimp-drawable.c',
@@ -45,56 +30,74 @@ python_so_libs = [
'pygimp-pdb.c',
'pygimp-tile.c',
'pygimp-vectors.c',
- ], ],
- [ '_gimpenums', [
- 'gimpenumsmodule.c',
- ], ],
- [ '_gimpui', [
- 'gimpuimodule.c', pygtk_generator.process('gimpui.defs'),
- ], ],
- [ 'gimpcolor', [
- 'gimpcolormodule.c', 'pygimp-colors.c',
- ], ],
- [ 'gimpthumb', [
- 'gimpthumbmodule.c', pygtk_generator.process('gimpthumb.defs'),
- ], ],
-]
-
-foreach pylib : python_so_libs
- shared_library(pylib[0],
- pylib[1],
- include_directories: [ rootInclude, ],
- dependencies: [
- gtk2, gegl,
- x11, xmu, xext, xfixes,
],
- link_with: [
+ [ pycairo, cairo, gtk2, ],
+ [
+ libgimp,
+ libgimpbase,
+ libgimpcolor,
+ libgimpui,
+ ],
+ ],
+ [ '_gimpenums',
+ [ 'gimpenumsmodule.c', ],
+ [ gobject, cairo, gtk2, ],
+ [
+ libgimp,libgimpbase
+ ],
+ ],
+ [ '_gimpui',
+ [ 'gimpuimodule.c', pygtk_generator.process('gimpui.defs'), ],
+ [ pygtk2, pycairo, gtk2, ],
+ [
libgimp,
libgimpbase,
libgimpcolor,
libgimpconfig,
- libgimpmath,
libgimpui,
- libgimpwidgets,
+ libgimpwidgets
],
+ ],
+ [ 'gimpcolor',
+ [ 'gimpcolormodule.c', 'pygimp-colors.c', ],
+ [cairo],
+ [ libgimpcolor, ],
+ ],
+ [ 'gimpthumb',
+ [ 'gimpthumbmodule.c', pygtk_generator.process('gimpthumb.defs'), ],
+ [],
+ [ libgimpthumb, ],
+ ],
+]
+
+foreach pylib : python_so_libs
+ shared_library(pylib[0],
+ pylib[1],
+ include_directories: [ rootInclude, ],
+ dependencies: pylib[2] + [
+ libpython2, pygobject,
+ gdk_pixbuf, gegl,
+ ],
+ link_with: pylib[3],
+ c_args: [ '-DGETTEXT_PACKAGE="' + gettext_package + '"', ],
install: true,
install_dir: join_paths(gimpplugindir, 'python'),
)
endforeach
+
+
install_data([
- 'gimpenums.py',
- 'gimpfu.py',
- 'gimpplugin.py',
- 'gimpshelf.py',
- 'gimpui.py',
- 'pygimp-logo.png',
+ 'gimpenums.py',
+ 'gimpfu.py',
+ 'gimpplugin.py',
+ 'gimpshelf.py',
+ 'gimpui.py',
+ 'pygimp-logo.png',
],
install_dir: join_paths(gimpplugindir, 'python'),
)
-
-
path_separator = platform_win32 ? ';' : ':'
custom_target('pygimp.env',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]