summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/ffmpeg
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2017-02-16 11:34:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:10 +0000
commit09c85a8307ddef4b1bfbaeb3a836ae4fa8b37025 (patch)
treebb5e5a2f68d1723f118064370e17bc1ac5601855 /meta/recipes-multimedia/ffmpeg
parentf786def0ec66a48d979a2dadccfc22ada08e33cc (diff)
downloadpoky-09c85a8307ddef4b1bfbaeb3a836ae4fa8b37025.tar.gz
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 <obi@opendreambox.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb53
1 files 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() {
115 ${S}/configure ${EXTRA_OECONF} 115 ${S}/configure ${EXTRA_OECONF}
116} 116}
117 117
118PACKAGES_DYNAMIC += "^lib(av(codec|device|filter|format|util|resample)|swscale|swresample|postproc).*" 118PACKAGES =+ "libavcodec \
119 libavdevice \
120 libavfilter \
121 libavformat \
122 libavresample \
123 libavutil \
124 libpostproc \
125 libswresample \
126 libswscale"
127
128FILES_libavcodec = "${libdir}/libavcodec${SOLIBS}"
129FILES_libavdevice = "${libdir}/libavdevice${SOLIBS}"
130FILES_libavfilter = "${libdir}/libavfilter${SOLIBS}"
131FILES_libavformat = "${libdir}/libavformat${SOLIBS}"
132FILES_libavresample = "${libdir}/libavresample${SOLIBS}"
133FILES_libavutil = "${libdir}/libavutil${SOLIBS}"
134FILES_libpostproc = "${libdir}/libpostproc${SOLIBS}"
135FILES_libswresample = "${libdir}/libswresample${SOLIBS}"
136FILES_libswscale = "${libdir}/libswscale${SOLIBS}"
119 137
120# ffmpeg disables PIC on some platforms (e.g. x86-32) 138# ffmpeg disables PIC on some platforms (e.g. x86-32)
121INSANE_SKIP_${MLPREFIX}libavcodec = "textrel" 139INSANE_SKIP_${MLPREFIX}libavcodec = "textrel"
@@ -127,36 +145,3 @@ INSANE_SKIP_${MLPREFIX}libavresample = "textrel"
127INSANE_SKIP_${MLPREFIX}libswscale = "textrel" 145INSANE_SKIP_${MLPREFIX}libswscale = "textrel"
128INSANE_SKIP_${MLPREFIX}libswresample = "textrel" 146INSANE_SKIP_${MLPREFIX}libswresample = "textrel"
129INSANE_SKIP_${MLPREFIX}libpostproc = "textrel" 147INSANE_SKIP_${MLPREFIX}libpostproc = "textrel"
130
131python populate_packages_prepend() {
132 av_libdir = d.expand('${libdir}')
133 av_pkgconfig = d.expand('${libdir}/pkgconfig')
134
135 # Runtime package
136 do_split_packages(d, av_libdir, '^lib(.*)\.so\..*',
137 output_pattern='lib%s',
138 description='libav %s library',
139 extra_depends='',
140 prepend=True,
141 allow_links=True)
142
143 # Development packages (-dev, -staticdev)
144 do_split_packages(d, av_libdir, '^lib(.*)\.so$',
145 output_pattern='lib%s-dev',
146 description='libav %s development package',
147 extra_depends='${PN}-dev',
148 prepend=True,
149 allow_links=True)
150 do_split_packages(d, av_pkgconfig, '^lib(.*)\.pc$',
151 output_pattern='lib%s-dev',
152 description='libav %s development package',
153 extra_depends='${PN}-dev',
154 prepend=True)
155 do_split_packages(d, av_libdir, '^lib(.*)\.a$',
156 output_pattern='lib%s-staticdev',
157 description='libav %s development package - static library',
158 extra_depends='${PN}-dev',
159 prepend=True,
160 allow_links=True)
161
162}