diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics')
15 files changed, 185 insertions, 18 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb index 29d0f64ac..7ac302821 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb @@ -19,7 +19,10 @@ SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ " SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" -inherit pkgconfig +inherit pkgconfig features_check + +# Depends on libepoxy +REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OEMAKE = "STRIP= 'srcdir=${S}' -f ${S}/GNUmakefile" diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.20.bb index e121ae946..356c78c0d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.20.bb @@ -1,10 +1,10 @@ SUMMARY = "Jpeg 2000 implementation" -HOMEPAGE = "https://github.com/mdadams/jasper" +HOMEPAGE = "https://github.com/jasper-software/jasper" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" -SRC_URI = "git://github.com/mdadams/jasper.git;protocol=https" -SRCREV = "7d8cfd8ac16d1af9b51e5ccd781e898f0fbf57cc" +SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" +SRCREV = "d10a710f31da3d079a984d35ff6cc82a853d25d7" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.80.0.bb index a6de1f795..a861bba5b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.80.0.bb @@ -1,13 +1,13 @@ 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=34aa579294e8284b7b848c8d5d361e8f" +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[md5sum] = "a545654b1dae7d29e2ea346b29095f84" -SRC_URI[sha256sum] = "045966c9c5d60ebded314a9931007a56d9d2f7a6ac39cb5cc077c816f62300d8" +SRC_URI[md5sum] = "d640d684234442a84c9e8902f0b3ff36" +SRC_URI[sha256sum] = "ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4" EXTRA_OECONF += " \ --without-libwebp \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch new file mode 100644 index 000000000..f5ce11a27 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch @@ -0,0 +1,51 @@ +From e8e258ab049240c2dd1f1051b4e773b21e2d3dc0 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sun, 28 Jun 2020 14:19:59 +0200 +Subject: [PATCH] opj_decompress: fix double-free on input directory with mix + of valid and invalid images (CVE-2020-15389) + +Fixes #1261 + +Credits to @Ruia-ruia for reporting and analysis. +--- + src/bin/jp2/opj_decompress.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- end of original header --- + +CVE: CVE-2020-15389 + +Upstream-Status: Backport [git://github.com/uclouvain/openjpeg.git] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +--- +diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c +index 7eeb0952..2634907f 100644 +--- a/src/bin/jp2/opj_decompress.c ++++ b/src/bin/jp2/opj_decompress.c +@@ -1316,10 +1316,6 @@ static opj_image_t* upsample_image_components(opj_image_t* original) + int main(int argc, char **argv) + { + opj_decompress_parameters parameters; /* decompression parameters */ +- opj_image_t* image = NULL; +- opj_stream_t *l_stream = NULL; /* Stream */ +- opj_codec_t* l_codec = NULL; /* Handle to a decompressor */ +- opj_codestream_index_t* cstr_index = NULL; + + OPJ_INT32 num_images, imageno; + img_fol_t img_fol; +@@ -1393,6 +1389,10 @@ int main(int argc, char **argv) + + /*Decoding image one by one*/ + for (imageno = 0; imageno < num_images ; imageno++) { ++ opj_image_t* image = NULL; ++ opj_stream_t *l_stream = NULL; /* Stream */ ++ opj_codec_t* l_codec = NULL; /* Handle to a decompressor */ ++ opj_codestream_index_t* cstr_index = NULL; + + if (!parameters.quiet) { + fprintf(stderr, "\n"); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb index 42011efa9..a0740a274 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb @@ -10,6 +10,7 @@ SRC_URI = " \ file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ file://CVE-2020-6851.patch \ file://CVE-2020-8112.patch \ + file://CVE-2020-15389.patch \ " SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb b/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb new file mode 100644 index 000000000..906179501 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb @@ -0,0 +1,25 @@ +SECTION = "shadow" +LICENSE = "MIT-X" +LIC_FILES_CHKSUM = "file://LICENSE;md5=04c3ca13a702147c62db90f556c5b3ca" +SRC_URI = "http://dl.suckless.org/${BPN}/${BP}.tar.gz" + +inherit pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6" + +DEPENDS += "libx11 libxft fontconfig ncurses-native" + +RDEPENDS_${PN} += "libx11-locale" + +do_compile() { + make INCS='-I. `pkg-config --cflags x11 fontconfig xft`' LIBS='-lm -lutil `pkg-config --libs x11 fontconfig xft`' +} +do_install() { + make install DESTDIR=${D} PREFIX=/usr TERMINFO=${D}${datadir}/terminfo +} + +FILES_${PN} += " \ + ${datadir}/terminfo \ +" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract/0001-include-sys-time.h.patch b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract/0001-include-sys-time.h.patch new file mode 100644 index 000000000..de1fa75b7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract/0001-include-sys-time.h.patch @@ -0,0 +1,34 @@ +From b47fa9532a7090d76521603dbc818bdec100085f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Sep 2020 17:04:27 -0700 +Subject: [PATCH] include sys/time.h + +This provides missing definitions of timeval stuct + +Fixes +| ../../../git/src/ccutil/ocrclass.h:154:7: error: member access into +incomplete type 'struct timeval' +| tv->tv_usec = (millisecs.count() % 1000) * 1000; + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ccutil/ocrclass.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h +index d39a6dd6..96395c9b 100644 +--- a/src/ccutil/ocrclass.h ++++ b/src/ccutil/ocrclass.h +@@ -28,6 +28,8 @@ + + #include <chrono> + #include <ctime> ++#include <sys/time.h> ++ + #ifdef _WIN32 + #include <winsock2.h> // for timeval + #endif +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_git.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb index 89d09a0f5..3b5032f06 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_4.1.1.bb @@ -1,19 +1,22 @@ SUMMARY = "A commercial quality OCR engine " +HOMEPAGE = "https://github.com/tesseract-ocr/tesseract" +BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=7ea4f9a43aba9d3c849fe5c203a0ed40" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +BRANCH = "4.1" +SRCREV = "f4ef2f2050f4c25b28bdbf0063b7d2eb30f41cf7" +SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH} \ + file://0001-include-sys-time.h.patch \ + " -BRANCH = "3.05" -PV = "${BRANCH}.01+git${SRCPV}" -SRCREV = "215866151e774972c9502282111b998d7a053562" -SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH}" S = "${WORKDIR}/git" DEPENDS = "leptonica" EXTRA_OECONF += "LIBLEPT_HEADERSDIR=${STAGING_INCDIR}/leptonica" - inherit autotools pkgconfig FILES_${PN} += "${datadir}/tessdata" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts/44-source-code-pro-fonts-fontconfig.conf b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts/44-source-code-pro-fonts-fontconfig.conf new file mode 100644 index 000000000..badb1b011 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts/44-source-code-pro-fonts-fontconfig.conf @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <alias> + <family>monospace</family> + <prefer> + <family>Source Code Pro</family> + </prefer> + </alias> + <alias> + <family>Source Code Pro</family> + <default> + <family>monospace</family> + </default> + </alias> +</fontconfig> + diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb new file mode 100644 index 000000000..5d10195f7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb @@ -0,0 +1,29 @@ +require ttf.inc + +SUMMARY = "Adobe Source Code Pro" +HOMEPAGE = "https://github.com/adobe-fonts/source-code-pro" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c7c16bdc2c96af797293d68503e5c65c" + +inherit allarch fontcache + +SRC_URI = " \ + https://github.com/adobe-fonts/source-code-pro/releases/download/2.030R-ro/1.050R-it/source-code-pro-2.030R-ro-1.050R-it.zip \ + file://44-source-code-pro-fonts-fontconfig.conf \ +" +SRC_URI[sha256sum] = "da2ac159497d31b0c6d9daa8fc390fb8252e75b4a9805ace6a2c9cccaed4932e" +S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it" + +do_install() { + install -d ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${WORKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ + + install -d ${D}${datadir}/fonts/truetype/ + find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; +} + +FILES_${PN} = " \ + ${sysconfdir}/fonts \ + ${datadir}/fonts \ +" + diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb index 5b406bc65..57efea86a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb @@ -24,6 +24,8 @@ do_install_append () { install -m 0644 LiberationSansNarrow*.ttf ${D}${datadir}/fonts/TTF/ install -D -m 0644 ${WORKDIR}/30-0-liberation-sans-narrow.conf ${D}${sysconfdir}/conf.avail/30-${PN}-sans.conf install -D -m 0644 ${S}/License.txt ${D}${datadir}/licenses/${PN}/LICENSE + # normal liberation fonts come from ttf-liberation recipe so delete here + rm -rf ${D}${datadir}/fonts/truetype } PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 4a297c313..e64a935dd 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -2,7 +2,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "\ - git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;tag=${BPN}-${PV};name=vk-gl-cts \ + git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang \ git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers \ @@ -12,7 +12,7 @@ SRC_URI = "\ S = "${WORKDIR}/git" -SRCREV_FORMAT = "vk-gl-cts" +SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb index 0e50fd947..5e0076b20 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb @@ -1,7 +1,8 @@ DESCRIPTION = "OpenGL CTS" require khronos-cts.inc - +# opengl-es-cts-3.2.6.1 +SRCREV_vk-gl-cts = "7e023f81b4fff54b558882fe739d7c959d0a02a8" SRCREV_amber = "d26ee22dd7faab1845a531d410f7ec1db407402a" SRCREV_glslang = "c538b5d796fb24dd418fdd650c7f76e56bcc3dd8" SRCREV_spirv-headers = "e4322e3be589e1ddd44afb20ea842a977c1319b8" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.2.bb index 77064d4ed..f07b12dec 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.2.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Vulkan CTS" require khronos-cts.inc - +# vulkan-cts-1.2.3.2 +SRCREV_vk-gl-cts = "5cd2240b60825fbbf6bd9ddda6af176ee3100c70" SRCREV_amber = "a40bef4dba98d2d80b48e5a940d8574fbfceb197" SRCREV_glslang = "b5f003d7a3ece37db45578a8a3140b370036fc64" SRCREV_spirv-headers = "f8bf11a0253a32375c32cad92c841237b96696c0" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb index 6cad97f15..9131c754d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb @@ -1,5 +1,5 @@ SUMMARY = "X screen saver and locker" - +HOMEPAGE = "https://www.jwz.org/xscreensaver/" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463" |