Skip to contentSkip to conversation

zbar: Update 1.23.1 -> 1.23.92+4e0f618

PATCH In review Daniel Gomez 2 participants 6 messages Mar 14, 2022 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 .../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
meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch deleted +0 -35
deleted file mode 100644
index d7ca15207..000000000
@@ -1,35 +0,0 @@
-From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001
-From: Daniel Gomez <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch deleted +0 -40
deleted file mode 100644
index a1c27b8b4..000000000
@@ -1,40 +0,0 @@
-From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001
-From: Daniel Gomez <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-oe/recipes-support/zbar/zbar_git.bb +4 -8
index 17084f830..5d7d7e173 100644
@@ -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

#1 lore raw

PATCH 4/6 opencl-icd-loader: Update 2020.12.18 -> v2022.01.04

- Fix recipe style WARNINGS from oe-stylize.

./contrib/oe-stylize.py meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb

Reminder: Tabs should not be used (use spaces instead) in : ' ${bindir}/icd_loader_test \ '

Reminder: The correct spacing for a variable is FOO = "BAR" in : '
SUMMARY = "OpenCL ICD Loader" '

- Fix missing lib for CL applications

    strace clinfo:
    openat(AT_FDCWD, "/usr/lib/libOpenCL.so.1", O_RDONLY|O_CLOEXEC) =
    -1 ENOENT (No such file or directory)
    newfstatat(AT_FDCWD, "/usr/lib", {st_mode=S_IFDIR|0755, st_size=36864, ...}, 0) = 0
    writev(2, [{iov_base="clinfo", iov_len=6}, {iov_base=": ", iov_len=2},
    {iov_base="error while loading shared libra"..., iov_len=36},
    {iov_base=": ", iov_len=2}, {iov_base="libOpenCL.so.1", iov_len=14},
    {iov_base=": ", iov_len=2}, {iov_base="cannot open shared object file", iov_len=30},
    {iov_base=": ", iov_len=2}, {iov
    _base="No such file or directory", iov_len=25}, {iov_base="\n", iov_len=1}], 10
    clinfo: error while loading shared libraries: libOpenCL.so.1: cannot open shared
    object file: No such file or directory) = 120
    exit_group(127)                         = ?

- Change branch name master -> main according to upstream repository.

---
 .../opencl/opencl-icd-loader_git.bb           | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)
meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb +30 -24
index 45b1ad549..67437732d 100644
@@ -1,30 +1,36 @@
-SUMMARY  = "OpenCL ICD Loader"
+SUMMARY = "OpenCL ICD Loader"
 DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group"
-LICENSE  = "Apache-2.0"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 SECTION = "base"
 
+inherit pkgconfig cmake
+
 DEPENDS += "opencl-headers"
 
-inherit pkgconfig cmake
+PROVIDES = "virtual/opencl-icd"
 
 S = "${WORKDIR}/git"
-PV = "2020.12.18+git${SRCPV}"
-SRCREV = "1d5315c3ed30d026acb79a1aa53a276fc833ffa7"
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=master;protocol=https"
-
-do_install () {
-	install -d ${D}${bindir}
-	install -m 0755 ${B}/test/loader_test/icd_loader_test ${D}${bindir}/
-	chrpath -d ${D}${bindir}/icd_loader_test
-	install -d ${D}${libdir}
-	install -m 0644 ${B}/test/log/libIcdLog.so ${D}${libdir}/
-	install -m 0644 ${B}/test/driver_stub/libOpenCLDriverStub.so ${D}${libdir}/
-	chrpath -d ${D}${libdir}/libOpenCLDriverStub.so
-	install -m 0644 ${B}/libOpenCL.so.1.2 ${D}${libdir}/
-	cd ${D}${libdir}
-	ln -s libOpenCL.so.1.2 libOpenCL.so.1
-	ln -s libOpenCL.so.1 libOpenCL.so
+PV = "v2022.01.04+git${SRCPV}"
+SRCREV = "169f05d026e65948b30cfe2200595fda92198cf7"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https"
+
+EXTRA_OECMAKE:append = " \
+    -DOPENCL_ICD_LOADER_HEADERS_DIR=${STAGING_INCDIR} \
+"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${B}/test/loader_test/icd_loader_test ${D}${bindir}/
+    chrpath -d ${D}${bindir}/icd_loader_test
+    install -d ${D}${libdir}
+    install -m 0644 ${B}/test/log/libIcdLog.so ${D}${libdir}/
+    install -m 0644 ${B}/test/driver_stub/libOpenCLDriverStub.so ${D}${libdir}/
+    chrpath -d ${D}${libdir}/libOpenCLDriverStub.so
+    install -m 0644 ${B}/libOpenCL.so.1.2 ${D}${libdir}/
+    cd ${D}${libdir}
+    ln -s libOpenCL.so.1.2 libOpenCL.so.1
+    ln -s libOpenCL.so.1 libOpenCL.so
 }
 
 PACKAGES = "opencl-icd-loader opencl-icd-loader-dev"
@@ -32,13 +38,13 @@ PACKAGES += "libicdlog libicdlog-dbg"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 
 FILES:${PN} = " \
-	${bindir}/icd_loader_test \
-	${libdir}/libOpenCLDriverStub.so \
-	${libdir}/libOpenCL.so.1.2 \
+    ${bindir}/icd_loader_test \
+    ${libdir}/libOpenCLDriverStub.so \
+    ${libdir}/libOpenCL.so.1.2 \
+    ${libdir}/libOpenCL.so.1 \
 "
 FILES:${PN}-dev = " \
-	${libdir}/libOpenCL.so \
-	${libdir}/libOpenCL.so.1 \
+    ${libdir}/libOpenCL.so \
 "
 
 FILES:libicdlog = "${libdir}/libIcdLog.so"
Signature · 1 line
2.34.1
#2 lore raw

PATCH 5/6 opencl-headers: Update v2020.12.18 -> v2022.01.04

In reply to Daniel Gomez

- Add PV to include package version + git revision.
- Add ALLOW_EMPTY to prevent error [1] when installing package in image.
- Change branch name master -> main according to upstream repository.

[1]: opencl-headers installation error:
E: Package 'opencl-headers' has no installation candidate

---
 meta-oe/recipes-core/opencl/opencl-headers_git.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta-oe/recipes-core/opencl/opencl-headers_git.bb +4 -3
index f77bf46d2..5e8e6f07f 100644
@@ -5,12 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SECTION = "base"
 
 S = "${WORKDIR}/git"
-# v2020.12.18
-SRCREV = "c57ba81c460ee97b6b9d0b8d18faf5ba6883114b"
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=master;protocol=https"
+PV = "v2022.01.04+git${SRCPV}"
+SRCREV = "59ac4dc2f282286d8db83143686cfe37ec658b84"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 do_install () {
 	install -d ${D}${includedir}/CL/

--
2.34.1

#3 lore raw

PATCH 6/6 opencl-clhpp: Update 2.0.15 -> 2.0.16

In reply to Daniel Gomez

- Change branch name master -> main according to upstream repository.
- Update 2.0.15 -> 2.0.16. Changelog:

1df82b9 Add param traits for CL_DEVICE_SUPPORTED_REGISTER_ALLOCATIONS_ARM (#165) 814e7b2 update the C++ bindings code example (#151)
6d833a5 Update opencl.hpp: Add CL_DEVICE_BOARD_NAME_AMD (#160)
25ad589 Added missing definitions for deprecated prefixes and suffixes for version 2.2 (#159) 21a34b0 Test two additional defines and update descriptions in header (#147) ff7318c Fix cl::enqueueMapSVM for cl::vector and cl::pointer (#145)
30d4219 Test most of the possible defines (#140)
63d9e41 Fix unreasonable error handling in opencl.hpp (#139)
0198c41 Add support for cl_khr_integer_dot_product v2 (#141)
8df6c8f Transition CI to Github Actions (#142)

---
 meta-oe/recipes-core/opencl/opencl-clhpp_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +3 -3
index 5a0776c26..8a712602c 100644
@@ -1,13 +1,13 @@
 SUMMARY  = "OpenCL API C++ bindings"
 DESCRIPTION = "OpenCL API C++ bindings from Khronos"
 
-SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main"
 
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-PV = "2.0.15+git${SRCPV}"
-SRCREV = "f7237f3799009d856935e1eecfd7c9301fe522b4"
+PV = "2.0.16+git${SRCPV}"
+SRCREV = "1df82b9749739f2681081092ae163bb0f0d40f66"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.34.1
#4 lore raw
In reply to Daniel Gomez

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

Quoted 145 lines · Daniel Gomez

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

---
  .../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

meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch deleted +0 -35
deleted file mode 100644
index d7ca15207..000000000
@@ -1,35 +0,0 @@
-From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001
-From: Daniel Gomez <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch deleted +0 -40
deleted file mode 100644
index a1c27b8b4..000000000
@@ -1,40 +0,0 @@
-From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001
-From: Daniel Gomez <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-oe/recipes-support/zbar/zbar_git.bb +4 -9
index 17084f830..5d7d7e173 100644
@@ -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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw

Re: [oe] [meta-oe][PATCH 3/6] xf86-video-ati: Update 19.1.0 -> 19.1.0+5eba006e

seeing failures on mips

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

Quoted 527 lines · Daniel Gomez

- 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.

---
 .../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
meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch deleted +0 -34
deleted file mode 100644
index 7dfa23342..000000000
@@ -1,34 +0,0 @@
-From cebbeaa9d0bdc18377faef27ea9ffd38e509d180 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch deleted +0 -369
deleted file mode 100644
index cda2c2f14..000000000
@@ -1,369 +0,0 @@
-From 6e035c007876ffe972a497681dd3debdc806e979 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <[email protected]>
-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
-
meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb deleted +0 -25
deleted file mode 100644
index c8ce77ab8..000000000
@@ -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"
meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_git.bb new file +43 -1
new file mode 100644
index 000000000..5131f4614
@@ -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://[email protected]/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: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-