From 178bb414468375e49b46469c2798d44a05a9cbee Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 19 Jul 2018 10:52:22 +0200 Subject: [PATCH] imx-codec: update to version 4.4.0 This is the version used by NXP in the rocko-4.9.88-2.2.0_8qxp_beta2 branch of their meta-fsl-bsp-release layer. https://jira.digi.com/browse/DEL-6078 Signed-off-by: Gabriel Valcazar --- .../imx-codec/imx-codec.inc | 114 ++++++++++++++++++ .../imx-codec/imx-codec_4.2.1.bb | 11 -- .../imx-codec/imx-codec_4.4.0.bb | 14 +++ ....2.1.bbappend => imx-codec_4.4.0.bbappend} | 0 4 files changed, 128 insertions(+), 11 deletions(-) create mode 100644 meta-digi-dey/recipes-multimedia/imx-codec/imx-codec.inc delete mode 100644 meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bb create mode 100644 meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.4.0.bb rename meta-digi-dey/recipes-multimedia/imx-codec/{imx-codec_4.2.1.bbappend => imx-codec_4.4.0.bbappend} (100%) diff --git a/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec.inc b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec.inc new file mode 100644 index 000000000..c14866db3 --- /dev/null +++ b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec.inc @@ -0,0 +1,114 @@ +# 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=6b552f505eedab4a11ab538cf3db743a" + +# Backward compatibility +PROVIDES += "libfslcodec" + +inherit fsl-eula-unpack autotools pkgconfig + +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" + +# Choose between 32bit and 64bit binaries +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" + +PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu" + +do_install_append() { + # FIXME: This link points to nowhere + if [ -e ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so ]; then + rm ${D}${libdir}/imx-mm/audio-codec/lib_src_ppp_arm11_elinux.so + fi + + # 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/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bb b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bb deleted file mode 100644 index 5145c34e9..000000000 --- a/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright 2017 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require recipes-multimedia/imx-codec/imx-codec.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a" - -SRC_URI[md5sum] = "3db67e3f602e65fe0ac00ae4f9ea6109" -SRC_URI[sha256sum] = "20d3f9b4187fcd9e7007c94558a00bab1191513eee74b6f0d8c7b43f874e06ed" - -COMPATIBLE_MACHINE = "(ccimx6)" diff --git a/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.4.0.bb b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.4.0.bb new file mode 100644 index 000000000..15660ce66 --- /dev/null +++ b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.4.0.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2017-2018 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require imx-codec.inc + +PACKAGECONFIG_remove_imxvpuamphion = "vpu" + +LIC_FILES_CHKSUM = "file://COPYING;md5=ab61cab9599935bfe9f700405ef00f28" + +SRC_URI[md5sum] = "27c4d8f70a2c9ee0c63034f97752c235" +SRC_URI[sha256sum] = "6f0117365e0b0235ba42fc8b1bbbc5e02e635da47aff66face5816721b581fbf" + +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bbappend b/meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.4.0.bbappend similarity index 100% rename from meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.2.1.bbappend rename to meta-digi-dey/recipes-multimedia/imx-codec/imx-codec_4.4.0.bbappend