Upgrade zbar from 89e7900d85dd (2020-12-31) to 0.23.93 (2024-01-09). Removed all patches because they have been merged upstream.
Enabled pthread integration by default and renamed configs to match upstream. Tested the python API and gstreamer integration, I wasn't able to test any of the various package configs that are related to GUIs because I don't have a access to boards with displays. Signed-off-by: Walter Werner Schneider <[email protected]> --- .../zbar/0001-qt-Create-subdir-in-Makefile.patch | 37 ------------------- .../0002-zbarcam-Create-subdir-in-Makefile.patch | 42 ---------------------- .../zbar/{zbar_git.bb => zbar_0.23.93.bb} | 29 +++++++-------- 3 files changed, 12 insertions(+), 96 deletions(-) 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 3d8c07f02b..0000000000 --- a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch +++ /dev/null @@ -1,37 +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]> ---- -Upstream-Status: Pending - - 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 9030ed88f2..0000000000 --- a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch +++ /dev/null @@ -1,42 +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]> ---- -Upstream-Status: Pending - - 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_0.23.93.bb similarity index 62% rename from meta-oe/recipes-support/zbar/zbar_git.bb rename to meta-oe/recipes-support/zbar/zbar_0.23.93.bb index 053e0161d7..36a9a5c827 100644 --- a/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-oe/recipes-support/zbar/zbar_0.23.93.bb @@ -9,41 +9,36 @@ 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" - -PV = "0.23.1+git" +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https;tag=${PV}" +SRCREV = "bb05ec54eec57f8397cb13fb9161372a281a1219" DEPENDS += "xmlto-native" PACKAGECONFIG ??= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + video \ " -PACKAGECONFIG ??= "video" - inherit autotools pkgconfig gettext \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk', 'gobject-introspection', '', d)} -PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" +PACKAGECONFIG[x11] = ",, libxext libxv" PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" PACKAGECONFIG[jpeg] = "--with-jpeg, --without-jpeg, jpeg" -PACKAGECONFIG[python3] = "--with-python=auto, --without-python, python3" -PACKAGECONFIG[gtk3] = "--with-gtk=gtk3, --without-gtk, gtk+3" -PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extras qtsvg, qtbase" +PACKAGECONFIG[python] = "--with-python=auto, --without-python, python3" +PACKAGECONFIG[gtk] = "--with-gtk=auto, --without-gtk, gtk+3" +PACKAGECONFIG[qt] = "--with-qt, --without-qt, qtbase qtbase-native qtx11extras qtsvg, qtbase" PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" +EXTRA_OECONF += "--enable-pthread" + FILES:${PN} += "${bindir} \ ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ " CPPFLAGS:append = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + ${@bb.utils.contains('PACKAGECONFIG', 'qt', '\ -I${STAGING_INCDIR}/QtX11Extras \ -I${STAGING_INCDIR}/dbus-1.0 \ -I${STAGING_LIBDIR}/dbus-1.0/include \ --- base-commit: d8cb988be342bc887d71ae68ede38cc013e552ea change-id: 20260626-upgrade-zbar-809e90ade667 Best regards, -- Walter Werner Schneider <[email protected]>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127801): https://lists.openembedded.org/g/openembedded-devel/message/127801 Mute This Topic: https://lists.openembedded.org/mt/119991123/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
