libomxil-xlnx: Remove obsolete versions

There is no reason to keep the older versions, as the current version remains
the same API, just with fixes.

Note before the version was set to 1.0.0, but the various version files inside
the source indicate it's really 1.1.2.  Adjust the naming to match and make
it clear this is the xilinx fork and which release.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

4 files changed, 1 insertions, 156 deletions

diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_1.1.2-xilinx-v2023.2.bb
index af40e50c..4a956a68 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_1.1.2-xilinx-v2023.2.bb
@@ -3,8 +3,7 @@ DESCRIPTION = "OMX IL Libraries,test applications and headers for VCU"
 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-omx-il.git;protocol=https"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
deleted file mode 100644
index 7387b90c..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.1.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers 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-omx-il.git;protocol=https"
-SRCREV = "b3308c608be7ed9250b9c6732f6e0a02b1a2e985"
-
-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}"
-
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
deleted file mode 100644
index 4e6019f4..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers 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-omx-il.git;protocol=https"
-SRCREV = "6752f5da88a8783f689ae762065295b89902d6d4"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-S  = "${WORKDIR}/git"
-
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb
deleted file mode 100644
index 2c94251b..00000000
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.1.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "OpenMAX Integration layer for VCU"
-DESCRIPTION = "OMX IL Libraries,test applications and headers 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-omx-il.git;protocol=https"
-SRCREV = "4773b372b72b88ccbabc122b023f042fb22a019e"
-
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-SRC_URI += "file://0001-Current-gcc-requires-cstdint-for-C-types.patch"
-
-S  = "${WORKDIR}/git"
-
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "vcu"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "libvcu-xlnx"
-RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
-
-EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
-
-EXTRA_OEMAKE = " \
-    CC='${CC}' CXX='${CXX} ${CXXFLAGS}' \
-    EXTERNAL_INCLUDE='${EXTERNAL_INCLUDE}' \
-    "
-
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}/vcu-omx-il
-
-    install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
-
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
-
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
-    oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_encoder ${D}/${libdir}/
-}
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-
-EXCLUDE_FROM_WORLD = "1"