imx-pxp-g2d: Rename to imx-g2d-pxpg2d-rename

NXP is moving the G2D implementations to an imx-g2d-<backend> naming
scheme, which groups them with imx-g2d-samples and matches the
already-renamed nxp-imx/imx-g2d-pxp repository.

Nothing changes for layers that go through virtual/libg2d. For the
rest, the rename keeps the old name working:

- PROVIDES the old name, so DEPENDS on imx-pxp-g2d still resolve.
- RPROVIDES, RREPLACES and RCONFLICTS the old package, so package
  feeds and images built before the rename upgrade cleanly.
- IMX_G2D_PXP_SRC defaults to the old IMX_PXP_G2D_SRC, so
  existing mirror overrides keep applying.

A imx-pxp-g2d_%.bbappend in another layer must be renamed; BitBake reports
it as dangling otherwise. PREFERRED_PROVIDER_virtual/libg2d set to
the old name must be updated as well, since it is matched against the
recipe name.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 13 insertions, 5 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 22f9623ea..985d11ec9 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -595,8 +595,8 @@ PREFERRED_RPROVIDER_virtual-opencl-icd:imxmali ?= "mali-imx-libopencl"
 
 PREFERRED_PROVIDER_virtual/libg2d              ?= "imx-g2d-gpu"
 PREFERRED_PROVIDER_virtual/libg2d:imxdpu       ?= "imx-g2d-dpu"
-PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d"
-PREFERRED_PROVIDER_virtual/libg2d:mx943-nxp-bsp ?= "imx-pxp-g2d"
+PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-g2d-pxp"
+PREFERRED_PROVIDER_virtual/libg2d:mx943-nxp-bsp ?= "imx-g2d-pxp"
 
 # Set preferred Vulkan ICD runtime
 PREFERRED_RPROVIDER_virtual-vulkan-icd         ?= "mesa-vulkan-drivers"
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-g2d-pxp_git.bb
index 7af23b2c6..d25ff8f56 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-pxp_git.bb
@@ -9,11 +9,14 @@ SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0a977e480eb69a215e364c381ff61aec"
 
-PROVIDES += "virtual/libg2d"
+PROVIDES += "virtual/libg2d imx-pxp-g2d"
 
 PV = "2.5.0+git"
 
-SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
+SRC_URI = "${IMX_G2D_PXP_SRC};branch=${SRCBRANCH}"
+# IMX_PXP_G2D_SRC is the name used before the rename to imx-g2d-pxp; keep
+# honouring it so existing mirror overrides are not silently dropped.
+IMX_G2D_PXP_SRC ?= "${IMX_PXP_G2D_SRC}"
 IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
 SRCBRANCH = "imx_2.5"
 SRCREV = "9551dd7f97c37af80b42cd8845ffb5aa190145dc"
@@ -29,4 +32,9 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+
+# Upgrade path for feeds and images built before the rename.
+RPROVIDES:${PN} = "imx-pxp-g2d"
+RREPLACES:${PN} = "imx-pxp-g2d"
+RCONFLICTS:${PN} = "imx-pxp-g2d"
 COMPATIBLE_MACHINE = "(mx93-nxp-bsp|mx943-nxp-bsp)"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index c61b20f90..47a58da01 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -56,7 +56,7 @@ PACKAGECONFIG[gpu-fbdev] = " \
 PACKAGECONFIG[pxp] = " \
     BUILD_IMPLEMENTATION=pxp, \
     , \
-    imx-pxp-g2d wayland-native wayland wayland-protocols, \
+    imx-g2d-pxp wayland-native wayland wayland-protocols, \
     , \
     , \
     dpu dpu95 gpu-drm gpu-fbdev"