[meta-oe,1/6] zbar: Update 1.23.1 -> 1.23.92+4e0f618

- Drop patches already upstream.
- Remove duplicated PACKAGECONFIG variable.
- Update to master: Version 1.23.92+4e0f618.

Signed-off-by: Daniel Gomez <daniel@qtec.com>
---
 .../0001-qt-Create-subdir-in-Makefile.patch   | 35 ----------------
 ...02-zbarcam-Create-subdir-in-Makefile.patch | 40 -------------------
 meta-oe/recipes-support/zbar/zbar_git.bb      | 12 ++----
 3 files changed, 4 insertions(+), 83 deletions(-)
 delete mode 100644 meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch
 delete mode 100644 meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch

--
2.34.1

please rebase this patch on top of master-next and resend.

On 3/14/22 1:56 AM, Daniel Gomez wrote:
> - Drop patches already upstream.
> - Remove duplicated PACKAGECONFIG variable.
> - Update to master: Version 1.23.92+4e0f618.
> 
> Signed-off-by: Daniel Gomez <daniel@qtec.com>
> ---
>   .../0001-qt-Create-subdir-in-Makefile.patch   | 35 ----------------
>   ...02-zbarcam-Create-subdir-in-Makefile.patch | 40 -------------------
>   meta-oe/recipes-support/zbar/zbar_git.bb      | 12 ++----
>   3 files changed, 4 insertions(+), 83 deletions(-)
>   delete mode 100644 meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch
>   delete mode 100644 meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch
> 
> diff --git a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch
> deleted file mode 100644
> index d7ca15207..000000000
> --- a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001
> -From: Daniel Gomez <dagmcr@gmail.com>
> -Date: Sun, 17 Jan 2021 23:32:51 +0100
> -Subject: [PATCH 1/2] qt: Create subdir in Makefile
> -
> -Create builddir/qt subdir when --with-qt5 is enabled.
> -
> -Fixes the following error:
> -
> -moc -Iqt -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
> --I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets
> --I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui
> --I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore
> --I../git/include ../git/include/zbar/QZBar.h -o qt/moc_QZBar.cpp
> -moc: Cannot create qt/moc_QZBar.cpp
> -make: *** [Makefile:2459: qt/moc_QZBar.cpp] Error 1
> -
> -Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
> ----
> - qt/Makefile.am.inc | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc
> -index b099c2b..c98fbeb 100644
> ---- a/qt/Makefile.am.inc
> -+++ b/qt/Makefile.am.inc
> -@@ -15,4 +15,5 @@ qt/moc_%.cpp: qt/%.h
> - 	$(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@
> -
> - qt/moc_%.cpp: include/zbar/%.h
> -+	@$(mkdir_p) qt 2>/dev/null
> - 	$(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@
> ---
> -2.29.2
> -
> diff --git a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch
> deleted file mode 100644
> index a1c27b8b4..000000000
> --- a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001
> -From: Daniel Gomez <dagmcr@gmail.com>
> -Date: Sun, 17 Jan 2021 23:33:19 +0100
> -Subject: [PATCH 2/2] zbarcam: Create subdir in Makefile
> -
> -Create builddir/zbarcam when --with-qt5 is enabled.
> -
> -Fixes the following error:
> -
> -moc -i -Izbarcam -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB
> --DQT_CORE_LIB
> --I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets
> --I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtX11Extras
> --I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui
> --I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore
> --I../git/include ../git/zbarcam/zbarcam-qt.cpp -o
> -zbarcam/moc_zbarcam_qt.h
> -moc: Cannot create zbarcam/moc_zbarcam_qt.h
> -make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1
> -
> -Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
> ----
> - zbarcam/Makefile.am.inc | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc
> -index b6de82c..e90c50c 100644
> ---- a/zbarcam/Makefile.am.inc
> -+++ b/zbarcam/Makefile.am.inc
> -@@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h
> -
> -
> - zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp
> -+	@$(mkdir_p) zbarcam 2>/dev/null
> - 	$(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@
> - endif
> -
> ---
> -2.29.2
> -
> diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb
> index 17084f830..5d7d7e173 100644
> --- a/meta-oe/recipes-support/zbar/zbar_git.bb
> +++ b/meta-oe/recipes-support/zbar/zbar_git.bb
> @@ -9,23 +9,19 @@ SECTION = "graphics"
>   LICENSE = "LGPL-2.1-only"
>   LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef"
> 
> -SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \
> -    file://0001-qt-Create-subdir-in-Makefile.patch \
> -    file://0002-zbarcam-Create-subdir-in-Makefile.patch \
> -"
> -SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37"
> +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https"
> +SRCREV = "4e0f618b54af060fc3516acfb34b6023ed064620"
> 
>   S = "${WORKDIR}/git"
> -PV = "0.23.1+git${SRCPV}"
> +PV = "0.23.92+git${SRCPV}"
> 
>   DEPENDS += "xmlto-native"
> 
>   PACKAGECONFIG ??= "\
>       ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
> +    video python3 \
>   "
> 
> -PACKAGECONFIG ??= "video python3"
> -
>   inherit autotools pkgconfig gettext \
>       ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \
>       ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection',	'', d)} \
> --
> 2.34.1
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95972): https://lists.openembedded.org/g/openembedded-devel/message/95972
> Mute This Topic: https://lists.openembedded.org/mt/89769362/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

seeing failures on mips

https://errors.yoctoproject.org/Errors/Details/651743/

On Mon, Mar 14, 2022 at 1:57 AM Daniel Gomez <daniel@qtec.com> wrote:
>
> - Move tarball recipe to git due to the lack of a release in over 2+
>   years.
> - Drop patches already upstream.
> - Add PACKAGECONFIG support: udev and glamor.
> - Add mesa driver runtime dependencies and libegl as glamor runtime dependency.
> - Add ${PN}-config package.
>
> Signed-off-by: Daniel Gomez <daniel@qtec.com>
> ---
>  .../0001-Fix-link-failure-with-gcc-10.patch   |  34 --
>  ...terminology-to-use-primary-secondary.patch | 369 ------------------
>  .../xorg-driver/xf86-video-ati_19.1.0.bb      |  25 --
>  .../xorg-driver/xf86-video-ati_git.bb         |  43 ++
>  4 files changed, 43 insertions(+), 428 deletions(-)
>  delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
>  delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch
>  delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb
>  create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_git.bb
>
> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
> deleted file mode 100644
> index 7dfa23342..000000000
> --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From cebbeaa9d0bdc18377faef27ea9ffd38e509d180 Mon Sep 17 00:00:00 2001
> -From: Adam Jackson <ajax@redhat.com>
> -Date: Tue, 4 Feb 2020 16:38:06 -0500
> -Subject: [PATCH] Fix link failure with gcc 10
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Without the 'extern' this looks like a definition not just a
> -declaration, in every file that includes the header. gcc 10 is stricter
> -about this kind of multiple definition.
> -
> -Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=f223035f4ffcff2a9296d1e907a5193f8e8845a3]
> -Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
> ----
> - src/drmmode_display.h | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/src/drmmode_display.h b/src/drmmode_display.h
> -index 96eaef0..8cd8a0a 100644
> ---- a/src/drmmode_display.h
> -+++ b/src/drmmode_display.h
> -@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type,
> -                        uint64_t *ust, uint32_t *result_seq);
> -
> -
> --miPointerSpriteFuncRec drmmode_sprite_funcs;
> -+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
> -
> -
> - #endif
> ---
> -2.28.0
> -
> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch
> deleted file mode 100644
> index cda2c2f14..000000000
> --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch
> +++ /dev/null
> @@ -1,369 +0,0 @@
> -From 6e035c007876ffe972a497681dd3debdc806e979 Mon Sep 17 00:00:00 2001
> -From: Dave Airlie <airlied@redhat.com>
> -Date: Mon, 13 Jul 2020 09:11:28 +1000
> -Subject: [PATCH] ati: cleanup terminology to use primary/secondary
> -
> -The X server changed some API/ABIs here.
> -
> -Based on amdgpu patch by Michel
> ----
> -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch]
> -man/radeon.man        |  2 +-
> - src/compat-api.h      |  6 ++++
> - src/drmmode_display.c |  4 +--
> - src/evergreen_state.h |  2 +-
> - src/r600_state.h      |  2 +-
> - src/radeon.h          | 10 +++---
> - src/radeon_exa.c      |  2 +-
> - src/radeon_glamor.c   |  2 +-
> - src/radeon_kms.c      | 74 +++++++++++++++++++++----------------------
> - 9 files changed, 55 insertions(+), 49 deletions(-)
> -
> -diff --git a/man/radeon.man b/man/radeon.man
> -index dcebf53..247dcdb 100644
> ---- a/man/radeon.man
> -+++ b/man/radeon.man
> -@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off'
> - accordingly. If this option isn't set, the default value of the property is
> - .B auto,
> - which means that TearFree is on for rotated outputs, outputs with RandR
> --transforms applied and for RandR 1.4 slave outputs, otherwise off.
> -+transforms applied and for RandR 1.4 secondary outputs, otherwise off.
> - .TP
> - .BI "Option \*qAccelMethod\*q \*q" "string" \*q
> - Chooses between available acceleration architectures.  Valid values are
> -diff --git a/src/compat-api.h b/src/compat-api.h
> -index f4e7524..def6d3e 100644
> ---- a/src/compat-api.h
> -+++ b/src/compat-api.h
> -@@ -34,4 +34,10 @@
> - #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
> - #endif
> -
> -+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
> -+#define current_primary current_master
> -+#define primary_pixmap master_pixmap
> -+#define secondary_dst slave_dst
> -+#endif
> -+
> - #endif
> -diff --git a/src/drmmode_display.c b/src/drmmode_display.c
> -index 0e9e247..3dec91e 100644
> ---- a/src/drmmode_display.c
> -+++ b/src/drmmode_display.c
> -@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
> -               xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
> -                                        ent) {
> -                       if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
> --                              dirty->slave_dst =
> -+                              dirty->secondary_dst =
> -                                       drmmode_crtc->scanout[scanout_id].pixmap;
> -                               break;
> -                       }
> -@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
> -
> -       xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
> -               if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
> --                      PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
> -+                      PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
> -                       break;
> -               }
> -       }
> -diff --git a/src/evergreen_state.h b/src/evergreen_state.h
> -index 7e54e1c..34ba87b 100644
> ---- a/src/evergreen_state.h
> -+++ b/src/evergreen_state.h
> -@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
> -                                   int *new_pitch);
> - extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
> - extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
> --extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
> -+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
> - extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
> -
> - #endif
> -diff --git a/src/r600_state.h b/src/r600_state.h
> -index 3434599..567c3ca 100644
> ---- a/src/r600_state.h
> -+++ b/src/r600_state.h
> -@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
> -                                   int *new_pitch);
> - extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
> - extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
> --extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
> -+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
> - extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
> - #endif
> -diff --git a/src/radeon.h b/src/radeon.h
> -index 2c91346..85fd021 100644
> ---- a/src/radeon.h
> -+++ b/src/radeon.h
> -@@ -182,18 +182,18 @@ typedef enum {
> -
> -
> - static inline ScreenPtr
> --radeon_master_screen(ScreenPtr screen)
> -+radeon_primary_screen(ScreenPtr screen)
> - {
> --    if (screen->current_master)
> --      return screen->current_master;
> -+    if (screen->current_primary)
> -+      return screen->current_primary;
> -
> -     return screen;
> - }
> -
> - static inline ScreenPtr
> --radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
> -+radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
> - {
> --    return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
> -+    return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
> - }
> -
> - static inline DrawablePtr
> -diff --git a/src/radeon_exa.c b/src/radeon_exa.c
> -index 268155e..320ff99 100644
> ---- a/src/radeon_exa.c
> -+++ b/src/radeon_exa.c
> -@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
> -     free(driverPriv);
> - }
> -
> --Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
> -+Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
> - {
> -     struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
> -
> -diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
> -index f109838..ccf9994 100644
> ---- a/src/radeon_glamor.c
> -+++ b/src/radeon_glamor.c
> -@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
> -
> -
> - static Bool
> --radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
> -+radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
> -                                  void **handle_p)
> - {
> -       ScreenPtr screen = pixmap->drawable.pScreen;
> -diff --git a/src/radeon_kms.c b/src/radeon_kms.c
> -index b3db7c4..62962d6 100644
> ---- a/src/radeon_kms.c
> -+++ b/src/radeon_kms.c
> -@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
> -       if (dirty->rotation != RR_Rotate_0) {
> -               dstregion = transform_region(damageregion,
> -                                            &dirty->f_inverse,
> --                                           dirty->slave_dst->drawable.width,
> --                                           dirty->slave_dst->drawable.height);
> -+                                           dirty->secondary_dst->drawable.width,
> -+                                           dirty->secondary_dst->drawable.height);
> -       } else
> - #endif
> -       {
> -@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
> -
> -           dstregion = RegionDuplicate(damageregion);
> -           RegionTranslate(dstregion, -dirty->x, -dirty->y);
> --          PixmapRegionInit(&pixregion, dirty->slave_dst);
> -+          PixmapRegionInit(&pixregion, dirty->secondary_dst);
> -           RegionIntersect(dstregion, dstregion, &pixregion);
> -           RegionUninit(&pixregion);
> -       }
> -@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
> -       if (RegionNil(region))
> -               goto out;
> -
> --      if (dirty->slave_dst->master_pixmap)
> --          DamageRegionAppend(&dirty->slave_dst->drawable, region);
> -+      if (dirty->secondary_dst->primary_pixmap)
> -+          DamageRegionAppend(&dirty->secondary_dst->drawable, region);
> -
> - #ifdef HAS_DIRTYTRACKING_ROTATION
> -       PixmapSyncDirtyHelper(dirty);
> -@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
> - #endif
> -
> -       radeon_cs_flush_indirect(src_scrn);
> --      if (dirty->slave_dst->master_pixmap)
> --          DamageRegionProcessPending(&dirty->slave_dst->drawable);
> -+      if (dirty->secondary_dst->primary_pixmap)
> -+          DamageRegionProcessPending(&dirty->secondary_dst->drawable);
> -
> - out:
> -       DamageEmpty(dirty->damage);
> -@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
> - void
> - radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
> - {
> --    ScreenPtr master_screen = radeon_dirty_master(dirty);
> -+    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
> -     PixmapDirtyUpdatePtr ent;
> -     RegionPtr region;
> -
> --    xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
> --      if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
> -+    xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) {
> -+      if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
> -           continue;
> -
> -       region = dirty_region(ent);
> -@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
> - #if HAS_SYNC_SHARED_PIXMAP
> -
> - static Bool
> --master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> -+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> - {
> --    ScreenPtr master_screen = radeon_dirty_master(dirty);
> -+    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
> -
> --    return !!master_screen->SyncSharedPixmap;
> -+    return !!primary_screen->SyncSharedPixmap;
> - }
> -
> - static Bool
> --slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> -+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> - {
> --    ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
> -+    ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
> -
> --    return !!slave_screen->SyncSharedPixmap;
> -+    return !!secondary_screen->SyncSharedPixmap;
> - }
> -
> - static void
> - call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
> - {
> --    ScreenPtr master_screen = radeon_dirty_master(dirty);
> -+    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
> -
> --    master_screen->SyncSharedPixmap(dirty);
> -+    primary_screen->SyncSharedPixmap(dirty);
> - }
> -
> - #else /* !HAS_SYNC_SHARED_PIXMAP */
> -
> - static Bool
> --master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> -+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> - {
> --    ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
> -+    ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
> -
> --    return master_scrn->driverName == scrn->driverName;
> -+    return primary_scrn->driverName == scrn->driverName;
> - }
> -
> - static Bool
> --slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> -+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
> - {
> --    ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
> -+    ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
> -
> --    return slave_scrn->driverName == scrn->driverName;
> -+    return secondary_scrn->driverName == scrn->driverName;
> - }
> -
> - static void
> -@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
> - static xf86CrtcPtr
> - radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
> - {
> --    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
> -+    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
> -     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> -     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
> -     int c;
> -
> --    /* Find the CRTC which is scanning out from this slave pixmap */
> -+    /* Find the CRTC which is scanning out from this secondary pixmap */
> -     for (c = 0; c < xf86_config->num_crtc; c++) {
> -       xf86CrtcPtr xf86_crtc = xf86_config->crtc[c];
> -       drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
> -@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
> -       if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
> -           RegionPtr region;
> -
> --          if (master_has_sync_shared_pixmap(scrn, dirty))
> -+          if (primary_has_sync_shared_pixmap(scrn, dirty))
> -               call_sync_shared_pixmap(dirty);
> -
> -           region = dirty_region(dirty);
> -@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
> -               radeon_cs_flush_indirect(scrn);
> -               RegionCopy(&drmmode_crtc->scanout_last_region, region);
> -               RegionTranslate(region, -crtc->x, -crtc->y);
> --              dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
> -+              dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
> -           }
> -
> -           redisplay_dirty(dirty, region);
> -@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u
> - static void
> - radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
> - {
> --    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
> -+    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
> -     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> -     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
> -     xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
> -@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
> - static void
> - radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
> - {
> --    ScreenPtr screen = ent->slave_dst->drawable.pScreen;
> -+    ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
> -     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
> -     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
> -     xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent);
> -@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn)
> -               if (screen->isGPU) {
> -                       PixmapDirtyUpdatePtr region_ent = ent;
> -
> --                      if (master_has_sync_shared_pixmap(scrn, ent)) {
> --                              ScreenPtr master_screen = radeon_dirty_master(ent);
> -+                      if (primary_has_sync_shared_pixmap(scrn, ent)) {
> -+                              ScreenPtr primary_screen = radeon_dirty_primary(ent);
> -
> --                              xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
> --                                      if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
> -+                              xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) {
> -+                                      if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
> -                                               break;
> -                               }
> -                       }
> -@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
> -
> -                       RegionDestroy(region);
> -               } else {
> --                      if (slave_has_sync_shared_pixmap(scrn, ent))
> -+                      if (secondary_has_sync_shared_pixmap(scrn, ent))
> -                               continue;
> -
> -                       region = dirty_region(ent);
> -@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
> -     (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
> -     pScreen->BlockHandler = RADEONBlockHandler_KMS;
> -
> --    if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema)
> -+    if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
> -       return;
> -
> -     if (!pScreen->isGPU)
> -@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
> -     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
> -     int c;
> -
> --    if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema)
> -+    if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema)
> -       return 0;
> -
> -     /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After
> ---
> -2.33.1
> -
> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb
> deleted file mode 100644
> index c8ce77ab8..000000000
> --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -require recipes-graphics/xorg-driver/xorg-driver-video.inc
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=aabff1606551f9461ccf567739af63dc"
> -
> -SUMMARY = "X.Org X server -- ATI Radeon video driver"
> -
> -DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics"
> -
> -DEPENDS += "virtual/libx11 libxvmc drm \
> -            virtual/libgl xorgproto libpciaccess"
> -
> -inherit features_check
> -REQUIRED_DISTRO_FEATURES += "opengl"
> -
> -SRC_URI += "file://0001-Fix-link-failure-with-gcc-10.patch \
> -            file://0001-ati-cleanup-terminology-to-use-primary-secondary.patch \
> -           "
> -SRC_URI[sha256sum] = "659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49"
> -
> -#EXTRA_OECONF += "--disable-glamor"
> -
> -RDEPENDS:${PN} += "xserver-xorg-module-exa"
> -RRECOMMENDS:${PN} += "linux-firmware-radeon"
> -
> -FILES:${PN} += "${datadir}/X11"
> diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_git.bb
> new file mode 100644
> index 000000000..5131f4614
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_git.bb
> @@ -0,0 +1,43 @@
> +require recipes-graphics/xorg-driver/xorg-driver-video.inc
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=aabff1606551f9461ccf567739af63dc"
> +
> +SUMMARY = "X.Org X server -- ATI Radeon video driver"
> +
> +DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics"
> +
> +DEPENDS += "virtual/libx11 libxvmc drm \
> +            virtual/libgl xorgproto libpciaccess"
> +
> +inherit features_check
> +
> +REQUIRED_DISTRO_FEATURES += "opengl"
> +
> +SRC_URI = "git://git@gitlab.freedesktop.org/xorg/driver/xf86-video-ati.git;branch=master"
> +SRCREV = "5eba006e4129e8015b822f9e1d2f1e613e252cda"
> +
> +SRC_URI[sha256sum] = "659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49"
> +
> +PV = "19.1.0+git${SRCPV}"
> +
> +S = "${WORKDIR}/git"
> +
> +PACKAGECONFIG ??= "udev"
> +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
> +PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor"
> +
> +RDEPENDS:${PN}:append = "\
> +    ${@bb.utils.contains('PACKAGECONFIG', 'glamor', 'libegl', '', d)} \
> +    mesa-driver-radeon \
> +    mesa-driver-radeonsi \
> +    mesa-driver-swrast \
> +    xserver-xorg-extension-glx \
> +    xserver-xorg-module-exa \
> +"
> +
> +RRECOMMENDS:${PN} += "linux-firmware-radeon"
> +
> +PACKAGES =+ "${PN}-config"
> +
> +FILES:${PN}-config = "${datadir}/X11/xorg.conf.d"
> +FILES:${PN} += "${datadir}/X11"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95974): https://lists.openembedded.org/g/openembedded-devel/message/95974
> Mute This Topic: https://lists.openembedded.org/mt/89769364/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>