From 31f04e4b16baf396766ff0fbb563a43d0b28fd7c Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Mon, 31 Aug 2020 21:10:05 +0000 Subject: imx-codec: update to 4.5.5 NOTE: This update uses new EULA v11 from NXP. Following commits are added in this release (including command): $ git log --oneline --no-decorate 4ebbb1bc..16dba069 16dba069 MMFMWK-8757 release/build_std: Fix yocto automation issue b912378e MMFMWK-8755 release/build_std: Add flac unit test to pkg 5871d696 MLK-23360-2: release/lib: Update mp3 codec lib 3573ebeb MLK-23360-1: mp3_dec: MP3 codec doesn't detect sample rate change in the stream edb24319 [configurea.ac] Update dsp version to 1.0.14 for next release 980baaad [configurea.ac] Update version to 4.5.5 for next release 4fddfbd5 [configurea.ac] Update dsp version to 1.0.13 for next release e3b603f8 [configurea.ac] Update version to 4.5.4 for next release Signed-off-by: Andrey Zhizhikin Cc: Tom Hochstein --- recipes-multimedia/imx-codec/imx-codec_4.5.3.bb | 119 ------------------------ recipes-multimedia/imx-codec/imx-codec_4.5.5.bb | 119 ++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 119 deletions(-) delete mode 100644 recipes-multimedia/imx-codec/imx-codec_4.5.3.bb create mode 100644 recipes-multimedia/imx-codec/imx-codec_4.5.5.bb diff --git a/recipes-multimedia/imx-codec/imx-codec_4.5.3.bb b/recipes-multimedia/imx-codec/imx-codec_4.5.3.bb deleted file mode 100644 index e41469f3..00000000 --- a/recipes-multimedia/imx-codec/imx-codec_4.5.3.bb +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright 2017 NXP -# Copyright 2018 (C) O.S. Systems Software LTDA. -# 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=fd4b227530cd88a82af6a5982cfb724d" - -# Backward compatibility -PROVIDES += "libfslcodec" - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "a0413b390a473aee862806dd25a4a366" -SRC_URI[sha256sum] = "ecaecb4afb646efad9a81d67a1a5e50a9e06ed49fa8ea947064465a085b2c578" - -inherit fsl-eula-unpack autotools pkgconfig - -# Choose between 32-bit and 64-bit binaries and between Soft Float-Point and Hard Float-Point -EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \ - bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '', d), d)}" - -PACKAGECONFIG ?= "" -PACKAGECONFIG_imxvpu = "vpu" - -# We need to ensure we don't have '-src' package overrided -PACKAGE_DEBUG_SPLIT_STYLE = 'debug-without-src' - -PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu" - -do_install_append() { - # 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 - - # Fixup ownership of files - chown -R root:root ${D} -} - -python __set_insane_skip() { - # Ensure we have PACKAGES expanded - bb.build.exec_func("read_subpackage_metadata", d) - - for p in d.getVar('PACKAGES').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 file-rdeps") - 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').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}" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/recipes-multimedia/imx-codec/imx-codec_4.5.5.bb b/recipes-multimedia/imx-codec/imx-codec_4.5.5.bb new file mode 100644 index 00000000..8f5caff0 --- /dev/null +++ b/recipes-multimedia/imx-codec/imx-codec_4.5.5.bb @@ -0,0 +1,119 @@ +# Copyright (C) 2012-2016 Freescale Semiconductor +# Copyright 2017 NXP +# Copyright 2018 (C) O.S. Systems Software LTDA. +# 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=228c72f2a91452b8a03c4cab30f30ef9" + +# Backward compatibility +PROVIDES += "libfslcodec" + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" +SRC_URI[md5sum] = "5472ae7b57a8390224761d151632a2a6" +SRC_URI[sha256sum] = "b0d5a6f847df99ee213cc79dae4f5e7194f567859c43d68d7c7c794a97f90294" + +inherit fsl-eula-unpack autotools pkgconfig + +# Choose between 32-bit and 64-bit binaries and between Soft Float-Point and Hard Float-Point +EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \ + bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '', d), d)}" + +PACKAGECONFIG ?= "" +PACKAGECONFIG_imxvpu = "vpu" + +# We need to ensure we don't have '-src' package overrided +PACKAGE_DEBUG_SPLIT_STYLE = 'debug-without-src' + +PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu" + +do_install_append() { + # 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 + + # Fixup ownership of files + chown -R root:root ${D} +} + +python __set_insane_skip() { + # Ensure we have PACKAGES expanded + bb.build.exec_func("read_subpackage_metadata", d) + + for p in d.getVar('PACKAGES').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 file-rdeps") + 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').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}" +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" -- cgit v1.2.3-54-g00ecf