diff options
Diffstat (limited to 'meta-oe/recipes-graphics')
62 files changed, 455 insertions, 239 deletions
diff --git a/meta-oe/recipes-graphics/assimp/assimp_git.bb b/meta-oe/recipes-graphics/assimp/assimp_git.bb new file mode 100644 index 0000000000..13d1002946 --- /dev/null +++ b/meta-oe/recipes-graphics/assimp/assimp_git.bb | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | SUMMARY = "Open Asset Import Library" | ||
| 2 | DESCRIPTION = "The Open Asset Import Library (assimp) is a portable Open Source \ | ||
| 3 | library to import various well-known 3D model formats in a uniform manner." | ||
| 4 | HOMEPAGE = "https://github.com/assimp/assimp" | ||
| 5 | SECTION = "devel" | ||
| 6 | |||
| 7 | LICENSE = "BSD-3-Clause" | ||
| 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f2d38c9e0d63058b051065fb7b1102a8" | ||
| 9 | |||
| 10 | DEPENDS = "zlib" | ||
| 11 | |||
| 12 | SRC_URI = "git://github.com/assimp/assimp.git;protocol=https;branch=master" | ||
| 13 | |||
| 14 | SRCREV = "1962da5ac484434524e7a25d566046edd932f901" | ||
| 15 | |||
| 16 | PV = "5.x+git${SRCPV}" | ||
| 17 | |||
| 18 | inherit cmake | ||
| 19 | |||
| 20 | EXTRA_OECMAKE = "\ | ||
| 21 | -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \ | ||
| 22 | -DASSIMP_BUILD_TESTS=OFF \ | ||
| 23 | -DASSIMP_LIB_INSTALL_DIR=${baselib} \ | ||
| 24 | -DCMAKE_INSTALL_PREFIX=${prefix} \ | ||
| 25 | -DCMAKE_INSTALL_LIBDIR=${baselib} \ | ||
| 26 | -DCMAKE_SKIP_RPATH=ON \ | ||
| 27 | -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF \ | ||
| 28 | " | ||
| 29 | |||
| 30 | do_install:append() { | ||
| 31 | |||
| 32 | sed -i \ | ||
| 33 | -e "s:${WORKDIR}.*:${prefix}:g" \ | ||
| 34 | -e "s:${TMPDIR}.*:${prefix}:g" \ | ||
| 35 | ${D}${libdir}/pkgconfig/assimp.pc | ||
| 36 | |||
| 37 | find ${D} -name "*assimp*cmake*" -delete | ||
| 38 | find ${D} -name "*.la" -delete | ||
| 39 | } | ||
diff --git a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.1.bb index 8a8e783309..371e085b0c 100644 --- a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb +++ b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.1.bb | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | SUMMARY = "C++ bindings for Cairo graphics library" | 1 | SUMMARY = "C++ bindings for Cairo graphics library" |
| 2 | 2 | ||
| 3 | LICENSE = "LGPL-2.0-only" | 3 | LICENSE = "LGPL-2.1-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21" |
| 5 | 5 | ||
| 6 | inherit gnomebase | 6 | inherit gnomebase |
| 7 | 7 | ||
| 8 | DEPENDS += "boost cairo libsigc++-3" | 8 | DEPENDS += "boost cairo libsigc++-3" |
| 9 | 9 | ||
| 10 | SRC_URI = "https://www.cairographics.org/releases/cairomm-${PV}.tar.xz" | 10 | SRC_URI = "https://www.cairographics.org/releases/cairomm-${PV}.tar.xz" |
| 11 | SRC_URI[sha256sum] = "b81255394e3ea8e8aa887276d22afa8985fc8daef60692eb2407d23049f03cfb" | 11 | SRC_URI[sha256sum] = "e0e996a979ee52c840dca3ee74f5d005e3259b94ddce58f255d3b6f47c8cb41d" |
| 12 | 12 | ||
| 13 | S = "${UNPACKDIR}/cairomm-${PV}" | 13 | S = "${UNPACKDIR}/cairomm-${PV}" |
| 14 | 14 | ||
diff --git a/meta-oe/recipes-graphics/cairo/cairomm_1.14.5.bb b/meta-oe/recipes-graphics/cairo/cairomm_1.14.6.bb index e451c5d1ad..b5e337e9b5 100644 --- a/meta-oe/recipes-graphics/cairo/cairomm_1.14.5.bb +++ b/meta-oe/recipes-graphics/cairo/cairomm_1.14.6.bb | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | SUMMARY = "C++ bindings for Cairo graphics library" | 1 | SUMMARY = "C++ bindings for Cairo graphics library" |
| 2 | 2 | ||
| 3 | LICENSE = "LGPL-2.0-only" | 3 | LICENSE = "LGPL-2.1-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21" |
| 5 | 5 | ||
| 6 | inherit gnomebase | 6 | inherit gnomebase |
| 7 | 7 | ||
| 8 | DEPENDS += "boost cairo libsigc++-2.0" | 8 | DEPENDS += "boost cairo libsigc++-2.0" |
| 9 | 9 | ||
| 10 | SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.xz" | 10 | SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.xz" |
| 11 | SRC_URI[sha256sum] = "70136203540c884e89ce1c9edfb6369b9953937f6cd596d97c78c9758a5d48db" | 11 | SRC_URI[sha256sum] = "7e0d5c7f29175d573a03ab5c45aef63f48dd91a5caf335a404cd763e4b7cea4a" |
| 12 | 12 | ||
| 13 | FILES:${PN}-doc += "${datadir}/devhelp" | 13 | FILES:${PN}-doc += "${datadir}/devhelp" |
| 14 | FILES:${PN}-dev += "${libdir}/cairomm-*/" | 14 | FILES:${PN}-dev += "${libdir}/cairomm-*/" |
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 0dc410b2cb..70e1280e2f 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc | |||
| @@ -26,7 +26,8 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g | |||
| 26 | file://0001-include-libgen.h-for-basename.patch \ | 26 | file://0001-include-libgen.h-for-basename.patch \ |
| 27 | file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ | 27 | file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ |
| 28 | file://0001-libdirect-remove-use-of-keyword-register.patch \ | 28 | file://0001-libdirect-remove-use-of-keyword-register.patch \ |
| 29 | " | 29 | file://0001-TaskManager-make-comparator-const.patch \ |
| 30 | " | ||
| 30 | 31 | ||
| 31 | S = "${UNPACKDIR}/DirectFB-${PV}" | 32 | S = "${UNPACKDIR}/DirectFB-${PV}" |
| 32 | 33 | ||
diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-TaskManager-make-comparator-const.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-TaskManager-make-comparator-const.patch new file mode 100644 index 0000000000..3064a4f420 --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-TaskManager-make-comparator-const.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | TaskManager: make comparator const for GCC 16 | ||
| 2 | |||
| 3 | Fixes build failure with GCC 16 due to stricter libstdc++ requirements | ||
| 4 | for std::set comparator (must be const-callable). | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/deniskropp/DirectFB/issues/29] | ||
| 7 | |||
| 8 | Signed-off-by: Hemanth Kumar M D <Hemanth.KumarMD@windriver.com> | ||
| 9 | --- | ||
| 10 | src/core/TaskManager.h | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/core/TaskManager.h b/src/core/TaskManager.h | ||
| 14 | index 3f2174c..6ac29ee 100644 | ||
| 15 | --- a/src/core/TaskManager.h | ||
| 16 | +++ b/src/core/TaskManager.h | ||
| 17 | @@ -121,7 +121,7 @@ public: | ||
| 18 | static void dumpTasks(); | ||
| 19 | |||
| 20 | |||
| 21 | - bool operator()( Task *t1, Task *t2 ) | ||
| 22 | + bool operator()( Task *t1, Task *t2 ) const | ||
| 23 | { | ||
| 24 | return t1->ts_emit < t2->ts_emit; | ||
| 25 | } | ||
| 26 | |||
diff --git a/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb b/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_1.0.0.bb index faffca2059..64aa6f655e 100644 --- a/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_git.bb +++ b/meta-oe/recipes-graphics/drm-framebuffer/drm-framebuffer_1.0.0.bb | |||
| @@ -5,10 +5,9 @@ SECTION = "graphics" | |||
| 5 | LICENSE = "GPL-3.0-only" | 5 | LICENSE = "GPL-3.0-only" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/embear-engineering/drm-framebuffer;protocol=https;branch=main" | 8 | SRC_URI = "git://github.com/embear-engineering/drm-framebuffer;protocol=https;branch=copilot/create-release-v1-0-0" |
| 9 | 9 | ||
| 10 | PV = "0.1+git" | 10 | SRCREV = "09df30960552f23d0fa7471be0caf7f095fcd522" |
| 11 | SRCREV = "a560c2b810c8f677aaaaa9e9e8b1d13854718aba" | ||
| 12 | 11 | ||
| 13 | inherit cmake pkgconfig | 12 | inherit cmake pkgconfig |
| 14 | 13 | ||
diff --git a/meta-oe/recipes-graphics/feh/feh_3.11.3.bb b/meta-oe/recipes-graphics/feh/feh_3.12.2.bb index c79ad488ba..a330c733d5 100644 --- a/meta-oe/recipes-graphics/feh/feh_3.11.3.bb +++ b/meta-oe/recipes-graphics/feh/feh_3.12.2.bb | |||
| @@ -9,7 +9,7 @@ DEPENDS = "\ | |||
| 9 | " | 9 | " |
| 10 | 10 | ||
| 11 | SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" | 11 | SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" |
| 12 | SRC_URI[sha256sum] = "f2cca3592a433922c0db7a9365fd63e5402c121d932a9327e279c71be6501063" | 12 | SRC_URI[sha256sum] = "7ce358b18a7f37bcc97a09b4efd89fdadd54cd8e7032db345f61e66dd04b1c3f" |
| 13 | 13 | ||
| 14 | inherit mime-xdg features_check | 14 | inherit mime-xdg features_check |
| 15 | # depends on virtual/libx11 | 15 | # depends on virtual/libx11 |
diff --git a/meta-oe/recipes-graphics/framebuffer-vncserver/framebuffer-vncserver/cmake.patch b/meta-oe/recipes-graphics/framebuffer-vncserver/framebuffer-vncserver/cmake.patch new file mode 100644 index 0000000000..03673ce323 --- /dev/null +++ b/meta-oe/recipes-graphics/framebuffer-vncserver/framebuffer-vncserver/cmake.patch | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg@jo-so.de> | ||
| 3 | Date: Tue, 21 Apr 2026 20:20:42 +0200 | ||
| 4 | Subject: [PATCH] CMakeLists: Raise minimum version to 3.10 | ||
| 5 | |||
| 6 | CMake 4 requires at least 3.5, but suggests 3.10. | ||
| 7 | |||
| 8 | Signed-off-by: Jörg Sommer <joerg@jo-so.de> | ||
| 9 | Upstream-Status: Submitted [https://github.com/ponty/framebuffer-vncserver/pull/30] | ||
| 10 | --- | ||
| 11 | CMakeLists.txt | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 15 | index c8b8f90..d342734 100644 | ||
| 16 | --- a/CMakeLists.txt | ||
| 17 | +++ b/CMakeLists.txt | ||
| 18 | @@ -1,5 +1,5 @@ | ||
| 19 | PROJECT(framebuffer-vncserver) | ||
| 20 | -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) | ||
| 21 | +CMAKE_MINIMUM_REQUIRED(VERSION 3.10) | ||
| 22 | |||
| 23 | |||
| 24 | FILE(GLOB SOURCES src/*.c) | ||
diff --git a/meta-oe/recipes-graphics/framebuffer-vncserver/framebuffer-vncserver_git.bb b/meta-oe/recipes-graphics/framebuffer-vncserver/framebuffer-vncserver_git.bb new file mode 100644 index 0000000000..d7ce066cb2 --- /dev/null +++ b/meta-oe/recipes-graphics/framebuffer-vncserver/framebuffer-vncserver_git.bb | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | SUMMARY = "VNC server for Linux framebuffer devices" | ||
| 2 | DESCRIPTION = "\ | ||
| 3 | The goal is to access remote embedded Linux systems without X. Implemented \ | ||
| 4 | features: remote display, touchscreen, keyboard, rotation. Not implemented: \ | ||
| 5 | file transfer, ... \ | ||
| 6 | " | ||
| 7 | HOMEPAGE = "https://github.com/ponty/framebuffer-vncserver" | ||
| 8 | BUGTRACKER = "https://github.com/ponty/framebuffer-vncserver/issues" | ||
| 9 | SECTION = "graphics" | ||
| 10 | |||
| 11 | LICENSE = "GPL-2.0-only" | ||
| 12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" | ||
| 13 | |||
| 14 | DEPENDS = "libvncserver" | ||
| 15 | |||
| 16 | SRC_URI = "\ | ||
| 17 | git://github.com/ponty/framebuffer-vncserver.git;protocol=https;branch=master \ | ||
| 18 | file://cmake.patch \ | ||
| 19 | " | ||
| 20 | SRCREV = "1963e57bebfde420baeecbb2c6848a2382488413" | ||
| 21 | |||
| 22 | inherit cmake systemd | ||
| 23 | |||
| 24 | do_install:append() { | ||
| 25 | install -m 644 -D -t ${D}${systemd_system_unitdir} ${S}/fbvnc.service | ||
| 26 | } | ||
| 27 | |||
| 28 | SYSTEMD_SERVICE:${PN} = "fbvnc.service" | ||
diff --git a/meta-oe/recipes-graphics/freeglut/freeglut/0001-Add-support-for-legacy-OpenGL.patch b/meta-oe/recipes-graphics/freeglut/files/0001-Add-support-for-legacy-OpenGL.patch index b7dc2a58aa..b7dc2a58aa 100644 --- a/meta-oe/recipes-graphics/freeglut/freeglut/0001-Add-support-for-legacy-OpenGL.patch +++ b/meta-oe/recipes-graphics/freeglut/files/0001-Add-support-for-legacy-OpenGL.patch | |||
diff --git a/meta-oe/recipes-graphics/freeglut/freeglut-gles_3.8.0.bb b/meta-oe/recipes-graphics/freeglut/freeglut-gles_3.8.0.bb new file mode 100644 index 0000000000..3101bfe63b --- /dev/null +++ b/meta-oe/recipes-graphics/freeglut/freeglut-gles_3.8.0.bb | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | require freeglut_${PV}.bb | ||
| 2 | |||
| 3 | PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles', '', d)}" | ||
| 4 | |||
| 5 | S = "${UNPACKDIR}/freeglut-${PV}" | ||
diff --git a/meta-oe/recipes-graphics/freeglut/freeglut_3.8.0.bb b/meta-oe/recipes-graphics/freeglut/freeglut_3.8.0.bb index 5c6ab1a1d7..a00519f0d7 100644 --- a/meta-oe/recipes-graphics/freeglut/freeglut_3.8.0.bb +++ b/meta-oe/recipes-graphics/freeglut/freeglut_3.8.0.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "MIT" | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" |
| 6 | 6 | ||
| 7 | SRC_URI = "\ | 7 | SRC_URI = "\ |
| 8 | https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ | 8 | https://github.com/freeglut/freeglut/releases/download/v${PV}/freeglut-${PV}.tar.gz \ |
| 9 | file://0001-Add-support-for-legacy-OpenGL.patch \ | 9 | file://0001-Add-support-for-legacy-OpenGL.patch \ |
| 10 | " | 10 | " |
| 11 | SRC_URI[sha256sum] = "674dcaff25010e09e450aec458b8870d9e98c46f99538db457ab659b321d9989" | 11 | SRC_URI[sha256sum] = "674dcaff25010e09e450aec458b8870d9e98c46f99538db457ab659b321d9989" |
| @@ -15,8 +15,7 @@ inherit cmake features_check pkgconfig | |||
| 15 | # depends on virtual/libgl and libxi | 15 | # depends on virtual/libgl and libxi |
| 16 | REQUIRED_DISTRO_FEATURES = "opengl x11" | 16 | REQUIRED_DISTRO_FEATURES = "opengl x11" |
| 17 | 17 | ||
| 18 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 glvnd', d)} \ | 18 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 glvnd', d)}" |
| 19 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles', '', d)}" | ||
| 20 | PACKAGECONFIG[glvnd] = "-DOpenGL_GL_PREFERENCE=GLVND,-DOpenGL_GL_PREFERENCE=LEGACY, libglvnd" | 19 | PACKAGECONFIG[glvnd] = "-DOpenGL_GL_PREFERENCE=GLVND,-DOpenGL_GL_PREFERENCE=LEGACY, libglvnd" |
| 21 | PACKAGECONFIG[gles] = "-DFREEGLUT_GLES=ON,-DFREEGLUT_GLES=OFF," | 20 | PACKAGECONFIG[gles] = "-DFREEGLUT_GLES=ON,-DFREEGLUT_GLES=OFF," |
| 22 | PACKAGECONFIG[wayland] = "-DFREEGLUT_WAYLAND=ON,-DFREEGLUT_WAYLAND=OFF,libxkbcommon" | 21 | PACKAGECONFIG[wayland] = "-DFREEGLUT_WAYLAND=ON,-DFREEGLUT_WAYLAND=OFF,libxkbcommon" |
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb index e8ad2aad0f..959463e962 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb | |||
| @@ -119,6 +119,9 @@ FILES:${PN}-doc = " \ | |||
| 119 | ${mandir} \ | 119 | ${mandir} \ |
| 120 | ${datadir}/fvwm \ | 120 | ${datadir}/fvwm \ |
| 121 | " | 121 | " |
| 122 | RDEPENDS:${PN} = " \ | ||
| 123 | xuser-account \ | ||
| 124 | " | ||
| 122 | RDEPENDS:${PN}-extra += "\ | 125 | RDEPENDS:${PN}-extra += "\ |
| 123 | perl \ | 126 | perl \ |
| 124 | python3-core \ | 127 | python3-core \ |
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch deleted file mode 100644 index e0c3de469a..0000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 1 Mar 2023 22:58:37 -0800 | ||
| 4 | Subject: [PATCH] Match prototypes of callbacks with libgphoto | ||
| 5 | |||
| 6 | In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e | ||
| 7 | we tried to fix by using pthread_t but it also needs to make changes in | ||
| 8 | libgphoto and these changes can be invasive, therefore lets revert to | ||
| 9 | older types and to fix musl problem fix it via type casts | ||
| 10 | |||
| 11 | Upstream-Status: Backport [https://github.com/gphoto/gphoto2/pull/569] | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | gphoto2/main.c | 8 ++++---- | ||
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/gphoto2/main.c b/gphoto2/main.c | ||
| 18 | index 0dac947..cd3c990 100644 | ||
| 19 | --- a/gphoto2/main.c | ||
| 20 | +++ b/gphoto2/main.c | ||
| 21 | @@ -1198,7 +1198,7 @@ thread_func (void *data) | ||
| 22 | pthread_cleanup_pop (1); | ||
| 23 | } | ||
| 24 | |||
| 25 | -static pthread_t | ||
| 26 | +static unsigned int | ||
| 27 | start_timeout_func (Camera *camera, unsigned int timeout, | ||
| 28 | CameraTimeoutFunc func, void __unused__ *data) | ||
| 29 | { | ||
| 30 | @@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, | ||
| 31 | |||
| 32 | pthread_create (&tid, NULL, thread_func, td); | ||
| 33 | |||
| 34 | - return (tid); | ||
| 35 | + return (unsigned int)tid; | ||
| 36 | } | ||
| 37 | |||
| 38 | static void | ||
| 39 | -stop_timeout_func (Camera __unused__ *camera, pthread_t id, | ||
| 40 | +stop_timeout_func (Camera __unused__ *camera, unsigned int id, | ||
| 41 | void __unused__ *data) | ||
| 42 | { | ||
| 43 | - pthread_t tid = id; | ||
| 44 | + pthread_t tid = (pthread_t)id; | ||
| 45 | |||
| 46 | pthread_cancel (tid); | ||
| 47 | pthread_join (tid, NULL); | ||
| 48 | -- | ||
| 49 | 2.39.2 | ||
| 50 | |||
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch index 3d54d58e18..bd916e339a 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch | |||
| @@ -14,13 +14,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 14 | --- a/configure.ac | 14 | --- a/configure.ac |
| 15 | +++ b/configure.ac | 15 | +++ b/configure.ac |
| 16 | @@ -26,7 +26,9 @@ AC_PROG_INSTALL | 16 | @@ -26,7 +26,9 @@ AC_PROG_INSTALL |
| 17 | AC_SYS_LARGEFILE | 17 | ]) |
| 18 | 18 | ||
| 19 | GP_CONFIG_MSG([Compiler],[${CC}]) | 19 | GP_CONFIG_MSG([Compiler], [${CC}]) |
| 20 | -AC_DEFINE_UNQUOTED([HAVE_CC],"$CC",[The C compiler we're using]) | 20 | -AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"], [The C compiler we are using]) |
| 21 | +CC_NO_SYSROOT=`echo $CC | sed -e \ | 21 | +CC_NO_SYSROOT=`echo $CC | sed -e \ |
| 22 | + 's|--sysroot=.*\b||g'` | 22 | + 's|--sysroot=.*\b||g'` |
| 23 | +AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], [The C compiler we're using]) | 23 | +AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], [The C compiler we are using]) |
| 24 | 24 | ||
| 25 | dnl AC_STRUCT_TIMEZONE | 25 | dnl AC_STRUCT_TIMEZONE |
| 26 | 26 | ||
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index 14976ffb72..358dbbb51a 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch | |||
| @@ -14,10 +14,10 @@ Upstream-Status: Pending | |||
| 14 | --- a/configure.ac | 14 | --- a/configure.ac |
| 15 | +++ b/configure.ac | 15 | +++ b/configure.ac |
| 16 | @@ -46,7 +46,6 @@ dnl i18n support | 16 | @@ -46,7 +46,6 @@ dnl i18n support |
| 17 | dnl --------------------------------------------------------------------------- | 17 | GP_GETTEXT_SETUP([GETTEXT_PACKAGE_GPHOTO2], |
| 18 | GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) | 18 | [gphoto2], |
| 19 | ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" | 19 | [po]) |
| 20 | -AM_PO_SUBDIRS() | 20 | -AM_PO_SUBDIRS() |
| 21 | AM_GNU_GETTEXT_VERSION([0.14.1]) | 21 | AM_GNU_GETTEXT_VERSION([0.19.1]) |
| 22 | AM_GNU_GETTEXT([external]) | 22 | AM_GNU_GETTEXT([external]) |
| 23 | AM_ICONV() | 23 | AM_ICONV() |
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch deleted file mode 100644 index a27c02cefc..0000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | From 23c67e93e51f700d0aeecfc08277e39f51201fc3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 2 Sep 2022 12:59:46 -0700 | ||
| 4 | Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs | ||
| 5 | |||
| 6 | This is not a plain old datatype in every libc, e.g. with musl this | ||
| 7 | would fail in type conversion | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/535] | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | gphoto2/main.c | 4 ++-- | ||
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/gphoto2/main.c b/gphoto2/main.c | ||
| 16 | index 2bf5964..9a6b05d 100644 | ||
| 17 | --- a/gphoto2/main.c | ||
| 18 | +++ b/gphoto2/main.c | ||
| 19 | @@ -1198,7 +1198,7 @@ thread_func (void *data) | ||
| 20 | pthread_cleanup_pop (1); | ||
| 21 | } | ||
| 22 | |||
| 23 | -static unsigned int | ||
| 24 | +static pthread_t | ||
| 25 | start_timeout_func (Camera *camera, unsigned int timeout, | ||
| 26 | CameraTimeoutFunc func, void __unused__ *data) | ||
| 27 | { | ||
| 28 | @@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeout, | ||
| 29 | } | ||
| 30 | |||
| 31 | static void | ||
| 32 | -stop_timeout_func (Camera __unused__ *camera, unsigned int id, | ||
| 33 | +stop_timeout_func (Camera __unused__ *camera, pthread_t id, | ||
| 34 | void __unused__ *data) | ||
| 35 | { | ||
| 36 | pthread_t tid = id; | ||
| 37 | -- | ||
| 38 | 2.37.3 | ||
| 39 | |||
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-fix-const-qualifier-violations.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-fix-const-qualifier-violations.patch new file mode 100644 index 0000000000..a8f85d034c --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-fix-const-qualifier-violations.patch | |||
| @@ -0,0 +1,73 @@ | |||
| 1 | From 55edc241e9b61b14153c61fd0baaefac927ad89f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Tue, 21 Apr 2026 17:39:43 -0700 | ||
| 4 | Subject: [PATCH] gphoto2: fix const qualifier violations | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | No logic is changed. The patch is a pure | ||
| 10 | type-correctness fix that makes the variable | ||
| 11 | declarations match the actual semantics — | ||
| 12 | const char * for pointers into string literals | ||
| 13 | or function parameters that must not be mutated, | ||
| 14 | and char * only for owned heap memory. This | ||
| 15 | satisfies Clang's strict qualifier checking without | ||
| 16 | needing any casts or warning suppressions. | ||
| 17 | |||
| 18 | Fixes errors seen on clang with | ||
| 19 | -Werror,-Wincompatible-pointer-types-discards-qualifiers | ||
| 20 | |||
| 21 | Upstream-Status: Pending | ||
| 22 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 23 | --- | ||
| 24 | gphoto2/main.c | 14 ++++++++------ | ||
| 25 | 1 file changed, 8 insertions(+), 6 deletions(-) | ||
| 26 | |||
| 27 | diff --git a/gphoto2/main.c b/gphoto2/main.c | ||
| 28 | index 5a3c5c1..086f9df 100644 | ||
| 29 | --- a/gphoto2/main.c | ||
| 30 | +++ b/gphoto2/main.c | ||
| 31 | @@ -146,7 +146,8 @@ static int | ||
| 32 | get_path_for_file (const char *folder, const char *name, CameraFileType type, CameraFile *file, char **path) | ||
| 33 | { | ||
| 34 | unsigned int i, l; | ||
| 35 | - char *s = NULL, b[1024]; | ||
| 36 | + const char *s = NULL; | ||
| 37 | + char *p = NULL; char b[1024]; | ||
| 38 | time_t t = 0; | ||
| 39 | struct tm *tm; | ||
| 40 | int hour12; | ||
| 41 | @@ -339,18 +340,18 @@ get_path_for_file (const char *folder, const char *name, CameraFileType type, Ca | ||
| 42 | b[1] = '\0'; | ||
| 43 | } | ||
| 44 | |||
| 45 | - s = *path ? realloc (*path, strlen (*path) + strlen (b) + 1) : | ||
| 46 | + p = *path ? realloc (*path, strlen (*path) + strlen (b) + 1) : | ||
| 47 | malloc (strlen (b) + 1); | ||
| 48 | - if (!s) { | ||
| 49 | + if (!p) { | ||
| 50 | free (*path); | ||
| 51 | *path = NULL; | ||
| 52 | return (GP_ERROR_NO_MEMORY); | ||
| 53 | } | ||
| 54 | if (*path) { | ||
| 55 | - *path = s; | ||
| 56 | + *path = p; | ||
| 57 | strcat (*path, b); | ||
| 58 | } else { | ||
| 59 | - *path = s; | ||
| 60 | + *path = p; | ||
| 61 | strcpy (*path, b); | ||
| 62 | } | ||
| 63 | } | ||
| 64 | @@ -696,7 +697,8 @@ dissolve_filename ( | ||
| 65 | const char *folder, const char *filename, | ||
| 66 | char **newfolder, char **newfilename | ||
| 67 | ) { | ||
| 68 | - char *nfolder, *s; | ||
| 69 | + char *nfolder; | ||
| 70 | + const char *s; | ||
| 71 | |||
| 72 | s = strrchr (filename, '/'); | ||
| 73 | if (!s) { | ||
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.32.bb index 40409ed388..dbd2b0e748 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.32.bb | |||
| @@ -8,11 +8,10 @@ RDEPENDS:gphoto2 = "libgphoto2" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.bz2;name=gphoto2 \ | 9 | SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.bz2;name=gphoto2 \ |
| 10 | file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ | 10 | file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ |
| 11 | file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \ | ||
| 12 | file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \ | ||
| 13 | file://0001-configure-Filter-out-buildpaths-from-CC.patch \ | 11 | file://0001-configure-Filter-out-buildpaths-from-CC.patch \ |
| 12 | file://0001-gphoto2-fix-const-qualifier-violations.patch \ | ||
| 14 | " | 13 | " |
| 15 | SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375" | 14 | SRC_URI[gphoto2.sha256sum] = "4e379a0f12f72b49ee5ee2283ffd806b5d12d099939d75197a3f4bbc7f27a1a1" |
| 16 | 15 | ||
| 17 | inherit autotools pkgconfig gettext | 16 | inherit autotools pkgconfig gettext |
| 18 | 17 | ||
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.34.bb index 6b5e6c21b9..fca158fe11 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.34.bb | |||
| @@ -12,8 +12,8 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2" | |||
| 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.xz;name=libgphoto2 \ | 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.xz;name=libgphoto2 \ |
| 13 | file://40-libgphoto2.rules \ | 13 | file://40-libgphoto2.rules \ |
| 14 | file://0001-configure-Filter-out-buildpaths-from-CC.patch \ | 14 | file://0001-configure-Filter-out-buildpaths-from-CC.patch \ |
| 15 | " | 15 | " |
| 16 | SRC_URI[libgphoto2.sha256sum] = "28825f767a85544cb58f6e15028f8e53a5bb37a62148b3f1708b524781c3bef2" | 16 | SRC_URI[libgphoto2.sha256sum] = "51993f5d9bfb6b4e5925cbbe5883085791bff6f81bcacb8ffe1b783ce76d586a" |
| 17 | 17 | ||
| 18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gphoto/files/libgphoto/" | 18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gphoto/files/libgphoto/" |
| 19 | 19 | ||
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_14.1.3.bb b/meta-oe/recipes-graphics/graphviz/graphviz_15.0.0.bb index d885dc43ac..f8fdb47cf5 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_14.1.3.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_15.0.0.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | SUMMARY = "Graph Visualization Tools" | 1 | SUMMARY = "Graph Visualization Tools" |
| 2 | HOMEPAGE = "http://www.graphviz.org" | 2 | HOMEPAGE = "http://www.graphviz.org" |
| 3 | LICENSE = "EPL-1.0" | 3 | LICENSE = "EPL-2.0" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d9fc0efef5228704e7f5b37f27192723" |
| 5 | 5 | ||
| 6 | DEPENDS = " \ | 6 | DEPENDS = " \ |
| 7 | bison-native \ | 7 | bison-native \ |
| @@ -23,7 +23,7 @@ SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-re | |||
| 23 | SRC_URI:append:class-nativesdk = "\ | 23 | SRC_URI:append:class-nativesdk = "\ |
| 24 | file://graphviz-setup.sh \ | 24 | file://graphviz-setup.sh \ |
| 25 | " | 25 | " |
| 26 | SRC_URI[sha256sum] = "fe76529477c22c0cf833ec5a35b430cf710f4705afc465d86292bf13560be584" | 26 | SRC_URI[sha256sum] = "937fe4757687260e46a1c9a171cc677e3d4c89abd1efc8885ccb66467c3616ff" |
| 27 | 27 | ||
| 28 | UPSTREAM_CHECK_URI = "https://graphviz.org/download/" | 28 | UPSTREAM_CHECK_URI = "https://graphviz.org/download/" |
| 29 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 29 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
| @@ -68,7 +68,7 @@ do_install:append:class-nativesdk() { | |||
| 68 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 68 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
| 69 | install -m 0755 ${UNPACKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 69 | install -m 0755 ${UNPACKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
| 70 | } | 70 | } |
| 71 | FILES:${PN}:class-nativesdk += "${SDKPATHNATIVE}" | 71 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" |
| 72 | 72 | ||
| 73 | # create /usr/lib/graphviz/config6 | 73 | # create /usr/lib/graphviz/config6 |
| 74 | graphviz_sstate_postinst() { | 74 | graphviz_sstate_postinst() { |
diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.127.bb index 0b87c1b21a..774a30e1a4 100644 --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.122.bb +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.127.bb | |||
| @@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only" | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" |
| 7 | 7 | ||
| 8 | SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" | 8 | SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" |
| 9 | SRC_URI[sha256sum] = "6201b5f93dcaeafa92fc0ec4ad4baeaf60acf16fc8f019bbf061cf4ebf27938a" | 9 | SRC_URI[sha256sum] = "f19da2db43b27bbcc669725843451945a68c3a4ce232562e341d6f63b80b55e4" |
| 10 | S = "${UNPACKDIR}/${BPN}-gtk3-${PV}" | 10 | S = "${UNPACKDIR}/${BPN}-gtk3-${PV}" |
| 11 | 11 | ||
| 12 | DEPENDS = " \ | 12 | DEPENDS = " \ |
diff --git a/meta-oe/recipes-graphics/kmscon/files/0001-fix-zlib-cross-compiling-errors.patch b/meta-oe/recipes-graphics/kmscon/files/0001-fix-zlib-cross-compiling-errors.patch new file mode 100644 index 0000000000..c720aa6dde --- /dev/null +++ b/meta-oe/recipes-graphics/kmscon/files/0001-fix-zlib-cross-compiling-errors.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From 0ff9beddd959ec9afc99f64789fdfb959842ba52 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Adam Duskett <adam.duskett@amarulasolutions.com> | ||
| 3 | Date: Thu, 21 May 2026 16:30:27 +0200 | ||
| 4 | Subject: [PATCH 1/1] fix zlib cross-compiling errors | ||
| 5 | |||
| 6 | zlib compression was introduced in version 9.3.3. However, when | ||
| 7 | cross-compiling kmscon for an architecture other than x86_64, the | ||
| 8 | genunifont executable tries to use the build-systems zlib instead | ||
| 9 | of the hosts zlib. | ||
| 10 | |||
| 11 | This leads to the following error during compiling: | ||
| 12 | libz.so: error adding symbols: file in wrong format | ||
| 13 | |||
| 14 | Fix this by adding a new native zlib dependency specifically for the | ||
| 15 | genunifont executable. | ||
| 16 | |||
| 17 | Upstream-Status: Submitted [https://github.com/kmscon/kmscon/pull/402] | ||
| 18 | Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> | ||
| 19 | --- | ||
| 20 | meson.build | 1 + | ||
| 21 | src/meson.build | 2 +- | ||
| 22 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
| 23 | |||
| 24 | diff --git a/meson.build b/meson.build | ||
| 25 | index f7c0858..74cf595 100644 | ||
| 26 | --- a/meson.build | ||
| 27 | +++ b/meson.build | ||
| 28 | @@ -52,6 +52,7 @@ libudev_deps = dependency('libudev', version: '>=172') | ||
| 29 | dl_deps = dependency('dl') | ||
| 30 | threads_deps = dependency('threads') | ||
| 31 | zlib_deps = dependency('zlib') | ||
| 32 | +zlib_deps_native = dependency('zlib', native: true) | ||
| 33 | |||
| 34 | python = find_program('python3') | ||
| 35 | |||
| 36 | diff --git a/src/meson.build b/src/meson.build | ||
| 37 | index 63d38ca..070e2a4 100644 | ||
| 38 | --- a/src/meson.build | ||
| 39 | +++ b/src/meson.build | ||
| 40 | @@ -159,7 +159,7 @@ endif | ||
| 41 | # Unifont Generator | ||
| 42 | # This generates the unifont sources from raw hex-encoded font data. | ||
| 43 | # | ||
| 44 | -genunifont = executable('genunifont', 'genunifont.c', dependencies: [zlib_deps], native: true) | ||
| 45 | +genunifont = executable('genunifont', 'genunifont.c', dependencies: [zlib_deps_native], native: true) | ||
| 46 | |||
| 47 | unifont_bin = custom_target('unifont-bin', | ||
| 48 | input: ['font_unifont_data.hex'], | ||
| 49 | -- | ||
| 50 | 2.54.0 | ||
| 51 | |||
diff --git a/meta-oe/recipes-graphics/kmscon/kmscon_9.3.2.bb b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.5.bb index 2db5162857..83256480ee 100644 --- a/meta-oe/recipes-graphics/kmscon/kmscon_9.3.2.bb +++ b/meta-oe/recipes-graphics/kmscon/kmscon_9.3.5.bb | |||
| @@ -17,15 +17,20 @@ DEPENDS = "\ | |||
| 17 | libtsm \ | 17 | libtsm \ |
| 18 | libxkbcommon \ | 18 | libxkbcommon \ |
| 19 | udev \ | 19 | udev \ |
| 20 | zlib \ | ||
| 20 | " | 21 | " |
| 21 | 22 | ||
| 22 | SRC_URI = "git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV}" | 23 | SRC_URI = "\ |
| 23 | SRCREV = "9ce1dc0dc639e54e243a21d93e13f502a746f0a8" | 24 | git://github.com/kmscon/kmscon;protocol=https;branch=main;tag=v${PV} \ |
| 25 | file://0001-fix-zlib-cross-compiling-errors.patch \ | ||
| 26 | " | ||
| 27 | SRCREV = "a8832afb1dcca5bb4c0476d4c13c7239fecbd93a" | ||
| 24 | 28 | ||
| 25 | inherit meson pkgconfig systemd | 29 | inherit meson pkgconfig systemd |
| 26 | 30 | ||
| 27 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" | 31 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" |
| 28 | 32 | ||
| 33 | PACKAGECONFIG[font_freetype] = "-Dfont_freetype=enabled, -Dfont_freetype=disabled, fontconfig freetype" | ||
| 29 | PACKAGECONFIG[font_pango] = "-Dfont_pango=enabled, -Dfont_pango=disabled, pango" | 34 | PACKAGECONFIG[font_pango] = "-Dfont_pango=enabled, -Dfont_pango=disabled, pango" |
| 30 | PACKAGECONFIG[multi_seat] = "-Dmulti_seat=enabled, -Dmulti_seat=disabled, systemd" | 35 | PACKAGECONFIG[multi_seat] = "-Dmulti_seat=enabled, -Dmulti_seat=disabled, systemd" |
| 31 | PACKAGECONFIG[opengl] = "-Drenderer_gltex=enabled -Dvideo_drm3d=enabled, -Drenderer_gltex=disabled -Dvideo_drm3d=disabled, libdrm virtual/egl virtual/libgles2 virtual/libgbm" | 36 | PACKAGECONFIG[opengl] = "-Drenderer_gltex=enabled -Dvideo_drm3d=enabled, -Drenderer_gltex=disabled -Dvideo_drm3d=disabled, libdrm virtual/egl virtual/libgles2 virtual/libgbm" |
diff --git a/meta-oe/recipes-graphics/ktx-software/ktx-software_4.4.0.bb b/meta-oe/recipes-graphics/ktx-software/ktx-software_5.0.0.bb index ae4caeb89c..8db0c79b87 100644 --- a/meta-oe/recipes-graphics/ktx-software/ktx-software_4.4.0.bb +++ b/meta-oe/recipes-graphics/ktx-software/ktx-software_5.0.0.bb | |||
| @@ -6,10 +6,10 @@ LICENSE = "Apache-2.0 & BSD-1-Clause & BSD-2-Clause & BSD-3-Clause & BSL-1.0 \ | |||
| 6 | & CC-BY-3.0 & CC-BY-4.0 & CC0-1.0 & Zlib & MIT & HI-Trademark & fmt & \ | 6 | & CC-BY-3.0 & CC-BY-4.0 & CC0-1.0 & Zlib & MIT & HI-Trademark & fmt & \ |
| 7 | Kodak & PNGSuite & ETCSLA & Cesium-Trademark-Terms" | 7 | Kodak & PNGSuite & ETCSLA & Cesium-Trademark-Terms" |
| 8 | 8 | ||
| 9 | LIC_FILES_CHKSUM = "file://REUSE.toml;md5=45910de791d599e6ba472f6fa506f391" | 9 | LIC_FILES_CHKSUM = "file://REUSE.toml;md5=9f87c97ba36aab42411bf93c094a61f2" |
| 10 | 10 | ||
| 11 | SRC_URI = "git://github.com/KhronosGroup/KTX-Software.git;protocol=https;branch=main;lfs=0" | 11 | SRC_URI = "git://github.com/KhronosGroup/KTX-Software.git;protocol=https;branch=main;lfs=0" |
| 12 | SRCREV = "beef80159525d9fb7abb8645ea85f4c4f6842e8f" | 12 | SRCREV = "6269d2752ed04446c2d4749f54f3aad4f94555b5" |
| 13 | 13 | ||
| 14 | inherit cmake | 14 | inherit cmake |
| 15 | 15 | ||
diff --git a/meta-oe/recipes-graphics/leptonica/leptonica_1.86.0.bb b/meta-oe/recipes-graphics/leptonica/leptonica_1.87.0.bb index 11adbc7125..1e6edfd138 100644 --- a/meta-oe/recipes-graphics/leptonica/leptonica_1.86.0.bb +++ b/meta-oe/recipes-graphics/leptonica/leptonica_1.87.0.bb | |||
| @@ -7,7 +7,7 @@ UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases" | |||
| 7 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 7 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" | 9 | SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" |
| 10 | SRC_URI[sha256sum] = "1fa08e40bb37fd45802d5e6e7b43927449a5c47d4608ef99d3bd3f0fa76baedc" | 10 | SRC_URI[sha256sum] = "c73363397f96eb1295602bf44d708a994ad42046c791bf03ea0505d829bdb6a7" |
| 11 | 11 | ||
| 12 | EXTRA_OECONF += " \ | 12 | EXTRA_OECONF += " \ |
| 13 | --without-libwebp \ | 13 | --without-libwebp \ |
diff --git a/meta-oe/recipes-graphics/libraqm/libraqm_0.10.5.bb b/meta-oe/recipes-graphics/libraqm/libraqm_0.10.5.bb new file mode 100644 index 0000000000..8eaaee4492 --- /dev/null +++ b/meta-oe/recipes-graphics/libraqm/libraqm_0.10.5.bb | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | SUMMARY = "A library for complex text layout" | ||
| 2 | DESCRIPTION = "\ | ||
| 3 | Raqm is a small library that encapsulates the logic for complex text \ | ||
| 4 | layout and provides a convenient API. It currently provides bidirectional \ | ||
| 5 | text support (using FriBiDi or SheenBidi), shaping (using HarfBuzz), and \ | ||
| 6 | proper script itemization. As a result, Raqm can support most writing \ | ||
| 7 | systems covered by Unicode. \ | ||
| 8 | " | ||
| 9 | HOMEPAGE = "https://github.com/HOST-Oman/libraqm" | ||
| 10 | BUGTRACKER = "https://github.com/HOST-Oman/libraqm/issues" | ||
| 11 | SECTION = "graphics" | ||
| 12 | |||
| 13 | LICENSE = "MIT" | ||
| 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=7dc444a99e2824eac906383266fe4fa6" | ||
| 15 | |||
| 16 | SRC_URI = "git://github.com/HOST-Oman/libraqm.git;protocol=https;branch=main;tag=v${PV}" | ||
| 17 | SRCREV = "3a6b891a3db0e0db1364aa38088422f68d8d81e6" | ||
| 18 | |||
| 19 | DEPENDS = "freetype fribidi harfbuzz" | ||
| 20 | |||
| 21 | inherit meson pkgconfig | ||
| 22 | |||
| 23 | PACKAGECONFIG ?= "" | ||
| 24 | |||
| 25 | PACKAGECONFIG[sheenbidi] = "-Dsheenbidi=true,-Dsheenbidi=false,sheenbidi" | ||
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.12.bb index c15e986dc3..7bc2cc60cd 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.12.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455" | |||
| 7 | DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp" | 7 | DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" | 9 | SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" |
| 10 | SRC_URI[sha256sum] = "2213b56fdaff2220d0e38c8e420cbe1a83c87374190cba8c70af2156097ce30a" | 10 | SRC_URI[sha256sum] = "393f5efb50536ec13ca4f4affb69cc9966d3c3f969e6c5e701faddf9f9785381" |
| 11 | 11 | ||
| 12 | S = "${UNPACKDIR}/SDL2_image-${PV}" | 12 | S = "${UNPACKDIR}/SDL2_image-${PV}" |
| 13 | 13 | ||
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.2.bb index 46e6ba0774..e7d85c6743 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.2.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "Zlib" | |||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455" |
| 6 | 6 | ||
| 7 | SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" | 7 | SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" |
| 8 | SRC_URI[sha256sum] = "cb760211b056bfe44f4a1e180cc7cb201137e4d1572f2002cc1be728efd22660" | 8 | SRC_URI[sha256sum] = "938dff531d00ace2296557a6599abe6f34599e2f34f0a4a08a397e2ccac8b8f7" |
| 9 | 9 | ||
| 10 | S = "${UNPACKDIR}/SDL2_mixer-${PV}" | 10 | S = "${UNPACKDIR}/SDL2_mixer-${PV}" |
| 11 | 11 | ||
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.4.0.bb index 4a7ada94cb..abdfd94122 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.4.0.bb | |||
| @@ -1,17 +1,16 @@ | |||
| 1 | DESCRIPTION = "Simple DirectMedia Layer networking library." | 1 | DESCRIPTION = "Simple DirectMedia Layer networking library." |
| 2 | SECTION = "libs/network" | 2 | SECTION = "libs/network" |
| 3 | LICENSE = "Zlib" | 3 | LICENSE = "Zlib" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=036a54229112040a743509a86b30c80c" |
| 5 | 5 | ||
| 6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
| 7 | https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \ | 7 | https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz" |
| 8 | " | ||
| 9 | S = "${UNPACKDIR}/SDL2_net-${PV}" | 8 | S = "${UNPACKDIR}/SDL2_net-${PV}" |
| 10 | 9 | ||
| 11 | inherit cmake pkgconfig | 10 | inherit cmake pkgconfig |
| 12 | 11 | ||
| 13 | DEPENDS = "virtual/libsdl2" | 12 | DEPENDS = "virtual/libsdl2" |
| 14 | 13 | ||
| 15 | SRC_URI[sha256sum] = "4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb" | 14 | SRC_URI[sha256sum] = "9cbca2527feb3f1a622d48ba65cc7dee9b1e3f2c55ceafb7d7720bb058aafb30" |
| 16 | 15 | ||
| 17 | FILES:${PN} += "${datadir}/licenses" | 16 | FILES:${PN} += "${datadir}/licenses" |
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.64.bb b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.70.bb index c83b90f77b..56134f805f 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.64.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.70.bb | |||
| @@ -11,7 +11,7 @@ LICENSE = "Zlib" | |||
| 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca6eaff208365238403badb97aa6b3d2" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca6eaff208365238403badb97aa6b3d2" |
| 12 | 12 | ||
| 13 | SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz" | 13 | SRC_URI = "http://www.libsdl.org/release/sdl2-compat-${PV}.tar.gz" |
| 14 | SRC_URI[sha256sum] = "b2fa522e7bb08113534904b3dc2d2f7ff7b0c259224d86c12374d5b4a4027930" | 14 | SRC_URI[sha256sum] = "998fa62557eb46ffe7e5c3e2c123bc332f7df9d9f593b3ceed88ed1158428a44" |
| 15 | S = "${UNPACKDIR}/sdl2-compat-${PV}" | 15 | S = "${UNPACKDIR}/sdl2-compat-${PV}" |
| 16 | 16 | ||
| 17 | DEPENDS += "libsdl3" | 17 | DEPENDS += "libsdl3" |
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.2.bb index 324332eb84..0f7ce92efd 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.0.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.4.2.bb | |||
| @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=df8f4d887d3997f6e9cf81bb7f43dbf7" | |||
| 6 | 6 | ||
| 7 | DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp libjxl" | 7 | DEPENDS = "tiff zlib libpng jpeg libsdl3 libwebp libjxl" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.4.x" | 9 | SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.4.x;tag=release-${PV}" |
| 10 | SRCREV = "ad58ecfc27a1bd09e510ceff8bbbdb1094806476" | 10 | SRCREV = "96a73a551a857b7c8d0ca3cc553a266eabbab6a7" |
| 11 | 11 | ||
| 12 | EXTRA_OECMAKE += "-DSDLIMAGE_JXL=ON" | 12 | EXTRA_OECMAKE += "-DSDLIMAGE_JXL=ON" |
| 13 | 13 | ||
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-mixer_3.2.0.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-mixer_3.2.2.bb index 8540ec55fc..138536c628 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl3-mixer_3.2.0.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-mixer_3.2.2.bb | |||
| @@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=df8f4d887d3997f6e9cf81bb7f43dbf7" | |||
| 4 | 4 | ||
| 5 | DEPENDS = "libsdl3" | 5 | DEPENDS = "libsdl3" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/libsdl-org/SDL_mixer.git;protocol=https;branch=release-3.2.x" | 7 | SRC_URI = "git://github.com/libsdl-org/SDL_mixer.git;protocol=https;branch=release-3.2.x;tag=release-${PV}" |
| 8 | SRCREV = "cedfeef30e93db35eee6b25759117da63f8e5a4f" | 8 | SRCREV = "a5e1890afc5115ffd16cefdbb4d50f74bf4970ce" |
| 9 | 9 | ||
| 10 | inherit cmake pkgconfig | 10 | inherit cmake pkgconfig |
| 11 | 11 | ||
| 12 | PACKAGECONFIG ?= "flac opus wave vorbis" | 12 | PACKAGECONFIG ?= "flac wave vorbis" |
| 13 | PACKAGECONFIG[opus] = "-DSDLMIXER_OPUS=ON -DSDLMIXER_OPUS_SHARED=ON, -DSDLMIXER_OPUS=OFF,opusfile" | 13 | PACKAGECONFIG[opus] = "-DSDLMIXER_OPUS=ON -DSDLMIXER_OPUS_SHARED=ON, -DSDLMIXER_OPUS=OFF,opusfile" |
| 14 | PACKAGECONFIG[vorbis] = "-DSDLMIXER_VORBIS_VORBISFILE=ON -DSDLMIXER_VORBIS_STB=OFF -DSDLMIXER_VORBIS_TREMOR=OFF, -DSDLMIXER_VORBIS_VORBISFILE=OFF -DSDLMIXER_VORBIS_STB=OFF -DSDLMIXER_VORBIS_TREMOR=OFF,libvorbis" | 14 | PACKAGECONFIG[vorbis] = "-DSDLMIXER_VORBIS_VORBISFILE=ON -DSDLMIXER_VORBIS_STB=OFF -DSDLMIXER_VORBIS_TREMOR=OFF, -DSDLMIXER_VORBIS_VORBISFILE=OFF -DSDLMIXER_VORBIS_STB=OFF -DSDLMIXER_VORBIS_TREMOR=OFF,libvorbis" |
| 15 | PACKAGECONFIG[flac] = "-DSDLMIXER_FLAC_LIBFLAC=ON -DSDLMIXER_FLAC_LIBFLAC_SHARED=ON, -DSDLMIXER_FLAC_LIBFLAC=OFF,flac" | 15 | PACKAGECONFIG[flac] = "-DSDLMIXER_FLAC_LIBFLAC=ON -DSDLMIXER_FLAC_LIBFLAC_SHARED=ON, -DSDLMIXER_FLAC_LIBFLAC=OFF,flac" |
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.2.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.10.bb index d6501f855c..aba096976e 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.2.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.4.10.bb | |||
| @@ -18,7 +18,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz" | |||
| 18 | 18 | ||
| 19 | S = "${UNPACKDIR}/SDL3-${PV}" | 19 | S = "${UNPACKDIR}/SDL3-${PV}" |
| 20 | 20 | ||
| 21 | SRC_URI[sha256sum] = "ef39a2e3f9a8a78296c40da701967dd1b0d0d6e267e483863ce70f8a03b4050c" | 21 | SRC_URI[sha256sum] = "12b34280415ec8418c864408b93d008a20a6530687ee613d60bfbd20411f2785" |
| 22 | 22 | ||
| 23 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even | 23 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even |
| 24 | 24 | ||
diff --git a/meta-oe/recipes-graphics/libtsm/libtsm_4.4.2.bb b/meta-oe/recipes-graphics/libtsm/libtsm_4.5.0.bb index 6f060cd0f5..9e999fe970 100644 --- a/meta-oe/recipes-graphics/libtsm/libtsm_4.4.2.bb +++ b/meta-oe/recipes-graphics/libtsm/libtsm_4.5.0.bb | |||
| @@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "\ | |||
| 22 | DEPENDS = "xkeyboard-config" | 22 | DEPENDS = "xkeyboard-config" |
| 23 | 23 | ||
| 24 | SRC_URI = "git://github.com/kmscon/libtsm;protocol=https;branch=main;tag=v${PV}" | 24 | SRC_URI = "git://github.com/kmscon/libtsm;protocol=https;branch=main;tag=v${PV}" |
| 25 | SRCREV = "b052e48cc776be1cdb940be2dcc1603457c01c96" | 25 | SRCREV = "556373437d1c5f57f4dfc7c6cc1330e5088a4174" |
| 26 | 26 | ||
| 27 | inherit meson pkgconfig | 27 | inherit meson pkgconfig |
| 28 | 28 | ||
diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch b/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch index 26c3a0230c..7413316bcc 100644 --- a/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch +++ b/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From a4b238241f3f3016ef3ddcd260c1490a9c9e8168 Mon Sep 17 00:00:00 2001 | 1 | From 8b95d3c1d5f475668d53cc21a7abf431d9a9822b Mon Sep 17 00:00:00 2001 |
| 2 | From: Andri Yngvason <andri@yngvason.is> | 2 | From: Andri Yngvason <andri@yngvason.is> |
| 3 | Date: Sun, 23 Mar 2025 15:55:11 +0000 | 3 | Date: Sun, 23 Mar 2025 15:55:11 +0000 |
| 4 | Subject: [PATCH] Use aml v1 | 4 | Subject: [PATCH] Use aml v1 |
| @@ -15,13 +15,13 @@ Upstream-Status: Backport [https://github.com/any1/neatvnc/commit/a4b238241f3f30 | |||
| 15 | src/server.c | 6 ++---- | 15 | src/server.c | 6 ++---- |
| 16 | src/stream/gnutls.c | 6 +++--- | 16 | src/stream/gnutls.c | 6 +++--- |
| 17 | src/stream/tcp.c | 6 +++--- | 17 | src/stream/tcp.c | 6 +++--- |
| 18 | 11 files changed, 35 insertions(+), 41 deletions(-) | 18 | 10 files changed, 34 insertions(+), 39 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/meson.build b/meson.build | 20 | diff --git a/meson.build b/meson.build |
| 21 | index 1017ffd..e731886 100644 | 21 | index a0d7401..b094d9b 100644 |
| 22 | --- a/meson.build | 22 | --- a/meson.build |
| 23 | +++ b/meson.build | 23 | +++ b/meson.build |
| 24 | @@ -71,7 +71,7 @@ libavcodec = dependency('libavcodec', required: get_option('h264')) | 24 | @@ -63,7 +63,7 @@ libavcodec = dependency('libavcodec', required: get_option('h264')) |
| 25 | libavfilter = dependency('libavfilter', required: get_option('h264')) | 25 | libavfilter = dependency('libavfilter', required: get_option('h264')) |
| 26 | libavutil = dependency('libavutil', required: get_option('h264')) | 26 | libavutil = dependency('libavutil', required: get_option('h264')) |
| 27 | 27 | ||
| @@ -159,10 +159,10 @@ index a361974..441df19 100644 | |||
| 159 | struct encoded_frame* result; | 159 | struct encoded_frame* result; |
| 160 | result = encoded_frame_new(self->dst.data, self->dst.len, self->n_rects, | 160 | result = encoded_frame_new(self->dst.data, self->dst.len, self->n_rects, |
| 161 | diff --git a/src/enc/zrle.c b/src/enc/zrle.c | 161 | diff --git a/src/enc/zrle.c b/src/enc/zrle.c |
| 162 | index 42044dc..e775f34 100644 | 162 | index 503c738..c043983 100644 |
| 163 | --- a/src/enc/zrle.c | 163 | --- a/src/enc/zrle.c |
| 164 | +++ b/src/enc/zrle.c | 164 | +++ b/src/enc/zrle.c |
| 165 | @@ -315,9 +315,9 @@ static int zrle_encode_frame(struct zrle_encoder* self, | 165 | @@ -340,9 +340,9 @@ static int zrle_encode_frame(struct zrle_encoder* self, z_stream* zs, |
| 166 | return 0; | 166 | return 0; |
| 167 | } | 167 | } |
| 168 | 168 | ||
| @@ -174,7 +174,7 @@ index 42044dc..e775f34 100644 | |||
| 174 | int rc __attribute__((unused)); | 174 | int rc __attribute__((unused)); |
| 175 | 175 | ||
| 176 | struct nvnc_fb* fb = self->current_fb; | 176 | struct nvnc_fb* fb = self->current_fb; |
| 177 | @@ -349,9 +349,9 @@ static void zrle_encoder_do_work(void* obj) | 177 | @@ -374,9 +374,9 @@ static void zrle_encoder_do_work(void* obj) |
| 178 | assert(self->current_result); | 178 | assert(self->current_result); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| @@ -215,7 +215,7 @@ index e24798b..8f4cfa0 100644 | |||
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | diff --git a/src/server.c b/src/server.c | 217 | diff --git a/src/server.c b/src/server.c |
| 218 | index f172658..61da4dd 100644 | 218 | index a4f0ad9..099be28 100644 |
| 219 | --- a/src/server.c | 219 | --- a/src/server.c |
| 220 | +++ b/src/server.c | 220 | +++ b/src/server.c |
| 221 | @@ -210,9 +210,8 @@ static void client_close(struct nvnc_client* client) | 221 | @@ -210,9 +210,8 @@ static void client_close(struct nvnc_client* client) |
| @@ -229,7 +229,7 @@ index f172658..61da4dd 100644 | |||
| 229 | struct nvnc_client* client = aml_get_userdata(idle); | 229 | struct nvnc_client* client = aml_get_userdata(idle); |
| 230 | client->close_task = NULL; | 230 | client->close_task = NULL; |
| 231 | aml_stop(aml_get_default(), idle); | 231 | aml_stop(aml_get_default(), idle); |
| 232 | @@ -2033,9 +2032,8 @@ static void on_client_event(struct stream* stream, enum stream_event event) | 232 | @@ -2013,9 +2012,8 @@ static void on_client_event(struct stream* stream, enum stream_event event) |
| 233 | client->buffer_index = 0; | 233 | client->buffer_index = 0; |
| 234 | } | 234 | } |
| 235 | 235 | ||
| @@ -276,6 +276,3 @@ index 37f139a..95f5aa8 100644 | |||
| 276 | 276 | ||
| 277 | // We hold a reference here in case the stream gets destroyed inside | 277 | // We hold a reference here in case the stream gets destroyed inside |
| 278 | // callback. | 278 | // callback. |
| 279 | -- | ||
| 280 | 2.43.0 | ||
| 281 | |||
diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.5.bb b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.6.bb index b83a886f11..34cfbf18cc 100644 --- a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.5.bb +++ b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.6.bb | |||
| @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/any1/neatvnc;branch=v0.9;protocol=https \ | |||
| 10 | file://0001-Use-aml-v1.patch \ | 10 | file://0001-Use-aml-v1.patch \ |
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRCREV = "36ef59a83291368d72f471700702a8b6a76f763b" | 13 | SRCREV = "3295c11b934a83dbcb44beabf3f21a8b885a2d11" |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | DEPENDS = "libdrm pixman aml zlib" | 16 | DEPENDS = "libdrm pixman aml zlib" |
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2026-6192.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2026-6192.patch new file mode 100644 index 0000000000..49be9bd0a6 --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2026-6192.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From 776b00ff792a3c54b65f3bd92dbe7476a5a54106 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Even Rouault <even.rouault@spatialys.com> | ||
| 3 | Date: Sun, 5 Apr 2026 13:25:27 +0200 | ||
| 4 | Subject: [PATCH] opj_pi_initialise_encode() (write code path): avoid potential | ||
| 5 | integer overflow leading to insufficient memory allocation | ||
| 6 | |||
| 7 | Fixes #1619 | ||
| 8 | |||
| 9 | CVE: CVE-2026-6192 | ||
| 10 | Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/commit/839936aa33eb8899bbbd80fda02796bb65068951] | ||
| 11 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 12 | --- | ||
| 13 | src/lib/openjp2/pi.c | 9 ++++++--- | ||
| 14 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c | ||
| 17 | index 15ac3314..4abb87af 100644 | ||
| 18 | --- a/src/lib/openjp2/pi.c | ||
| 19 | +++ b/src/lib/openjp2/pi.c | ||
| 20 | @@ -1694,9 +1694,12 @@ opj_pi_iterator_t *opj_pi_initialise_encode(const opj_image_t *p_image, | ||
| 21 | l_current_pi = l_pi; | ||
| 22 | |||
| 23 | /* memory allocation for include*/ | ||
| 24 | - l_current_pi->include_size = l_tcp->numlayers * l_step_l; | ||
| 25 | - l_current_pi->include = (OPJ_INT16*) opj_calloc(l_current_pi->include_size, | ||
| 26 | - sizeof(OPJ_INT16)); | ||
| 27 | + l_current_pi->include = NULL; | ||
| 28 | + if (l_step_l <= UINT_MAX / l_tcp->numlayers) { | ||
| 29 | + l_current_pi->include_size = l_tcp->numlayers * l_step_l; | ||
| 30 | + l_current_pi->include = (OPJ_INT16*) opj_calloc(l_current_pi->include_size, | ||
| 31 | + sizeof(OPJ_INT16)); | ||
| 32 | + } | ||
| 33 | if (!l_current_pi->include) { | ||
| 34 | opj_free(l_tmp_data); | ||
| 35 | opj_free(l_tmp_ptr); | ||
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest b/meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest new file mode 100644 index 0000000000..a161244fbd --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/run-ptest | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | # Only run unit tests, exclude nonregression and conformance tests that need external data files | ||
| 4 | ctest -E "(NR-|CONF-|ETS-|testjp2)" -V | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' | ||
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb index 33dc48b2ea..0fe7a75e52 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb | |||
| @@ -8,14 +8,49 @@ DEPENDS = "libpng tiff lcms zlib" | |||
| 8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ |
| 9 | file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ | 9 | file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ |
| 10 | file://CVE-2023-39327.patch \ | 10 | file://CVE-2023-39327.patch \ |
| 11 | file://CVE-2026-6192.patch \ | ||
| 12 | file://run-ptest \ | ||
| 11 | " | 13 | " |
| 12 | SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f" | 14 | SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f" |
| 13 | 15 | ||
| 14 | inherit cmake | 16 | inherit cmake ptest |
| 15 | 17 | ||
| 16 | # for multilib | 18 | # for multilib |
| 17 | EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" | 19 | EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" |
| 18 | 20 | ||
| 21 | EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTING=ON', '', d)}" | ||
| 22 | |||
| 19 | FILES:${PN} += "${libdir}/openjpeg*" | 23 | FILES:${PN} += "${libdir}/openjpeg*" |
| 20 | 24 | ||
| 25 | do_install_ptest() { | ||
| 26 | install -d ${D}${PTEST_PATH} | ||
| 27 | |||
| 28 | # Install test binaries only | ||
| 29 | if [ -d ${B}/bin ]; then | ||
| 30 | install -d ${D}${PTEST_PATH}/bin | ||
| 31 | find ${B}/bin -maxdepth 1 -type f -executable ! -name "*.so*" \ | ||
| 32 | -exec install -m 0755 {} ${D}${PTEST_PATH}/bin/ \; | ||
| 33 | fi | ||
| 34 | |||
| 35 | # Install CTest configuration files with proper structure | ||
| 36 | if [ -d ${B}/tests ]; then | ||
| 37 | cp -r ${B}/tests ${D}${PTEST_PATH}/ | ||
| 38 | fi | ||
| 39 | if [ -f ${B}/CTestTestfile.cmake ]; then | ||
| 40 | install -m 0644 ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}/ | ||
| 41 | fi | ||
| 42 | |||
| 43 | # Fix all build paths in cmake files to point to ptest installation | ||
| 44 | find ${D}${PTEST_PATH} \( -name "*.cmake" -o -name "*.ctest" \) -type f -exec sed -i \ | ||
| 45 | -e "s#${B}/bin#${PTEST_PATH}/bin#g" \ | ||
| 46 | -e "s#${B}#${PTEST_PATH}#g" \ | ||
| 47 | -e "s#${S}#${PTEST_PATH}#g" \ | ||
| 48 | -e "s#${TMPDIR}#/tmp#g" \ | ||
| 49 | -e "s#${STAGING_DIR_NATIVE}##g" \ | ||
| 50 | -e "s#/tmp/work/[^/]*/[^/]*/[^/]*/recipe-sysroot-native/usr/bin/cmake#/usr/bin/cmake#g" \ | ||
| 51 | {} + | ||
| 52 | } | ||
| 53 | |||
| 54 | RDEPENDS:${PN}-ptest += "${PN} bash cmake" | ||
| 55 | |||
| 21 | BBCLASSEXTEND = "native nativesdk" | 56 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-graphics/suckless/st_0.9.2.bb b/meta-oe/recipes-graphics/suckless/st_0.9.3.bb index 22ad0211b6..12cc4bb877 100644 --- a/meta-oe/recipes-graphics/suckless/st_0.9.2.bb +++ b/meta-oe/recipes-graphics/suckless/st_0.9.3.bb | |||
| @@ -7,7 +7,7 @@ inherit pkgconfig features_check | |||
| 7 | 7 | ||
| 8 | REQUIRED_DISTRO_FEATURES = "x11" | 8 | REQUIRED_DISTRO_FEATURES = "x11" |
| 9 | 9 | ||
| 10 | SRC_URI[sha256sum] = "6b215d4f472b21d6232f30f221117a777e24bcfee68955ddefb7426467f9494b" | 10 | SRC_URI[sha256sum] = "9ed9feabcded713d4ded38c8cebf36a3b08f0042ef7934a0e2b2409da56e649b" |
| 11 | 11 | ||
| 12 | DEPENDS += "libx11 libxft fontconfig ncurses-native" | 12 | DEPENDS += "libx11 libxft fontconfig ncurses-native" |
| 13 | 13 | ||
diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch deleted file mode 100644 index d273d1459f..0000000000 --- a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | From 0cd38e6dbcaff7eef39fd46a60ff8a47e5f488c4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Sun, 3 Oct 2021 23:08:48 +0200 | ||
| 4 | Subject: [PATCH] config.ml: make compatible with webkitgtk 2.34.0 | ||
| 5 | |||
| 6 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 7 | --- | ||
| 8 | Upstream-Status: Pending | ||
| 9 | |||
| 10 | config.mk | 8 ++++---- | ||
| 11 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
| 12 | |||
| 13 | --- a/config.mk | ||
| 14 | +++ b/config.mk | ||
| 15 | @@ -2,6 +2,7 @@ | ||
| 16 | VERSION = 2.1 | ||
| 17 | |||
| 18 | # Customize below to fit your system | ||
| 19 | +PKG_CONFIG ?= pkg-config | ||
| 20 | |||
| 21 | # paths | ||
| 22 | PREFIX = /usr/local | ||
| 23 | @@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man | ||
| 24 | LIBPREFIX = $(PREFIX)/lib | ||
| 25 | LIBDIR = $(LIBPREFIX)/surf | ||
| 26 | |||
| 27 | -X11INC = `pkg-config --cflags x11` | ||
| 28 | -X11LIB = `pkg-config --libs x11` | ||
| 29 | +X11INC = $(shell $(PKG_CONFIG) --cflags x11) | ||
| 30 | +X11LIB = $(shell $(PKG_CONFIG) --libs x11) | ||
| 31 | |||
| 32 | -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` | ||
| 33 | -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` | ||
| 34 | -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` | ||
| 35 | -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` | ||
| 36 | +GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) | ||
| 37 | +GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) | ||
| 38 | +WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) | ||
| 39 | +WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) | ||
| 40 | |||
| 41 | # includes and libs | ||
| 42 | INCS = $(X11INC) $(GTKINC) | ||
diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb index 258c78e509..6da7a0d93e 100644 --- a/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb | |||
| @@ -9,20 +9,12 @@ DEPENDS = "webkitgtk3 gtk+3 glib-2.0 gcr3" | |||
| 9 | 9 | ||
| 10 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | 10 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
| 11 | 11 | ||
| 12 | SRCREV = "665a709b522a6fa18c671f1fc41297603292d0e8" | 12 | SRCREV = "48517e586cdc98bc1af7115674b554cc70c8bc2e" |
| 13 | SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ | 13 | SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ |
| 14 | file://0001-config.mk-Fix-compiler-and-linker.patch \ | ||
| 14 | " | 15 | " |
| 15 | 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)}" | ||
| 16 | |||
| 17 | |||
| 18 | inherit pkgconfig features_check | 16 | inherit pkgconfig features_check |
| 19 | 17 | ||
| 20 | PACKAGECONFIG_SOUP ?= "soup3" | ||
| 21 | PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" | ||
| 22 | |||
| 23 | PACKAGECONFIG[soup2] = ",,," | ||
| 24 | PACKAGECONFIG[soup3] = ",,," | ||
| 25 | |||
| 26 | TARGET_CC_ARCH += "${LDFLAGS}" | 18 | TARGET_CC_ARCH += "${LDFLAGS}" |
| 27 | 19 | ||
| 28 | do_install () { | 20 | do_install () { |
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.2.bb index 6e8e80f283..a35ab2e3da 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.16.2.bb | |||
| @@ -16,9 +16,9 @@ REQUIRED_DISTRO_FEATURES = "x11 pam" | |||
| 16 | # out-of-tree builds. | 16 | # out-of-tree builds. |
| 17 | B = "${S}" | 17 | B = "${S}" |
| 18 | 18 | ||
| 19 | SRCREV = "dc50022844dfad0a0e195d54b8499fcf242fff0c" | 19 | SRCREV = "b555312d70d7ff017f866649a7e7167af4eb8fca" |
| 20 | 20 | ||
| 21 | SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.16-branch;protocol=https \ | 21 | SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.16-branch;protocol=https;tag=v${PV} \ |
| 22 | file://0001-do-not-build-tests-sub-directory.patch \ | 22 | file://0001-do-not-build-tests-sub-directory.patch \ |
| 23 | file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ | 23 | file://0002-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ |
| 24 | file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ | 24 | file://0003-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ |
| @@ -26,10 +26,10 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.16-branch;protocol=ht | |||
| 26 | 26 | ||
| 27 | # Keep sync with xorg-server in oe-core | 27 | # Keep sync with xorg-server in oe-core |
| 28 | XORG_PN ?= "xorg-server" | 28 | XORG_PN ?= "xorg-server" |
| 29 | XORG_PV ?= "21.1.21" | 29 | XORG_PV ?= "21.1.22" |
| 30 | SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg" | 30 | SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.xz;name=xorg" |
| 31 | XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" | 31 | XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" |
| 32 | SRC_URI[xorg.sha256sum] = "c0cbe5545b3f645bae6024b830d1d1154a956350683a4e52b2fff5b0fa1ab519" | 32 | SRC_URI[xorg.sha256sum] = "1a242c8917c49ba29ccc1f6021613d8a2b9805dd0d271a66ae9d09f4b0bb06b3" |
| 33 | 33 | ||
| 34 | # It is the directory containing the Xorg source for the | 34 | # It is the directory containing the Xorg source for the |
| 35 | # machine on which you are building TigerVNC. | 35 | # machine on which you are building TigerVNC. |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb index 9dc23fc4c7..98c0660ad2 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb | |||
| @@ -2,7 +2,7 @@ require ttf.inc | |||
| 2 | 2 | ||
| 3 | SUMMARY = "DejaVu font - TTF Edition" | 3 | SUMMARY = "DejaVu font - TTF Edition" |
| 4 | HOMEPAGE = "http://dejavu.sourceforge.net/wiki/" | 4 | HOMEPAGE = "http://dejavu.sourceforge.net/wiki/" |
| 5 | LICENSE = "BitstreamVera" | 5 | LICENSE = "Bitstream-Vera" |
| 6 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=449b2c30bfe5fa897fe87b8b70b16cfa" | 6 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=449b2c30bfe5fa897fe87b8b70b16cfa" |
| 7 | 7 | ||
| 8 | # all subpackages except ${PN}-common itself rdepends on ${PN}-common | 8 | # all subpackages except ${PN}-common itself rdepends on ${PN}-common |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20220612.bb index e34770d520..dbc9e67406 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20220612.bb | |||
| @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.en;md5=cc06b20e7a20bdf6c989624405378303 \ | |||
| 10 | 10 | ||
| 11 | SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/fonts-vlgothic/${PV}-1ubuntu1/fonts-vlgothic_${PV}.orig.tar.xz" | 11 | SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/fonts-vlgothic/${PV}-1ubuntu1/fonts-vlgothic_${PV}.orig.tar.xz" |
| 12 | 12 | ||
| 13 | SRC_URI[sha256sum] = "297a3813675fbea12c5813b55a78091c9a5946515ecbf9fde8b8102e01c579f4" | 13 | SRC_URI[sha256sum] = "c201dd3fa73492a2551a339fe235608d3be771237fd5868a526f1b3eb3164d93" |
| 14 | 14 | ||
| 15 | S = "${UNPACKDIR}/VLGothic" | 15 | S = "${UNPACKDIR}/VLGothic" |
| 16 | 16 | ||
diff --git a/meta-oe/recipes-graphics/wayland/libei_1.5.0.bb b/meta-oe/recipes-graphics/wayland/libei_1.6.0.bb index e44709759c..4acb48deaf 100644 --- a/meta-oe/recipes-graphics/wayland/libei_1.5.0.bb +++ b/meta-oe/recipes-graphics/wayland/libei_1.6.0.bb | |||
| @@ -16,7 +16,7 @@ DEPENDS = " \ | |||
| 16 | 16 | ||
| 17 | SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main" | 17 | SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main" |
| 18 | 18 | ||
| 19 | SRCREV = "19b64535408aa47abbc8151bc2c925afd6583851" | 19 | SRCREV = "8a46bf3d4b6af7f25a61be53386cf618218114ef" |
| 20 | 20 | ||
| 21 | inherit meson pkgconfig | 21 | inherit meson pkgconfig |
| 22 | 22 | ||
diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_4.20251130.1.bb b/meta-oe/recipes-graphics/xdotool/xdotool_4.20251130.1.bb index 75fa636838..e2792ed0b0 100644 --- a/meta-oe/recipes-graphics/xdotool/xdotool_4.20251130.1.bb +++ b/meta-oe/recipes-graphics/xdotool/xdotool_4.20251130.1.bb | |||
| @@ -18,5 +18,5 @@ UPSTREAM_CHECK_URI = "https://github.com/jordansissel/xdotool/tags" | |||
| 18 | UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+\.\d{8}\.\d+)" | 18 | UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+\.\d{8}\.\d+)" |
| 19 | 19 | ||
| 20 | do_install() { | 20 | do_install() { |
| 21 | oe_runmake install DESTDIR=${D} PREFIX=${prefix} | 21 | oe_runmake install DESTDIR=${D} PREFIX=${prefix} LDCONFIG=true |
| 22 | } | 22 | } |
diff --git a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.10.bb b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.11.bb index 7d025de4c4..d10d9d2cfb 100644 --- a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.10.bb +++ b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.11.bb | |||
| @@ -12,5 +12,5 @@ BBCLASSEXTEND = "native" | |||
| 12 | DEPENDS += "libice" | 12 | DEPENDS += "libice" |
| 13 | 13 | ||
| 14 | SRC_URI_EXT = "xz" | 14 | SRC_URI_EXT = "xz" |
| 15 | SRC_URI[sha256sum] = "3deefb7da26af9dc799b5628d929d91c9af68c78575639944db3b955f29aa029" | 15 | SRC_URI[sha256sum] = "9d633cf0d4d1d98e3ef02d18660372958b60a67016e8a72cd04093a8d8f8d4e9" |
| 16 | 16 | ||
diff --git a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.5.bb index 9c522d6ae1..3b0fdf6077 100644 --- a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.5.bb | |||
| @@ -16,4 +16,4 @@ DEPENDS += "libxkbfile xrandr" | |||
| 16 | BBCLASSEXTEND = "native" | 16 | BBCLASSEXTEND = "native" |
| 17 | 17 | ||
| 18 | SRC_URI_EXT = "xz" | 18 | SRC_URI_EXT = "xz" |
| 19 | SRC_URI[sha256sum] = "be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade" | 19 | SRC_URI[sha256sum] = "360193cecc93f906d8383a8fb5c1f3a7eed35e6ced0e118a64ee56ae13c88cac" |
diff --git a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.5.bb b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.6.bb index d73a27f971..5ba0831dec 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.6.bb | |||
| @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=350e1b718a56df39cfe8ca9345ea4575" | |||
| 11 | BBCLASSEXTEND = "native" | 11 | BBCLASSEXTEND = "native" |
| 12 | 12 | ||
| 13 | SRC_URI_EXT = "xz" | 13 | SRC_URI_EXT = "xz" |
| 14 | SRC_URI[sha256sum] = "68baee57e70250ac4a7759fb78221831f97d88bc8e51dcc2e64eb3f8ca56bae3" | 14 | SRC_URI[sha256sum] = "909810a3fdbd01d84747907f2c0cc32ee732e77afc88cb310abb9d155b2a0807" |
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_407.bb b/meta-oe/recipes-graphics/xorg-app/xterm_410.bb index 4aecd77f98..d10fb999fe 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_407.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_410.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=413ff95100710d7a81 | |||
| 7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ | 7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ |
| 8 | file://0001-include-missing-pty.h-header-for-openpty.patch \ | 8 | file://0001-include-missing-pty.h-header-for-openpty.patch \ |
| 9 | " | 9 | " |
| 10 | SRC_URI[sha256sum] = "2136eba530068a1b7565abbf17823274f5cefb7fe3618355cbc89dc55c8b7b6a" | 10 | SRC_URI[sha256sum] = "7ba9fbb303dd3d95d06ca24360d019048d84e5822dc6fe722cd77369bdbf231f" |
| 11 | 11 | ||
| 12 | PACKAGECONFIG ?= "" | 12 | PACKAGECONFIG ?= "" |
| 13 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" | 13 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" |
diff --git a/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.3.bb b/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.3.bb deleted file mode 100644 index 5f49152972..0000000000 --- a/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.3.bb +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | require xorg-data-common.inc | ||
| 2 | |||
| 3 | SUMMARY = "Common X11 Bitmaps" | ||
| 4 | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=dbd075aaffa4a60a8d00696f2e4b9a8f" | ||
| 6 | |||
| 7 | SRC_URI[sha256sum] = "ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a" | ||
diff --git a/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.4.bb b/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.4.bb new file mode 100644 index 0000000000..3da81156a7 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.4.bb | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | require xorg-data-common.inc | ||
| 2 | |||
| 3 | SUMMARY = "Common X11 Bitmaps" | ||
| 4 | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=91d7417ea327b03bd865e34bb3b6bc0e" | ||
| 6 | |||
| 7 | SRC_URI[sha256sum] = "895722f136e21e728c52f2d99fd2dae95018b9ddad1bac1f29d61bcd6593721d" | ||
diff --git a/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.4.bb index 52d5892c15..7c145c43b8 100644 --- a/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb +++ b/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.4.bb | |||
| @@ -10,10 +10,11 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util" | |||
| 10 | RDEPENDS:${PN} = "encodings font-util" | 10 | RDEPENDS:${PN} = "encodings font-util" |
| 11 | RDEPENDS:${PN}:class-native = "font-util-native" | 11 | RDEPENDS:${PN}:class-native = "font-util-native" |
| 12 | 12 | ||
| 13 | UPSTREAM_CHECK_REGEX = "font\-adobe\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.gz" | 13 | UPSTREAM_CHECK_REGEX = "font\-adobe\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.xz" |
| 14 | 14 | ||
| 15 | inherit features_check | 15 | inherit features_check |
| 16 | # depends on bdftopcf-native -> virtual/libx11 | 16 | # depends on bdftopcf-native -> virtual/libx11 |
| 17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054" | 19 | SRC_URI_EXT = "xz" |
| 20 | SRC_URI[sha256sum] = "b67aff445e056328d53f9732d39884f55dd8d303fc25af3dbba33a8ba35a9ccf" | ||
diff --git a/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb b/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.5.bb index 7c43767d22..bf9089a982 100644 --- a/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb +++ b/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.5.bb | |||
| @@ -10,10 +10,11 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util" | |||
| 10 | RDEPENDS:${PN} = "encodings font-util" | 10 | RDEPENDS:${PN} = "encodings font-util" |
| 11 | RDEPENDS:${PN}:class-native = "font-util-native" | 11 | RDEPENDS:${PN}:class-native = "font-util-native" |
| 12 | 12 | ||
| 13 | UPSTREAM_CHECK_REGEX = "font\-adobe\-utopia\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.gz" | 13 | UPSTREAM_CHECK_REGEX = "font\-adobe\-utopia\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.xz" |
| 14 | 14 | ||
| 15 | inherit features_check | 15 | inherit features_check |
| 16 | # depends on bdftopcf-native -> virtual/libx11 | 16 | # depends on bdftopcf-native -> virtual/libx11 |
| 17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5" | 19 | SRC_URI_EXT = "xz" |
| 20 | SRC_URI[sha256sum] = "fb84ec297a906973548ca59b7c6daeaad21244bec5d3fb1e7c93df5ef43b024b" | ||
diff --git a/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.4.bb index fd8f16dca8..e5dcc01e3e 100644 --- a/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb +++ b/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.4.bb | |||
| @@ -10,10 +10,11 @@ DEPENDS += "util-macros-native font-util-native bdftopcf-native font-util" | |||
| 10 | RDEPENDS:${PN} = "encodings font-util" | 10 | RDEPENDS:${PN} = "encodings font-util" |
| 11 | RDEPENDS:${PN}:class-native = "font-util-native" | 11 | RDEPENDS:${PN}:class-native = "font-util-native" |
| 12 | 12 | ||
| 13 | UPSTREAM_CHECK_REGEX = "font\-bh\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.gz" | 13 | UPSTREAM_CHECK_REGEX = "font\-bh\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.xz" |
| 14 | 14 | ||
| 15 | inherit features_check | 15 | inherit features_check |
| 16 | # depends on bdftopcf-native -> virtual/libx11 | 16 | # depends on bdftopcf-native -> virtual/libx11 |
| 17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481" | 19 | SRC_URI_EXT = "xz" |
| 20 | SRC_URI[sha256sum] = "fd8f5efe8491faabdd2744808d3d4eafdae5c83e617017c7fddd2716d049ab1e" | ||
diff --git a/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.4.bb index a1a6d43e06..89e2f26f05 100644 --- a/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb +++ b/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.4.bb | |||
| @@ -10,10 +10,11 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util" | |||
| 10 | RDEPENDS:${PN} = "encodings font-util" | 10 | RDEPENDS:${PN} = "encodings font-util" |
| 11 | RDEPENDS:${PN}:class-native = "font-util-native" | 11 | RDEPENDS:${PN}:class-native = "font-util-native" |
| 12 | 12 | ||
| 13 | UPSTREAM_CHECK_REGEX = "font\-bh\-lucidatypewriter\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.gz" | 13 | UPSTREAM_CHECK_REGEX = "font\-bh\-lucidatypewriter\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.xz" |
| 14 | 14 | ||
| 15 | inherit features_check | 15 | inherit features_check |
| 16 | # depends on bdftopcf-native -> virtual/libx11 | 16 | # depends on bdftopcf-native -> virtual/libx11 |
| 17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb" | 19 | SRC_URI_EXT = "xz" |
| 20 | SRC_URI[sha256sum] = "76ec09eda4094a29d47b91cf59c3eba229c8f7d1ca6bae2abbb3f925e33de8f2" | ||
diff --git a/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.4.bb index def7357e3f..5a05ae9728 100644 --- a/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb +++ b/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.4.bb | |||
| @@ -10,10 +10,11 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native" | |||
| 10 | RDEPENDS:${PN} = "encodings font-util" | 10 | RDEPENDS:${PN} = "encodings font-util" |
| 11 | RDEPENDS:${PN}:class-native = "font-util-native" | 11 | RDEPENDS:${PN}:class-native = "font-util-native" |
| 12 | 12 | ||
| 13 | UPSTREAM_CHECK_REGEX = "font\-bitstream\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.gz" | 13 | UPSTREAM_CHECK_REGEX = "font\-bitstream\-100dpi\-(?P<pver>\d+(\.\d+)+).tar.xz" |
| 14 | 14 | ||
| 15 | inherit features_check | 15 | inherit features_check |
| 16 | # depends on bdftopcf-native -> virtual/libx11 | 16 | # depends on bdftopcf-native -> virtual/libx11 |
| 17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
| 18 | 18 | ||
| 19 | SRC_URI[sha256sum] = "ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce" | 19 | SRC_URI_EXT = "xz" |
| 20 | SRC_URI[sha256sum] = "2d1cc682efe4f7ebdf5fbd88961d8ca32b2729968728633dea20a1627690c1a7" | ||
diff --git a/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb b/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.4.bb index 787541d3b3..9ac3c19e0b 100644 --- a/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb +++ b/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.4.bb | |||
| @@ -13,4 +13,5 @@ inherit features_check | |||
| 13 | # depends on bdftopcf-native -> virtual/libx11 | 13 | # depends on bdftopcf-native -> virtual/libx11 |
| 14 | REQUIRED_DISTRO_FEATURES = "x11" | 14 | REQUIRED_DISTRO_FEATURES = "x11" |
| 15 | 15 | ||
| 16 | SRC_URI[sha256sum] = "17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635" | 16 | SRC_URI_EXT = "xz" |
| 17 | SRC_URI[sha256sum] = "25d9c9595013cb8ca08420509993a6434c917e53ca1fec3f63acd45a19d4f982" | ||
diff --git a/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb b/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.3.bb index ed314ab3c0..959a7c9795 100644 --- a/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb +++ b/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.3.bb | |||
| @@ -13,4 +13,5 @@ inherit features_check | |||
| 13 | # depends on bdftopcf-native -> virtual/libx11 | 13 | # depends on bdftopcf-native -> virtual/libx11 |
| 14 | REQUIRED_DISTRO_FEATURES = "x11" | 14 | REQUIRED_DISTRO_FEATURES = "x11" |
| 15 | 15 | ||
| 16 | SRC_URI[sha256sum] = "b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794" | 16 | SRC_URI_EXT = "xz" |
| 17 | SRC_URI[sha256sum] = "79abe361f58bb21ade9f565898e486300ce1cc621d5285bec26e14b6a8618fed" | ||
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.15.bb index 8710ec80dc..15ba9590b3 100644 --- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb +++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.15.bb | |||
| @@ -11,7 +11,7 @@ SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz \ | |||
| 11 | " | 11 | " |
| 12 | MIRRORS += "https://www.jwz.org/${BPN} https://ftp.osuosl.org/pub/blfs/conglomeration/${BPN}" | 12 | MIRRORS += "https://www.jwz.org/${BPN} https://ftp.osuosl.org/pub/blfs/conglomeration/${BPN}" |
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152" | 14 | SRC_URI[sha256sum] = "d2e687e56263fbfd8fca1fb9cc7c9331fd4f096ab57d3f7482565fe012c362d3" |
| 15 | 15 | ||
| 16 | UPSTREAM_CHECK_URI = "https://www.jwz.org/xscreensaver/download.html" | 16 | UPSTREAM_CHECK_URI = "https://www.jwz.org/xscreensaver/download.html" |
| 17 | 17 | ||
| @@ -19,6 +19,7 @@ DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc- | |||
| 19 | # These are only needed as part of the stopgap screensaver implementation: | 19 | # These are only needed as part of the stopgap screensaver implementation: |
| 20 | RDEPENDS:${PN} = " \ | 20 | RDEPENDS:${PN} = " \ |
| 21 | liberation-fonts \ | 21 | liberation-fonts \ |
| 22 | xuser-account \ | ||
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check | 25 | inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check |
