dany/meta-wayland
1
0
Fork 0
mirror of https://codeberg.org/flk/meta-wayland.git synced 2024-12-26 13:38:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

gimp: cleanup

Browse Source
This commit is contained in:
Markus Volk 2021-09-02 01:44:38 +02:00
parent fbd99555a4
commit 6115acde12
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-gimp/gimp/gimp/0001-meson-make-gir-buildable.patch
View File

@ -21,7 +21,7 @@ index 9e7b4fbbe3..99614733d7 100644
]
-if meson.is_cross_build()
+if meson.is_cross_build() and not get_option('can-crosscompile-gir')
+if meson.is_cross_build() and not get_option('introspection')
have_gobject_introspection = false
gobject_introspection_warning = '\n '.join(['',
'GObject Introspection is disabled while cross-compiling because',
@ -34,7 +34,7 @@ index 7b6ad78045..c29fdb5b40 100644
option('gtk-doc-app', type: 'boolean', value: false, description: 'Build developer documentation for app')
option('g-ir-doc', type: 'boolean', value: false, description: 'Build developer documentation for introspected API')
-
+option('can-crosscompile-gir', type: 'boolean', value: false, description: 'GIR is buildable even if crosscompiling')
+option('introspection', type: 'boolean', value: false, description: 'GIR is buildable even if crosscompiling')
option('linux-input', type: 'feature', value: 'auto', description: 'Linux input event controller module')
option('vec-icons', type: 'boolean', value: true, description: 'Use vector icons rather than raster ones')

20
recipes-gimp/gimp/gimp_git.bb
View File

@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
DEPENDS = " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \
appstream-glib \
atk \
babl \
@ -20,34 +19,31 @@ DEPENDS = " \
gegl \
gegl-native \
gexiv2 \
gobject-introspection-native \
gtk+3 \
harfbuzz \
intltool-native \
json-glib \
lcms \
libarchive \
libexif \
libmypaint \
libxslt-native \
mypaint-brushes-1.0 \
pango \
poppler \
poppler-data \
prelink-native \
python3-native \
python3-pygobject-native \
qemuwrapper-cross \
"
DEPENDS:append:libc-musl = " libexecinfo"
RDEPENDS:${PN} += "mypaint-brushes-1.0 glib-networking"
RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking"
inherit meson gtk-icon-cache mime-xdg pkgconfig features_check
inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection
SRC_URI = " \
git://github.com/GNOME/gimp.git;protocol=https \
file://0001-meson-make-gir-buildable.patch \
"
S = "${WORKDIR}/git"
PV = "2.99.6"
SRCREV = "GIMP_2_99_6"
@ -77,10 +73,11 @@ PACKAGECONFIG[vala-plugins] = "-Dvala-plugins=enabled,-Dvala-plugins=disabled"
PACKAGECONFIG[webkit] = "-Dwebkit=enabled,-Dwebkit=disabled,webkitgtk"
PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
PACKAGECONFIG[xcursor] = "-Dxcursor=enabled,-Dxcursor=disabled,libxcursor"
PACKAGECONFIG[xpm] = "-Dxpm=enabled,-Dxpm=disabled,libexif"
PACKAGECONFIG[x11] = "-Dxpm=enabled,-Dxpm=disabled,libxpm libxmu"
PACKAGECONFIG[zlib] = ",,zlib"
PACKAGECONFIG ?= " \
${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
aa \
alsa \
bzip2 \
@ -97,8 +94,6 @@ PACKAGECONFIG ?= " \
rsvg \
tiff \
webp \
xcursor \
xpm \
zlib \
"
@ -109,9 +104,8 @@ FILES:${PN} += " \
${libdir}/girepository-1.0 \
"
EXTRA_OEMESON = " \
EXTRA_OEMESON += " \
-Dshmem-type=posix \
-Dcan-crosscompile-gir=true \
--buildtype release \
"