5 files changed, 1 insertions, 195 deletions

diff --git a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch b/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch
deleted file mode 100644
index defe14dc..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2316632e8f3eefc21bc4f9cb97be4603b4c14719 Mon Sep 17 00:00:00 2001
-From: Mark Hatle <mark.hatle@amd.com>
-Date: Thu, 28 Sep 2023 12:24:04 -0600
-Subject: [PATCH] Current gcc requires cstdint for C types
-
-Add #include <cstdint> to resolve the issues similar to the following:
-
-  module/module_structs.h:259:3: note: 'uint16_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-  module/module_structs.h:260:3: error: 'uint16_t' does not name a type
-
-Signed-off-by: Mark Hatle <mark.hatle@amd.com>
----
- exe_omx/encoder/EncCmdMngr.h | 1 +
- module/module_structs.h      | 1 +
- utility/processor_fifo.h     | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/exe_omx/encoder/EncCmdMngr.h b/exe_omx/encoder/EncCmdMngr.h
-index 6dacd68..cd3d0a6 100644
---- a/exe_omx/encoder/EncCmdMngr.h
-+++ b/exe_omx/encoder/EncCmdMngr.h
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "ICommandsSender.h"
- 
-diff --git a/module/module_structs.h b/module/module_structs.h
-index 7151b86..37ff8ac 100644
---- a/module/module_structs.h
-+++ b/module/module_structs.h
-@@ -6,6 +6,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 1c62ba4..3c9cd86 100644
---- a/utility/processor_fifo.h
-+++ b/utility/processor_fifo.h
-@@ -6,6 +6,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/vcu/libvcu-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb
index 9c790ce3..0c97f637 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "Control software libraries, test applications and headers provide
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e"
 
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git"
+PV .= "+git"
 
 BRANCH ?= "xlnx_rel_v2023.2"
 REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
deleted file mode 100644
index 0632821f..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git"
-
-BRANCH ?= "xlnx_rel_v2022.1"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "5bf158af204b181f00ac009c8745557642ecfe5f"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RDEPENDS:${PN} = "kernel-module-vcu"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
-
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
deleted file mode 100644
index 3ebb4d8d..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git"
-
-BRANCH ?= "xlnx_rel_v2022.2"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "3c59dede1923a159a8db736ce0b4ab55633a2114"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-RDEPENDS:${PN} = "kernel-module-vcu"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
-
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb
deleted file mode 100644
index c0d6da1c..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY = "Control Software for VCU"
-DESCRIPTION = "Control software libraries, test applications and headers provider for VCU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5375796c5ae4ee85ea1f2c1603e58509"
-
-XILINX_VCU_VERSION = "1.0.0"
-PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git"
-
-BRANCH ?= "xlnx_rel_v2023.1"
-REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "83aabb84c26667f7d6aee632654c63e504838061"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-RDEPENDS:${PN} = "kernel-module-vcu"
-
-EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-ctrl-sw/include
-
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
-    oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
-
-# Disable buildpaths QA check warnings.
-INSANE_SKIP:${PN} += "buildpaths"