diff options
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r-- | meta-oe/recipes-multimedia/libav/libav.inc | 4 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-multimedia/live555/live555.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 0e80430eb2..32fcd61549 100644 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ b/meta-oe/recipes-multimedia/libav/libav.inc @@ -89,8 +89,8 @@ LEAD_SONAME = "libavcodec.so" FILES_${PN}-dev = "${includedir}" python populate_packages_prepend() { - av_libdir = bb.data.expand('${libdir}', d) - av_pkgconfig = bb.data.expand('${libdir}/pkgconfig', d) + av_libdir = d.expand('${libdir}') + av_pkgconfig = d.expand('${libdir}/pkgconfig') # Runtime package do_split_packages(d, av_libdir, '^lib(.*)\.so\..*', diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb index bff53124a6..64f3e5d1fc 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb @@ -22,7 +22,7 @@ FILES_${PN} = "${libdir}/${PN}${SOLIB}" FILES_${PN}-utils = "${bindir}/*" python populate_packages_prepend () { - glibdir = bb.data.expand('${libdir}', d) + glibdir = d.expand('${libdir}') do_split_packages(d, glibdir, '^lib(.*)\.so\..*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) } diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index e47bacf919..03016358ca 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc @@ -9,7 +9,7 @@ SECTION = "devel" INC_PR = "r0" -URLV = "${@bb.data.getVar('PV',d,1)[0:4]}.${@bb.data.getVar('PV',d,1)[4:6]}.${@bb.data.getVar('PV',d,1)[6:8]}" +URLV = "${@d.getVar('PV',1)[0:4]}.${@d.getVar('PV',1)[4:6]}.${@d.getVar('PV',1)[6:8]}" SRC_URI = "http://www.live555.com/liveMedia/public/live.${URLV}.tar.gz \ file://config.linux-cross" |