diff options
Diffstat (limited to 'poky/meta/recipes-multimedia')
4 files changed, 45 insertions, 9 deletions
diff --git a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb index 2d69d8bd7..307e37e3f 100644 --- a/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb +++ b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb @@ -38,12 +38,12 @@ ARM_INSTRUCTION_SET_armv6 = "arm" # libpostproc was previously packaged from a separate recipe PROVIDES = "libav libpostproc" -DEPENDS = "alsa-lib zlib libogg nasm-native" +DEPENDS = "nasm-native" inherit autotools pkgconfig PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \ - bzlib gpl lzma theora x264 \ + alsa bzlib gpl lzma theora x264 zlib \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}" # libraries to build in addition to avutil @@ -57,6 +57,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc" PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" @@ -68,13 +69,14 @@ PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2" PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex" -PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora" +PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora libogg" PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb" PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" # Check codecs that require --enable-nonfree USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch new file mode 100644 index 000000000..a36fdc9a1 --- /dev/null +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/gtkdoc-no-tree.patch @@ -0,0 +1,35 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 6f720cebe632d7dc187c6907857d67ce1f7313d6 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Mon, 9 Sep 2019 22:48:49 +0100 +Subject: [PATCH] docs: don't include the type hierarchy + +gtk-doc can't generate a type hierarchy when scanning gst-libav, and gtk-doc +1.30 onwards doesn't write a file if there is no type hierarchy (unlike previous +releases, which wrote an empty file). This results in the build failing with +gtk-doc 1.30 onwards, so remove the type hierarchy section from the +documentation as it doesn't serve any purpose. + +Fixes https://gitlab.freedesktop.org/gstreamer/gst-libav/issues/57 +--- + docs/plugins/gst-libav-plugins-docs.sgml | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/docs/plugins/gst-libav-plugins-docs.sgml b/docs/plugins/gst-libav-plugins-docs.sgml +index 75c68f4..f68d554 100644 +--- a/docs/plugins/gst-libav-plugins-docs.sgml ++++ b/docs/plugins/gst-libav-plugins-docs.sgml +@@ -32,9 +32,4 @@ + <title>gst-libav Plugins</title> + <xi:include href="xml/plugin-libav.xml" /> + </chapter> +- +- <chapter> +- <title>Object Hierarchy</title> +- <xi:include href="xml/tree_index.sgml" /> +- </chapter> + </book> +-- +2.22.0 diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb index d94c3215d..d2629b506 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.16.0.bb @@ -18,6 +18,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz file://mips64_cpu_detection.patch \ file://0001-configure-check-for-armv7ve-variant.patch \ file://0001-fix-host-contamination.patch \ + file://gtkdoc-no-tree.patch \ " SRC_URI[md5sum] = "e3a201a45985ddc1327cd496046ca818" SRC_URI[sha256sum] = "dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a" @@ -28,11 +29,6 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" inherit autotools pkgconfig upstream-version-is-even gtk-doc -# Disable documentation for now as it is failing with gtk-doc 1.30: -# gst-libav-plugins-docs.sgml:38: element include: XInclude error: -# could not load xml/tree_index.sgml, and no fallback was found -GTKDOC_ENABLED = "False" - # CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, # compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the # libav copy included in the gst-libav package. diff --git a/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb b/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb index 01fc02d23..a4d1ae43d 100644 --- a/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb +++ b/poky/meta/recipes-multimedia/webp/libwebp_1.0.3.bb @@ -25,11 +25,14 @@ EXTRA_OECONF = " \ --enable-libwebpdemux \ --enable-threading \ " + # Do not trust configure to determine if neon is available. # -EXTRA_OECONF_append_arm = " \ +EXTRA_OECONF_ARM = " \ ${@bb.utils.contains("TUNE_FEATURES","neon","--enable-neon","--disable-neon",d)} \ " +EXTRA_OECONF_append_arm = " ${EXTRA_OECONF_ARM}" +EXTRA_OECONF_append_armeb = " ${EXTRA_OECONF_ARM}" inherit autotools lib_package |