diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics')
13 files changed, 88 insertions, 72 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.9.1.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.bb index d78fe7e17d..0f0e61893a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.bb @@ -10,7 +10,7 @@ DEPENDS = "\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "455c92711b588af149b945edc5c145f3e9aa137ed9689dabed49d5e4acac75fa" +SRC_URI[sha256sum] = "1d71d1f6dcfe9ffee5e2766969a11978f7eb4fac7d7ae556f104c11f9c57cc98" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch new file mode 100644 index 0000000000..c9d63c9079 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch @@ -0,0 +1,31 @@ +From fb6eb15b34b5b07a431bb4c3585341411a3e088f Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 28 Feb 2023 13:42:18 +0100 +Subject: [PATCH] libdecor-gtk.c: dont skip for conflicting_symbols + +This is a hack that should be removed, once the underlying bug in glibc was fixed and +libdecor was updated to use dlmopen() instead of dlopen() + +https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/47 +https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/44 + +--- + src/plugins/gtk/libdecor-gtk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/gtk/libdecor-gtk.c b/src/plugins/gtk/libdecor-gtk.c +index 228161e..fd91afb 100644 +--- a/src/plugins/gtk/libdecor-gtk.c ++++ b/src/plugins/gtk/libdecor-gtk.c +@@ -2606,7 +2606,7 @@ libdecor_plugin_description = { + .priorities = priorities, + .constructor = libdecor_plugin_new, + .conflicting_symbols = { +- "png_free", ++ //"png_free", + NULL, + }, + }; +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb index 4e396d83e9..ed0b05f41f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb @@ -2,25 +2,28 @@ SUMMARY = "libdecor - A client-side decorations library for Wayland clients" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7" -SRC_URI = "git://gitlab.gnome.org/jadahl/libdecor.git;protocol=https;branch=master" +SRC_URI = " \ + git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=master \ + file://0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch \ +" DEPENDS = " \ - cairo \ - pango \ - wayland \ - wayland-native \ - wayland-protocols \ + cairo \ + pango \ + wayland \ + wayland-native \ + wayland-protocols \ " S = "${WORKDIR}/git" -SRCREV = "e87dcfdaf83f332fa83b43c804fcf93c151ff0f5" +SRCREV = "a254d0c2ff0cbfcf0bbf14cc67cc403640880c01" -PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk3 opengl', d)}" +PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}" PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" PACKAGECONFIG[demo] = "-Ddemo=true,-Ddemo=false,virtual/libegl libxkbcommon" -PACKAGECONFIG[gtk3] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" -PACKAGECONFIG[opengl] = ",,virtual/libgl" +PACKAGECONFIG[install_demo] = "-Dinstall_demo=true,-Dinstall_demo=false" +PACKAGECONFIG[gtk+3] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" inherit meson pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb index 1a94215839..cf33c69048 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" # TODO: Pin upstream release (current v7.11.0-80-g419a757) -SRC_URI = "git://github.com/lvgl/lv_drivers;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "git://github.com/lvgl/lv_drivers;protocol=https;nobranch=1" SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254" DEPENDS = "libxkbcommon lvgl wayland" @@ -19,15 +19,15 @@ REQUIRED_DISTRO_FEATURES = "wayland" inherit cmake inherit features_check -S = "${WORKDIR}/${PN}-${PV}" +S = "${WORKDIR}/git" LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" LVGL_CONFIG_WAYLAND_VER_RES ?= "320" -EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${BASELIB}" +EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" # Upstream does not support a default configuration # but propose a default "disabled" template, which is used as reference diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb index 032e85f522..22b4826403 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb @@ -8,21 +8,23 @@ DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lod LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" -SRC_URI = "git://github.com/lvgl/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "git://github.com/lvgl/lv_lib_png;;protocol=https;nobranch=1" SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" +S = "${WORKDIR}/git" + # because of lvgl dependency REQUIRED_DISTRO_FEATURES = "wayland" DEPENDS += "lvgl" -EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${BASELIB}" +EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${baselib}" inherit cmake inherit features_check TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" +TARGET_CFLAGS += "-I${STAGING_INCDIR}/lvgl" FILES:${PN}-dev = "\ ${includedir}/lvgl/lv_lib_png/ \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb index 2005afa2fd..ea74c59185 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb @@ -8,7 +8,7 @@ SUMMARY = "Light and Versatile Graphics Library" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" -SRC_URI = "gitsm://github.com/lvgl/lvgl;destsuffix=${S};protocol=https;nobranch=1" +SRC_URI = "gitsm://github.com/lvgl/lvgl;protocol=https;nobranch=1" SRCREV = "d38eb1e689fa5a64c25e677275172d9c8a4ab2f0" REQUIRED_DISTRO_FEATURES = "wayland" @@ -16,8 +16,8 @@ REQUIRED_DISTRO_FEATURES = "wayland" inherit cmake inherit features_check -EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${BASELIB}" -S = "${WORKDIR}/${PN}-${PV}" +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib}" +S = "${WORKDIR}/git" LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" diff --git a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb index 143ab6a0be..225619ed66 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb @@ -12,4 +12,9 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig -EXTRA_OECONF += "--without-tools --without-tests" +BBCLASSEXTEND = "native" + +EXTRA_OECONF += "--without-tests" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[tools] = "--with-tools,--without-tools,libpng" diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb index 0bc03941fa..ceff54f46a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e" SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" SRC_URI = " \ - git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x;protocol=https \ + git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch b/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch index 2fb44eb0e7..f31018c3de 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch @@ -8,25 +8,33 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/config.mk b/config.mk -index 032bf9f..850afbf 100644 --- a/config.mk +++ b/config.mk -@@ -12,10 +12,10 @@ LIBDIR = $(LIBPREFIX)/surf - X11INC = `pkg-config --cflags x11` - X11LIB = `pkg-config --libs x11` +@@ -2,6 +2,7 @@ + VERSION = 2.1 + + # Customize below to fit your system ++PKG_CONFIG ?= pkg-config + + # paths + PREFIX = /usr/local +@@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man + LIBPREFIX = $(PREFIX)/lib + LIBDIR = $(LIBPREFIX)/surf + +-X11INC = `pkg-config --cflags x11` +-X11LIB = `pkg-config --libs x11` ++X11INC = $(shell $(PKG_CONFIG) --cflags x11) ++X11LIB = $(shell $(PKG_CONFIG) --libs x11) -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -+GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1` -+GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.1` -+WEBEXTINC = `pkg-config --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` -+WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` ++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) ++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) ++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) ++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) # includes and libs INCS = $(X11INC) $(GTKINC) --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb index 7523ed5877..7140a72845 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -9,7 +9,7 @@ DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr3" REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" +SRCREV = "665a709b522a6fa18c671f1fc41297603292d0e8" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ " SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch deleted file mode 100644 index 2978080c92..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 30 Jan 2023 11:27:07 -0800 -Subject: [PATCH] Fix build with gcc 13 by including <cstdint> - -gcc 13 moved some includes around and as a result <cstdint> is -no longer transitively included [1]. Explicitly include it for -int32_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://github.com/tesseract-ocr/tesseract/pull/4009] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ccutil/params.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ccutil/params.h b/src/ccutil/params.h -index f514d870..0f3f8743 100644 ---- a/src/ccutil/params.h -+++ b/src/ccutil/params.h -@@ -21,6 +21,7 @@ - - #include <tesseract/export.h> // for TESS_API - -+#include <cstdint> - #include <cstdio> - #include <cstring> - #include <string> --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.1.bb index 057a7cd859..8e54a2791e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.1.bb @@ -5,9 +5,8 @@ BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "080da83cc51c4ef8b324a7e03146fe0bd7e0944b" -SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https \ - file://0001-Fix-build-with-gcc-13-by-including-cstdint.patch" +SRCREV = "71af4542990adae6d9f31d6657068bc0139c6ec4" +SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 01f4a572f8..4fd32d93c2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake features_check python3native qemu -ANY_OF_DISTRO_FEATURES += "opengl wayland" +ANY_OF_DISTRO_FEATURES += "opengl vulkan" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" |