From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 3/8] ffmpeg: add PACKAGECONFIG controls for alsa and zlib (enable by default)
Date: Mon, 16 Sep 2019 12:24:24 -0700 [thread overview]
Message-ID: <20190916192429.27294-3-armccurdy@gmail.com> (raw)
In-Reply-To: <20190916192429.27294-1-armccurdy@gmail.com>
Also move the libogg dependency to the theora PACKAGECONFIG, since
according to the configure script, theora is the specific component
which requires it.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb
index 2d69d8bd72..307e37e3fe 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.bb
+++ b/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)}"
--
2.23.0
next prev parent reply other threads:[~2019-09-16 19:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 19:24 [PATCH 1/8] base-files: drop legacy empty file /etc/default/usbd Andre McCurdy
2019-09-16 19:24 ` [PATCH 2/8] busybox: rcS and rcK should not be writeable by everyone Andre McCurdy
2019-09-16 19:24 ` Andre McCurdy [this message]
2019-09-16 19:24 ` [PATCH 4/8] ffmpeg: don't rely on configure to correctly detect ARM vfp or neon Andre McCurdy
2019-09-16 21:33 ` Christopher Larson
2019-09-16 22:08 ` Andre McCurdy
2019-09-16 22:34 ` Adrian Bunk
2019-09-16 22:43 ` Andre McCurdy
2019-09-17 8:16 ` Adrian Bunk
2019-09-16 19:24 ` [PATCH 5/8] ffmpeg: enable more verbose build logs Andre McCurdy
2019-09-16 19:24 ` [PATCH 6/8] libwebp: apply ARM specific config options to big endian ARM Andre McCurdy
2019-09-16 19:24 ` [PATCH 7/8] initscripts: enable alignment.sh init script for " Andre McCurdy
2019-09-16 19:24 ` [PATCH 8/8] libunwind: apply configure over-ride to both big and little " Andre McCurdy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190916192429.27294-3-armccurdy@gmail.com \
--to=armccurdy@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox