From: Mark Hatle <[email protected]> Use the core/core_version.mk as an indication of the correct version number for this component.
Signed-off-by: Mark Hatle <[email protected]> --- ...libvdu-omxil-Fix-missing-definitions.patch | 54 ------------------ ...b => libvdu-omxil_1.1.2-xilinx-v2023.2.bb} | 2 - .../vdu/libvdu-omxil_2023.1.bb | 55 ------------------- 3 files changed, 111 deletions(-) delete mode 100644 meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch rename meta-xilinx-core/recipes-multimedia/vdu/{libvdu-omxil_2023.2.bb => libvdu-omxil_1.1.2-xilinx-v2023.2.bb} (95%) delete mode 100644 meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb diff --git a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch b/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch deleted file mode 100644 index db23ed00..00000000 --- a/meta-xilinx-core/recipes-multimedia/vdu/files/0001-libvdu-omxil-Fix-missing-definitions.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7fc63cdd6642ea84b78db62fccafc460af0ff23e Mon Sep 17 00:00:00 2001 -From: Mark Hatle <[email protected]> -Date: Thu, 25 Jan 2024 12:50:18 -0700 -Subject: [PATCH] Fix missing definitions - -Fix issues such as: -| module/module_structs.h:370:3: error: 'uint8_t' does not name a type -| 370 | uint8_t distributionMaxrgbPercentages[MAX_MAXRGB_PERCENTILES_ST2094_40]; -| | ^~~~~~~ -| module/module_structs.h:370:3: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? -| module/module_structs.h:371:3: error: 'uint32_t' does not name a type -| 371 | uint32_t distributionMaxrgbPercentiles[MAX_MAXRGB_PERCENTILES_ST2094_40]; -| | ^~~~~~~~ -| module/module_structs.h:371:3: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? - -and - -| ./utility/processor_fifo.h:80:15: error: field 'name_' has incomplete type 'std::string' {aka 'std::__cxx11::basic_string<char>'} -| 80 | std::string name_; -| | ^~~~~ - -Signed-off-by: Mark Hatle <[email protected]> ---- - module/module_structs.h | 1 + - utility/processor_fifo.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/module/module_structs.h b/module/module_structs.h -index 75bdff6..594076f 100644 ---- a/module/module_structs.h -+++ b/module/module_structs.h -@@ -27,6 +27,7 @@ - #include "module_enums.h" - #include <string> - #include <vector> -+#include <cstdint> - - template<typename T> - struct InputOutput -diff --git a/utility/processor_fifo.h b/utility/processor_fifo.h -index e0dd47c..f047267 100644 ---- a/utility/processor_fifo.h -+++ b/utility/processor_fifo.h -@@ -27,6 +27,7 @@ - #include <utility/locked_queue.h> - #include <thread> - #include <functional> -+#include <string> - - #if defined __linux__ - #include <sys/prctl.h> --- -2.34.1 - diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb similarity index 95% rename from meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb rename to meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb index 516719aa..7a79e238 100644 --- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2023.2.bb @@ -3,8 +3,6 @@ DESCRIPTION = "OMX IL Libraries,test application and headers for VDU" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f" -XILINX_VDU_VERSION = "1.0.0" -PV =. "${XILINX_VDU_VERSION}-xilinx-v" PV .= "+git" BRANCH ?= "xlnx_rel_v2023.2" diff --git a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb deleted file mode 100644 index 04cac04e..00000000 --- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_2023.1.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "OpenMAX Integration layer for VDU" -DESCRIPTION = "OMX IL Libraries,test application and headers for VDU" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aaf483d309243c4596f6373eb9c8325f" - -XILINX_VDU_VERSION = "1.0.0" -PV =. "${XILINX_VDU_VERSION}-xilinx-v" -PV .= "+git" - -BRANCH ?= "xlnx_rel_v2023.1" -REPO ?= "git://github.com/Xilinx/vdu-omx-il.git;protocol=https" -SRCREV ?= "811eefac953fd5e098c69cada97a0dd35f5e9015" - -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG} \ - file://0001-libvdu-omxil-Fix-missing-definitions.patch \ - " -S = "${WORKDIR}/git" - -inherit autotools features_check - -REQUIRED_MACHINE_FEATURES = "vdu" - -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core" -COMPATIBLE_MACHINE:versal-ai-edge = "versal-ai-edge" - -PACKAGE_ARCH = "${SOC_FAMILY_ARCH}" - -DEPENDS = "libvdu-ctrlsw" -RDEPENDS:${PN} = "kernel-module-vdu libvdu-ctrlsw" - -EXTERNAL_INCLUDE="${STAGING_INCDIR}/vdu-ctrl-sw/include" - -do_compile[dirs] = "${S}" -do_install[dirs] = "${S}" - -EXTRA_OEMAKE = " \ - CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \ - EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \ - INSTALL_PATH=${D}${bindir} \ - INCLUDE_INST_PATH=${D}${includedir} \ - " - -do_install:append() { - install -d ${D}${libdir} - - oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/ - oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/ -} - -# These libraries shouldn't get installed in world builds unless something -# explicitly depends upon them. - -EXCLUDE_FROM_WORLD = "1" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5342): https://lists.yoctoproject.org/g/meta-xilinx/message/5342 Mute This Topic: https://lists.yoctoproject.org/mt/106179159/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
