diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2024-05-17 12:12:31 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2024-05-19 20:05:07 -0600 |
| commit | 3f00dfb748181b0d132eb0535a7979402aef451f (patch) | |
| tree | be233cb5605bb32262b2f89975b49adfb3200faf | |
| parent | d6021590fc12c04fdaa53f288097e542b19aee1b (diff) | |
| download | meta-xilinx-3f00dfb748181b0d132eb0535a7979402aef451f.tar.gz | |
libvcu-xlnx: Remove obsolete versions
No reason to keep older versions.
Note before the version was listed as 1.0.0, but looking at the release notes
it's clear this is actually version 1.0.74.
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
| -rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/files/0001-Current-gcc-requires-cstdint-for-C-types.patch | 55 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb (renamed from meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb) | 3 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.1.bb | 46 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb | 46 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.1.bb | 46 |
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 @@ | |||
| 1 | From 2316632e8f3eefc21bc4f9cb97be4603b4c14719 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mark Hatle <mark.hatle@amd.com> | ||
| 3 | Date: Thu, 28 Sep 2023 12:24:04 -0600 | ||
| 4 | Subject: [PATCH] Current gcc requires cstdint for C types | ||
| 5 | |||
| 6 | Add #include <cstdint> to resolve the issues similar to the following: | ||
| 7 | |||
| 8 | module/module_structs.h:259:3: note: 'uint16_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? | ||
| 9 | module/module_structs.h:260:3: error: 'uint16_t' does not name a type | ||
| 10 | |||
| 11 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
| 12 | --- | ||
| 13 | exe_omx/encoder/EncCmdMngr.h | 1 + | ||
| 14 | module/module_structs.h | 1 + | ||
| 15 | utility/processor_fifo.h | 1 + | ||
| 16 | 3 files changed, 3 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/exe_omx/encoder/EncCmdMngr.h b/exe_omx/encoder/EncCmdMngr.h | ||
| 19 | index 6dacd68..cd3d0a6 100644 | ||
| 20 | --- a/exe_omx/encoder/EncCmdMngr.h | ||
| 21 | +++ b/exe_omx/encoder/EncCmdMngr.h | ||
| 22 | @@ -7,6 +7,7 @@ | ||
| 23 | #include <iostream> | ||
| 24 | #include <string> | ||
| 25 | #include <vector> | ||
| 26 | +#include <cstdint> | ||
| 27 | |||
| 28 | #include "ICommandsSender.h" | ||
| 29 | |||
| 30 | diff --git a/module/module_structs.h b/module/module_structs.h | ||
| 31 | index 7151b86..37ff8ac 100644 | ||
| 32 | --- a/module/module_structs.h | ||
| 33 | +++ b/module/module_structs.h | ||
| 34 | @@ -6,6 +6,7 @@ | ||
| 35 | #include "module_enums.h" | ||
| 36 | #include <string> | ||
| 37 | #include <vector> | ||
| 38 | +#include <cstdint> | ||
| 39 | |||
| 40 | template<typename T> | ||
| 41 | struct InputOutput | ||
| 42 | diff --git a/utility/processor_fifo.h b/utility/processor_fifo.h | ||
| 43 | index 1c62ba4..3c9cd86 100644 | ||
| 44 | --- a/utility/processor_fifo.h | ||
| 45 | +++ b/utility/processor_fifo.h | ||
| 46 | @@ -6,6 +6,7 @@ | ||
| 47 | #include <utility/locked_queue.h> | ||
| 48 | #include <thread> | ||
| 49 | #include <functional> | ||
| 50 | +#include <string> | ||
| 51 | |||
| 52 | #if defined __linux__ | ||
| 53 | #include <sys/prctl.h> | ||
| 54 | -- | ||
| 55 | 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 | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ef69c2bb405668101824f0b644631e2e" |
| 5 | 5 | ||
| 6 | XILINX_VCU_VERSION = "1.0.0" | 6 | PV .= "+git" |
| 7 | PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" | ||
| 8 | 7 | ||
| 9 | BRANCH ?= "xlnx_rel_v2023.2" | 8 | BRANCH ?= "xlnx_rel_v2023.2" |
| 10 | REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https" | 9 | 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 @@ | |||
| 1 | SUMMARY = "Control Software for VCU" | ||
| 2 | DESCRIPTION = "Control software libraries, test applications and headers provider for VCU" | ||
| 3 | LICENSE = "Proprietary" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493" | ||
| 5 | |||
| 6 | XILINX_VCU_VERSION = "1.0.0" | ||
| 7 | PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" | ||
| 8 | |||
| 9 | BRANCH ?= "xlnx_rel_v2022.1" | ||
| 10 | REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https" | ||
| 11 | SRCREV = "5bf158af204b181f00ac009c8745557642ecfe5f" | ||
| 12 | |||
| 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | ||
| 14 | SRC_URI = "${REPO};${BRANCHARG}" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | |||
| 18 | inherit features_check | ||
| 19 | |||
| 20 | REQUIRED_MACHINE_FEATURES = "vcu" | ||
| 21 | |||
| 22 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 23 | |||
| 24 | RDEPENDS:${PN} = "kernel-module-vcu" | ||
| 25 | |||
| 26 | EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'" | ||
| 27 | |||
| 28 | do_install() { | ||
| 29 | install -d ${D}${libdir} | ||
| 30 | install -d ${D}${includedir}/vcu-ctrl-sw/include | ||
| 31 | |||
| 32 | install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder | ||
| 33 | install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder | ||
| 34 | |||
| 35 | oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include | ||
| 36 | oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/ | ||
| 37 | oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/ | ||
| 38 | } | ||
| 39 | |||
| 40 | # These libraries shouldn't get installed in world builds unless something | ||
| 41 | # explicitly depends upon them. | ||
| 42 | |||
| 43 | EXCLUDE_FROM_WORLD = "1" | ||
| 44 | |||
| 45 | # Disable buildpaths QA check warnings. | ||
| 46 | 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 @@ | |||
| 1 | SUMMARY = "Control Software for VCU" | ||
| 2 | DESCRIPTION = "Control software libraries, test applications and headers provider for VCU" | ||
| 3 | LICENSE = "Proprietary" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493" | ||
| 5 | |||
| 6 | XILINX_VCU_VERSION = "1.0.0" | ||
| 7 | PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" | ||
| 8 | |||
| 9 | BRANCH ?= "xlnx_rel_v2022.2" | ||
| 10 | REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https" | ||
| 11 | SRCREV = "3c59dede1923a159a8db736ce0b4ab55633a2114" | ||
| 12 | |||
| 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | ||
| 14 | SRC_URI = "${REPO};${BRANCHARG}" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | |||
| 18 | inherit features_check | ||
| 19 | |||
| 20 | REQUIRED_MACHINE_FEATURES = "vcu" | ||
| 21 | |||
| 22 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 23 | |||
| 24 | RDEPENDS:${PN} = "kernel-module-vcu" | ||
| 25 | |||
| 26 | EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'" | ||
| 27 | |||
| 28 | do_install() { | ||
| 29 | install -d ${D}${libdir} | ||
| 30 | install -d ${D}${includedir}/vcu-ctrl-sw/include | ||
| 31 | |||
| 32 | install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder | ||
| 33 | install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder | ||
| 34 | |||
| 35 | oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include | ||
| 36 | oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/ | ||
| 37 | oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/ | ||
| 38 | } | ||
| 39 | |||
| 40 | # These libraries shouldn't get installed in world builds unless something | ||
| 41 | # explicitly depends upon them. | ||
| 42 | |||
| 43 | EXCLUDE_FROM_WORLD = "1" | ||
| 44 | |||
| 45 | # Disable buildpaths QA check warnings. | ||
| 46 | 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 @@ | |||
| 1 | SUMMARY = "Control Software for VCU" | ||
| 2 | DESCRIPTION = "Control software libraries, test applications and headers provider for VCU" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5375796c5ae4ee85ea1f2c1603e58509" | ||
| 5 | |||
| 6 | XILINX_VCU_VERSION = "1.0.0" | ||
| 7 | PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" | ||
| 8 | |||
| 9 | BRANCH ?= "xlnx_rel_v2023.1" | ||
| 10 | REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https" | ||
| 11 | SRCREV = "83aabb84c26667f7d6aee632654c63e504838061" | ||
| 12 | |||
| 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | ||
| 14 | SRC_URI = "${REPO};${BRANCHARG}" | ||
| 15 | |||
| 16 | SRC_URI += "file://0001-Support-updated-gcc-add-cstdint-where-necessary.patch" | ||
| 17 | |||
| 18 | S = "${WORKDIR}/git" | ||
| 19 | |||
| 20 | inherit features_check | ||
| 21 | |||
| 22 | REQUIRED_MACHINE_FEATURES = "vcu" | ||
| 23 | |||
| 24 | RDEPENDS:${PN} = "kernel-module-vcu" | ||
| 25 | |||
| 26 | EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'" | ||
| 27 | |||
| 28 | do_install() { | ||
| 29 | install -d ${D}${libdir} | ||
| 30 | install -d ${D}${includedir}/vcu-ctrl-sw/include | ||
| 31 | |||
| 32 | install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder | ||
| 33 | install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder | ||
| 34 | |||
| 35 | oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include | ||
| 36 | oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/ | ||
| 37 | oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/ | ||
| 38 | } | ||
| 39 | |||
| 40 | # These libraries shouldn't get installed in world builds unless something | ||
| 41 | # explicitly depends upon them. | ||
| 42 | |||
| 43 | EXCLUDE_FROM_WORLD = "1" | ||
| 44 | |||
| 45 | # Disable buildpaths QA check warnings. | ||
| 46 | INSANE_SKIP:${PN} += "buildpaths" | ||
