diff options
Diffstat (limited to 'poky/meta/recipes-multimedia/gstreamer')
5 files changed, 358 insertions, 13 deletions
diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch new file mode 100644 index 0000000000..022ff9af29 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch @@ -0,0 +1,346 @@ +From 38d10ee800e42afeacc6bee714216e4c974c11f5 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao <xry111@mengyan1223.wang> +Date: Mon, 17 Jan 2022 01:33:47 +0800 +Subject: [PATCH] gst-libav: fix build with ffmpeg-5.0.0 + +Latest ffmpeg has removed avcodec_get_context_defaults(), and its +documentation says a new AVCodecContext should be allocated for this +purpose. The pointer returned by avcodec_find_decoder() is now +const-qualified so we also need to adjust for it. And, AVCOL_RANGE_MPEG +is now rejected with strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL. + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1531> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + ext/libav/gstavauddec.c | 22 ++++++++------------- + ext/libav/gstavaudenc.c | 40 +++++++++++++++++++-------------------- + ext/libav/gstavcodecmap.c | 7 ++++--- + ext/libav/gstavutils.c | 2 +- + ext/libav/gstavviddec.c | 28 +++++++++++---------------- + ext/libav/gstavvidenc.c | 21 ++++++++++---------- + 6 files changed, 54 insertions(+), 66 deletions(-) + +diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c +index baf7aa5..b03a724 100644 +--- a/ext/libav/gstavauddec.c ++++ b/ext/libav/gstavauddec.c +@@ -168,12 +168,7 @@ gst_ffmpegauddec_finalize (GObject * object) + GstFFMpegAudDec *ffmpegdec = (GstFFMpegAudDec *) object; + + av_frame_free (&ffmpegdec->frame); +- +- if (ffmpegdec->context != NULL) { +- gst_ffmpeg_avcodec_close (ffmpegdec->context); +- av_free (ffmpegdec->context); +- ffmpegdec->context = NULL; +- } ++ avcodec_free_context (&ffmpegdec->context); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -193,14 +188,12 @@ gst_ffmpegauddec_close (GstFFMpegAudDec * ffmpegdec, gboolean reset) + gst_ffmpeg_avcodec_close (ffmpegdec->context); + ffmpegdec->opened = FALSE; + +- if (ffmpegdec->context->extradata) { +- av_free (ffmpegdec->context->extradata); +- ffmpegdec->context->extradata = NULL; +- } ++ av_freep (&ffmpegdec->context->extradata); + + if (reset) { +- if (avcodec_get_context_defaults3 (ffmpegdec->context, +- oclass->in_plugin) < 0) { ++ avcodec_free_context (&ffmpegdec->context); ++ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegdec->context == NULL) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + return FALSE; + } +@@ -219,8 +212,9 @@ gst_ffmpegauddec_start (GstAudioDecoder * decoder) + oclass = (GstFFMpegAudDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); + + GST_OBJECT_LOCK (ffmpegdec); +- gst_ffmpeg_avcodec_close (ffmpegdec->context); +- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { ++ avcodec_free_context (&ffmpegdec->context); ++ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegdec->context == NULL) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + GST_OBJECT_UNLOCK (ffmpegdec); + return FALSE; +diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c +index 3ff6432..689982f 100644 +--- a/ext/libav/gstavaudenc.c ++++ b/ext/libav/gstavaudenc.c +@@ -175,10 +175,8 @@ gst_ffmpegaudenc_finalize (GObject * object) + + /* clean up remaining allocated data */ + av_frame_free (&ffmpegaudenc->frame); +- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); +- gst_ffmpeg_avcodec_close (ffmpegaudenc->refcontext); +- av_free (ffmpegaudenc->context); +- av_free (ffmpegaudenc->refcontext); ++ avcodec_free_context (&ffmpegaudenc->context); ++ avcodec_free_context (&ffmpegaudenc->refcontext); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -193,9 +191,9 @@ gst_ffmpegaudenc_start (GstAudioEncoder * encoder) + ffmpegaudenc->opened = FALSE; + ffmpegaudenc->need_reopen = FALSE; + +- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) { ++ avcodec_free_context (&ffmpegaudenc->context); ++ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegaudenc->context == NULL) { + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -241,10 +239,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + + /* close old session */ + if (ffmpegaudenc->opened) { +- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); ++ avcodec_free_context (&ffmpegaudenc->context); + ffmpegaudenc->opened = FALSE; +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) { ++ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegaudenc->context == NULL) { + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -286,11 +284,11 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + /* open codec */ + if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) { + gst_caps_unref (allowed_caps); +- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); ++ avcodec_free_context (&ffmpegaudenc->context); + GST_DEBUG_OBJECT (ffmpegaudenc, "avenc_%s: Failed to open FFMPEG codec", + oclass->in_plugin->name); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) ++ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegaudenc->context == NULL) + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + + if ((oclass->in_plugin->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && +@@ -312,10 +310,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + + if (!other_caps) { + gst_caps_unref (allowed_caps); +- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); ++ avcodec_free_context (&ffmpegaudenc->context); + GST_DEBUG ("Unsupported codec - no caps found"); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) ++ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegaudenc->context == NULL) + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -331,10 +329,10 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + + if (!gst_audio_encoder_set_output_format (GST_AUDIO_ENCODER (ffmpegaudenc), + icaps)) { +- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); ++ avcodec_free_context (&ffmpegaudenc->context); + gst_caps_unref (icaps); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) ++ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegaudenc->context == NULL) + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -403,8 +401,8 @@ buffer_info_free (void *opaque, guint8 * data) + gst_buffer_unmap (info->buffer, &info->map); + gst_buffer_unref (info->buffer); + } else { +- av_free (info->ext_data); +- av_free (info->ext_data_array); ++ av_freep (&info->ext_data); ++ av_freep (&info->ext_data_array); + } + g_slice_free (BufferInfo, info); + } +diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c +index f58633d..e2a3641 100644 +--- a/ext/libav/gstavcodecmap.c ++++ b/ext/libav/gstavcodecmap.c +@@ -2331,7 +2331,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodecID codec_id, + } + + if (buildcaps) { +- AVCodec *codec; ++ const AVCodec *codec; + + if ((codec = avcodec_find_decoder (codec_id)) || + (codec = avcodec_find_encoder (codec_id))) { +@@ -2975,6 +2975,7 @@ gst_ffmpeg_videoinfo_to_context (GstVideoInfo * info, AVCodecContext * context) + context->color_range = AVCOL_RANGE_JPEG; + } else { + context->color_range = AVCOL_RANGE_MPEG; ++ context->strict_std_compliance = FF_COMPLIANCE_UNOFFICIAL; + } + } + +@@ -4330,7 +4331,7 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) + audio = TRUE; + } else if (!strncmp (mimetype, "audio/x-gst-av-", 15)) { + gchar ext[16]; +- AVCodec *codec; ++ const AVCodec *codec; + + if (strlen (mimetype) <= 30 && + sscanf (mimetype, "audio/x-gst-av-%s", ext) == 1) { +@@ -4342,7 +4343,7 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context) + } + } else if (!strncmp (mimetype, "video/x-gst-av-", 15)) { + gchar ext[16]; +- AVCodec *codec; ++ const AVCodec *codec; + + if (strlen (mimetype) <= 30 && + sscanf (mimetype, "video/x-gst-av-%s", ext) == 1) { +diff --git a/ext/libav/gstavutils.c b/ext/libav/gstavutils.c +index 3780cff..f3878c3 100644 +--- a/ext/libav/gstavutils.c ++++ b/ext/libav/gstavutils.c +@@ -36,7 +36,7 @@ + const gchar * + gst_ffmpeg_get_codecid_longname (enum AVCodecID codec_id) + { +- AVCodec *codec; ++ const AVCodec *codec; + /* Let's use what ffmpeg can provide us */ + + if ((codec = avcodec_find_decoder (codec_id)) || +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index 7ec5766..5dd207e 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -320,12 +320,7 @@ gst_ffmpegviddec_finalize (GObject * object) + GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) object; + + av_frame_free (&ffmpegdec->picture); +- +- if (ffmpegdec->context != NULL) { +- gst_ffmpeg_avcodec_close (ffmpegdec->context); +- av_free (ffmpegdec->context); +- ffmpegdec->context = NULL; +- } ++ avcodec_free_context (&ffmpegdec->context); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -363,13 +358,11 @@ gst_ffmpegviddec_close (GstFFMpegVidDec * ffmpegdec, gboolean reset) + + gst_buffer_replace (&ffmpegdec->palette, NULL); + +- if (ffmpegdec->context->extradata) { +- av_free (ffmpegdec->context->extradata); +- ffmpegdec->context->extradata = NULL; +- } ++ av_freep (&ffmpegdec->context->extradata); + if (reset) { +- if (avcodec_get_context_defaults3 (ffmpegdec->context, +- oclass->in_plugin) < 0) { ++ avcodec_free_context (&ffmpegdec->context); ++ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegdec->context == NULL) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + return FALSE; + } +@@ -1704,7 +1697,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec, + if (side_data) { + GST_LOG_OBJECT (ffmpegdec, + "Found CC side data of type AV_FRAME_DATA_A53_CC, size %d", +- side_data->size); ++ (int) side_data->size); + GST_MEMDUMP ("A53 CC", side_data->data, side_data->size); + + /* do not add closed caption meta if it already exists */ +@@ -1966,8 +1959,9 @@ gst_ffmpegviddec_start (GstVideoDecoder * decoder) + oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); + + GST_OBJECT_LOCK (ffmpegdec); +- gst_ffmpeg_avcodec_close (ffmpegdec->context); +- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { ++ avcodec_free_context (&ffmpegdec->context); ++ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegdec->context == NULL) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + GST_OBJECT_UNLOCK (ffmpegdec); + return FALSE; +@@ -2261,10 +2255,10 @@ gst_ffmpegviddec_get_property (GObject * object, + + switch (prop_id) { + case PROP_LOWRES: +- g_value_set_enum (value, ffmpegdec->context->lowres); ++ g_value_set_enum (value, ffmpegdec->lowres); + break; + case PROP_SKIPFRAME: +- g_value_set_enum (value, ffmpegdec->context->skip_frame); ++ g_value_set_enum (value, ffmpegdec->skip_frame); + break; + case PROP_DIRECT_RENDERING: + g_value_set_boolean (value, ffmpegdec->direct_rendering); +diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c +index 0468d88..2ed9e5a 100644 +--- a/ext/libav/gstavvidenc.c ++++ b/ext/libav/gstavvidenc.c +@@ -224,8 +224,8 @@ gst_ffmpegvidenc_finalize (GObject * object) + av_frame_free (&ffmpegenc->picture); + gst_ffmpeg_avcodec_close (ffmpegenc->context); + gst_ffmpeg_avcodec_close (ffmpegenc->refcontext); +- av_free (ffmpegenc->context); +- av_free (ffmpegenc->refcontext); ++ av_freep (&ffmpegenc->context); ++ av_freep (&ffmpegenc->refcontext); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -247,10 +247,10 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, + + /* close old session */ + if (ffmpegenc->opened) { +- gst_ffmpeg_avcodec_close (ffmpegenc->context); ++ avcodec_free_context (&ffmpegenc->context); + ffmpegenc->opened = FALSE; +- if (avcodec_get_context_defaults3 (ffmpegenc->context, +- oclass->in_plugin) < 0) { ++ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegenc->context == NULL) { + GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); + return FALSE; + } +@@ -454,9 +454,9 @@ bad_input_fmt: + } + close_codec: + { +- gst_ffmpeg_avcodec_close (ffmpegenc->context); +- if (avcodec_get_context_defaults3 (ffmpegenc->context, +- oclass->in_plugin) < 0) ++ avcodec_free_context (&ffmpegenc->context); ++ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegenc->context == NULL) + GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); + goto cleanup_stats_in; + } +@@ -896,8 +896,9 @@ gst_ffmpegvidenc_start (GstVideoEncoder * encoder) + ffmpegenc->need_reopen = FALSE; + + /* close old session */ +- gst_ffmpeg_avcodec_close (ffmpegenc->context); +- if (avcodec_get_context_defaults3 (ffmpegenc->context, oclass->in_plugin) < 0) { ++ avcodec_free_context (&ffmpegenc->context); ++ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin); ++ if (ffmpegenc->context == NULL) { + GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); + return FALSE; + } diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb index a77ec62759..64b8bcdb52 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.18.5.bb @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ " -SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" +SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ + file://0001-gst-libav-fix-build-with-ffmpeg-5.0.0.patch \ + " SRC_URI[sha256sum] = "822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548" S = "${WORKDIR}/gst-libav-${PV}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb index f3ea6f7293..f90dff693d 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.5.bb @@ -18,6 +18,10 @@ S = "${WORKDIR}/gst-plugins-bad-${PV}" LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + DEPENDS += "gstreamer1.0-plugins-base" inherit gobject-introspection @@ -25,7 +29,7 @@ inherit gobject-introspection PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ bz2 closedcaption curl dash dtls hls openssl sbc smoothstreaming \ @@ -93,6 +97,7 @@ PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" PACKAGECONFIG[webrtc] = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice" PACKAGECONFIG[webrtcdsp] = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing" PACKAGECONFIG[zbar] = "-Dzbar=enabled,-Dzbar=disabled,zbar" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,libxcb libxkbcommon" PACKAGECONFIG[x265] = "-Dx265=enabled,-Dx265=disabled,x265" EXTRA_OEMESON += " \ diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb index 5e2cca3864..180241828f 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.5.bb @@ -43,6 +43,7 @@ X11DISABLEOPTS = "-Dx11=disabled -Dxvideo=disabled -Dxshm=disabled" PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" PACKAGECONFIG[cdparanoia] = "-Dcdparanoia=enabled,-Dcdparanoia=disabled,cdparanoia" +PACKAGECONFIG[graphene] = "-Dgl-graphene=enabled,-Dgl-graphene=disabled,graphene" PACKAGECONFIG[jpeg] = "-Dgl-jpeg=enabled,-Dgl-jpeg=disabled,jpeg" PACKAGECONFIG[ogg] = "-Dogg=enabled,-Dogg=disabled,libogg" PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus" @@ -71,7 +72,6 @@ OPENGL_WINSYS = "${@bb.utils.filter('PACKAGECONFIG', 'x11 gbm wayland dispmanx e EXTRA_OEMESON += " \ -Ddoc=disabled \ - -Dgl-graphene=disabled \ ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \ ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \ ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb index a32805d129..1dd7d0d09a 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.18.5.bb @@ -21,14 +21,6 @@ EXTRA_OEMESON += "-Dlibpython-dir=${libdir}" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" -inherit meson pkgconfig distutils3-base upstream-version-is-even features_check - -# Generating introspection data depends on a combination of native and target -# introspection tools, and qemu to run the target tools. -DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native prelink-native" - -# Even though introspection is disabled on -native, gobject-introspection package is still -# needed for m4 macros. -DEPENDS:append:class-native = " gobject-introspection-native" -DEPENDS:append:class-nativesdk = " gobject-introspection-native" +inherit meson pkgconfig setuptools3-base upstream-version-is-even gobject-introspection features_check |