openclaw/tqma6-yocto-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Yocto mirror with license table for TQMa6UL (2038-compliance)

Browse Source 
- 264 license table entries with exact download URLs (224/264 resolved)
- Complete sources/ directory with all BitBake recipes
- Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl)
- Full traceability for Softwarefreigabeantrag
- GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4
- License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
Siggi (OpenClaw Agent)
2026-03-01 20:58:18 +00:00
commit 16accb6b24
15086 changed files with 1292356 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sources/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb Normal file
View File

@@ -0,0 +1,35 @@
SUMMARY = "Andri's Main Loop"
DESCRIPTION = "Andri's Main Loop"
HOMEPAGE = "https://github.com/any1/aml"
LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://COPYING;md5=e6f3cfaa39204b96e14b68b9d50d3e4e"
SRC_URI = "git://github.com/any1/aml;branch=master;protocol=https"
SRCREV = "b83f3576ce4187d9285f06e9066ef43a691464d4"
PV = "0.3.0+git"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= ""
PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
PACKAGE_BEFORE_PN += "${PN}-examples"
ALLOW_EMPTY:${PN}-examples = "1"
FILES:${PN}-examples = "${bindir}"
inherit meson pkgconfig
AML_EXAMPLES = "ticker nested-ticker reader"
do_install:append () {
if ${@bb.utils.contains('PACKAGECONFIG', 'examples', 'true', 'false', d)}; then
install -d ${D}${bindir}
for bin in ${AML_EXAMPLES}; do
install -m 0755 ${B}/examples/$bin ${D}${bindir}
done
fi
}
BBCLASSEXTEND = "native"

17
sources/meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb Normal file
View File

@@ -0,0 +1,17 @@
SUMMARY = "C++ bindings for Cairo graphics library"
LICENSE = "LGPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9"
inherit gnomebase
DEPENDS += "boost cairo libsigc++-3"
SRC_URI = "https://www.cairographics.org/releases/cairomm-${PV}.tar.xz"
SRC_URI[sha256sum] = "b81255394e3ea8e8aa887276d22afa8985fc8daef60692eb2407d23049f03cfb"
S = "${WORKDIR}/cairomm-${PV}"
FILES:${PN}-doc += "${datadir}/devhelp"
FILES:${PN}-dev += "${libdir}/cairomm-*/"

15
sources/meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.bb Normal file
View File

@@ -0,0 +1,15 @@
SUMMARY = "C++ bindings for Cairo graphics library"
LICENSE = "LGPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9"
inherit gnomebase
DEPENDS += "boost cairo libsigc++-2.0"
SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.xz"
SRC_URI[sha256sum] = "0d37e067c5c4ca7808b7ceddabfe1932c5bd2a750ad64fb321e1213536297e78"
FILES:${PN}-doc += "${datadir}/devhelp"
FILES:${PN}-dev += "${libdir}/cairomm-*/"

25
sources/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb Normal file
View File

@@ -0,0 +1,25 @@
SUMMARY = "OpenGL Mathematics Library for C"
DESCRIPTION = "Highly optimized 2D|3D math library, also known as OpenGL Mathematics (glm) for `C`. \
cglm provides lot of utils to help math operations to be fast and quick to write. It is community \
friendly, feel free to bring any issues, bugs you faced."
HOMEPAGE = "https://github.com/recp/cglm"
BUGTRACKER = "https://github.com/recp/cglm/issues"
SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7"
SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https"
# Tag v0.9.1
SRCREV = "c8781615183ce3cb4f5d72caf70f2c01d7d4d2af"
S = "${WORKDIR}/git"
PACKAGECONFIG[build_tests] = "-Dbuild_tests=true,-Dbuild_tests=false,"
PACKAGECONFIG ?= ""
inherit meson pkgconfig
EXTRA_OEMESON += "--buildtype release"
BBCLASSEXTEND = "native"

28
sources/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch Normal file
View File

@@ -0,0 +1,28 @@
From 272491297564513c4ce49a11bc1ecc523a3afd63 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 15 Mar 2024 11:05:54 -0700
Subject: [PATCH] Mimic GNU basename() API for non-glibc library e.g. musl
Upstream-Status: Submitted [https://github.com/lucasdemarchi/dietsplash/pull/7]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/util.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/util.h b/src/util.h
index 1f4c3ef..a3ab54a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -60,6 +60,9 @@
*/
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + _array_size_chk(arr))
+#if !defined(__GLIBC__)
+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
+#endif
#define DIE_PREFIX "[" PACKAGE_NAME "] ERR: "
#define LOG_SUFFIX "\n"
--
2.44.0

30
sources/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch Normal file
View File

@@ -0,0 +1,30 @@
From 65e8e3c9c69f41778b6308c2f8f3262c82c6f3e1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 29 Jun 2017 13:57:53 -0700
Subject: [PATCH] configure.ac: Do not demand linker hash-style
This helps fixing on architectures e.g. mips where gnu hash
is not supported
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
configure.ac | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index e1dba23..7bcc039 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,6 @@ CC_CHECK_CFLAGS_APPEND([ \
-ffunction-sections \
-fdata-sections \
-Wl,-O1 \
- -Wl,--hash-style=gnu \
-Wl,--as-needed \
-Wl,--gc-sections])
--
2.13.2

22
sources/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb Normal file
View File

@@ -0,0 +1,22 @@
SUMMARY = "Simple bootsplash for systemd systems"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
# Really, no depends besides a C library
PV = "0.3+git"
SRCREV = "8bed71d860bbb0c8792fa2a1179c9beeae84d577"
SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git;branch=master;protocol=https \
file://0001-configure.ac-Do-not-demand-linker-hash-style.patch \
file://0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch \
"
inherit autotools
S = "${WORKDIR}/git"
EXTRA_OECONF = " --with-systemdsystemunitdir=${systemd_unitdir}/system \
--disable-staticimages --with-rootdir=${root_prefix}"
FILES:${PN} += "${systemd_unitdir}/system/"

39
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples/0001-spacedream-Add-typecast-to-pthread_t-in-assignment.patch Normal file
View File

@@ -0,0 +1,39 @@
From 85a30903ea3ba4232379bbbcb54960307d5a2da0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 18:49:03 -0700
Subject: [PATCH] spacedream: Add typecast to pthread_t in assignment
render_loop_thread is of type pthread_t, therefore -1 which is int can
not be assigned to it. Do the needed typecast conversion
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/spacedream/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/spacedream/main.c b/src/spacedream/main.c
index 430800f..8e1887c 100644
--- a/src/spacedream/main.c
+++ b/src/spacedream/main.c
@@ -205,7 +205,7 @@ void unload_stars()
int main( int argc, char *argv[] )
{
int quit = 0;
- pthread_t render_loop_thread = -1;
+ pthread_t render_loop_thread = (pthread_t)-1;
IDirectFBSurface *primary;
IDirectFBEventBuffer *buffer;
@@ -344,7 +344,7 @@ int main( int argc, char *argv[] )
pthread_cancel( render_loop_thread );
pthread_mutex_unlock( &render_start );
pthread_join( render_loop_thread, NULL );
- render_loop_thread = -1;
+ render_loop_thread = (pthread_t)-1;
unload_stars();
--
2.37.3

28
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch Normal file
View File

@@ -0,0 +1,28 @@
From 88077ed156a714f32bb408f422278d61611ffd41 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 26 Jul 2014 16:57:46 -0300
Subject: [PATCH] configure.in: Fix string argument syntax
Upstream-Status: Submitted
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
index bfe1b82..e939bbd 100644
--- a/configure.in
+++ b/configure.in
@@ -65,7 +65,7 @@ fi)
DIRECTFB_REQUIRED_VERSION=1.4.14
-PKG_CHECK_MODULES(DIRECTFB, directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ],
+PKG_CHECK_MODULES([DIRECTFB], directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ],
AC_MSG_ERROR([$DIRECTFB_PKG_ERRORS
*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest version
*** of DirectFB is available from http://www.directfb.org/.]))
--
1.7.10.4

22
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb Normal file
View File

@@ -0,0 +1,22 @@
SUMMARY = "Example DirectFB applications"
DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \
applications that can be used to test and demonstrate various DirectFB \
features"
DEPENDS = "directfb"
SECTION = "libs"
LICENSE = "MIT"
SRC_URI = " \
http://downloads.yoctoproject.org/mirror/sources/DirectFB-examples-${PV}.tar.gz \
file://configure.in-Fix-string-argument-syntax.patch \
file://0001-spacedream-Add-typecast-to-pthread_t-in-assignment.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f"
S = "${WORKDIR}/DirectFB-examples-${PV}"
inherit autotools pkgconfig
SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307"
SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a"

91
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc Normal file
View File

@@ -0,0 +1,91 @@
SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device"
DESCRIPTION = "DirectFB is a thin library that provides developers \
with hardware graphics acceleration, input device handling and \
abstraction, an integrated windowing system with support for \
translucent windows and multiple display layers on top of the \
Linux framebuffer device."
SECTION = "libs"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
HOMEPAGE = "http://directfb.org"
DEPENDS = "jpeg libpng freetype zlib sysfsutils"
SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \
file://configurefix.patch \
file://fusion.patch \
file://bashism.patch \
file://0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch \
file://compar_fn_t.patch \
file://union-sigval.patch \
file://use-PTHREAD_MUTEX_RECURSIVE.patch \
file://fix-client-gfx_state-initialisation.patch \
file://fix-tslib-version-check.patch \
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \
file://0001-include-libgen.h-for-basename.patch \
"
S = "${WORKDIR}/DirectFB-${PV}"
LDFLAGS:append = " -lm"
CXXFLAGS:append:toolchain-clang = " -Wno-error=dtor-typedef"
# Workaround for linking issues seen with armv7a + gold
LDFLAGS:append:arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
BINCONFIG = "${bindir}/directfb-config"
inherit autotools binconfig-disabled pkgconfig
PACKAGECONFIG ??= "linuxinput"
PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"
PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm"
PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib"
PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,,"
PACKAGECONFIG[noinput] = "--with-inputdrivers=none,,"
PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa,"
PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg,"
EXTRA_OECONF = "\
--with-gfxdrivers=none \
--enable-freetype=yes \
--enable-zlib \
--disable-imlib2 \
--disable-sdl \
--disable-vnc \
--disable-x11vdpau \
--disable-xine-vdpau \
"
#Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default
#this will cause directfb build failure on x86 arch, so filter out it.
TARGET_CFLAGS:remove:x86 = "-fno-omit-frame-pointer"
#PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*"
#
#python populate_packages:prepend () {
# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers')
# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
#}
# NOTE: monolithic packaging for now, should improve that eventually
FILES:${PN}-dev += "\
${bindir}/directfb-config \
${libdir}/directfb-${RV}/systems/*.la \
${libdir}/directfb-${RV}/inputdrivers/*.la \
${libdir}/directfb-${RV}/interfaces/*/*.la \
${libdir}/directfb-${RV}/wm/*.la \
"
FILES:${PN} += "\
${libdir}/directfb-${RV}/systems/*.so \
${libdir}/directfb-${RV}/inputdrivers/*.so \
${libdir}/directfb-${RV}/interfaces/*/*.so \
${libdir}/directfb-${RV}/wm/*.so \
${datadir}/directfb-${PV} \
"

139
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch Normal file
View File

@@ -0,0 +1,139 @@
From 0b66557f2e924023b12006b58d8e86149c745aed Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 30 Nov 2019 20:34:33 -0800
Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
time element is deprecated on new input_event structure in kernel's
input.h [1]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
inputdrivers/linux_input/linux_input.c | 36 ++++++++++++++++++--------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c
index 7e9a6ad..03deebc 100644
--- a/inputdrivers/linux_input/linux_input.c
+++ b/inputdrivers/linux_input/linux_input.c
@@ -42,6 +42,11 @@ typedef unsigned long kernel_ulong_t;
#include <linux/input.h>
+#ifndef input_event_sec
+#define input_event_sec time.tv_sec
+#define input_event_usec time.tv_usec
+#endif
+
#ifndef KEY_OK
/* Linux kernel 2.5.42+ defines additional keys in linux/input.h */
#include "input_fake.h"
@@ -754,7 +759,8 @@ translate_event( const LinuxInputData *data,
DFBInputEvent *devt )
{
devt->flags = DIEF_TIMESTAMP;
- devt->timestamp = levt->time;
+ devt->timestamp.tv_sec = levt->input_event_sec;
+ devt->timestamp.tv_usec = levt->input_event_usec;
switch (levt->type) {
case EV_KEY:
@@ -2139,7 +2145,8 @@ touchpad_translate( struct touchpad_fsm_state *state,
int abs, rel;
devt->flags = DIEF_TIMESTAMP | (dfb_config->linux_input_touch_abs ? DIEF_AXISABS : DIEF_AXISREL);
- devt->timestamp = levt->time;
+ devt->timestamp.tv_sec = levt->input_event_sec;
+ devt->timestamp.tv_usec = levt->input_event_usec;
devt->type = DIET_AXISMOTION;
switch (levt->code) {
@@ -2204,7 +2211,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
DFBInputEvent *devt )
{
struct timeval timeout = { 0, 125000 };
-
+ struct timeval tval;
/* select() timeout? */
if (!levt) {
/* Check if button release is due. */
@@ -2223,6 +2230,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
return 0;
}
+ tval.tv_sec = levt->input_event_sec;
+ tval.tv_usec = levt->input_event_usec;
/* More or less ignore these events for now */
if ((levt->type == EV_SYN && levt->code == SYN_REPORT) ||
(levt->type == EV_ABS && levt->code == ABS_PRESSURE) ||
@@ -2233,7 +2242,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
/* Check if button release is due. */
if (state->fsm_state == TOUCHPAD_FSM_DRAG_START &&
- timeout_passed( &state->timeout, &levt->time )) {
+ timeout_passed( &state->timeout, &tval )) {
devt->flags = DIEF_TIMESTAMP;
devt->timestamp = state->timeout; /* timeout of levt->time? */
devt->type = DIET_BUTTONRELEASE;
@@ -2255,7 +2264,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
case TOUCHPAD_FSM_START:
if (touchpad_finger_landing( levt )) {
state->fsm_state = TOUCHPAD_FSM_MAIN;
- state->timeout = levt->time;
+ state->timeout.tv_sec = levt->input_event_sec;
+ state->timeout.tv_usec = levt->input_event_usec;
timeout_add( &state->timeout, &timeout );
}
return 0;
@@ -2268,15 +2278,17 @@ touchpad_fsm( struct touchpad_fsm_state *state,
}
}
else if (touchpad_finger_leaving( levt )) {
- if (!timeout_passed( &state->timeout, &levt->time )) {
+ if (!timeout_passed( &state->timeout, &tval )) {
devt->flags = DIEF_TIMESTAMP;
- devt->timestamp = levt->time;
+ devt->timestamp.tv_sec = levt->input_event_sec;
+ devt->timestamp.tv_usec = levt->input_event_usec;
devt->type = DIET_BUTTONPRESS;
devt->button = DIBI_FIRST;
touchpad_fsm_init( state );
state->fsm_state = TOUCHPAD_FSM_DRAG_START;
- state->timeout = levt->time;
+ state->timeout.tv_sec = levt->input_event_sec;
+ state->timeout.tv_usec = levt->input_event_usec;
timeout_add( &state->timeout, &timeout );
return 1;
}
@@ -2287,7 +2299,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
return 0;
case TOUCHPAD_FSM_DRAG_START:
- if (timeout_passed( &state->timeout, &levt->time )){
+ if (timeout_passed( &state->timeout, &tval )){
devt->flags = DIEF_TIMESTAMP;
devt->timestamp = state->timeout; /* timeout of levt->time? */
devt->type = DIET_BUTTONRELEASE;
@@ -2299,7 +2311,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
else {
if (touchpad_finger_landing( levt )) {
state->fsm_state = TOUCHPAD_FSM_DRAG_MAIN;
- state->timeout = levt->time;
+ state->timeout.tv_sec = levt->input_event_sec;
+ state->timeout.tv_usec = levt->input_event_usec;
timeout_add( &state->timeout, &timeout );
}
}
@@ -2314,7 +2327,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
}
else if (touchpad_finger_leaving( levt )) {
devt->flags = DIEF_TIMESTAMP;
- devt->timestamp = levt->time;
+ devt->timestamp.tv_sec = levt->input_event_sec;
+ devt->timestamp.tv_usec = levt->input_event_usec;
devt->type = DIET_BUTTONRELEASE;
devt->button = DIBI_FIRST;

61
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch Normal file
View File

@@ -0,0 +1,61 @@
From f43ef44806ffb8e3b35d99070dde9b6cc1714d3d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 8 Sep 2015 21:32:20 +0000
Subject: [PATCH] gfx,direct: Aboid usng VLAs and printf formats
VLAs are flagged by clang when using non-POD types, therefore replace
the usage with alloca which is exact same allocation on stack
__attribute__((__format__ (__printf__))) is not portable as used here
therefore disable the check for clang here, we lose no functionality
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
lib/direct/util.h | 2 +-
src/gfx/util.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/direct/util.h b/lib/direct/util.h
index 72941e9..8e7fa4a 100644
--- a/lib/direct/util.h
+++ b/lib/direct/util.h
@@ -98,7 +98,7 @@
#define D_CONST_FUNC
#endif
-#if __GNUC__ >= 3
+#if __GNUC__ >= 3 && !defined __clang__
#define D_FORMAT_PRINTF(n) __attribute__((__format__ (__printf__, n, n+1)))
#define D_FORMAT_VPRINTF(n) __attribute__((__format__ (__printf__, n, 0)))
#else
diff --git a/src/gfx/util.cpp b/src/gfx/util.cpp
index 40032bc..d1015d4 100644
--- a/src/gfx/util.cpp
+++ b/src/gfx/util.cpp
@@ -294,8 +294,8 @@ dfb_gfx_copy_regions_stereo( CoreSurface *source,
{
unsigned int i, n = 0;
DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h };
- DFBRectangle rects[num];
- DFBPoint points[num];
+ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num);
+ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num);
for (i=0; i<num; i++) {
DFB_REGION_ASSERT( &regions[i] );
@@ -351,8 +351,8 @@ dfb_gfx_copy_regions_client( CoreSurface *source,
{
unsigned int i, n = 0;
DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h };
- DFBRectangle rects[num];
- DFBPoint points[num];
+ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num);
+ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num);
CoreGraphicsStateClient *client = _client ? _client : &StateClient::Get()->client;
CardState *state = client->state;
CardState backup;
--
2.5.1

32
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-include-libgen.h-for-basename.patch Normal file
View File

@@ -0,0 +1,32 @@
From c8cf3ffd4fa14cdc6d607a09d51e898dec922348 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 25 Mar 2024 18:17:44 -0700
Subject: [PATCH] include libgen.h for basename
basename prototype has been removed from string.h from latest musl [1]
compilers e.g. clang-18 flags the absense of prototype as error. therefore
include libgen.h for providing it.
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
Upstream-Status: Inappropriate [Upstream is dead]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
systems/fbdev/fbdev.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/systems/fbdev/fbdev.c b/systems/fbdev/fbdev.c
index 5297358..4e6f178 100644
--- a/systems/fbdev/fbdev.c
+++ b/systems/fbdev/fbdev.c
@@ -42,6 +42,7 @@
#include <errno.h>
#include <string.h>
#include <strings.h>
+#include <libgen.h>
#if defined(HAVE_SYSIO)
# include <sys/io.h>
#endif
--
2.44.0

54
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch Normal file
View File

@@ -0,0 +1,54 @@
From 7df69c3a784ab2cc4770bdb366cf788cdb78099a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 15 Nov 2020 12:30:41 -0800
Subject: [PATCH] os/linux: Fix build when __NR_futex is not available
Newer architectures like riscv32 do not define __NR_futex intentionally
since it uses 64bit time_t from very beginning, therefore only caters to
futex_time64 syscall
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/direct/os/linux/glibc/system.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/direct/os/linux/glibc/system.c b/lib/direct/os/linux/glibc/system.c
index 373a711..d027a70 100644
--- a/lib/direct/os/linux/glibc/system.c
+++ b/lib/direct/os/linux/glibc/system.c
@@ -36,6 +36,7 @@
#include <errno.h>
#include <signal.h>
+#include <sys/syscall.h>
#include <unistd.h>
#include <linux/unistd.h>
@@ -46,6 +47,10 @@
#include <direct/system.h>
#include <direct/util.h>
+#if !defined(SYS_futex) && defined(SYS_futex_time64)
+# define SYS_futex SYS_futex_time64
+#endif
+
D_LOG_DOMAIN( Direct_Futex, "Direct/Futex", "Direct Futex" );
D_LOG_DOMAIN( Direct_Trap, "Direct/Trap", "Direct Trap" );
@@ -239,10 +244,9 @@ direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int *
}
#endif
- ret = syscall( __NR_futex, uaddr, op, val, timeout, uaddr2, val3 );
+ ret = syscall( SYS_futex, uaddr, op, val, timeout, uaddr2, val3 );
if (ret < 0)
return errno2result( errno );
return DR_OK;
}
-
--
2.29.2

18
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/bashism.patch Normal file
View File

@@ -0,0 +1,18 @@
${x//y/} is a bash syntax. Replace with something dash compatible
RP 2015/5/3
Upstream-Status: Pending
Index: DirectFB-1.7.7/configure.in
===================================================================
--- DirectFB-1.7.7.orig/configure.in
+++ DirectFB-1.7.7/configure.in
@@ -2696,7 +2696,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_
AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS"
-CXXFLAGS="$CXXFLAGS ${CFLAGS//-Werror-implicit-function-declaration/}"
+CXXFLAGS="$CXXFLAGS $(printf '%s\n' "$CFLAGS" | sed 's/-Werror-implicit-function-declaration//g')"
DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS"
CFLAGS="$CFLAGS $CFLAGS_STD"

62
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/compar_fn_t.patch Normal file
View File

@@ -0,0 +1,62 @@
test for __compar_fn_t and if not defined by libc then define it
help make directfb compile with musl
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: DirectFB-1.7.7/configure.in
===================================================================
--- DirectFB-1.7.7.orig/configure.in
+++ DirectFB-1.7.7/configure.in
@@ -112,6 +112,17 @@ AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
AC_CHECK_FUNCS(fork)
+AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [
+ AC_TRY_COMPILE(
+ [#include <stdlib.h>],
+ [void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }],
+ ccache_cv_COMPAR_FN_T=yes,
+ ccache_cv_COMPAR_FN_T=no)])
+if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then
+ AC_DEFINE(HAVE_COMPAR_FN_T, 1,
+ Define to 1 if you have the `__compar_fn_t' typedef.)
+fi
+
AC_PATH_PROGS(PERL, perl5 perl)
AC_PATH_PROG(MAN2HTML, man2html, no)
Index: DirectFB-1.7.7/inputdrivers/lirc/lirc.c
===================================================================
--- DirectFB-1.7.7.orig/inputdrivers/lirc/lirc.c
+++ DirectFB-1.7.7/inputdrivers/lirc/lirc.c
@@ -59,6 +59,11 @@
#include <core/input_driver.h>
+#if HAVE_COMPAR_FN_T
+#define COMPAR_FN_T __compar_fn_t
+#else
+typedef int (*COMPAR_FN_T)(const void *, const void *);
+#endif
DFB_INPUT_DRIVER( lirc )
@@ -97,7 +102,7 @@ static DFBInputDeviceKeySymbol lirc_pars
qsort ( keynames,
D_ARRAY_SIZE( keynames ),
sizeof(keynames[0]),
- (__compar_fn_t) keynames_sort_compare );
+ (COMPAR_FN_T) keynames_sort_compare );
keynames_sorted = true;
}
@@ -124,7 +129,7 @@ static DFBInputDeviceKeySymbol lirc_pars
symbol_name = bsearch( name, keynames,
D_ARRAY_SIZE( keynames ),
sizeof(keynames[0]),
- (__compar_fn_t) keynames_compare );
+ (COMPAR_FN_T) keynames_compare );
if (symbol_name)
return symbol_name->symbol;
break;

60
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/configurefix.patch Normal file
View File

@@ -0,0 +1,60 @@
Libtool needs these set correctly else we end up with pointless rpaths
such as the QA warnings:
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfblayer contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbmaster contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgifft contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbdump contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinput contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbfx contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/pack ages-split/directfb/usr/bin/dfbscreen contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgiff contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinspector contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdfiff contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinfo contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbpenmount contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbg contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_fbdev.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_devmem.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_dummy.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_ft2.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/wm/libdirectfbwm_default.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_zytronic.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_penmount.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_linux_input.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_serialmouse.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_mutouch.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_tslib.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_joystick.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_sonypi.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_lirc.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_wm97xx_ts.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_ps2mouse.so contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_keyboard.so contains probably-redundant RPATH /usr/lib
Upstream-Status: Pending
RP 2012/03/16
Index: DirectFB-1.4.15/configure.in
===================================================================
--- DirectFB-1.4.15.orig/configure.in 2012-03-16 13:32:23.692402879 +0000
+++ DirectFB-1.4.15/configure.in 2012-03-16 13:33:22.312400960 +0000
@@ -97,13 +97,6 @@
AC_CHECK_SIZEOF(long long)
AC_CHECK_FUNCS(fork)
-
-## Work around libstuhl during cross build...
-if test "$host" != "$build"; then
- sys_lib_dlsearch_path_spec=""
- sys_lib_search_path_spec=""
-fi
-
AC_PATH_PROGS(PERL, perl5 perl)
AC_PATH_PROG(MAN2HTML, man2html, no)

38
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-client-gfx_state-initialisation.patch Normal file
View File

@@ -0,0 +1,38 @@
From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Mon, 13 Jun 2016 13:32:44 -0700
Subject: [PATCH] fix client->gfx_state initialisation
Shortly before the DirectFB 1.7.7 release, an optimisation was added
to CoreGraphicsStateClient_Init() to avoid creating an extended
Graphics State object if it will not later be required:
4d422fb Client: Create extended Graphics State object when needed for later usage
Unfortunately the client->gfx_state variable used to track the
extended Graphics State object is not initialised, which can lead to
crashes etc due to creation of the Graphics State object erroneously
being skipped.
Upstream-Status: Pending
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
src/core/CoreGraphicsStateClient.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp
index 5d46f0e..5007755 100644
--- a/src/core/CoreGraphicsStateClient.cpp
+++ b/src/core/CoreGraphicsStateClient.cpp
@@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client,
client->renderer = NULL;
client->requestor = NULL;
client->throttle = NULL;
+ client->gfx_state = NULL;
if (dfb_config->task_manager) {
if (dfb_config->call_nodirect) {
--
1.9.1

38
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch Normal file
View File

@@ -0,0 +1,38 @@
fix tslib version check in configure.in
The patch makes sure that the old as well as the new tslib pkg-config
metadata file naming style is handled correctly.
tslib 0.0 to 1.0 created only a tslib-<VERSION>.pc pkg-config metadata
file.
With tslib 1.1 the tslib-<VERSION>.pc phase out was started.
Additionally, the pkg-config metadata file tslib.pc was added.
Since tslib 1.6 the tslib-<VERSION>.pc metadata file is deprecated.
Now, there is only a tslib.pc.
Upstream-Status: Inappropriate [no upstream]
Signed-off-by: Ben Guan <ben.guan@cn.bosch.com>
Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
diff -Nru DirectFB-1.7.7.orig/configure.in DirectFB-1.7.7/configure.in
--- DirectFB-1.7.7.orig/configure.in 2015-02-10 01:16:46.000000000 +0800
+++ DirectFB-1.7.7/configure.in 2018-06-06 17:19:18.472143103 +0800
@@ -2459,10 +2459,13 @@
enable_tslib=no
if test "$checkfor_tslib" = "yes"; then
- PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
+ PKG_CHECK_MODULES([TSLIB], [tslib >= 1.1], [enable_tslib=yes], [enable_tslib=no])
if test "$enable_tslib" = "no"; then
- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
- AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no])
+ if test "$enable_tslib" = "no"; then
+ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
+ AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
+ fi
fi
fi

36
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fusion.patch Normal file
View File

@@ -0,0 +1,36 @@
directfb: Fix for hangs in direct_test, fusion_skirmish on exit
Upstream-Status: Pending
Signed-off-by: Lauren Post <lauren.post@freescale.com>
--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800
+++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800
@@ -2853,9 +2853,14 @@
direct_mutex_lock( &world->event_dispatcher_mutex );
while (1) {
- if (!world->event_dispatcher_buffers)
+ if (!world->event_dispatcher_buffers){
direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
-
+ if (world->dispatch_stop) {
+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" );
+ direct_mutex_unlock( &world->event_dispatcher_mutex );
+ return NULL;
+ }
+ }
buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;
D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer );
@@ -2872,6 +2877,11 @@
//D_INFO("waiting...\n");
D_ASSERT( buf->read_pos == buf->write_pos );
direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex );
+ if (world->dispatch_stop) {
+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" );
+ direct_mutex_unlock( &world->event_dispatcher_mutex );
+ return NULL;
+ }
}
buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers;

19
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/union-sigval.patch Normal file
View File

@@ -0,0 +1,19 @@
This patch is taken from gentoo musl overlay
sigval_t is glibc only construct, we use a union of sigval
which pretty much is same effect as sigval_t
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
diff -Naur DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c
--- DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c 2014-07-15 02:54:58.000000000 -0400
+++ DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c 2015-07-18 16:55:35.077989166 -0400
@@ -111,7 +111,7 @@
void
direct_trap( const char *domain, int sig )
{
- sigval_t val;
+ union sigval val;
if (direct_config->delay_trap_ms) {
D_LOG( Direct_Trap, VERBOSE, "NOT RAISING signal %d from %s, waiting for %dms... attach gdb --pid=%d\n", sig, domain, direct_config->delay_trap_ms, getpid() );

116
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch Normal file
View File

@@ -0,0 +1,116 @@
Remove use of DIRECT_RECURSIVE_MUTEX_INITIALIZER its not portable
use portable way to initialize recursive mutex using pthread_once() and direct_recursive_mutex_init()
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h
===================================================================
--- DirectFB-1.7.7.orig/lib/direct/os/linux/glibc/mutex.h
+++ DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h
@@ -46,7 +46,6 @@ struct __D_DirectMutex {
/**********************************************************************************************************************/
#define DIRECT_MUTEX_INITIALIZER(name) { PTHREAD_MUTEX_INITIALIZER }
-#define DIRECT_RECURSIVE_MUTEX_INITIALIZER(name) { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP }
#endif
Index: DirectFB-1.7.7/lib/direct/trace.c
===================================================================
--- DirectFB-1.7.7.orig/lib/direct/trace.c
+++ DirectFB-1.7.7/lib/direct/trace.c
@@ -89,8 +89,15 @@ struct __D_DirectTraceBuffer {
/**************************************************************************************************/
static DirectLink *buffers;
-static DirectMutex buffers_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(buffers_lock);
+static pthread_once_t buffers_lock_init_once = PTHREAD_ONCE_INIT;
+static DirectMutex buffers_lock;
+
+static void
+buffers_lock_init( void )
+{
+ direct_recursive_mutex_init(&buffers_lock);
+}
/**************************************************************************************************/
__dfb_no_instrument_function__
@@ -113,6 +120,7 @@ get_trace_buffer( void )
D_MAGIC_SET( buffer, DirectTraceBuffer );
+ pthread_once(&buffers_lock_init_once, buffers_lock_init);
direct_mutex_lock( &buffers_lock );
direct_list_append( &buffers, &buffer->link );
direct_mutex_unlock( &buffers_lock );
@@ -138,8 +146,14 @@ typedef struct {
} SymbolTable;
static DirectLink *tables = NULL;
-static DirectMutex tables_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(tables_lock);
+static pthread_once_t tables_lock_init_once = PTHREAD_ONCE_INIT;
+static DirectMutex tables_lock;
+static void
+tables_lock_init( void )
+{
+ direct_recursive_mutex_init(&tabless_lock);
+}
__dfb_no_instrument_function__
static void
@@ -370,6 +384,7 @@ direct_trace_lookup_symbol( const char *
Symbol *symbol;
SymbolTable *table;
+ pthread_once(&tables_lock_init_once, tables_lock_init);
direct_mutex_lock( &tables_lock );
table = find_table( filename );
@@ -514,6 +529,7 @@ direct_trace_print_stacks()
DirectTraceBuffer *b;
DirectTraceBuffer *buffer = get_trace_buffer();
+ pthread_once(&buffers_lock_init_once, buffers_lock_init);
direct_mutex_lock( &buffers_lock );
if (buffer && buffer->level)
@@ -611,6 +627,7 @@ direct_trace_free_buffer( DirectTraceBuf
D_MAGIC_ASSERT( buffer, DirectTraceBuffer );
if (buffer->thread) {
+ pthread_once(&buffers_lock_init_once, buffers_lock_init);
direct_mutex_lock( &buffers_lock );
direct_list_remove( &buffers, &buffer->link );
direct_mutex_unlock( &buffers_lock );
Index: DirectFB-1.7.7/src/directfb.c
===================================================================
--- DirectFB-1.7.7.orig/src/directfb.c
+++ DirectFB-1.7.7/src/directfb.c
@@ -99,6 +99,15 @@ const unsigned int directfb_micro_versio
const unsigned int directfb_binary_age = DIRECTFB_BINARY_AGE;
const unsigned int directfb_interface_age = DIRECTFB_INTERFACE_AGE;
+static pthread_once_t lock_init_once = PTHREAD_ONCE_INIT;
+static DirectMutex lock;
+
+static void
+lock_init( void )
+{
+ direct_recursive_mutex_init(&lock);
+}
+
const char *
DirectFBCheckVersion( unsigned int required_major,
unsigned int required_minor,
@@ -215,8 +224,7 @@ DirectFBCreate( IDirectFB **interface_pt
if (dfb_config->remote.host)
return CreateRemote( dfb_config->remote.host, dfb_config->remote.port, interface_ptr );
- static DirectMutex lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(lock);
-
+ pthread_once(&lock_init_once, lock_init);
direct_mutex_lock( &lock );
if (!dfb_config->no_singleton && idirectfb_singleton) {

8
sources/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb Normal file
View File

@@ -0,0 +1,8 @@
require directfb.inc
RV = "1.7-7"
LEAD_SONAME = "libdirectfb-1.7.so.0"
SRC_URI[md5sum] = "152cf1863b1a3a28aa1370e9053440bf"
SRC_URI[sha256sum] = "b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3"

28
sources/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch Normal file
View File

@@ -0,0 +1,28 @@
From 80179c297abb9de2829bd02356257241dd414d70 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Mon, 18 Dec 2017 16:25:54 +0900
Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
Upstream-Status: Pending
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 230c87b..e699e83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ else(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
message(STATUS "Found sphinx-build: ${SPHINX_EXECUTABLE}")
endif(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+#execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
string(REGEX REPLACE "\n$" "" ${PYTHON_INSTALL_DIR} "${PYTHON_INSTALL_DIR}")
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION)
message(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
--
2.17.1

34
sources/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch Normal file
View File

@@ -0,0 +1,34 @@
From 56d9b838b3475729d7ed9c6c156d72c28943c2b6 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Tue, 19 Dec 2017 11:15:29 +0900
Subject: [PATCH] To fix error when do_package
QA Issue: nativesdk-dnfdragora: Files/directories were installed but not
shipped in any package:
/etc
/etc/dnfdragora
/etc/dnfdragora/dnfdragora.yaml
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
Upstream-Status: Pending
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 230c87b..1b8d800 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ endif(ENABLE_COMPS)
set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share")
set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
-set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc" CACHE PATH "sysconfig directory (default /etc)")
+set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc" CACHE PATH "sysconfig directory (default /etc)")
# Configure files
configure_file(${CMAKE_SOURCE_DIR}/etc/dnfdragora.yaml.in ${CMAKE_BINARY_DIR}/etc/dnfdragora.yaml @ONLY)
--
2.17.1

27
sources/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch Normal file
View File

@@ -0,0 +1,27 @@
From 2e6a0db24be373a5b7741dc5a0d322a28389fbf0 Mon Sep 17 00:00:00 2001
From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Date: Thu, 23 Nov 2017 16:35:44 +0900
Subject: [PATCH] disable build manpages.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
Upstream-Status: Pending
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 230c87b..1624998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,6 @@ endif(GETTEXT_FOUND)
# Build and install the man-pages
if(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
- add_subdirectory(man)
endif(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND")
# Installing application code
--
2.17.1

31
sources/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb Normal file
View File

@@ -0,0 +1,31 @@
SUMMARY = "dnfdragora is a DNF frontend, based on rpmdragora from Mageia (originally rpmdrake) Perl code."
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \
"
SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=stable-2.x;protocol=https \
file://0001-disable-build-manpages.patch \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0001-To-fix-error-when-do_package.patch \
"
SRCREV = "abbe08b7a487325182758d5285b54437a914207b"
S = "${WORKDIR}/git"
inherit cmake gettext pkgconfig python3-dir python3native setuptools3-base mime-xdg
DEPENDS += "dnf python3 "
#DEPENDS:class-nativesdk += "nativesdk-python3"
RDEPENDS:${PN}:class-target = " python3-core libyui libyui-ncurses "
# manpages generation requires http://www.sphinx-doc.org/
EXTRA_OECMAKE = " -DWITH_MAN=OFF -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3"
BBCLASSEXTEND = "nativesdk"
FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora ${sysconfdir}/xdg"
SKIP_RECIPE[dnfdragora] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}"

16
sources/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb Normal file
View File

@@ -0,0 +1,16 @@
SUMMARY = "FBGrab is a framebuffer screenshot program"
HOMEPAGE = "https://github.com/GunnarMonell/fbgrab"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a"
SECTION = "console/utils"
DEPENDS = "libpng zlib"
SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https;branch=master"
SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8"
S = "${WORKDIR}/git"
inherit autotools-brokensep
do_configure:prepend() {
sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile
}

41
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb Normal file
View File

@@ -0,0 +1,41 @@
SUMMARY = "Framebuffer image and doc viewer tools"
DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \
with the main focus being photos."
HOMEPAGE = "https://www.kraxel.org/blog/linux/fbida/"
SECTION = "utils"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39"
DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo"
PV = "2.14+git"
SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \
file://fix-preprocessor.patch \
file://support-jpeg-turbo.patch \
file://fbida-gcc10.patch \
file://0001-meson.build-install-fbgs-shell-script.patch \
file://0002-meson.build-add-features-options-for-png-gif-tiff-we.patch \
file://0003-meson.build-do-not-require-xkbcommon.patch \
file://0001-meson.build-make-fbpdf-build-optional.patch \
file://0001-fbida-Include-missing-sys-types.h.patch \
"
SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5"
S = "${WORKDIR}/git"
inherit meson pkgconfig features_check
# Depends on libepoxy
REQUIRED_DISTRO_FEATURES = "opengl"
PACKAGECONFIG ??= "gif png pdf"
PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib"
PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng"
PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff"
PACKAGECONFIG[motif] = "-Dmotif=enabled,-Dmotif=disabled,libx11 libxext libxpm libxt openmotif"
PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler libepoxy"
CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}"
RDEPENDS:${PN} = "ttf-dejavu-sans-mono"

31
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch Normal file
View File

@@ -0,0 +1,31 @@
From 17490e264e627ead81bf5840c8797de968485943 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 3 Jul 2023 11:25:26 -0700
Subject: [PATCH] fbida: Include missing <sys/types.h>
Fixes build on musl
../git/gfx.h:43:5: error: unknown type name 'dev_t'; did you mean 'div_t'?
dev_t devnum;
^~~~~
div_t
TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/fbida/2.14+gitAUTOINC+eb769e3d7f-r0/recipe-sysroot/usr/include/stdlib.h:64:35: note: 'div_t' declared here
typedef struct { int quot, rem; } div_t;
^
1 error generated
Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/3]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
gfx.h | 1 +
1 file changed, 1 insertion(+)
--- a/gfx.h
+++ b/gfx.h
@@ -1,5 +1,6 @@
#include <stdbool.h>
#include <inttypes.h>
+#include <sys/types.h>
#include <pixman.h>
#include <cairo.h>

28
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch Normal file
View File

@@ -0,0 +1,28 @@
From f9c455e81ad4d870c8ae20b9af8598139231ad26 Mon Sep 17 00:00:00 2001
From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
Date: Fri, 9 Sep 2022 09:32:22 +0200
Subject: [PATCH] meson.build: install fbgs shell script
Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4]
Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
---
meson.build | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meson.build b/meson.build
index cbed982..2129896 100644
--- a/meson.build
+++ b/meson.build
@@ -126,6 +126,9 @@ executable('fbpdf',
sources : fbpdf_srcs,
dependencies : fbpdf_deps,
install : true)
+install_data('fbgs',
+ install_dir : get_option('bindir'),
+ install_mode : 'rwxr--r--')
# build fbcon
fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ]
--
2.37.3

66
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch Normal file
View File

@@ -0,0 +1,66 @@
From c00a155e90a9b22bd6ab5fa5407bb9923ee16ca0 Mon Sep 17 00:00:00 2001
From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
Date: Fri, 16 Sep 2022 18:45:58 +0200
Subject: [PATCH] meson.build: make fbpdf build optional
Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4]
Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
---
meson.build | 22 ++++++++++++----------
meson_options.txt | 1 +
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/meson.build b/meson.build
index 6b3daf3..289d1ec 100644
--- a/meson.build
+++ b/meson.build
@@ -15,11 +15,11 @@ x11resdir = x11resrun.stdout().strip()
# pkg-config deps
pixman_dep = dependency('pixman-1')
-poppler_dep = dependency('poppler-glib')
+poppler_dep = dependency('poppler-glib', required: get_option('pdf'))
cairo_dep = dependency('cairo')
drm_dep = dependency('libdrm')
-gbm_dep = dependency('gbm')
-epoxy_dep = dependency('epoxy')
+gbm_dep = dependency('gbm', required: get_option('pdf'))
+epoxy_dep = dependency('epoxy', required: get_option('pdf'))
exif_dep = dependency('libexif')
png_dep = dependency('libpng', required: get_option('png'))
tiff_dep = dependency('libtiff-4', required: get_option('tiff'))
@@ -132,13 +132,15 @@ fbpdf_deps = [ drm_dep, gbm_dep, epoxy_dep,
pixman_dep, poppler_dep, cairo_dep,
udev_dep, input_dep ]
-executable('fbpdf',
- sources : fbpdf_srcs,
- dependencies : fbpdf_deps,
- install : true)
-install_data('fbgs',
- install_dir : get_option('bindir'),
- install_mode : 'rwxr--r--')
+if get_option('pdf').enabled()
+ executable('fbpdf',
+ sources : fbpdf_srcs,
+ dependencies : fbpdf_deps,
+ install : true)
+ install_data('fbgs',
+ install_dir : get_option('bindir'),
+ install_mode : 'rwxr--r--')
+endif
# build fbcon
fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ]
diff --git a/meson_options.txt b/meson_options.txt
index ce37188..74699ab 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,3 +3,4 @@ option('png', type: 'feature', value : 'enabled')
option('tiff', type: 'feature', value : 'enabled')
option('webp', type: 'feature', value : 'disabled')
option('motif', type: 'feature', value : 'disabled')
+option('pdf', type: 'feature', value : 'enabled')
--
2.37.3

124
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch Normal file
View File

@@ -0,0 +1,124 @@
From cdcde5c1fd106a69118dff98118600911392762f Mon Sep 17 00:00:00 2001
From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
Date: Fri, 16 Sep 2022 16:25:38 +0200
Subject: [PATCH] meson.build: add features options for png, gif, tiff, webp, and motif
Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4]
Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
---
meson.build | 41 +++++++++++++++++++++++++++--------------
meson_options.txt | 5 +++++
selections.c | 4 ++++
3 files changed, 36 insertions(+), 14 deletions(-)
create mode 100644 meson_options.txt
diff --git a/meson.build b/meson.build
index cd9cc49..b5e3ffc 100644
--- a/meson.build
+++ b/meson.build
@@ -23,9 +23,9 @@ drm_dep = dependency('libdrm')
gbm_dep = dependency('gbm')
epoxy_dep = dependency('epoxy')
exif_dep = dependency('libexif')
-png_dep = dependency('libpng')
-tiff_dep = dependency('libtiff-4')
-webp_dep = dependency('libwebp', required : false)
+png_dep = dependency('libpng', required: get_option('png'))
+tiff_dep = dependency('libtiff-4', required: get_option('tiff'))
+webp_dep = dependency('libwebp', required : get_option('webp'))
udev_dep = dependency('libudev')
input_dep = dependency('libinput')
xkb_dep = dependency('xkbcommon')
@@ -36,20 +36,20 @@ jpeg_dep = cc.find_library('jpeg')
util_dep = cc.find_library('util')
math_dep = cc.find_library('m', required : false)
pcd_dep = cc.find_library('pcd', required : false)
-gif_dep = cc.find_library('gif', required : false)
+gif_dep = cc.find_library('gif', required: get_option('gif'))
# motif + x11 libs
-motif_dep = cc.find_library('Xm', required : false)
-xpm_dep = cc.find_library('Xpm', required : false)
-xt_dep = cc.find_library('Xt', required : false)
-xext_dep = cc.find_library('Xext', required : false)
-x11_dep = cc.find_library('X11', required : false)
+motif_dep = cc.find_library('Xm', required : get_option('motif'))
+xpm_dep = cc.find_library('Xpm', required : get_option('motif'))
+xt_dep = cc.find_library('Xt', required : get_option('motif'))
+xext_dep = cc.find_library('Xext', required : get_option('motif'))
+x11_dep = cc.find_library('X11', required : get_option('motif'))
# image formats
read_srcs = [ 'readers.c', 'rd/read-ppm.c', 'rd/read-bmp.c',
- 'rd/read-jpeg.c', 'rd/read-png.c', 'rd/read-tiff.c' ]
+ 'rd/read-jpeg.c' ]
write_srcs = [ 'writers.c', 'wr/write-ppm.c', 'wr/write-ps.c',
- 'wr/write-jpeg.c', 'wr/write-png.c', 'wr/write-tiff.c' ]
+ 'wr/write-jpeg.c' ]
image_deps = [ jpeg_dep, png_dep, tiff_dep,
pcd_dep, gif_dep, webp_dep ]
@@ -57,11 +57,21 @@ if pcd_dep.found()
read_srcs += 'rd/read-pcd.c'
config.set('HAVE_LIBPCD', true)
endif
-if gif_dep.found()
+if get_option('png').enabled()
+ read_srcs += 'rd/read-png.c'
+ write_srcs += 'wr/write-png.c'
+ config.set('HAVE_LIBPNG', true)
+endif
+if get_option('tiff').enabled()
+ read_srcs += 'rd/read-tiff.c'
+ write_srcs += 'wr/write-tiff.c'
+ config.set('HAVE_LIBTIFF', true)
+endif
+if get_option('gif').enabled()
read_srcs += 'rd/read-gif.c'
config.set('HAVE_LIBGIF', true)
endif
-if webp_dep.found()
+if get_option('webp').enabled()
read_srcs += 'rd/read-webp.c'
config.set('HAVE_LIBWEBP', true)
endif
@@ -168,7 +181,7 @@ ida_srcs = [ 'ida.c', 'man.c', 'hex.c', 'x11.c', 'viewer.c',
ida_deps = [ pixman_dep, exif_dep, image_deps, math_dep,
motif_dep, xpm_dep, xt_dep, xext_dep, x11_dep ]
-if motif_dep.found()
+if get_option('motif').enabled()
executable('ida',
sources : ida_srcs,
dependencies : ida_deps,
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..ce37188
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,5 @@
+option('gif', type: 'feature', value : 'enabled')
+option('png', type: 'feature', value : 'enabled')
+option('tiff', type: 'feature', value : 'enabled')
+option('webp', type: 'feature', value : 'disabled')
+option('motif', type: 'feature', value : 'disabled')
diff --git a/selections.c b/selections.c
index 7b16264..ccdc686 100644
--- a/selections.c
+++ b/selections.c
@@ -609,8 +609,12 @@ void ipc_init()
#ifdef HAVE_LIBGIF
targets[ntargets++] = MIME_IMAGE_GIF;
#endif
+#ifdef HAVE_LIBPNG
targets[ntargets++] = MIME_IMAGE_PNG;
+#endif
+#ifdef HAVE_LIBTIFF
targets[ntargets++] = MIME_IMAGE_TIFF;
+#endif
targets[ntargets++] = XA_PIXMAP;
targets[ntargets++] = XA_STRING;
--
2.37.3

27
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch Normal file
View File

@@ -0,0 +1,27 @@
From ec82a194f3454ac203a134c9a99bac6d63095d25 Mon Sep 17 00:00:00 2001
From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
Date: Fri, 16 Sep 2022 18:29:03 +0200
Subject: [PATCH] meson.build: do not require xkbcommon
Upstream-Status: Pending
Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 341939c..b5dab14 100644
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ tiff_dep = dependency('libtiff-4', required: get_option('tiff'))
webp_dep = dependency('libwebp', required : get_option('webp'))
udev_dep = dependency('libudev')
input_dep = dependency('libinput')
-xkb_dep = dependency('xkbcommon')
+xkb_dep = dependency('xkbcommon', required : false)
tsm_dep = dependency('libtsm', required : false)
# other library deps
--
2.37.3

61
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch Normal file
View File

@@ -0,0 +1,61 @@
Fix build with gcc10
Patch from https://src.fedoraproject.org/rpms/fbida/raw/master/f/fbida.gcc10.patch
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- fbida-2.14/fbi.c.org 2020-03-15 17:02:17.944189632 +0100
+++ fbida-2.14/fbi.c 2020-03-15 17:02:21.880223224 +0100
@@ -100,7 +100,6 @@
/* graphics interface */
gfxstate *gfx;
-int debug;
/* framebuffer */
char *fbdev = NULL;
--- fbida-2.14/filter.c 2020-03-15 16:44:17.159855150 +0100
+++ fbida-2.14/filter.c 2020-03-15 16:44:27.017941447 +0100
@@ -6,8 +6,6 @@
#include "readers.h"
#include "filter.h"
-int debug = 0;
-
/* ----------------------------------------------------------------------- */
static void
--- fbida-2.14/readers.c.org 2020-03-15 17:01:18.692683597 +0100
+++ fbida-2.14/readers.c 2020-03-15 16:57:19.141632384 +0100
@@ -6,6 +6,8 @@
#include "readers.h"
+int debug=0;
+
/* ----------------------------------------------------------------------- */
void load_bits_lsb(unsigned char *dst, unsigned char *src, int width,
--- fbida-2.14/viewer.c.org 2020-03-15 17:05:02.991595832 +0100
+++ fbida-2.14/viewer.c 2020-03-15 17:04:55.424531467 +0100
@@ -40,7 +40,6 @@
#define PROCESS_LINES 16
-int debug;
Cursor ptrs[POINTER_COUNT];
/* ----------------------------------------------------------------------- */
--- fbida-2.14/idaconfig.h.org 2020-03-15 17:07:09.239668196 +0100
+++ fbida-2.14/idaconfig.h 2020-03-15 17:07:21.248770061 +0100
@@ -17,7 +17,7 @@
/* -------------------------------------------------------------------------- */
-char *ida_lists;
+extern char *ida_lists;
void ida_init_config(void);
void ida_read_config(void);

8
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch Normal file
View File

@@ -0,0 +1,8 @@
Upstream-Status: Pending
--- a/scripts/jpeg-version.sh
+++ b/scripts/jpeg-version.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1
+${CPP} -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' '

1856
sources/meta-openembedded/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch Normal file
View File

File diff suppressed because it is too large Load Diff

30
sources/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.2.bb Normal file
View File

@@ -0,0 +1,30 @@
SUMMARY = "X11 image viewer aimed mostly at console users"
HOMEPAGE = "https://feh.finalrewind.org/"
SECTION = "x11/utils"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=150e4c518ff8aaecfe35694e47661d9a"
DEPENDS = "\
imlib2 \
virtual/libx11 libxt\
"
SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2"
SRC_URI[sha256sum] = "5f94a77de25c5398876f0cf431612d782b842f4db154d2139b778c8f196e8969"
inherit mime-xdg features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OEMAKE = "curl=0 xinerama=0 PREFIX=/usr"
do_compile () {
oe_runmake
}
do_install () {
oe_runmake install app=1 'DESTDIR=${D}' 'ICON_PREFIX=${D}${datadir}/icons'
}
RDEPENDS:${PN} += "imlib2-loaders"
FILES:${PN} += "${datadir}/icons"

385
sources/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch Normal file
View File

@@ -0,0 +1,385 @@
From e6ccc8a8cf1391010a8220836a732da9fab19c69 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 7 Sep 2023 12:35:12 -0700
Subject: [PATCH] Fix Translations containing invalid directives %hs
Found with gettext 0.22
Older versions of msgfmt were more sloppy, thus allowing such mistakes to cause bugs at runtime.
https://bugs.gentoo.org/908868
https://savannah.gnu.org/bugs/index.php?64333
https://github.com/fontforge/fontforge/issues/5251
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
fontforgeexe/searchview.c | 2 +-
po/ca.po | 4 ++--
po/de.po | 4 ++--
po/en_GB.po | 4 ++--
po/fr.po | 40 +++++++++++++++++++--------------------
po/hr.po | 4 ++--
po/it.po | 8 ++++----
po/ja.po | 4 ++--
po/ko.po | 4 ++--
po/pl.po | 4 ++--
po/uk.po | 4 ++--
po/vi.po | 4 ++--
12 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/fontforgeexe/searchview.c b/fontforgeexe/searchview.c
index 1cb39a221..7e1c109cb 100644
--- a/fontforgeexe/searchview.c
+++ b/fontforgeexe/searchview.c
@@ -516,7 +516,7 @@ return( true );
if ( ask_if_difficult==2 && !searcher->isvisible )
return( false );
if ( gwwv_ask(_("Bad Reference"),(const char **) buttons,1,1,
- _("The %1$s in the search dialog contains a reference to %2$.20hs which does not exist in the new font.\nShould I remove the reference?"),
+ _("The %1$s in the search dialog contains a reference to %2$.20s which does not exist in the new font.\nShould I remove the reference?"),
i==0?_("Search Pattern"):_("Replace Pattern"),
r->sc->name)==1 )
return( false );
diff --git a/po/ca.po b/po/ca.po
index e2349b6ef..6c920b7c0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12347,11 +12347,11 @@ msgstr "Tai"
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"Al diàleg de cerca, %1$s conté una referència a %2$.20hs\n"
+"Al diàleg de cerca, %1$s conté una referència a %2$.20s\n"
"que no existeix en el nou tipus.\n"
"Voleu eliminar la referència?"
diff --git a/po/de.po b/po/de.po
index 41430ffae..8a31aeaa2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15765,11 +15765,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s im Suchdialog enthält eine Referenz auf %2$.20hs, die in der neuen "
+"%1$s im Suchdialog enthält eine Referenz auf %2$.20s, die in der neuen "
"Schrift nicht existiert.\n"
"Soll der Referenz entfernt werden?"
diff --git a/po/en_GB.po b/po/en_GB.po
index 9bd2d62bb..fce64c97d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -728,11 +728,11 @@ msgstr "Template Colour"
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"The %1$s in the search dialogue contains a reference to %2$.20hs which does "
+"The %1$s in the search dialogue contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
diff --git a/po/fr.po b/po/fr.po
index 26e446b38..d130f89bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s"
#. GT: $4 is the changed flag ('*' for the changed items)
#, c-format
msgid "%1$.80s at %2$d from %3$.90s%4$s"
-msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
+msgstr "%1$.80s à %2$d de %3$.90s%4$s"
#. GT: This is the title for a window showing a bitmap character
#. GT: It will look something like:
@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
#. GT: $4 is the font name
#, c-format
msgid "%1$.80s at %2$d size %3$d from %4$.80s"
-msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs"
+msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s"
#, c-format
msgid "%1$s from lookup subtable %2$.50s"
@@ -7433,7 +7433,7 @@ msgid ""
"Reverting the file will lose those changes.\n"
"Is that what you want?"
msgstr ""
-"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n"
+"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n"
"Revenir vous fera perdre toutes les modifications.\n"
"Voulez vous vraiment revenir ?"
@@ -19077,11 +19077,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20hs qui "
+"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20s qui "
"n'existe pas dans la nouvelle fonte.\n"
"Faut-il supprimer la référence ?"
@@ -19925,7 +19925,7 @@ msgid ""
"The fonts %1$.30s and %2$.30s have a different number of glyphs or different "
"encodings"
msgstr ""
-"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des "
+"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des "
"codages différents"
#, c-format
@@ -19933,7 +19933,7 @@ msgid ""
"The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, "
"one cubic)"
msgstr ""
-"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres "
+"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres "
"différents (quadratique et cubique)"
msgid "The generated font won't work with ATM"
@@ -19968,8 +19968,8 @@ msgid ""
"The glyph %1$.30s in font %2$.30s has a different hint mask on its contours "
"than in %3$.30s"
msgstr ""
-"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que "
-"dans %3$.30hs"
+"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que "
+"dans %3$.30s"
#, c-format
msgid ""
@@ -19984,8 +19984,8 @@ msgid ""
"The glyph %1$.30s in font %2$.30s has a different number of references than "
"in %3$.30s"
msgstr ""
-"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent "
-"dans %3$.30hs"
+"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent "
+"dans %3$.30s"
#, c-format
msgid ""
@@ -20457,7 +20457,7 @@ msgstr ""
#, c-format
msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s"
msgstr ""
-"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs"
+"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s"
msgid "The paths that make up this glyph intersect one another"
msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres"
@@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP"
#, c-format
msgid "There is already an anchor point named %1$.40s in %2$.40s."
-msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs."
+msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s."
msgid "There is another glyph in the font with this name"
msgstr "Il y a un autre glyphe dans la fonte avec ce nom"
@@ -21441,8 +21441,8 @@ msgid ""
"been able to find is %1$.20s-%2$.20s-%4$d.\n"
"Shall I use that or let you search?"
msgstr ""
-"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais "
-"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n"
+"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais "
+"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n"
"Devrais-je utiliser cette valeur ou préférez vous chercher ?"
msgid ""
@@ -21770,7 +21770,7 @@ msgid ""
"with a 0 offset for this combination. Would you like to alter this kerning "
"class entry (or create a kerning pair for just these two glyphs)?"
msgstr ""
-"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n"
+"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n"
"avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette "
"partie\n"
"de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 "
@@ -24551,8 +24551,8 @@ msgid ""
"referred to.\n"
"It will not be copied."
msgstr ""
-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
-"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le "
+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
+"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le "
"glyphe auquel il se référait.\n"
"Le glyphe ne sera pas copié."
@@ -24562,8 +24562,8 @@ msgid ""
"But %1$s does not exist in this font.\n"
"Would you like to copy the original splines (or delete the reference)?"
msgstr ""
-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n"
-"Mais %1$hs n'existe pas dans cette fonte.\n"
+"Vous essayer de coller une référence vers %1$s dans %2$s.\n"
+"Mais %1$s n'existe pas dans cette fonte.\n"
"Voulez vous copier le contour d'origine (ou supprimer la référence)?"
msgid ""
diff --git a/po/hr.po b/po/hr.po
index d261d4ca7..ac41b9250 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -20156,11 +20156,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20hs koja ne "
+"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20s koja ne "
"postoji u fontu.\n"
"Želiš li dozvoliti uklanjanje reference?"
diff --git a/po/it.po b/po/it.po
index e13711485..d0c3ea987 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2303,7 +2303,7 @@ msgid ""
"Reverting the file will lose those changes.\n"
"Is that what you want?"
msgstr ""
-"Il font %1$.40s nel file %2$.40hs è stato modificato.\n"
+"Il font %1$.40s nel file %2$.40s è stato modificato.\n"
"Ripristinando il file perderai tutte le modifiche.\n"
"È quello che vuoi fare?"
@@ -5835,7 +5835,7 @@ msgid ""
"The glyph %1$.30s has a different number of contours in font %2$.30s than in "
"%3$.30s"
msgstr ""
-"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto "
+"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto "
"a %3$.30s"
#, c-format
@@ -6235,8 +6235,8 @@ msgid ""
"been able to find is %1$.20s-%2$.20s-%4$d.\n"
"Shall I use that or let you search?"
msgstr ""
-"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma "
-"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n"
+"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma "
+"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n"
"Devo usare questo valore o preferisci cercare tu stesso?"
msgid ""
diff --git a/po/ja.po b/po/ja.po
index ed9f5a645..206ae82d1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11458,11 +11458,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s には, 新しいフォントには含まれないグリフ %2$.20hs への参照が含まれていま"
+"%1$s には, 新しいフォントには含まれないグリフ %2$.20s への参照が含まれていま"
"す.\n"
"参照を削除しますか?"
diff --git a/po/ko.po b/po/ko.po
index 971b4db03..4d5c8d40d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -20920,11 +20920,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20hs에 대한 참조가 포함되어 있"
+"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20s에 대한 참조가 포함되어 있"
"다.\n"
"참조를 제거해야 하는가?"
diff --git a/po/pl.po b/po/pl.po
index 2bbbf00be..c1fd5a454 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -19552,11 +19552,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20hs, który nie "
+"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20s, który nie "
"istnieje w nowym foncie.\n"
"Czy usunąć to odwołanie?"
diff --git a/po/uk.po b/po/uk.po
index e3768acc3..3302a1005 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -19860,11 +19860,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"%1$s у діалоговому вікні пошуку містить посилання на %2$.20hs, якого не "
+"%1$s у діалоговому вікні пошуку містить посилання на %2$.20s, якого не "
"існує у новому шрифті.\n"
"Вилучити це посилання?"
diff --git a/po/vi.po b/po/vi.po
index 6aee8bb3f..f5eb739e6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -17109,11 +17109,11 @@ msgstr ""
#, c-format
msgid ""
-"The %1$s in the search dialog contains a reference to %2$.20hs which does "
+"The %1$s in the search dialog contains a reference to %2$.20s which does "
"not exist in the new font.\n"
"Should I remove the reference?"
msgstr ""
-"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20hs mà không tồn "
+"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20s mà không tồn "
"tại trong phông mới.\n"
"Bạn có muốn gỡ bỏ tham chiếu này không?"
--
2.42.0

77
sources/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch Normal file
View File

@@ -0,0 +1,77 @@
From 644c3380f75b20a11755e7052aa632887f3eee2b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 7 Jul 2022 12:32:47 -0700
Subject: [PATCH] cmake: Use alternate way to detect libm
The standard package provided with MathLib cmake module does not work
when libm is folded into libc starting glibc 2.35+
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
CMakeLists.txt | 7 ++++++-
contrib/fonttools/CMakeLists.txt | 2 +-
fontforge/CMakeLists.txt | 2 +-
fontforgeexe/CMakeLists.txt | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e234cb6e9..284ba2d20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,9 +115,14 @@ else()
endif()
find_package(Iconv REQUIRED)
find_package(LibXml2 REQUIRED)
-find_package(MathLib REQUIRED)
find_package(ZLIB REQUIRED)
+include(CheckLibraryExists)
+CHECK_LIBRARY_EXISTS(m pow "" HAVE_LIB_M)
+if (HAVE_LIB_M)
+ set(EXTRA_LIBS ${EXTRA_LIBS} m)
+endif (HAVE_LIB_M)
+
check_include_file(pthread.h HAVE_PTHREAD_H)
if(HAVE_PTHREAD_H)
find_package(Threads)
diff --git a/contrib/fonttools/CMakeLists.txt b/contrib/fonttools/CMakeLists.txt
index d6c698877..1608af152 100644
--- a/contrib/fonttools/CMakeLists.txt
+++ b/contrib/fonttools/CMakeLists.txt
@@ -15,7 +15,7 @@ add_executable(woff woff.c)
target_link_libraries(acorn2sfd PRIVATE fontforge)
target_link_libraries(dewoff PRIVATE ZLIB::ZLIB)
-target_link_libraries(pcl2ttf PRIVATE MathLib::MathLib)
+target_link_libraries(pcl2ttf PRIVATE ${EXTRA_LIBS})
target_link_libraries(ttf2eps PRIVATE fontforge)
target_link_libraries(woff PRIVATE ZLIB::ZLIB)
diff --git a/fontforge/CMakeLists.txt b/fontforge/CMakeLists.txt
index 9a052f360..067ef40df 100644
--- a/fontforge/CMakeLists.txt
+++ b/fontforge/CMakeLists.txt
@@ -237,7 +237,7 @@ target_link_libraries(fontforge
GLIB::GLIB
Intl::Intl
PRIVATE
- MathLib::MathLib
+ ${EXTRA_LIBS}
Iconv::Iconv
ZLIB::ZLIB
)
diff --git a/fontforgeexe/CMakeLists.txt b/fontforgeexe/CMakeLists.txt
index e2982c39d..8829993ea 100644
--- a/fontforgeexe/CMakeLists.txt
+++ b/fontforgeexe/CMakeLists.txt
@@ -121,7 +121,7 @@ if(ENABLE_PYTHON_SCRIPTING_RESULT)
target_link_libraries(fontforgeexe PRIVATE Python3::Python)
endif()
-target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv MathLib::MathLib)
+target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv ${EXTRA_LIBS})
install(TARGETS fontforgeexe RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
if(UNIX)

29
sources/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-fontforgeexe-Use-env-to-find-fontforge.patch Normal file
View File

@@ -0,0 +1,29 @@
From f5a19ad9b2aea85dab28e7c61ac39404631fad2d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 6 Jul 2022 04:54:23 -0700
Subject: [PATCH] fontforgeexe: Use env to find fontforge
This helps in avoiding to encode build paths into interpeter
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
fontforgeexe/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fontforgeexe/CMakeLists.txt b/fontforgeexe/CMakeLists.txt
index b2d663b88..e2a8fee54 100644
--- a/fontforgeexe/CMakeLists.txt
+++ b/fontforgeexe/CMakeLists.txt
@@ -118,7 +118,7 @@ if(UNIX)
foreach(_script fontimage.pe fontlint.pe sfddiff.pe)
get_filename_component(_output \"\${_script}\" NAME_WE)
file(READ \"${CMAKE_CURRENT_SOURCE_DIR}/\${_script}\" _input)
- file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/\${_output}\" \"#!\${CMAKE_INSTALL_PREFIX}/bin/fontforge -lang=ff\\n\${_input}\")
+ file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/\${_output}\" \"#!/usr/bin/env fontforge -lang=ff\\n\${_input}\")
endforeach()
" COMPONENT nativescripts)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fontimage" "${CMAKE_CURRENT_BINARY_DIR}/fontlint" "${CMAKE_CURRENT_BINARY_DIR}/sfddiff"
--
2.37.0

24
sources/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch Normal file
View File

@@ -0,0 +1,24 @@
From 798f2816130838f3618212291de6ab0ea814c868 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 29 Sep 2019 20:39:02 -0700
Subject: [PATCH] include sys/select on non-glibc platforms
musl needs sys/select.h for defining fd_set
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
gdraw/gdraw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/gdraw/gdraw.c
+++ b/gdraw/gdraw.c
@@ -33,7 +33,7 @@
#include "gkeysym.h"
#include "ustring.h"
-#if __Mac
+#if __Mac || (defined(__linux__) && !defined(__GLIBC__))
# include <sys/select.h>
#endif

52
sources/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb Normal file
View File

@@ -0,0 +1,52 @@
SUMMARY = "A font editor"
HOMEPAGE = "http://fontforge.github.io/en-US/"
LICENSE = "BSD-3-Clause & GPL-3.0-only"
LIC_FILES_CHKSUM = " \
file://COPYING.gplv3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE;md5=d042f3d2a8fd7208b704a499168e3c89 \
"
DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro"
DEPENDS:append:class-target = " libxi"
inherit cmake pkgconfig python3native python3targetconfig features_check gettext gtk-icon-cache mime mime-xdg
REQUIRED_DISTRO_FEATURES:append:class-target = " x11"
# tag 20220308
SRCREV = "a1dad3e81da03d5d5f3c4c1c1b9b5ca5ebcfcecf"
SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
file://0001-include-sys-select-on-non-glibc-platforms.patch \
file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \
file://0001-cmake-Use-alternate-way-to-detect-libm.patch \
file://0001-Fix-Translations-containing-invalid-directives-hs.patch \
"
S = "${WORKDIR}/git"
EXTRA_OECMAKE = "-DENABLE_DOCS=OFF"
PACKAGECONFIG = "readline"
PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline"
CFLAGS += "-fno-strict-aliasing"
LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
#do_configure:prepend() {
# uthash sources are expected in uthash/src
# mkdir -p ${S}/uthash/src
# cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src
#}
PACKAGES =+ "${PN}-python"
FILES:${PN} += " \
${datadir}/appdata \
${datadir}/metainfo \
${datadir}/mime \
"
FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${BPN}/python"
RDEPENDS:${PN}-python = "python3"
# for e.g kde's oxygen-fonts
BBCLASSEXTEND = "native"

14
sources/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb Normal file
View File

@@ -0,0 +1,14 @@
# Copyright (C) 2022 Khem Raj <raj.khem@gmail.com>
# Released under the MIT license (see COPYING.MIT for the terms)
SUMMARY = "LibSpiro is an adaptation of Spiro formula and functions into a sharable library"
HOMEPAGE = "https://github.com/fontforge/libspiro"
LICENSE = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz"
SRC_URI[sha256sum] = "5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be"
inherit autotools
BBCLASSEXTEND = "native"

30
sources/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb Normal file
View File

@@ -0,0 +1,30 @@
DESCRIPTION = "FreeGLUT is a free-software/open-source alternative to the OpenGL \
Utility Toolkit (GLUT) library"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb"
SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
SRC_URI[sha256sum] = "3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec"
inherit cmake features_check pkgconfig
# depends on virtual/libgl and libxi
REQUIRED_DISTRO_FEATURES = "opengl x11"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
PACKAGECONFIG[gles] = "-DFREEGLUT_GLES=ON,-DFREEGLUT_GLES=OFF,"
PACKAGECONFIG[wayland] = "-DFREEGLUT_WAYLAND=ON,-DFREEGLUT_WAYLAND=OFF,libxkbcommon"
PACKAGECONFIG[demos] = "-DFREEGLUT_BUILD_DEMOS=ON,-DFREEGLUT_BUILD_DEMOS=OFF,"
PACKAGECONFIG[x11] = ",,virtual/libx11 libice libxmu libglu libxrandr libxext"
# Add -Wno-implicit-function-declaration since it might be otherwise treated at
# error by clang16+ and this is not really a problem
CFLAGS += "-Wno-implicit-function-declaration"
PROVIDES += "mesa-glut"
DEPENDS = "virtual/libgl libxi"
do_install:append() {
# Remove buildpaths
sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/FreeGLUT/FreeGLUTTargets.cmake
}

38
sources/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch Normal file
View File

@@ -0,0 +1,38 @@
From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 9 Feb 2019 08:28:09 -0800
Subject: [PATCH] Explicit typecast to avoid implicit double to float
conversion
fixes compile errors e.g.
../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to
'float' in initializer list [-Wc++11-narrowing]
(t3 + 2.0) / 3, 0.3 };
^~~~~~~~~~~~~~
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
demo/simple.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/demo/simple.cpp b/demo/simple.cpp
index 532e862..aba55b4 100644
--- a/demo/simple.cpp
+++ b/demo/simple.cpp
@@ -105,9 +105,9 @@ static void RenderScene(void)
float t2 = sin(n / 50 + 1);
float t3 = sin(n / 30 + 2);
- float ambient[4] = { (t1 + 2.0) / 3,
- (t2 + 2.0) / 3,
- (t3 + 2.0) / 3, 0.3 };
+ float ambient[4] = { float(t1 + 2.0) / 3,
+ float(t2 + 2.0) / 3,
+ float(t3 + 2.0) / 3, 0.3 };
float diffuse[4] = { 1.0, 0.9, 0.9, 1.0 };
float specular[4] = { 1.0, 0.7, 0.7, 1.0 };
float position[4] = { 100.0, 100.0, 0.0, 1.0 };
--
2.20.1

38
sources/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch Normal file
View File

@@ -0,0 +1,38 @@
From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 23 Oct 2016 22:46:43 +0200
Subject: [PATCH] use pkg-config to find freetype2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 53560ea..b5bb6a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup)
AC_PATH_X
-AC_CHECK_FT2([9.0.3],[],
- [AC_MSG_ERROR([FreeType2 is required to compile this library])])
+PKG_CHECK_MODULES(FT2, freetype2,
+ CFLAGS="$CFLAGS $FT2_CFLAGS"
+ LIBS="$LIBS $FT2_LIBS",
+ AC_MSG_ERROR([FreeType2 is required to compile this library])
+)
+AC_SUBST([FT2_CFLAGS])
+AC_SUBST([FT2_LIBS])
AC_PATH_XTRA
--
2.5.5

38
sources/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch Normal file
View File

@@ -0,0 +1,38 @@
From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 23 Oct 2016 23:54:14 +0200
Subject: [PATCH] Makefile.am: remove useless and breaking code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile.am | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 89a8a7f..e582a34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,15 +24,6 @@ EXTRA_DIST = \
m4 \
$(NULL)
-# Print out an informative summary.
-all-local:
- @$(ECHO) "Done."
- @$(ECHO)
- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \
- $(ECHO) "---" ;\
- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
- fi
- @$(ECHO)
# Upload documentation
DOC = docs/html docs/latex/ftgl.pdf
--
2.5.5

27
sources/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb Normal file
View File

@@ -0,0 +1,27 @@
SUMMARY = "OpenGL frontend to Freetype 2"
HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
inherit autotools pkgconfig features_check
REQUIRED_DISTRO_FEATURES = "opengl x11"
DEPENDS += " \
freetype \
freeglut \
"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0001-use-pkg-config-to-find-freetype2.patch \
file://0002-Makefile.am-remove-useless-and-breaking-code.patch \
file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \
"
SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503"
SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59"
S = "${WORKDIR}/ftgl-2.1.3~rc5"
# undefined reference to symbol 'sin@@GLIBC_2.4'
CFLAGS += "-lm"

37
sources/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch Normal file
View File

@@ -0,0 +1,37 @@
From 60c17eb49121bf2aa485acd30750b2fc6c8eb61f Mon Sep 17 00:00:00 2001
From: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi>
Date: Mon, 19 Jun 2017 16:41:36 +0300
Subject: [PATCH] Fix compilation for Helix.
Gnome support, including GNOME_INIT_HOOK, has been removed, but it was
still being called.
COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system
most definitely is not. It is accomplished by trying to execute
a program, which does not work when cross compiling.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi>
Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
configure.ac | 20 ++++----------------
doc/fvwm/Makefile.am | 2 +-
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 48ce264..fab7b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1413,8 +1413,4 @@ else
# Define some compatibility macros needed for config.h.
-mg_DEFINE_IF_NOT([#include <X11/keysym.h>],
- [defined XK_Page_Up && defined XK_Page_Down],
- [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS],
- [Old AIX systems (3.2.5) don't define some common keysyms.])
AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
[#ifdef COMPAT_OLD_KEYSYMDEF
# define XK_Page_Up XK_Prior
--
1.9.1

123
sources/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb Normal file
View File

@@ -0,0 +1,123 @@
SUMMARY = "F Virtual Window Manager "
HOMEPAGE = "http://www.fvwm.org/"
SECTION = "x11/wm"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=f8204787357db6ea518dcc9b6cf08388"
DEPENDS = " \
bison-native \
flex-native \
freetype-native \
gettext-native \
libxslt-native \
fontconfig \
libice \
libpng \
librsvg \
libsm \
libxau \
libxcb \
libxcursor \
libxdmcp \
libxext \
libxfixes \
libxft \
libxinerama \
libxml2 \
libxrender \
libxt \
virtual/libx11 \
xrandr \
zlib \
"
SRC_URI = " \
git://github.com/fvwmorg/fvwm.git;protocol=https;branch=master \
file://0001-Fix-compilation-for-disabled-gnome.patch \
"
SRCREV = "7baf540e56fb1a3e91752acba872a88543529d46"
S = "${WORKDIR}/git"
inherit autotools gettext update-alternatives pkgconfig python3native perlnative features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
ALTERNATIVE:${PN} = "x-window-manager"
ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/fvwm"
ALTERNATIVE_PRIORITY[x-window-manager] = "20"
EXTRA_OECONF = " \
--disable-bidi \
--disable-fontconfigtest \
--disable-htmldoc \
--disable-imlibtest \
--disable-nls \
--disable-perllib \
--disable-rsvg \
--disable-shape \
--disable-sm \
--disable-xfttest \
--with-imlib-exec-prefix=/nonexistent \
--with-imlib-prefix=/nonexistent \
--without-ncurses-library \
--without-readline-library \
--without-rplay-library \
--without-stroke-library \
--without-termcap-library \
--without-xpm-library \
ac_cv_func_mkstemp=no \
has_safety_mkstemp=yes \
"
# show the exact commands in the log file
EXTRA_OEMAKE = " \
V=1 \
"
# clang treats them as errors by default now starting with 15.0+
CFLAGS += "-Wno-error=int-conversion -Wno-error=implicit-int"
do_install:append() {
install -d -m 0755 ${D}/${sysconfdir}/xdg/fvwm
# You can install the config file here
install -d -m 0755 ${D}/${datadir}/fvwm
touch ${D}/${datadir}/fvwm/ConfigFvwmDefaults
sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-*
sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm*
sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop
}
# the only needed packages (note: locale packages are automatically generated
# as well)
PACKAGES = " \
${PN} \
${PN}-extra \
${PN}-doc \
${PN}-dbg \
"
# minimal set of binaries
FILES:${PN} = " \
${bindir}/fvwm \
${bindir}/fvwm-root \
${datadir}/fvwm/ConfigFvwmDefaults \
"
FILES:${PN}-extra = " \
${bindir} \
${libexecdir} \
${sysconfdir}/xdg/fvwm \
"
FILES:${PN}-doc = " \
${mandir} \
${datadir}/fvwm \
"
RDEPENDS:${PN} = " \
xuser-account \
"
RDEPENDS:${PN}-extra += "\
perl \
python3-core \
"

32
sources/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch Normal file
View File

@@ -0,0 +1,32 @@
From ee405855bca7d6399ff1a1aef952010056c84ff6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 1 Mar 2023 21:08:09 -0800
Subject: [PATCH] Do not use -Werror with clang
Too many warnings to handle for a distro build
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
test/CMakeLists.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e7f85f19..0b6fd980 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -197,10 +197,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler")
endif()
- add_compile_options(-Werror -Weverything)
- add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
- add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral)
-
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
if(NOT GLM_QUIET)
message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler")
--
2.39.2

145
sources/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch Normal file
View File

@@ -0,0 +1,145 @@
From bd9b5060bc3b9581090d44f15b4e236566ea86a6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 4 Jun 2021 12:57:57 -0700
Subject: [PATCH] Silence clang warnings
Fixes
glm/gtc/random.inl:25:17: error: implicit conversion loses integer precision: 'int' to 'unsigned char' [-Werror,-Wimplicit-int-conversion]
| std::rand() % std::numeric_limits<uint8>::max());
| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror,-Wunused-parameter]
GLM_FUNC_QUALIFIER qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k)
^
and
test/gtx/gtx_fast_trigonometry.cpp:135:9: error: variable 'result' set but not used [-Werror,-Wunused-but-set-variable]
| float result = 0.f;
| ^
Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
glm/ext/quaternion_common.inl | 2 +-
glm/gtc/random.inl | 2 +-
test/gtx/gtx_fast_trigonometry.cpp | 30 ++++++++++++------------------
3 files changed, 14 insertions(+), 20 deletions(-)
--- a/glm/ext/quaternion_common.inl
+++ b/glm/ext/quaternion_common.inl
@@ -104,7 +104,7 @@ namespace glm
{
// Graphics Gems III, page 96
T angle = acos(cosTheta);
- T phi = angle + k * glm::pi<T>();
+ T phi = angle + static_cast<T>(k) * glm::pi<T>();
return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle);
}
}
--- a/test/gtx/gtx_fast_trigonometry.cpp
+++ b/test/gtx/gtx_fast_trigonometry.cpp
@@ -19,15 +19,14 @@ namespace fastCos
{
const float begin = -glm::pi<float>();
const float end = glm::pi<float>();
- float result = 0.f;
const std::clock_t timestamp1 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::fastCos(i);
+ glm::fastCos(i);
const std::clock_t timestamp2 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::cos(i);
+ glm::cos(i);
const std::clock_t timestamp3 = std::clock();
const std::clock_t time_fast = timestamp2 - timestamp1;
@@ -53,15 +52,14 @@ namespace fastSin
{
const float begin = -glm::pi<float>();
const float end = glm::pi<float>();
- float result = 0.f;
const std::clock_t timestamp1 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::fastSin(i);
+ glm::fastSin(i);
const std::clock_t timestamp2 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::sin(i);
+ glm::sin(i);
const std::clock_t timestamp3 = std::clock();
const std::clock_t time_fast = timestamp2 - timestamp1;
@@ -79,15 +77,14 @@ namespace fastTan
{
const float begin = -glm::pi<float>();
const float end = glm::pi<float>();
- float result = 0.f;
const std::clock_t timestamp1 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::fastTan(i);
+ glm::fastTan(i);
const std::clock_t timestamp2 = std::clock();
for (float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::tan(i);
+ glm::tan(i);
const std::clock_t timestamp3 = std::clock();
const std::clock_t time_fast = timestamp2 - timestamp1;
@@ -105,15 +102,14 @@ namespace fastAcos
{
const float begin = -glm::pi<float>();
const float end = glm::pi<float>();
- float result = 0.f;
const std::clock_t timestamp1 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::fastAcos(i);
+ glm::fastAcos(i);
const std::clock_t timestamp2 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::acos(i);
+ glm::acos(i);
const std::clock_t timestamp3 = std::clock();
const std::clock_t time_fast = timestamp2 - timestamp1;
@@ -132,13 +128,12 @@ namespace fastAsin
{
const float begin = -glm::pi<float>();
const float end = glm::pi<float>();
- float result = 0.f;
const std::clock_t timestamp1 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::fastAsin(i);
+ glm::fastAsin(i);
const std::clock_t timestamp2 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::asin(i);
+ glm::asin(i);
const std::clock_t timestamp3 = std::clock();
const std::clock_t time_fast = timestamp2 - timestamp1;
const std::clock_t time_default = timestamp3 - timestamp2;
@@ -155,13 +150,12 @@ namespace fastAtan
{
const float begin = -glm::pi<float>();
const float end = glm::pi<float>();
- float result = 0.f;
const std::clock_t timestamp1 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::fastAtan(i);
+ glm::fastAtan(i);
const std::clock_t timestamp2 = std::clock();
for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f)
- result = glm::atan(i);
+ glm::atan(i);
const std::clock_t timestamp3 = std::clock();
const std::clock_t time_fast = timestamp2 - timestamp1;
const std::clock_t time_default = timestamp3 - timestamp2;

7
sources/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glm.pc.in Normal file
View File

@@ -0,0 +1,7 @@
prefix=/usr
includedir=${prefix}/include
Name: GLM
Description: OpenGL Mathematics
Version: @VERSION@
Cflags: -I${includedir}

20
sources/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in Normal file
View File

@@ -0,0 +1,20 @@
set(GLM_VERSION "@VERSION@")
####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
macro(set_and_check _var _file)
set(${_var} "${_file}")
if(NOT EXISTS "${_file}")
message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
endif()
endmacro()
####################################################################################
set_and_check(GLM_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include")
if (NOT CMAKE_VERSION VERSION_LESS "3.0")
include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
endif()

31
sources/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in Normal file
View File

@@ -0,0 +1,31 @@
# This is a basic version file for the Config-mode of find_package().
# It is used by write_basic_package_version_file() as input file for configure_file()
# to create a version-file which can be installed along a config.cmake file.
#
# The created file sets PACKAGE_VERSION_EXACT if the current version string and
# the requested version string are exactly the same and it sets
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
# The variable CVF_VERSION must be set before calling configure_file().
set(PACKAGE_VERSION "@VERSION@")
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()
set(PACKAGE_VERSION_COMPATIBLE TRUE)
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()
# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
return()
endif()
# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
math(EXPR installedBits "8 * 8")
set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
set(PACKAGE_VERSION_UNSUITABLE FALSE)
endif()

107
sources/meta-openembedded/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake Normal file
View File

@@ -0,0 +1,107 @@
# Generated by CMake
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
message(FATAL_ERROR "CMake >= 2.6.0 required")
endif()
cmake_policy(PUSH)
cmake_policy(VERSION 2.6)
#----------------------------------------------------------------
# Generated CMake target import file.
#----------------------------------------------------------------
# Commands may need to know the format version.
set(CMAKE_IMPORT_FILE_VERSION 1)
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
set(_targetsDefined)
set(_targetsNotDefined)
set(_expectedTargets)
foreach(_expectedTarget glm)
list(APPEND _expectedTargets ${_expectedTarget})
if(NOT TARGET ${_expectedTarget})
list(APPEND _targetsNotDefined ${_expectedTarget})
endif()
if(TARGET ${_expectedTarget})
list(APPEND _targetsDefined ${_expectedTarget})
endif()
endforeach()
if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
unset(_targetsDefined)
unset(_targetsNotDefined)
unset(_expectedTargets)
set(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP)
return()
endif()
if(NOT "${_targetsDefined}" STREQUAL "")
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
endif()
unset(_targetsDefined)
unset(_targetsNotDefined)
unset(_expectedTargets)
# Compute the installation prefix relative to this file.
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
# Use original install prefix when loaded through a
# cross-prefix symbolic link such as /lib -> /usr/lib.
get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
get_filename_component(_realOrig "/usr/lib/cmake/glm" REALPATH)
if(_realCurr STREQUAL _realOrig)
set(_IMPORT_PREFIX "/usr/lib/cmake/glm")
endif()
unset(_realOrig)
unset(_realCurr)
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
if(_IMPORT_PREFIX STREQUAL "/")
set(_IMPORT_PREFIX "")
endif()
# Create imported target glm
add_library(glm INTERFACE IMPORTED)
set_target_properties(glm PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
)
if(CMAKE_VERSION VERSION_LESS 3.0.0)
message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")
endif()
# Load information for each installed configuration.
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
file(GLOB CONFIG_FILES "${_DIR}/glmTargets-*.cmake")
foreach(f ${CONFIG_FILES})
include(${f})
endforeach()
# Cleanup temporary variables.
set(_IMPORT_PREFIX)
# Loop over all imported files and verify that they actually exist
foreach(target ${_IMPORT_CHECK_TARGETS} )
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
if(NOT EXISTS "${file}" )
message(FATAL_ERROR "The imported target \"${target}\" references the file
\"${file}\"
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully.
* The installation package was faulty and contained
\"${CMAKE_CURRENT_LIST_FILE}\"
but not all the files it references.
")
endif()
endforeach()
unset(_IMPORT_CHECK_FILES_FOR_${target})
endforeach()
unset(_IMPORT_CHECK_TARGETS)
# This file does not depend on other imported targets which have
# been exported from the same project but in a separate export set.
# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP)

41
sources/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb Normal file
View File

@@ -0,0 +1,41 @@
SUMMARY = "OpenGL Mathematics Library"
DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \
mathematics library for graphics software based on the OpenGL \
Shading Language (GLSL) specifications."
HOMEPAGE = "https://glm.g-truc.net"
BUGTRACKER = "https://github.com/g-truc/glm/issues"
SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d"
SRC_URI = " \
git://github.com/g-truc/glm;branch=master;protocol=https \
file://0001-Silence-clang-warnings.patch \
file://0001-Do-not-use-Werror-with-clang.patch \
file://glmConfig.cmake.in \
file://glmConfigVersion.cmake.in \
file://glm.pc.in \
file://glmTargets.cmake \
"
SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447"
PV .= "+0.9.9.9+git"
S = "${WORKDIR}/git"
inherit cmake
do_install() {
install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm
cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir}
cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm
rm ${D}${includedir}/glm/CMakeLists.txt
sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake
sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake
sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc
install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake
}
RDEPENDS:${PN}-dev = ""
BBCLASSEXTEND = "native"

50
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch Normal file
View File

@@ -0,0 +1,50 @@
From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 1 Mar 2023 22:58:37 -0800
Subject: [PATCH] Match prototypes of callbacks with libgphoto
In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e
we tried to fix by using pthread_t but it also needs to make changes in
libgphoto and these changes can be invasive, therefore lets revert to
older types and to fix musl problem fix it via type casts
Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/569]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
gphoto2/main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gphoto2/main.c b/gphoto2/main.c
index 0dac947..cd3c990 100644
--- a/gphoto2/main.c
+++ b/gphoto2/main.c
@@ -1198,7 +1198,7 @@ thread_func (void *data)
pthread_cleanup_pop (1);
}
-static pthread_t
+static unsigned int
start_timeout_func (Camera *camera, unsigned int timeout,
CameraTimeoutFunc func, void __unused__ *data)
{
@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout,
pthread_create (&tid, NULL, thread_func, td);
- return (tid);
+ return (unsigned int)tid;
}
static void
-stop_timeout_func (Camera __unused__ *camera, pthread_t id,
+stop_timeout_func (Camera __unused__ *camera, unsigned int id,
void __unused__ *data)
{
- pthread_t tid = id;
+ pthread_t tid = (pthread_t)id;
pthread_cancel (tid);
pthread_join (tid, NULL);
--
2.39.2

23
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch Normal file
View File

@@ -0,0 +1,23 @@
From 60b6d5c95ca3632e02031ac04fb5486dd209011c Mon Sep 17 00:00:00 2001
From: Andreas Baak <andreas.baak@gmail.com>
Date: Sun, 12 Jul 2015 01:02:15 -0700
Subject: [PATCH] configure.ac remove AM_PO_SUBDIRS
This is done twice together with oe autotools.bbclass.
---
Upstream-Status: Pending
configure.ac | 1 -
1 file changed, 1 deletion(-)
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ dnl i18n support
dnl ---------------------------------------------------------------------------
GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
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"
-AM_PO_SUBDIRS()
AM_GNU_GETTEXT_VERSION([0.14.1])
AM_GNU_GETTEXT([external])
AM_ICONV()

39
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch Normal file
View File

@@ -0,0 +1,39 @@
From 23c67e93e51f700d0aeecfc08277e39f51201fc3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 12:59:46 -0700
Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs
This is not a plain old datatype in every libc, e.g. with musl this
would fail in type conversion
Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/535]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
gphoto2/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gphoto2/main.c b/gphoto2/main.c
index 2bf5964..9a6b05d 100644
--- a/gphoto2/main.c
+++ b/gphoto2/main.c
@@ -1198,7 +1198,7 @@ thread_func (void *data)
pthread_cleanup_pop (1);
}
-static unsigned int
+static pthread_t
start_timeout_func (Camera *camera, unsigned int timeout,
CameraTimeoutFunc func, void __unused__ *data)
{
@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeout,
}
static void
-stop_timeout_func (Camera __unused__ *camera, unsigned int id,
+stop_timeout_func (Camera __unused__ *camera, pthread_t id,
void __unused__ *data)
{
pthread_t tid = id;
--
2.37.3

24
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb Normal file
View File

@@ -0,0 +1,24 @@
SUMMARY = "gphoto2 - a command-line frontend to libgphoto2"
HOMEPAGE = "http://www.gphoto.com/"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
DEPENDS = "libgphoto2 popt readline"
RDEPENDS:gphoto2 = "libgphoto2"
SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \
file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \
file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \
"
SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375"
inherit autotools pkgconfig gettext
EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \
--without-cdk \
"
do_configure:append() {
sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h
}

48
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch Normal file
View File

@@ -0,0 +1,48 @@
From 06be633b8f4e2241bd37d4faf62b49606ad778e7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 25 May 2023 19:01:36 -0700
Subject: [PATCH] configure: Filter out buildpaths from CC
Upstream-Status: Inappropriate [Cross-compile specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 4 +++-
libgphoto2_port/configure.ac | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 17216b1..39c8cc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -261,7 +261,9 @@ GP_CONFIG_MSG([Compiler],[${CC}])
GP_CONFIG_MSG([libltdl includes],[$LTDLINCL])
GP_CONFIG_MSG([libltdl library],[$LIBLTDL])
-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"],
+CC_NO_SYSROOT=`echo $CC | sed -e \
+ 's|--sysroot=.*\b||g'`
+AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"],
[The C compiler we are using])
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index 1086b8e..59f3c34 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -103,8 +103,10 @@ GP_CONFIG_MSG([Compiler],[${CC}])
GP_CONFIG_MSG([libltdl includes],[$LTDLINCL])
GP_CONFIG_MSG([libltdl library],[$LIBLTDL])
-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"],
- [The C compiler we're using])
+CC_NO_SYSROOT=`echo $CC | sed -e \
+ 's|--sysroot=.*\b||g'`
+AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"],
+ [The C compiler we are using])
AM_CPPFLAGS=""
--
2.40.1

41
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch Normal file
View File

@@ -0,0 +1,41 @@
From 31a5d2f7db18737aef08c34e8707b4f69f7e5156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 21 Oct 2012 17:59:20 +0200
Subject: [PATCH] configure.ac: remove AM_PO_SUBDIRS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
together with oe autotools.bbclass this is done twice and causes:
| autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m
| configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 1 -
libgphoto2_port/configure.ac | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,6 @@ dnl ------------------------------------
GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2],
[${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],
[po])
-AM_PO_SUBDIRS()
AM_GNU_GETTEXT_VERSION([0.19.1])
AM_GNU_GETTEXT([external])
AM_ICONV()
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -122,7 +122,6 @@ dnl ------------------------------------
GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT],
[${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],
[po])
-AM_PO_SUBDIRS()
AM_GNU_GETTEXT_VERSION([0.19.1])
AM_GNU_GETTEXT([external])
AM_ICONV()

1955
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules Normal file
View File

File diff suppressed because it is too large Load Diff

53
sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb Normal file
View File

@@ -0,0 +1,53 @@
SUMMARY = "libgphoto2 allows you to access digital cameras"
SECTION = "libs"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=477378d78dfeeaa93826ee4ec7c643fb"
DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
# The .fdi and .rules files were generated with:
# libgphoto2-2.5.8/packaging/generic$ qemu-arm -s 1048576 -r 2.6.24 -L /OE/angstrom-dev/staging/armv5te-angstrom-linux-gnueabi/ .libs/print-camera-list
# They are release specific, so please regen when adding new releases
SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
file://40-libgphoto2.rules \
file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
file://0001-configure-Filter-out-buildpaths-from-CC.patch \
"
SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b"
inherit autotools pkgconfig gettext lib_package
EXTRA_OECONF = " --with-drivers=all udevscriptdir=${nonarch_base_libdir}/udev ac_cv_lib_ltdl_lt_dlcaller_register=yes"
PACKAGECONFIG ??= ""
PACKAGECONFIG[gd] = ",--without-gdlib,gd"
PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
do_configure:prepend() {
rm -rf ${S}/libgphoto2_port/auto-m4/*
rm -rf ${S}/auto-m4/*
}
do_configure:append() {
cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
cd ${S}/libgphoto2_port/
autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
cd ${S}
}
do_install:append() {
install -d ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
}
PACKAGES =+ "libgphotoport libgphoto2-camlibs"
FILES:libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*"
RRECOMMENDS:${PN} = "libgphoto2-camlibs"
FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*"
FILES:${PN} += "${nonarch_base_libdir}/udev/*"
FILES:${PN}-dbg += "${libdir}/*/*/.debug"
FILES:${PN}-dev += "${libdir}/*/*/*.la"
FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt"

58
sources/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch Normal file
View File

@@ -0,0 +1,58 @@
From 671e0d091b40ef7deb4a9d43e0dbed2a44edbec8 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 9 Sep 2023 01:03:04 -0700
Subject: [PATCH] Autotools: fix: do not put '$prefix' based paths in
compilation flags
This was causing problems with cross-compilation with a dedicated sysroot,
because compilation would incorrectly use headers and libraries from the
`--prefix` path. The `--prefix` path is meant to indicate a target path to
install to, not a path from which to source dependent libraries.
Gitlab: fixes #2442
Reported-by: Daniel Klauer
Suggested-by: Daniel Klauer
Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/012d250a903e13114bce3ba40995fb957fed7848]
Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
---
CHANGELOG.md | 3 +++
configure.ac | 8 --------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9b7e8e08..3a15fd256 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
longer fails due to missing PHP files. #2388
- Syntax for a loop in `gvmap.sh` has been corrected. This was a regression in
Graphviz 2.50.0. #2404
+- The Autotools build system no longer uses headers and libraries from the
+ `--prefix` path given on the command line. This previously caused
+ cross-compilation to incorrectly pick up host headers and libraries. #2442
## [8.0.5] – 2023-04-30
diff --git a/configure.ac b/configure.ac
index 573a3ee5d..7d53346de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,14 +190,6 @@ if test "x${prefix}" = "xNONE"; then
AC_SUBST([prefix])
fi
-# automatically check for other dependencies in $prefix first
-if test "x${prefix}" != "x/usr"; then
- CPPFLAGS="$CPPFLAGS -I${prefix}/include"
- LDFLAGS="$LDFLAGS -L${prefix}/lib"
- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH"
- export PKG_CONFIG_PATH
-fi
-
dnl -----------------------------------
# Static/Shared binaries
--
2.34.1

37
sources/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/CVE-2023-46045-0001.patch Normal file
View File

@@ -0,0 +1,37 @@
From 361f274ca901c3c476697a6404662d95f4dd43cb Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 24 Jul 2024 13:19:03 +0800
Subject: [PATCH] gvc gvconfig_plugin_install_from_config: more tightly scope
'gv_api'
CVE: CVE-2023-46045
Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/361f274ca901c3c476697a6404662d95f4dd43cb]
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
lib/gvc/gvconfig.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index d03de09..2f31b98 100644
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -174,7 +174,6 @@ static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
{
char *package_path, *name, *api;
const char *type;
- api_t gv_api;
int quality;
int nest = 0;
gvplugin_package_t *package;
@@ -189,7 +188,7 @@ static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
package = gvplugin_package_record(gvc, package_path, name);
do {
api = token(&nest, &s);
- gv_api = gvplugin_api(api);
+ const api_t gv_api = gvplugin_api(api);
do {
if (nest == 2) {
type = token(&nest, &s);
--
2.25.1

38
sources/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/CVE-2023-46045-0002.patch Normal file
View File

@@ -0,0 +1,38 @@
From 3f31704cafd7da3e86bb2861accf5e90c973e62a Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 24 Jul 2024 13:39:39 +0800
Subject: [PATCH] gvc gvconfig_plugin_install_from_config: more tightly scope
'api'
CVE: CVE-2023-46045
Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/3f31704cafd7da3e86bb2861accf5e90c973e62a]
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
lib/gvc/gvconfig.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 2f31b98..ea0d81b 100644
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -172,7 +172,7 @@ static char *token(int *nest, char **tokens)
static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
{
- char *package_path, *name, *api;
+ char *package_path, *name;
const char *type;
int quality;
int nest = 0;
@@ -187,7 +187,7 @@ static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
name = "x";
package = gvplugin_package_record(gvc, package_path, name);
do {
- api = token(&nest, &s);
+ const char *api = token(&nest, &s);
const api_t gv_api = gvplugin_api(api);
do {
if (nest == 2) {
--
2.25.1

33
sources/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/CVE-2023-46045-0003.patch Normal file
View File

@@ -0,0 +1,33 @@
From a95f977f5d809915ec4b14836d2b5b7f5e74881e Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 24 Jul 2024 15:02:06 +0800
Subject: [PATCH] gvc: detect plugin installation failure and display an error
Gitlab: fixes #2441
Reported-by: GJDuck
CVE: CVE-2023-46045
Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/a95f977f5d809915ec4b14836d2b5b7f5e74881e]
Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
lib/gvc/gvconfig.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index ea0d81b..1eccc70 100644
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -189,6 +189,10 @@ static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
do {
const char *api = token(&nest, &s);
const api_t gv_api = gvplugin_api(api);
+ if (gv_api == (api_t)-1) {
+ agerr(AGERR, "config error: %s %s not found\n", package_path, api);
+ return 0;
+ }
do {
if (nest == 2) {
type = token(&nest, &s);
--
2.25.1

6
sources/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh Normal file
View File

@@ -0,0 +1,6 @@
#!/bin/sh
echo "Setting up graphviz..."
# Create /usr/lib/graphviz/config6
$OECORE_NATIVE_SYSROOT/usr/bin/dot -c

120
sources/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb Normal file
View File

@@ -0,0 +1,120 @@
SUMMARY = "Graph Visualization Tools"
HOMEPAGE = "http://www.graphviz.org"
LICENSE = "EPL-1.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04"
DEPENDS = " \
bison-native \
groff-native \
libtool \
gdk-pixbuf \
cairo \
pango \
expat \
freetype \
"
DEPENDS:append:class-target = " ${BPN}-native"
DEPENDS:append:class-nativesdk = " ${BPN}-native"
inherit autotools-brokensep pkgconfig gettext qemu
SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \
file://0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch \
file://CVE-2023-46045-0001.patch \
file://CVE-2023-46045-0002.patch \
file://CVE-2023-46045-0003.patch \
"
SRC_URI:append:class-nativesdk = "\
file://graphviz-setup.sh \
"
SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565"
PACKAGECONFIG ??= "librsvg"
PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg"
EXTRA_OECONF:append = " PS2PDF=/bin/echo --disable-man-pdfs"
EXTRA_OECONF:class-target = "\
--with-expatincludedir=${STAGING_INCDIR} \
--with-expatlibdir=${STAGING_LIBDIR} \
--without-included-ltdl \
--disable-java \
--disable-tcl \
--disable-r \
--disable-sharp \
"
EXTRA_OECONF:class-nativesdk = "\
--with-expatincludedir=${STAGING_INCDIR} \
--with-expatlibdir=${STAGING_LIBDIR} \
--without-included-ltdl \
--disable-java \
--disable-tcl \
--disable-r \
--disable-sharp \
"
EXTRA_OECONF:class-native = "\
--disable-tcl \
"
CFLAGS:append:class-target = " -D_typ_ssize_t=1 -D_long_double=1"
CFLAGS:append:class-nativesdk = " -D_typ_ssize_t=1 -D_long_double=1"
do_configure:prepend() {
cd ${S}
# create version.m4 and ignore libtoolize errors
./autogen.sh NOCONFIG || true
}
do_install:append:class-nativesdk() {
# graphviz-setup.sh must be executed at SDK installation
install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d
}
FILES:${PN}:class-nativesdk += "${SDKPATHNATIVE}"
# create /usr/lib/graphviz/config6
graphviz_sstate_postinst() {
mkdir -p ${SYSROOT_DESTDIR}${bindir}
dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN}
echo '#!/bin/sh' > $dest
echo '' >> $dest
echo 'dot -c' >> $dest
chmod 0755 $dest
}
SYSROOT_PREPROCESS_FUNCS:append:class-native = " graphviz_sstate_postinst"
pkg_postinst:${PN} () {
if [ -n "$D" ]; then
if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then
${@qemu_run_binary(d, '$D', '${bindir}/dot')} -c
fi
else
dot -c
fi
}
pkg_postrm:${PN} () {
rm -f $D${libdir}/graphviz/config*
rmdir --ignore-fail-on-non-empty $D${libdir}/graphviz
}
PACKAGE_WRITE_DEPS += "qemu-native"
PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo"
FILES:${PN}-python += "${PYTHON_SITEPACKAGES_DIR}/ ${libdir}/graphviz/python/"
FILES:${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/"
FILES:${PN}-demo += "${datadir}/graphviz/demo/"
RDEPENDS:${PN}-perl += "perl"
RDEPENDS:${PN}-python += "python3"
RDEPENDS:${PN}-demo += "python3 perl"
RRECOMMENDS:${PN} = "liberation-fonts"
INSANE_SKIP:${PN}-perl = "dev-so"
INSANE_SKIP:${PN}-python = "dev-so"
FILES_SOLIBSDEV:append = " ${libdir}/graphviz/lib*${SOLIBSDEV}"
RRECOMMENDS:${PN} = "liberation-fonts"
BBCLASSEXTEND = "native nativesdk"

36
sources/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch Normal file
View File

@@ -0,0 +1,36 @@
From f8ac48abded02353918b02db38629988bd111c46 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 27 Jun 2017 08:19:44 -0700
Subject: [PATCH 1/2] Include stdlib.h for exit() API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes
main.c:81: warning: incompatible implicit declaration of built-in function ‘exit’
Patch from Debian
http://sources.debian.net/src/gtkperf/0.40%2Bds-2/debian/patches/01-include_stdlib.patch/
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
src/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main.c b/src/main.c
index 888eb36..c226799 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,6 +11,7 @@
#endif
#include <getopt.h>
+#include <stdlib.h>
#include "interface.h"
#include "support.h"
--
2.13.2

27
sources/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-main.c-Define-prototype-for-setup_appdata.patch Normal file
View File

@@ -0,0 +1,27 @@
From 6b5f695cb206cd8b3cbcbcd7713e52772e89306b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 2 Sep 2022 20:47:32 -0700
Subject: [PATCH] main.c: Define prototype for setup_appdata
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main.c b/src/main.c
index c226799..b4ce6d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,6 +18,8 @@
#include "callbacks.h"
#include "appdata.h"
+void setup_appdata(AppData * appdata_in);
+
int
main (int argc, char **argv)
{
--
2.37.3

44
sources/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch Normal file
View File

@@ -0,0 +1,44 @@
From 47974b8473c5b928f6742caee466f5c2d4d2e9eb Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 27 Jun 2017 08:22:26 -0700
Subject: [PATCH 2/2] timing.c: Fix format-security errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
src/timing.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/timing.c b/src/timing.c
index 0b8f0eb..c0668c9 100644
--- a/src/timing.c
+++ b/src/timing.c
@@ -97,7 +97,7 @@ add_test_info_time (AppData * appdata)
gtk_text_buffer_insert (appdata->textview_info_buffer, &iter,
timestring, -1);
- g_printf (timestring);
+ g_printf ("%s", timestring);
}
@@ -129,7 +129,7 @@ add_test_info_end (AppData * appdata)
gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
" Test Finished");
- g_printf (timestring);
+ g_printf ("%s", timestring);
}
@@ -154,5 +154,5 @@ add_test_info_start (AppData * appdata)
gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
" Running tests...");
- g_printf (timestring);
+ g_printf ("%s", timestring);
}
--
2.13.2

25
sources/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/Makevars Normal file
View File

@@ -0,0 +1,25 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
# These two variables depend on the location of this directory.
subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
# package. (Note that the msgstr strings, extracted from the package's
# sources, belong to the copyright holder of the package.) Translators are
# expected to transfer the copyright for their translations to this person
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
COPYRIGHT_HOLDER = Free Software Foundation, Inc.
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =

36
sources/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch Normal file
View File

@@ -0,0 +1,36 @@
Fix build with gettext 0.20.x
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
## If you don't want it to overwrite it,
## Please disable it in the Anjuta project configuration
-SUBDIRS = intl po src pixmaps
+SUBDIRS = po src pixmaps
gtkperfdocdir = ${prefix}/doc/gtkperf
gtkperfdoc_DATA = \
--- a/configure.in
+++ b/configure.in
@@ -31,8 +31,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
dnl Languages which your application supports
ALL_LINGUAS=""
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.10.40)
+AM_GNU_GETTEXT([external])
dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
@@ -100,7 +99,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "
AC_OUTPUT([
Makefile
-intl/Makefile
po/Makefile.in
src/Makefile
pixmaps/Makefile

34
sources/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb Normal file
View File

@@ -0,0 +1,34 @@
SUMMARY = "GTK Performance tool"
SECTION = "libs"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BPN}_${PV}.tar.gz \
file://Makevars \
file://0001-Include-stdlib.h-for-exit-API.patch \
file://0002-timing.c-Fix-format-security-errors.patch \
file://gettext.patch \
file://0001-main.c-Define-prototype-for-setup_appdata.patch \
"
SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53"
SRC_URI[sha256sum] = "9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b"
DEPENDS = "gtk+"
S = "${WORKDIR}/${BPN}"
inherit features_check autotools binconfig pkgconfig gettext
REQUIRED_DISTRO_FEATURES = "x11"
do_configure:prepend () {
rm -f ${S}/m4/init.m4
cp -f ${WORKDIR}/Makevars ${S}/po/
}
do_install:append () {
rm -rf ${D}/${exec_prefix}/doc
}
FILES:${PN} += "${exec_prefix}/share/duck.png"

44
sources/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.119.bb Normal file
View File

@@ -0,0 +1,44 @@
SUMMARY = "VCD (Value Change Dump) file waveform viewer"
DESCRIPTION = "gtkwave is a viewer for VCD (Value Change Dump) files which are usually created by digital circuit simulators. (These files have no connection to video CDs!) "
HOMEPAGE = "http://gtkwave.sourceforge.net/"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz"
SRC_URI[sha256sum] = "eab3e09e7641115c07848bfb30f7dd0c3bbe2b8cbe45017e95e077dbba6ac038"
S = "${WORKDIR}/${BPN}-gtk3-${PV}"
DEPENDS = " \
gperf-native \
gtk+3 \
gdk-pixbuf \
tcl \
tk \
bzip2 \
xz \
pango \
zlib \
"
inherit pkgconfig autotools gettext texinfo mime mime-xdg
inherit features_check
# depends on gtk+3 which has this restriction
# ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
# but https://github.com/gtkwave/gtkwave/blob/f9d82a82aa3ddc30ca47984278371f62c9a3bd81/gtkwave3-gtk3/src/gtk23compat.h#L10
# explicitly includes gdk/gdkwayland.h for gtk-3.22.26 and newer (oe-core currently has 3.24.29)
# and it needs x11 as well for tk dependency (so it happends to be both GTK3DISTROFEATURES instead of either of them)
REQUIRED_DISTRO_FEATURES = "wayland x11"
EXTRA_OECONF = " \
--enable-gtk3 \
--with-tcl=${STAGING_BINDIR_CROSS} \
--with-tk=${STAGING_BINDIR_CROSS} \
--with-tirpc \
--disable-mime-update \
"
FILES:${PN} = "${bindir} ${datadir}"
RDEPENDS:${PN} += "tk-lib"

38
sources/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb Normal file
View File

@@ -0,0 +1,38 @@
SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation"
HOMEPAGE = "https://sourceforge.net/projects/enlightenment/"
SECTION = "libs"
LICENSE = "Imlib2"
LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
DEPENDS = "freetype "
PROVIDES = "virtual/imlib2"
PV = "1.12.2"
SRCREV = "a860e34b19af6b0a73d86ddc0e4829145e18fa6e"
inherit autotools pkgconfig lib_package
AUTO_LIBNAME_PKGS = ""
SRC_URI = "git://git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
X11_DEPS = "virtual/libx11 libxext libice"
PACKAGECONFIG[x11] = "--with-x,--without-x,${X11_DEPS}"
PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg"
PACKAGECONFIG[png] = "--with-png,--without-png,libpng"
PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff"
PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag"
PACKAGES =+ "${BPN}-loaders ${BPN}-filters ${BPN}-data"
FILES:${PN}-data = "${datadir}"
FILES:imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
FILES:imlib2-filters = "${libdir}/imlib2/filters/*.so"

34
sources/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb Normal file
View File

@@ -0,0 +1,34 @@
SUMMARY = "Jpeg 2000 implementation"
HOMEPAGE = "https://jasper-software.github.io/jasper/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a80440d1d8f17d041c71c7271d6e06eb"
SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master"
SRCREV = "917f7708b755d8434f70618108c1a76f1b6a0a82"
CVE_STATUS[CVE-2015-8751] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
S = "${WORKDIR}/git"
inherit cmake multilib_header
do_configure:prepend() {
JAS_STDC_VERSION="$(echo __STDC_VERSION__ | ${CPP} -E -P -)"
}
EXTRA_OECMAKE:append = " -DJAS_STDC_VERSION=${JAS_STDC_VERSION}"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl', '', d)} \
jpeg"
PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=ON,-DJAS_ENABLE_LIBJPEG=OFF,jpeg,"
PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=ON,-DJAS_ENABLE_OPENGL=OFF,freeglut,"
do_install:append() {
chrpath -d ${D}${bindir}/jasper
chrpath -d ${D}${bindir}/imginfo
chrpath -d ${D}${bindir}/imgcmp
chrpath -d ${D}${libdir}/libjasper.so.*
oe_multilib_header jasper/jas_config.h
}

19
sources/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb Normal file
View File

@@ -0,0 +1,19 @@
DESCRIPTION = "A pedagogically-oriented open source site containing software that is broadly useful for image processing and image analysis applications"
DEPENDS = "jpeg tiff libpng zlib"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=809b282cea2df68975fbe0ffe02b560f"
UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases"
SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz"
SRC_URI[sha256sum] = "155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6"
EXTRA_OECONF += " \
--without-libwebp \
"
PACKAGECONFIG ??= "giflib"
PACKAGECONFIG[openjpeg] = "--with-libopenjpeg,--without-libopenjpeg,openjpeg"
PACKAGECONFIG[giflib] = "--with-giflib,--without-giflib,giflib"
inherit autotools pkgconfig

31
sources/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb Normal file
View File

@@ -0,0 +1,31 @@
SUMMARY = "libdecor - A client-side decorations library for Wayland clients"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7"
SRC_URI = " \
git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=master \
"
DEPENDS = " \
cairo \
pango \
wayland \
wayland-native \
wayland-protocols \
"
S = "${WORKDIR}/git"
SRCREV = "7807ae3480f5c6a37c5e8505d94af1e764aaf704"
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[install_demo] = "-Dinstall_demo=true,-Dinstall_demo=false"
PACKAGECONFIG[gtk+3] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3"
inherit meson pkgconfig
EXTRA_OEMESON += "--buildtype release"
BBCLASSEXTEND = "native nativesdk"

31
sources/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch Normal file
View File

@@ -0,0 +1,31 @@
From a57c498f6c25aa297e49533c242525f2b9da7048 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 13 Aug 2020 18:20:42 -0700
Subject: [PATCH] Make extern declarations in header file
curobj is a static object in other places as well.
Fixes build with gcc10/-fno-common
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
fdesign/sp_spinner.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c
index 04f2c19..6206daa 100644
--- a/fdesign/sp_spinner.c
+++ b/fdesign/sp_spinner.c
@@ -29,7 +29,7 @@
#include "spec/spinner_spec.h"
static FD_spinnerattrib * spn_attrib;
-FL_OBJECT *curobj;
+static FL_OBJECT *curobj;
/***************************************
--
2.28.0

33
sources/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch Normal file
View File

@@ -0,0 +1,33 @@
From d2d05928342f7f9f687ffea5e0b77f97f0ae5aad Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Wed, 7 Sep 2022 14:29:13 +0900
Subject: [PATCH] Modify include dir
error messagge:
../../xforms-1.2.4/lib/fd/cmdbr.h:28:10: fatal error: ../include/forms.h: No such file or directory
../include/forms.h specified in the header file cmdbr.h is not exist.
Upstream-Status: Pending
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
lib/fd/cmdbr.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/fd/cmdbr.h b/lib/fd/cmdbr.h
index 8495e05..2ddeced 100644
--- a/lib/fd/cmdbr.h
+++ b/lib/fd/cmdbr.h
@@ -25,7 +25,7 @@
#ifndef FD_cmd_h_
#define FD_cmd_h_
-#include "../include/forms.h"
+#include "include/forms.h"
/* Callbacks, globals and object handlers */
--
2.25.1

14
sources/meta-openembedded/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch Normal file
View File

@@ -0,0 +1,14 @@
Upstream-Status: Pending
diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am
--- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 12:58:51.968645873 +0000
+++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:00:48.500635163 +0000
@@ -11,7 +11,7 @@
fdesign.1:
cp -p $(srcdir)/fdesign.man fdesign.1
-INCLUDES = -I./xpm $(X_CFLAGS)
+INCLUDES = -I./xpm -I$(srcdir)/xpm $(X_CFLAGS)
bin_PROGRAMS = fdesign

14
sources/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch Normal file
View File

@@ -0,0 +1,14 @@
Upstream-Status: Pending
diff -Naur xforms-1.2.3.orig/lib/Makefile.am xforms-1.2.3/lib/Makefile.am
--- xforms-1.2.3.orig/lib/Makefile.am 2019-02-24 12:53:58.340678373 +0000
+++ xforms-1.2.3/lib/Makefile.am 2019-02-24 12:54:33.096674102 +0000
@@ -25,7 +25,7 @@
man_MANS = xforms.5
xforms.5:
- cp -p ./xforms.man xforms.5
+ cp -p $(srcdir)/xforms.man xforms.5
libforms_la_SOURCES = \
align.c \

14
sources/meta-openembedded/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch Normal file
View File

@@ -0,0 +1,14 @@
Upstream-Status: Pending
diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am
--- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 13:08:48.412603250 +0000
+++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:09:18.412601874 +0000
@@ -15,7 +15,7 @@
bin_PROGRAMS = fdesign
-fdesign_LDADD = $(top_srcdir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fdesign_LDADD = $(top_builddir)/lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
fdesign_SOURCES = \
fd_attribs.c \

26
sources/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb Normal file
View File

@@ -0,0 +1,26 @@
DESCRIPTION = "The XForms graphical interface widget library "
HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86"
SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar.gz \
file://fix-link-to-xforms-man.patch \
file://add-absolute-path-for-include-dir.patch \
file://fix-path-fdesign_LDADD.patch \
file://0001-Make-extern-declarations-in-header-file.patch \
file://0001-Modify-include-dir.patch \
"
SRC_URI[sha256sum] = "92b5e6466ea2dffca7332aec12734e65b3e961825eb3100b7d889c0d1abb4697"
inherit autotools features_check
REQUIRED_DISTRO_FEATURES = "opengl x11"
S = "${WORKDIR}/xforms-${PV}"
DEPENDS = "libxpm jpeg libx11 virtual/libgl"
RDEPENDS:${PN} = "bash"
EXTRA_OECONF = "--with-extra-inc=${S}/lib"

30
sources/meta-openembedded/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb Normal file
View File

@@ -0,0 +1,30 @@
DESCRIPTION = "libglvnd is a vendor-neutral dispatch layer for arbitrating \
OpenGL API calls between multiple vendors."
HOMEPAGE = "https://gitlab.freedesktop.org/glvnd/libglvnd"
LICENSE = "MIT & BSD-1-Clause & BSD-3-Clause & GPL-3.0-with-autoconf-exception"
LIC_FILES_CHKSUM = "file://README.md;beginline=323;md5=7ac5f0111f648b92fe5427efeb08e8c4"
SRC_URI = "git://git@gitlab.freedesktop.org/glvnd/libglvnd.git;protocol=https;branch=master"
# v1.5.0 tag
SRCREV = "faa23f21fc677af5792825dc30cb1ccef4bf33a6"
REQUIRED_DISTRO_FEATURES = "opengl"
inherit meson pkgconfig features_check
S = "${WORKDIR}/git"
PACKAGECONFIG ?= "\
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl gles1 gles2', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)} \
"
PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,libx11 libxext xorgproto"
PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,libx11 libxext xorgproto"
PACKAGECONFIG[egl] = "-Degl=true,-Degl=false,"
PACKAGECONFIG[gles1] = "-Dgles1=true,-Dgles1=false,"
PACKAGECONFIG[gles2] = "-Dgles2=true,-Dgles2=false,"
BBCLASSEXTEND = "native nativesdk"

23
sources/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb Normal file
View File

@@ -0,0 +1,23 @@
# Copyright (C) 2016 Khem Raj <raj.khem@gmail.com>
# Released under the MIT license (see COPYING.MIT for the terms)
DESCRIPTION = "Development files for the Multiple-image Network Graphics library"
HOMEPAGE = "http://www.libpng.org/pub/mng/"
LICENSE = "Zlib"
LIC_FILES_CHKSUM = "file://LICENSE;md5=32becdb8930f90eab219a8021130ec09"
SECTION = "devel"
DEPENDS = "zlib"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
SRC_URI[md5sum] = "7e9a12ba2a99dff7e736902ea07383d4"
SRC_URI[sha256sum] = "cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa"
inherit autotools-brokensep pkgconfig
PACKAGECONFIG ??= "jpeg"
PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg"
PACKAGECONFIG[lcms] = "--with-lcms2,--without-lcms2,lcms"
BBCLASSEXTEND = "native"

73
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch Normal file
View File

@@ -0,0 +1,73 @@
From 44e4bb4cfb81024c8f5fd2e179e8a32c42756a2f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 23 Jul 2017 16:52:43 -0700
Subject: [PATCH] build: Pass --tag=CC explictly when using libtool
Do not depend solely on libtool heuristics which fail
in OE case when building with external compiler and
hardening flags
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile.in | 4 ++--
build-scripts/makedep.sh | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index ab51035..743ce30 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,10 +72,10 @@ depend:
include $(depend)
$(objects)/$(TARGET): $(OBJECTS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
+ $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(SDLMAIN_LDFLAGS)
install: all install-bin install-hdrs install-lib install-data install-man
diff --git a/build-scripts/makedep.sh b/build-scripts/makedep.sh
index 3b3863b..dba28f2 100755
--- a/build-scripts/makedep.sh
+++ b/build-scripts/makedep.sh
@@ -51,19 +51,19 @@ do echo "Generating dependencies for $src"
case $ext in
c) cat >>${output}.new <<__EOF__
- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
__EOF__
;;
cc) cat >>${output}.new <<__EOF__
- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
__EOF__
;;
m) cat >>${output}.new <<__EOF__
- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
__EOF__
;;
@@ -75,7 +75,7 @@ __EOF__
;;
S) cat >>${output}.new <<__EOF__
- \$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
+ \$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) -c $src -o \$@
__EOF__
;;
--
2.13.3

29
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch Normal file
View File

@@ -0,0 +1,29 @@
From 97fefd050976bbbfca9608499f6a7d9fb86e70db Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 30 Jul 2019 11:00:00 -0700
Subject: [PATCH] Fixed bug 4538 - validate image size when loading BMP files
---
Upstream-Status: Pending
src/video/SDL_bmp.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index 8eadc5f..5b5e12c 100644
--- a/src/video/SDL_bmp.c
+++ b/src/video/SDL_bmp.c
@@ -143,6 +143,11 @@ SDL_Surface * SDL_LoadBMP_RW (SDL_RWops *src, int freesrc)
(void) biYPelsPerMeter;
(void) biClrImportant;
+ if (biWidth <= 0 || biHeight == 0) {
+ SDL_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight);
+ was_error = SDL_TRUE;
+ goto done;
+ }
if (biHeight < 0) {
topDown = SDL_TRUE;
biHeight = -biHeight;
--
2.25.1

114
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7572.patch Normal file
View File

@@ -0,0 +1,114 @@
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560182231 25200
# Mon Jun 10 08:57:11 2019 -0700
# Branch SDL-1.2
# Node ID a8afedbcaea0e84921dc770195c4699bda3ccdc5
# Parent faf9abbcfb5fe0d0ca23c4bf0394aa226ceccf02
CVE-2019-7572: Fix a buffer overwrite in IMA_ADPCM_decode
If data chunk was longer than expected based on a WAV format
definition, IMA_ADPCM_decode() tried to write past the output
buffer. This patch fixes it.
Based on patch from
<https://bugzilla.libsdl.org/show_bug.cgi?id=4496>.
CVE-2019-7572
https://bugzilla.libsdl.org/show_bug.cgi?id=4495
Signed-off-by: Petr Písař <ppisar@redhat.com>
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560041863 25200
# Sat Jun 08 17:57:43 2019 -0700
# Branch SDL-1.2
# Node ID e52413f5258600878f9a10d2f92605a729aa8976
# Parent 4e73be7b47877ae11d2279bd916910d469d18f8e
CVE-2019-7572: Fix a buffer overread in IMA_ADPCM_nibble
If an IMA ADPCM block contained an initial index out of step table
range (loaded in IMA_ADPCM_decode()), IMA_ADPCM_nibble() blindly used
this bogus value and that lead to a buffer overread.
This patch fixes it by moving clamping the index value at the
beginning of IMA_ADPCM_nibble() function instead of the end after
an update.
CVE-2019-7572
https://bugzilla.libsdl.org/show_bug.cgi?id=4495
Signed-off-by: Petr Písař <ppisar@redhat.com>
CVE: CVE-2019-7572
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
diff -r faf9abbcfb5f -r a8afedbcaea0 src/audio/SDL_wave.c
--- a/src/audio/SDL_wave.c Mon Jun 10 08:54:29 2019 -0700
+++ b/src/audio/SDL_wave.c Mon Jun 10 08:57:11 2019 -0700
@@ -346,7 +346,7 @@
static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
{
struct IMA_ADPCM_decodestate *state;
- Uint8 *freeable, *encoded, *encoded_end, *decoded;
+ Uint8 *freeable, *encoded, *encoded_end, *decoded, *decoded_end;
Sint32 encoded_len, samplesleft;
unsigned int c, channels;
@@ -373,6 +373,7 @@
return(-1);
}
decoded = *audio_buf;
+ decoded_end = decoded + *audio_len;
/* Get ready... Go! */
while ( encoded_len >= IMA_ADPCM_state.wavefmt.blockalign ) {
@@ -392,6 +393,7 @@
}
/* Store the initial sample we start with */
+ if (decoded + 2 > decoded_end) goto invalid_size;
decoded[0] = (Uint8)(state[c].sample&0xFF);
decoded[1] = (Uint8)(state[c].sample>>8);
decoded += 2;
@@ -402,6 +404,8 @@
while ( samplesleft > 0 ) {
for ( c=0; c<channels; ++c ) {
if (encoded + 4 > encoded_end) goto invalid_size;
+ if (decoded + 4 * 4 * channels > decoded_end)
+ goto invalid_size;
Fill_IMA_ADPCM_block(decoded, encoded,
c, channels, &state[c]);
encoded += 4;
diff -r 4e73be7b4787 -r e52413f52586 src/audio/SDL_wave.c
--- a/src/audio/SDL_wave.c Sat Jun 01 18:27:46 2019 +0100
+++ b/src/audio/SDL_wave.c Sat Jun 08 17:57:43 2019 -0700
@@ -264,6 +264,14 @@
};
Sint32 delta, step;
+ /* Clamp index value. The inital value can be invalid. */
+ if ( state->index > 88 ) {
+ state->index = 88;
+ } else
+ if ( state->index < 0 ) {
+ state->index = 0;
+ }
+
/* Compute difference and new sample value */
step = step_table[state->index];
delta = step >> 3;
@@ -275,12 +283,6 @@
/* Update index value */
state->index += index_table[nybble];
- if ( state->index > 88 ) {
- state->index = 88;
- } else
- if ( state->index < 0 ) {
- state->index = 0;
- }
/* Clamp output sample */
if ( state->sample > max_audioval ) {

68
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7574.patch Normal file
View File

@@ -0,0 +1,68 @@
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560181859 25200
# Mon Jun 10 08:50:59 2019 -0700
# Branch SDL-1.2
# Node ID a6e3d2f5183e1cc300ad993e10e9ce077e13bd9c
# Parent 388987dff7bf8f1e214e69c2e4f1aa31e06396b5
CVE-2019-7574: Fix a buffer overread in IMA_ADPCM_decode
If data chunk was shorter than expected based on a WAV format
definition, IMA_ADPCM_decode() tried to read past the data chunk
buffer. This patch fixes it.
CVE-2019-7574
https://bugzilla.libsdl.org/show_bug.cgi?id=4496
Signed-off-by: Petr Písař <ppisar@redhat.com>
CVE: CVE-2019-7574
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
diff -r 388987dff7bf -r a6e3d2f5183e src/audio/SDL_wave.c
--- a/src/audio/SDL_wave.c Sat Jun 08 18:02:09 2019 -0700
+++ b/src/audio/SDL_wave.c Mon Jun 10 08:50:59 2019 -0700
@@ -331,7 +331,7 @@
static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
{
struct IMA_ADPCM_decodestate *state;
- Uint8 *freeable, *encoded, *decoded;
+ Uint8 *freeable, *encoded, *encoded_end, *decoded;
Sint32 encoded_len, samplesleft;
unsigned int c, channels;
@@ -347,6 +347,7 @@
/* Allocate the proper sized output buffer */
encoded_len = *audio_len;
encoded = *audio_buf;
+ encoded_end = encoded + encoded_len;
freeable = *audio_buf;
*audio_len = (encoded_len/IMA_ADPCM_state.wavefmt.blockalign) *
IMA_ADPCM_state.wSamplesPerBlock*
@@ -362,6 +363,7 @@
while ( encoded_len >= IMA_ADPCM_state.wavefmt.blockalign ) {
/* Grab the initial information for this block */
for ( c=0; c<channels; ++c ) {
+ if (encoded + 4 > encoded_end) goto invalid_size;
/* Fill the state information for this block */
state[c].sample = ((encoded[1]<<8)|encoded[0]);
encoded += 2;
@@ -384,6 +386,7 @@
samplesleft = (IMA_ADPCM_state.wSamplesPerBlock-1)*channels;
while ( samplesleft > 0 ) {
for ( c=0; c<channels; ++c ) {
+ if (encoded + 4 > encoded_end) goto invalid_size;
Fill_IMA_ADPCM_block(decoded, encoded,
c, channels, &state[c]);
encoded += 4;
@@ -395,6 +398,10 @@
}
SDL_free(freeable);
return(0);
+invalid_size:
+ SDL_SetError("Unexpected chunk length for an IMA ADPCM decoder");
+ SDL_free(freeable);
+ return(-1);
}
SDL_AudioSpec * SDL_LoadWAV_RW (SDL_RWops *src, int freesrc,

81
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7575.patch Normal file
View File

@@ -0,0 +1,81 @@
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560183905 25200
# Mon Jun 10 09:25:05 2019 -0700
# Branch SDL-1.2
# Node ID a936f9bd3e381d67d8ddee8b9243f85799ea4798
# Parent fcbecae427951bac1684baaba2ade68221315140
CVE-2019-7575: Fix a buffer overwrite in MS_ADPCM_decode
If a WAV format defines shorter audio stream and decoded MS ADPCM data chunk
is longer, decoding continued past the output audio buffer.
This fix is based on a patch from
<https://bugzilla.libsdl.org/show_bug.cgi?id=4492>.
https://bugzilla.libsdl.org/show_bug.cgi?id=4493
CVE-2019-7575
Signed-off-by: Petr Písař <ppisar@redhat.com>
CVE: CVE-2019-7575
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
diff -r fcbecae42795 -r a936f9bd3e38 src/audio/SDL_wave.c
--- a/src/audio/SDL_wave.c Mon Jun 10 09:06:23 2019 -0700
+++ b/src/audio/SDL_wave.c Mon Jun 10 09:25:05 2019 -0700
@@ -122,7 +122,7 @@
static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
{
struct MS_ADPCM_decodestate *state[2];
- Uint8 *freeable, *encoded, *encoded_end, *decoded;
+ Uint8 *freeable, *encoded, *encoded_end, *decoded, *decoded_end;
Sint32 encoded_len, samplesleft;
Sint8 nybble, stereo;
Sint16 *coeff[2];
@@ -142,6 +142,7 @@
return(-1);
}
decoded = *audio_buf;
+ decoded_end = decoded + *audio_len;
/* Get ready... Go! */
stereo = (MS_ADPCM_state.wavefmt.channels == 2);
@@ -149,7 +150,7 @@
state[1] = &MS_ADPCM_state.state[stereo];
while ( encoded_len >= MS_ADPCM_state.wavefmt.blockalign ) {
/* Grab the initial information for this block */
- if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto too_short;
+ if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto invalid_size;
state[0]->hPredictor = *encoded++;
if ( stereo ) {
state[1]->hPredictor = *encoded++;
@@ -179,6 +180,7 @@
coeff[1] = MS_ADPCM_state.aCoeff[state[1]->hPredictor];
/* Store the two initial samples we start with */
+ if (decoded + 4 + (stereo ? 4 : 0) > decoded_end) goto invalid_size;
decoded[0] = state[0]->iSamp2&0xFF;
decoded[1] = state[0]->iSamp2>>8;
decoded += 2;
@@ -200,7 +202,8 @@
samplesleft = (MS_ADPCM_state.wSamplesPerBlock-2)*
MS_ADPCM_state.wavefmt.channels;
while ( samplesleft > 0 ) {
- if (encoded + 1 > encoded_end) goto too_short;
+ if (encoded + 1 > encoded_end) goto invalid_size;
+ if (decoded + 4 > decoded_end) goto invalid_size;
nybble = (*encoded)>>4;
new_sample = MS_ADPCM_nibble(state[0],nybble,coeff[0]);
@@ -223,8 +226,8 @@
}
SDL_free(freeable);
return(0);
-too_short:
- SDL_SetError("Too short chunk for a MS ADPCM decoder");
+invalid_size:
+ SDL_SetError("Unexpected chunk length for a MS ADPCM decoder");
SDL_free(freeable);
return(-1);
invalid_predictor:

80
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7576.patch Normal file
View File

@@ -0,0 +1,80 @@
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560182783 25200
# Mon Jun 10 09:06:23 2019 -0700
# Branch SDL-1.2
# Node ID fcbecae427951bac1684baaba2ade68221315140
# Parent a8afedbcaea0e84921dc770195c4699bda3ccdc5
CVE-2019-7573, CVE-2019-7576: Fix buffer overreads in InitMS_ADPCM
If MS ADPCM format chunk was too short, InitMS_ADPCM() parsing it
could read past the end of chunk data. This patch fixes it.
CVE-2019-7573
https://bugzilla.libsdl.org/show_bug.cgi?id=4491
CVE-2019-7576
https://bugzilla.libsdl.org/show_bug.cgi?id=4490
Signed-off-by: Petr Písař <ppisar@redhat.com>
CVE: CVE-2019-7573
CVE: CVE-2019-7576
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
diff -r a8afedbcaea0 -r fcbecae42795 src/audio/SDL_wave.c
--- a/src/audio/SDL_wave.c Mon Jun 10 08:57:11 2019 -0700
+++ b/src/audio/SDL_wave.c Mon Jun 10 09:06:23 2019 -0700
@@ -44,12 +44,13 @@
struct MS_ADPCM_decodestate state[2];
} MS_ADPCM_state;
-static int InitMS_ADPCM(WaveFMT *format)
+static int InitMS_ADPCM(WaveFMT *format, int length)
{
- Uint8 *rogue_feel;
+ Uint8 *rogue_feel, *rogue_feel_end;
int i;
/* Set the rogue pointer to the MS_ADPCM specific data */
+ if (length < sizeof(*format)) goto too_short;
MS_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
MS_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
MS_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
@@ -58,9 +59,11 @@
MS_ADPCM_state.wavefmt.bitspersample =
SDL_SwapLE16(format->bitspersample);
rogue_feel = (Uint8 *)format+sizeof(*format);
+ rogue_feel_end = (Uint8 *)format + length;
if ( sizeof(*format) == 16 ) {
rogue_feel += sizeof(Uint16);
}
+ if (rogue_feel + 4 > rogue_feel_end) goto too_short;
MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1]<<8)|rogue_feel[0]);
rogue_feel += sizeof(Uint16);
MS_ADPCM_state.wNumCoef = ((rogue_feel[1]<<8)|rogue_feel[0]);
@@ -70,12 +73,16 @@
return(-1);
}
for ( i=0; i<MS_ADPCM_state.wNumCoef; ++i ) {
+ if (rogue_feel + 4 > rogue_feel_end) goto too_short;
MS_ADPCM_state.aCoeff[i][0] = ((rogue_feel[1]<<8)|rogue_feel[0]);
rogue_feel += sizeof(Uint16);
MS_ADPCM_state.aCoeff[i][1] = ((rogue_feel[1]<<8)|rogue_feel[0]);
rogue_feel += sizeof(Uint16);
}
return(0);
+too_short:
+ SDL_SetError("Unexpected length of a chunk with a MS ADPCM format");
+ return(-1);
}
static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
@@ -495,7 +502,7 @@
break;
case MS_ADPCM_CODE:
/* Try to understand this */
- if ( InitMS_ADPCM(format) < 0 ) {
+ if ( InitMS_ADPCM(format, lenread) < 0 ) {
was_error = 1;
goto done;
}

118
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch Normal file
View File

@@ -0,0 +1,118 @@
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560182051 25200
# Mon Jun 10 08:54:11 2019 -0700
# Branch SDL-1.2
# Node ID 416136310b88cbeeff8773e573e90ac1e22b3526
# Parent a6e3d2f5183e1cc300ad993e10e9ce077e13bd9c
CVE-2019-7577: Fix a buffer overread in MS_ADPCM_decode
If RIFF/WAV data chunk length is shorter then expected for an audio
format defined in preceeding RIFF/WAV format headers, a buffer
overread can happen.
This patch fixes it by checking a MS ADPCM data to be decoded are not
past the initialized buffer.
CVE-2019-7577
Reproducer: https://bugzilla.libsdl.org/show_bug.cgi?id=4492
Signed-off-by: Petr Písař <ppisar@redhat.com>
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560182069 25200
# Mon Jun 10 08:54:29 2019 -0700
# Branch SDL-1.2
# Node ID faf9abbcfb5fe0d0ca23c4bf0394aa226ceccf02
# Parent 416136310b88cbeeff8773e573e90ac1e22b3526
CVE-2019-7577: Fix a buffer overread in MS_ADPCM_nibble and MS_ADPCM_decode
If a chunk of RIFF/WAV file with MS ADPCM encoding contains an invalid
predictor (a valid predictor's value is between 0 and 6 inclusive),
a buffer overread can happen when the predictor is used as an index
into an array of MS ADPCM coefficients.
The overead happens when indexing MS_ADPCM_state.aCoeff[] array in
MS_ADPCM_decode() and later when dereferencing a coef pointer in
MS_ADPCM_nibble().
This patch fixes it by checking the MS ADPCM predictor values fit
into the valid range.
CVE-2019-7577
Reproducer: https://bugzilla.libsdl.org/show_bug.cgi?id=4492
Signed-off-by: Petr Písař <ppisar@redhat.com>
CVE: CVE-2019-7577
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Refresh CVE-2019-7577.patch as it can't be applyed when using PATCHTOOL = "patch".
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
---
src/audio/SDL_wave.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index b4ad6c7..0bcf7e2 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -115,7 +115,7 @@ static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
{
struct MS_ADPCM_decodestate *state[2];
- Uint8 *freeable, *encoded, *decoded;
+ Uint8 *freeable, *encoded, *encoded_end, *decoded;
Sint32 encoded_len, samplesleft;
Sint8 nybble, stereo;
Sint16 *coeff[2];
@@ -124,6 +124,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
/* Allocate the proper sized output buffer */
encoded_len = *audio_len;
encoded = *audio_buf;
+ encoded_end = encoded + encoded_len;
freeable = *audio_buf;
*audio_len = (encoded_len/MS_ADPCM_state.wavefmt.blockalign) *
MS_ADPCM_state.wSamplesPerBlock*
@@ -141,10 +142,14 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
state[1] = &MS_ADPCM_state.state[stereo];
while ( encoded_len >= MS_ADPCM_state.wavefmt.blockalign ) {
/* Grab the initial information for this block */
+ if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto too_short;
state[0]->hPredictor = *encoded++;
if ( stereo ) {
state[1]->hPredictor = *encoded++;
}
+ if (state[0]->hPredictor >= 7 || state[1]->hPredictor >= 7) {
+ goto invalid_predictor;
+ }
state[0]->iDelta = ((encoded[1]<<8)|encoded[0]);
encoded += sizeof(Sint16);
if ( stereo ) {
@@ -188,6 +193,8 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
samplesleft = (MS_ADPCM_state.wSamplesPerBlock-2)*
MS_ADPCM_state.wavefmt.channels;
while ( samplesleft > 0 ) {
+ if (encoded + 1 > encoded_end) goto too_short;
+
nybble = (*encoded)>>4;
new_sample = MS_ADPCM_nibble(state[0],nybble,coeff[0]);
decoded[0] = new_sample&0xFF;
@@ -209,6 +216,14 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
}
SDL_free(freeable);
return(0);
+too_short:
+ SDL_SetError("Too short chunk for a MS ADPCM decoder");
+ SDL_free(freeable);
+ return(-1);
+invalid_predictor:
+ SDL_SetError("Invalid predictor value for a MS ADPCM decoder");
+ SDL_free(freeable);
+ return(-1);
}
struct IMA_ADPCM_decodestate {
--
2.7.4

64
sources/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7578.patch Normal file
View File

@@ -0,0 +1,64 @@
# HG changeset patch
# User Petr Písař <ppisar@redhat.com>
# Date 1560042129 25200
# Sat Jun 08 18:02:09 2019 -0700
# Branch SDL-1.2
# Node ID 388987dff7bf8f1e214e69c2e4f1aa31e06396b5
# Parent e52413f5258600878f9a10d2f92605a729aa8976
CVE-2019-7578: Fix a buffer overread in InitIMA_ADPCM
If IMA ADPCM format chunk was too short, InitIMA_ADPCM() parsing it
could read past the end of chunk data. This patch fixes it.
CVE-2019-7578
https://bugzilla.libsdl.org/show_bug.cgi?id=4494
Signed-off-by: Petr Písař <ppisar@redhat.com>
CVE: CVE-2019-7578
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
diff -r e52413f52586 -r 388987dff7bf src/audio/SDL_wave.c
--- a/src/audio/SDL_wave.c Sat Jun 08 17:57:43 2019 -0700
+++ b/src/audio/SDL_wave.c Sat Jun 08 18:02:09 2019 -0700
@@ -222,11 +222,12 @@
struct IMA_ADPCM_decodestate state[2];
} IMA_ADPCM_state;
-static int InitIMA_ADPCM(WaveFMT *format)
+static int InitIMA_ADPCM(WaveFMT *format, int length)
{
- Uint8 *rogue_feel;
+ Uint8 *rogue_feel, *rogue_feel_end;
/* Set the rogue pointer to the IMA_ADPCM specific data */
+ if (length < sizeof(*format)) goto too_short;
IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
@@ -235,11 +236,16 @@
IMA_ADPCM_state.wavefmt.bitspersample =
SDL_SwapLE16(format->bitspersample);
rogue_feel = (Uint8 *)format+sizeof(*format);
+ rogue_feel_end = (Uint8 *)format + length;
if ( sizeof(*format) == 16 ) {
rogue_feel += sizeof(Uint16);
}
+ if (rogue_feel + 2 > rogue_feel_end) goto too_short;
IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1]<<8)|rogue_feel[0]);
return(0);
+too_short:
+ SDL_SetError("Unexpected length of a chunk with an IMA ADPCM format");
+ return(-1);
}
static Sint32 IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state,Uint8 nybble)
@@ -471,7 +477,7 @@
break;
case IMA_ADPCM_CODE:
/* Try to understand this */
- if ( InitIMA_ADPCM(format) < 0 ) {
+ if ( InitIMA_ADPCM(format, lenread) < 0 ) {
was_error = 1;
goto done;
}

Some files were not shown because too many files have changed in this diff Show More