From 09c85a8307ddef4b1bfbaeb3a836ae4fa8b37025 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Thu, 16 Feb 2017 11:34:48 +0100 Subject: ffmpeg: use static package list Dynamic packaging isn't useful if every library needs to be listed manually. This also merges the -dev packages into a single ffmpeg-dev, as is typical. (From OE-Core rev: 7731035a14e3caf90ae220692ec2def5cb1aaad5) Signed-off-by: Andreas Oberritter Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb | 53 +++++++++----------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb index 22895a75a2..3216f8eb00 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb @@ -115,7 +115,25 @@ do_configure() { ${S}/configure ${EXTRA_OECONF} } -PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util|resample)|swscale|swresample|postproc).*" +PACKAGES =+ "libavcodec \ + libavdevice \ + libavfilter \ + libavformat \ + libavresample \ + libavutil \ + libpostproc \ + libswresample \ + libswscale" + +FILES_libavcodec = "${libdir}/libavcodec${SOLIBS}" +FILES_libavdevice = "${libdir}/libavdevice${SOLIBS}" +FILES_libavfilter = "${libdir}/libavfilter${SOLIBS}" +FILES_libavformat = "${libdir}/libavformat${SOLIBS}" +FILES_libavresample = "${libdir}/libavresample${SOLIBS}" +FILES_libavutil = "${libdir}/libavutil${SOLIBS}" +FILES_libpostproc = "${libdir}/libpostproc${SOLIBS}" +FILES_libswresample = "${libdir}/libswresample${SOLIBS}" +FILES_libswscale = "${libdir}/libswscale${SOLIBS}" # ffmpeg disables PIC on some platforms (e.g. x86-32) INSANE_SKIP_${MLPREFIX}libavcodec = "textrel" @@ -127,36 +145,3 @@ INSANE_SKIP_${MLPREFIX}libavresample = "textrel" INSANE_SKIP_${MLPREFIX}libswscale = "textrel" INSANE_SKIP_${MLPREFIX}libswresample = "textrel" INSANE_SKIP_${MLPREFIX}libpostproc = "textrel" - -python populate_packages_prepend() { - av_libdir = d.expand('${libdir}') - av_pkgconfig = d.expand('${libdir}/pkgconfig') - - # Runtime package - do_split_packages(d, av_libdir, '^lib(.*)\.so\..*', - output_pattern='lib%s', - description='libav %s library', - extra_depends='', - prepend=True, - allow_links=True) - - # Development packages (-dev, -staticdev) - do_split_packages(d, av_libdir, '^lib(.*)\.so$', - output_pattern='lib%s-dev', - description='libav %s development package', - extra_depends='${PN}-dev', - prepend=True, - allow_links=True) - do_split_packages(d, av_pkgconfig, '^lib(.*)\.pc$', - output_pattern='lib%s-dev', - description='libav %s development package', - extra_depends='${PN}-dev', - prepend=True) - do_split_packages(d, av_libdir, '^lib(.*)\.a$', - output_pattern='lib%s-staticdev', - description='libav %s development package - static library', - extra_depends='${PN}-dev', - prepend=True, - allow_links=True) - -} -- cgit 1.2.3-korg