From 253edff4b1cfbdeacac4166d7ef1a8aaf99f754e Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 17 May 2024 13:49:28 -0600 Subject: libvcu-ctrlsw: Rename from libvcu-xlnx Rename to better reflect what the package is. Signed-off-by: Mark Hatle --- .../vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb | 47 ++++++++++++++++++++++ .../vcu/libvcu-omxil_1.1.2-xilinx-v2023.2.bb | 4 +- .../vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb | 44 -------------------- 3 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb delete mode 100644 meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb new file mode 100644 index 00000000..081398cc --- /dev/null +++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2023.2.bb @@ -0,0 +1,47 @@ +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=ef69c2bb405668101824f0b644631e2e" + +# Recipe has been renamed +PROVIDES += "libvcu-xlnx" + +PV .= "+git" + +BRANCH ?= "xlnx_rel_v2023.2" +REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https" +SRCREV = "84b0856cad7844d69f57ac4d9447c20930875475" + +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" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +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 + + oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include INSTALL_PATH=${D}/${bindir} + 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-omxil_1.1.2-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2023.2.bb index 188b2712..becb73b7 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2023.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2023.2.bb @@ -26,8 +26,8 @@ REQUIRED_MACHINE_FEATURES = "vcu" PACKAGE_ARCH = "${MACHINE_ARCH}" -DEPENDS = "libvcu-xlnx" -RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx" +DEPENDS = "libvcu-ctrlsw" +RDEPENDS:${PN} = "kernel-module-vcu libvcu-ctrlsw" EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include" diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb deleted file mode 100644 index f28bba55..00000000 --- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_1.0.74-xilinx-v2023.2.bb +++ /dev/null @@ -1,44 +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=ef69c2bb405668101824f0b644631e2e" - -PV .= "+git" - -BRANCH ?= "xlnx_rel_v2023.2" -REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https" -SRCREV = "84b0856cad7844d69f57ac4d9447c20930875475" - -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" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -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 - - oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include INSTALL_PATH=${D}/${bindir} - 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" -- cgit v1.2.3-54-g00ecf