diff --git a/recipes-gtk/gimp/gimp_git.bb b/recipes-gtk/gimp/gimp_git.bb index 30c1bad..d25113b 100644 --- a/recipes-gtk/gimp/gimp_git.bb +++ b/recipes-gtk/gimp/gimp_git.bb @@ -41,14 +41,17 @@ RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking" inherit meson gtk-icon-cache mime-xdg pkgconfig features_check gobject-introspection vala GIR_MESON_OPTION = '' +VALA_MESON_OPTION = "vala" +VALA_MESON_ENABLE_FLAG = "enabled" +VALA_MESON_DISABLE_FLAG = "disabled" SRC_URI = " \ git://github.com/GNOME/gimp.git;protocol=https;branch=master \ " S = "${WORKDIR}/git" -SRCREV = "a0811ff614ec8361e570b2570dee05de6fc5a078" -PV = "2.99.14" +SRCREV = "d3c5536ac85bb84e1beaba68aea12cf28062e08c" +PV = "2.99.16" PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" @@ -56,25 +59,23 @@ PACKAGECONFIG[appdata-test] = "-Dappdata-test=enabled,-Dappdata-test=disabled,ap PACKAGECONFIG[bzip2] = ",,bzip2" PACKAGECONFIG[cairo-pdf] = "-Dcairo-pdf=enabled,-Dcairo-pdf=disabled" PACKAGECONFIG[check-update] = "-Dcheck-update=yes,-Dcheck-update=no" -PACKAGECONFIG[email] = ",,,xdg-utils" PACKAGECONFIG[enable-console-bin] = "-Denable-console-bin=true,-Denable-console-bin=false" PACKAGECONFIG[ghostscript] = "-Dghostscript=enabled,-Dghostscript=disabled,ghostscript" PACKAGECONFIG[gi-docgen] = "-Dgi-docgen=enabled,-Dgi-docgen=disabled,gi-docgen-native" PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev" PACKAGECONFIG[iso-codes] = ",,iso-codes" -PACKAGECONFIG[javascript] = "-Djavascript=true,-Djavascript=false,,openjre-8" +PACKAGECONFIG[javascript] = "-Djavascript=enabled,-Djavascript=disabled,gjs" PACKAGECONFIG[jpeg2000] = "-Djpeg2000=enabled,-Djpeg2000=disabled,jasper" PACKAGECONFIG[jpeg] = ",,jpeg" PACKAGECONFIG[jpeg-xl] = ",,libjxl" PACKAGECONFIG[libunwind] = ",,libunwind" PACKAGECONFIG[libbacktrace] = ",,libbacktrace" -PACKAGECONFIG[lua] = "-Dlua=true,-Dlua=false,,luajit lgi" +PACKAGECONFIG[lua] = "-Dlua=enabled,-Dlua=disabled,luajit" PACKAGECONFIG[lzma] = ",,xz" PACKAGECONFIG[mng] = "-Dmng=enabled,-Dmng=disabled,libmng" -PACKAGECONFIG[python] = "-Dpython=true,-Dpython=false,,python3 python3-pygobject" +PACKAGECONFIG[python] = "-Dpython=enabled,-Dpython=disabled,,python3-core python3-pygobject" PACKAGECONFIG[rsvg] = ",,librsvg" PACKAGECONFIG[tiff] = ",,tiff" -PACKAGECONFIG[vala-plugins] = "-Dvala-plugins=enabled,-Dvala-plugins=disabled" PACKAGECONFIG[vector-icons] = "-Dvector-icons=true,-Dvector-icons=false,librsvg shared-mime-info" PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" PACKAGECONFIG[xcursor] = "-Dxcursor=enabled,-Dxcursor=disabled,libxcursor" @@ -91,24 +92,17 @@ PACKAGECONFIG ?= " \ jpeg \ jpeg2000 \ jpeg-xl \ - lua \ lzma \ mng \ python \ rsvg \ tiff \ - vala-plugins \ vector-icons \ webp \ zlib \ " -FILES:${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/gir-1.0 \ - ${datadir}/appdata \ - ${libdir}/girepository-1.0 \ -" +FILES:${PN} += "${datadir}/metainfo" EXTRA_OEMESON += " \ -Dshmem-type=posix \