meta-digi: another round of updates following meta-freescale
meta-freescale did another merge of recipe updates that we need to follow to prevent build failures. Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera
parent
de0e08a7c0
commit
c2a333de76
|
|
@ -204,10 +204,10 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin imx-gst1.0-plu
|
|||
|
||||
# In 'meta-freescale' these gstreamer preferred versions are restricted to 'mx8-nxp-bsp'
|
||||
# but in DEY we use them also in the 6UL, so relax the override to 'imx-nxp-base'
|
||||
PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp ??= "1.20.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.20.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.20.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp ??= "1.20.0.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp ??= "1.20.3.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.20.3.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.20.3.imx"
|
||||
PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp ??= "1.20.3.imx"
|
||||
PREFERRED_VERSION_ffmpeg:imx-nxp-bsp ??= "4.4.1"
|
||||
|
||||
# Determines if the SoC has support for Vivante kernel driver
|
||||
|
|
|
|||
|
|
@ -1,119 +0,0 @@
|
|||
# Copyright (C) 2012-2016 Freescale Semiconductor
|
||||
# Copyright 2017-2021 NXP
|
||||
# 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}/${BP}.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 ?= ""
|
||||
# Enable vpu PACKAGECONFIG for aarch32 vpu platforms only
|
||||
PACKAGECONFIG:mx6q-nxp-bsp = "vpu"
|
||||
PACKAGECONFIG:mx6dl-nxp-bsp = "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 lib-src-ppp-arm11-elinux1"
|
||||
|
||||
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.*"
|
||||
FILES:lib-src-ppp-arm11-elinux1 += "${libdir}/lib_src_ppp_arm11_elinux.so.1"
|
||||
|
||||
PACKAGE_ARCH:mx6q-nxp-bsp = "${MACHINE_SOCARCH}"
|
||||
PACKAGE_ARCH:mx6dl-nxp-bsp = "${MACHINE_SOCARCH}"
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
# Copyright (C) 2013-2016 Freescale Semiconductor
|
||||
# Copyright 2017-2021 NXP
|
||||
# Released under the MIT license (see COPYING.MIT for the terms)
|
||||
|
||||
require imx-codec.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f"
|
||||
|
||||
SRC_URI[md5sum] = "f4b85212470daa797c91d2142faa493b"
|
||||
SRC_URI[sha256sum] = "8203956cddb3cac560efafcc60e8cab07dded8fea53bd144576d1ae6f3269826"
|
||||
|
||||
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)"
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
# Empirically detected binaries that are not needed for a given platform
|
||||
REDUNDANT_BINS ?= ""
|
||||
REDUNDANT_BINS:ccimx6ul ?= " \
|
||||
usr/lib/imx-mm/parser/lib_ape_parser_arm9_elinux* \
|
||||
usr/lib/imx-mm/parser/lib_avi_parser_arm9_elinux* \
|
||||
usr/lib/imx-mm/parser/lib_flv_parser_arm9_elinux* \
|
||||
usr/lib/imx-mm/parser/lib_mkv_parser_arm9_elinux* \
|
||||
|
|
|
|||
Loading…
Reference in New Issue