diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2024-10-27 18:13:52 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-11-30 05:41:59 -0800 |
commit | 7c76a24afb06e47fc2f14ee7a7f16bec14b077e2 (patch) | |
tree | 9f199e69a767b394d8e30e93f07b4cbf05d4de5e /meta | |
parent | 57ad766534451295ee2f41743ea46e5c69ac97c3 (diff) | |
download | poky-7c76a24afb06e47fc2f14ee7a7f16bec14b077e2.tar.gz |
ffmpeg: fix packaging examples
* I've noticed that ffmpeg package isn't created in my builds, due
to --disable-programs in EXTRA_OECONF added by our .bbappend, but
was surprised that lib32-ffmpeg is created.
* lib32-ffmpeg was created only because it contained the examples
which are installed in /usr/share/ffmpeg even when PN is lib32-ffmpeg
as we pass --datadir=${datadir}/ffmpeg in EXTRA_OECONF here
* --disable-programs controls ${bindir}/ffprobe ${bindir}/ffmpeg and
${datadir}/ffmpeg/ffprobe.xsd ${datadir}/ffmpeg/libvpx-*.ffpreset
(From OE-Core rev: 24bf3ad245fa2dba14a59477279c6db3c8bcd088)
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d7bf828b6431a254201675e41047f53da47912f5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb index bb6b71735c..db0aa60826 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb | |||
@@ -182,6 +182,6 @@ FILES:libavutil = "${libdir}/libavutil${SOLIBS}" | |||
182 | FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}" | 182 | FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}" |
183 | FILES:libswresample = "${libdir}/libswresample${SOLIBS}" | 183 | FILES:libswresample = "${libdir}/libswresample${SOLIBS}" |
184 | FILES:libswscale = "${libdir}/libswscale${SOLIBS}" | 184 | FILES:libswscale = "${libdir}/libswscale${SOLIBS}" |
185 | FILES:${PN}-examples = "${datadir}/${PN}/examples" | 185 | FILES:${PN}-examples = "${datadir}/${BPN}/examples" |
186 | 186 | ||
187 | CVE_PRODUCT = "ffmpeg libswresample libavcodec" | 187 | CVE_PRODUCT = "ffmpeg libswresample libavcodec" |