From 4b91194a9576c5ade5d58741c7931eb5b5989bcd Mon Sep 17 00:00:00 2001 From: Yuqing Zhu Date: Mon, 18 Apr 2016 22:57:48 +0800 Subject: imx-codec: Upgrade to v4.0.9 --Change the recipe name from "libfslcodec" to "imx-codec" --Add RREPLACE/RPROVIDES/RCONFLICTS for backwards compatibility. --[aac_dec] refine the code for pure c build aac decoder c build need float point support, which use some float point function. Change-Id: Ie8071031b45038107d27b16e2c129376cf4f109d Signed-off-by: Yuqing Zhu Signed-off-by: Otavio Salvador --- recipes-multimedia/imx-codec/imx-codec.inc | 109 +++++++++++++++++++++ recipes-multimedia/imx-codec/imx-codec_4.0.9.bb | 9 ++ recipes-multimedia/libfslcodec/libfslcodec.inc | 98 ------------------ .../libfslcodec/libfslcodec_4.0.8.bb | 9 -- 4 files changed, 118 insertions(+), 107 deletions(-) create mode 100644 recipes-multimedia/imx-codec/imx-codec.inc create mode 100644 recipes-multimedia/imx-codec/imx-codec_4.0.9.bb delete mode 100644 recipes-multimedia/libfslcodec/libfslcodec.inc delete mode 100644 recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb diff --git a/recipes-multimedia/imx-codec/imx-codec.inc b/recipes-multimedia/imx-codec/imx-codec.inc new file mode 100644 index 0000000..e6fd9c6 --- /dev/null +++ b/recipes-multimedia/imx-codec/imx-codec.inc @@ -0,0 +1,109 @@ +# Copyright (C) 2012-2016 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) +DESCRIPTION = "Freescale Multimedia codec libs" +LICENSE = "Proprietary" +SECTION = "multimedia" +LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a" + +inherit fsl-eula-unpack autotools pkgconfig + +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" + +# Choose between Soft Float-Point and Hard Float-Point +EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '', d)}" + +PACKAGECONFIG ?= "" +PACKAGECONFIG_mx6q = "vpu" +PACKAGECONFIG_mx6dl = "vpu" + +PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,imx-vpu" + +do_install_append() { + # FIXME: This link points to nowhere + rm ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so + + # LTIB move the files around or gst-fsl-plugin won't find them + for p in $(find ${D}${libdir}/imx-mm -mindepth 2 -maxdepth 2 -not -type d); do + mv $p ${D}${libdir} + done + rmdir ${D}${libdir}/imx-mm/video-codec + +} + +python __set_insane_skip() { + # Ensure we have PACKAGES expanded + bb.build.exec_func("read_subpackage_metadata", d) + + for p in d.getVar('PACKAGES', True).split(): + # Even though we are packaging libraries those are plugins so we + # shouldn't rename the packages to follow its sonames. + d.setVar("DEBIAN_NOAUTONAME_%s" % p, "1") + + # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have + # the source we cannot fix it. Disable the insane check for now. + if p == 'imx-codec-test-bin': + # FIXME: includes the DUT .so files so we need to deploy those + d.setVar("INSANE_SKIP_%s" % p, "ldflags textrel libdir") + else: + d.setVar("INSANE_SKIP_%s" % p, "ldflags textrel") +} + +do_package_qa[prefuncs] += "__set_insane_skip" + +python __split_libfslcodec_plugins() { + codecdir = bb.data.expand('${libdir}', d) + do_split_packages(d, codecdir, '^lib_([^_]*).*_arm.*_elinux\.so\..*', + aux_files_pattern='${libdir}/imx-mm/audio-codec/wrap/lib_%sd_wrap_arm*_elinux.so.*', + output_pattern='imx-codec-%s', + description='Freescale i.MX Codec (%s)', + extra_depends='') + pkgs = d.getVar('PACKAGES', True).split() + for pkg in pkgs: + meta = pkg[10:] + if meta != '': + d.setVar('RREPLACES_%s' % pkg, ' libfslcodec-%s' % meta) + d.setVar('RPROVIDES_%s' % pkg, ' libfslcodec-%s' % meta) + d.setVar('RCONFLICTS_%s' % pkg, ' libfslcodec-%s' % meta) + else : + d.setVar('RREPLACES_%s' % pkg, ' libfslcodec') + d.setVar('RPROVIDES_%s' % pkg, ' libfslcodec') + d.setVar('RCONFLICTS_%s' % pkg, ' libfslcodec') +} + +python __set_metapkg_rdepends() { + # Allow addition of all codecs in a image; useful specially for + # debugging. + codec_pkgs = oe.utils.packages_filter_out_system(d) + codec_pkgs = filter(lambda x: x not in ['imx-codec-test-bin', 'imx-codec-test-source'], + codec_pkgs) + d.appendVar('RDEPENDS_imx-codec-meta', ' ' + ' '.join(codec_pkgs)) +} + +PACKAGESPLITFUNCS =+ "__split_libfslcodec_plugins __set_metapkg_rdepends" + +PACKAGES_DYNAMIC = "${PN}-*" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +PACKAGES += "${PN}-meta ${PN}-test-bin ${PN}-test-source" + +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-meta = "1" + +# Ensure we get warnings if we miss something +FILES_${PN} = "" + +FILES_${PN}-dev += "${libdir}/imx-mm/*/*${SOLIBSDEV} \ + ${libdir}/imx-mm/*/*/*${SOLIBSDEV} \ + ${libdir}/pkgconfig/*.pc ${includedir}/imx-mm/*" + +FILES_${PN}-test-bin += "${datadir}/imx-mm/*/examples/*/bin" + +FILES_${PN}-test-source += "${datadir}/imx-mm/*" + +# FIXME: The wrap and lib names does not match +FILES_${PN}-oggvorbis += "${libdir}/imx-mm/audio-codec/wrap/lib_vorbisd_wrap_arm*_elinux.so.*" +FILES_${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux.so.*" +FILES_${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-multimedia/imx-codec/imx-codec_4.0.9.bb b/recipes-multimedia/imx-codec/imx-codec_4.0.9.bb new file mode 100644 index 0000000..3fb9802 --- /dev/null +++ b/recipes-multimedia/imx-codec/imx-codec_4.0.9.bb @@ -0,0 +1,9 @@ +# Copyright (C) 2013-2016 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-codec.inc + +SRC_URI[md5sum] = "bcf54698af6f52958b36e34dcbd9fcd1" +SRC_URI[sha256sum] = "62bda182143cde9743cba0eb2a1c315a53cb434294605742f9fc364219958888" + +COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)" diff --git a/recipes-multimedia/libfslcodec/libfslcodec.inc b/recipes-multimedia/libfslcodec/libfslcodec.inc deleted file mode 100644 index 2f0bc44..0000000 --- a/recipes-multimedia/libfslcodec/libfslcodec.inc +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (C) 2012-2014 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Freescale Multimedia codec libs" -LICENSE = "Proprietary" -SECTION = "multimedia" -LIC_FILES_CHKSUM = "file://COPYING;md5=3880bb9c943b135a30fad5e8aabd3ee9" - -inherit fsl-eula-unpack autotools pkgconfig - -SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" - -# Choose between Soft Float-Point and Hard Float-Point -EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '', d)}" - -PACKAGECONFIG ?= "" -PACKAGECONFIG_mx6q = "vpu" -PACKAGECONFIG_mx6dl = "vpu" - -PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,imx-vpu" - -do_install_append() { - # FIXME: This link points to nowhere - rm ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so - - # LTIB move the files around or gst-fsl-plugin won't find them - for p in $(find ${D}${libdir}/imx-mm -mindepth 2 -maxdepth 2 -not -type d); do - mv $p ${D}${libdir} - done - rmdir ${D}${libdir}/imx-mm/video-codec - -} - -python __set_insane_skip() { - # Ensure we have PACKAGES expanded - bb.build.exec_func("read_subpackage_metadata", d) - - for p in d.getVar('PACKAGES', True).split(): - # Even though we are packaging libraries those are plugins so we - # shouldn't rename the packages to follow its sonames. - d.setVar("DEBIAN_NOAUTONAME_%s" % p, "1") - - # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have - # the source we cannot fix it. Disable the insane check for now. - if p == 'libfslcodec-test-bin': - # FIXME: includes the DUT .so files so we need to deploy those - d.setVar("INSANE_SKIP_%s" % p, "ldflags textrel libdir") - else: - d.setVar("INSANE_SKIP_%s" % p, "ldflags textrel") -} - -do_package_qa[prefuncs] += "__set_insane_skip" - -python __split_libfslcodec_plugins() { - codecdir = bb.data.expand('${libdir}', d) - do_split_packages(d, codecdir, '^lib_([^_]*).*_arm.*_elinux\.so\..*', - aux_files_pattern='${libdir}/imx-mm/audio-codec/wrap/lib_%sd_wrap_arm*_elinux.so.*', - output_pattern='libfslcodec-%s', - description='Freescale i.MX Codec (%s)', - extra_depends='') -} - -python __set_metapkg_rdepends() { - # Allow addition of all codecs in a image; useful specially for - # debugging. - codec_pkgs = oe.utils.packages_filter_out_system(d) - codec_pkgs = filter(lambda x: x not in ['libfslcodec-test-bin', 'libfslcodec-test-source'], - codec_pkgs) - d.appendVar('RDEPENDS_libfslcodec-meta', ' ' + ' '.join(codec_pkgs)) -} - -PACKAGESPLITFUNCS =+ "__split_libfslcodec_plugins __set_metapkg_rdepends" - -PACKAGES_DYNAMIC = "${PN}-*" -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -PACKAGES += "${PN}-meta ${PN}-test-bin ${PN}-test-source" - -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-meta = "1" - -# Ensure we get warnings if we miss something -FILES_${PN} = "" - -FILES_${PN}-dev += "${libdir}/imx-mm/*/*${SOLIBSDEV} \ - ${libdir}/imx-mm/*/*/*${SOLIBSDEV} \ - ${libdir}/pkgconfig/*.pc ${includedir}/imx-mm/*" - -FILES_${PN}-test-bin += "${datadir}/imx-mm/*/examples/*/bin" - -FILES_${PN}-test-source += "${datadir}/imx-mm/*" - -# FIXME: The wrap and lib names does not match -FILES_${PN}-oggvorbis += "${libdir}/imx-mm/audio-codec/wrap/lib_vorbisd_wrap_arm*_elinux.so.*" -FILES_${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux.so.*" -FILES_${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*" - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb b/recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb deleted file mode 100644 index 1b32f90..0000000 --- a/recipes-multimedia/libfslcodec/libfslcodec_4.0.8.bb +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2013-2015 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) - -require libfslcodec.inc - -SRC_URI[md5sum] = "462fb27b20cd7df56a49b9e7d6b7c8b4" -SRC_URI[sha256sum] = "544ffc5989bce18ca50c7a826cc03370b1cf8455335e4291ef0c0779b4c33de0" - -COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)" -- cgit v1.2.3-54-g00ecf