diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics')
11 files changed, 116 insertions, 28 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb index aa597cd8e4..4c51af669c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb @@ -31,6 +31,10 @@ SRC_URI:append:class-nativesdk = "\ SRC_URI[sha256sum] = "6b16bf990df114195be669773a1dae975dbbffada45e1de2849ddeb5851bb9a8" +CVE_CHECK_IGNORE += "\ + CVE-2014-9157 \ +" + PACKAGECONFIG ??= "librsvg" PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb index 4c17105a99..27dff82df5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb @@ -6,6 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master" SRCREV = "fe00207dc10db1d7cc6f2757961c5c6bdfd10973" +CVE_CHECK_IGNORE += "\ + CVE-2015-8751 \ +" + S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index 5f404f2aa2..5cde7c9fb4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tigervnc.com/" LICENSE = "GPL-2.0-or-later" SECTION = "x11/utils" DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam" -RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash" +RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp" LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb index fcc6a2364f..b4a598527e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb @@ -3,7 +3,7 @@ require ttf.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Simplified Chinese" HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" inherit allarch fontcache @@ -11,7 +11,7 @@ inherit allarch fontcache #EXCLUDE_FROM_WORLD = "1" SRC_URI = " \ - https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansCN.zip \ + svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/CN;protocol=http;rev=82 \ file://44-source-han-sans-cn.conf \ " SRC_URI[md5sum] = "d16abc21f6575bb08894efedbed484a2" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb index 27fe9dbaf6..6a4509048f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb @@ -3,7 +3,7 @@ require ttf.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Japanese" HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" inherit allarch fontcache @@ -11,7 +11,7 @@ inherit allarch fontcache #EXCLUDE_FROM_WORLD = "1" SRC_URI = " \ - https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansJP.zip \ + svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/JP;protocol=http;rev=82 \ file://44-source-han-sans-jp.conf \ " SRC_URI[md5sum] = "908fbf97f3df04a6838708c093f1e900" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb index fc3a6b7947..5ab5057d86 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb @@ -3,7 +3,7 @@ require ttf.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Korean" HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" inherit allarch fontcache @@ -11,7 +11,7 @@ inherit allarch fontcache #EXCLUDE_FROM_WORLD = "1" SRC_URI = " \ - https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansKR.zip \ + svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ file://44-source-han-sans-kr.conf \ " SRC_URI[md5sum] = "f8d1bd6c87d8575afdb25e2f46bd81d4" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb index aa43c92299..a2b3fff079 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb @@ -3,7 +3,7 @@ require ttf.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Traditional Chinese" HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" inherit allarch fontcache @@ -11,7 +11,7 @@ inherit allarch fontcache #EXCLUDE_FROM_WORLD = "1" SRC_URI = " \ - https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansTW.zip \ + svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ file://44-source-han-sans-tw.conf \ " SRC_URI[md5sum] = "6533b71b31c19e548768f0fc963202f3" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch index 4ce2faed5d..1d0d20da2f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch @@ -1,3 +1,14 @@ +From f2c592352360e52a7c817a1adcc8b09fd92cd941 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Jul 2022 09:58:24 -0700 +Subject: [PATCH 1/2] Tweak app defaults + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + driver/XScreenSaver.ad.in | 259 +------------------------------------- + 1 file changed, 6 insertions(+), 253 deletions(-) + --- a/driver/XScreenSaver.ad.in +++ b/driver/XScreenSaver.ad.in @@ -29,7 +29,7 @@ @@ -32,7 +43,7 @@ *splashDuration: 0:00:05 *visualID: default *installColormap: True -@@ -324,250 +324,8 @@ XScreenSaver.bourneShell: /bin/sh +@@ -324,256 +324,8 @@ XScreenSaver.bourneShell: /bin/sh !============================================================================= *programs: \ @@ -74,7 +85,7 @@ - munch -root \n\ - penrose -root \n\ -@GL_KLUDGE@ GL: pipes -root \n\ -- rd-bomb -root \n\ +- rdbomb -root \n\ -@GL_KLUDGE@ GL: rubik -root \n\ -- sierpinski -root \n\ - slip -root \n\ @@ -277,7 +288,13 @@ -@GL_KLUDGE@ GL: etruscanvenus -root \n\ -@GL_KLUDGE@ GL: gibson -root \n\ -@GL_KLUDGE@ GL: headroom -root \n\ --@GL_KLUDGE@ GL: sphereeversion -root \n +-@GL_KLUDGE@ GL: sphereeversion -root \n\ +- binaryhorizon -root \n\ +- marbling -root \n\ +-@GL_KLUDGE@ GL: chompytower -root \n\ +-@GL_KLUDGE@ GL: mapscroller -root \n\ +-@GL_KLUDGE@ GL: nakagin -root \n\ +-@GL_KLUDGE@ GL: squirtorus -root \n - - +- fontglide -root -program "date +'%F %H:%M %z'" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch new file mode 100644 index 0000000000..ea3f25a2f2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch @@ -0,0 +1,47 @@ +From 516fbcdcfe6343b1d64d35957ddb768346713ff6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 17 Jul 2022 09:47:35 -0700 +Subject: [PATCH] configure: Ignore CONF_STATUS for gtk and openGL needs + +These are just warnings + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c4fd38f..d7463cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4522,7 +4522,6 @@ fi + if test "$gtk_halfassed" != no ; then + warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK" + warn2 "can't be used." +- CONF_STATUS=1 + + if ( echo $gtk_halfassed_lib | grep -qi pixbuf-xlib ); then + echo '' +@@ -4549,7 +4548,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then + else + warnL "The GTK libraries do not seem to be available; the" + warn2 "\`xscreensaver-settings' program requires them." +- CONF_STATUS=1 + # echo '' + # warn2 'You can use Motif or Lesstif instead of GTK (use the' + # warn2 "\`--with-motif' option) but that is NOT recommended." +@@ -4735,10 +4733,8 @@ if test "$have_gl" = no ; then + CONF_STATUS=1 + elif test "$with_gl_req" = no ; then + noteL 'The OpenGL 3D library is not being used.' +- CONF_STATUS=1 + else + noteL 'The OpenGL 3D library was not found.' +- CONF_STATUS=1 + fi + + if test "$gl_halfassed" = yes ; then +-- +2.37.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch index 7703a43204..0ceba7be02 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch @@ -1,18 +1,22 @@ -From 19bd0a979677a81d7399d5b567998398ec81f38b Mon Sep 17 00:00:00 2001 +From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 8 Jul 2021 15:40:10 -0700 -Subject: [PATCH] build: Do not build po files +Date: Sat, 16 Jul 2022 09:59:40 -0700 +Subject: [PATCH 2/2] build: Do not build po files Fixes | make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po' | make[1]: *** No rule to make target 'default'. Stop. Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - Makefile.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + Makefile.in | 5 ++--- + driver/Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) +diff --git a/Makefile.in b/Makefile.in +index 9de79b2..1c1d16c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,8 +6,8 @@ srcdir = @srcdir@ @@ -26,14 +30,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> SUBDIRS2 = $(SUBDIRS) OSX android TARFILES = README README.hacking INSTALL \ configure configure.ac Makefile.in config.h.in \ -@@ -451,4 +451,3 @@ cerebrum:: - --include 'configure*' \ +@@ -461,4 +461,3 @@ cerebrum:: + --include 'ad2c' \ --include '*/' \ --exclude '*' - +diff --git a/driver/Makefile.in b/driver/Makefile.in +index e1fa1b2..feca6fc 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in -@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid +@@ -211,7 +211,7 @@ TEST_EXES = test-passwd test-uid test-xdpms test-grab \ xdpyinfo test-screens test-yarandom test-xinput \ test-xkb @@ -42,3 +48,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ SETUID_EXES = xscreensaver-auth DEMO_EXES = @ALL_DEMO_PROGRAMS@ +-- +2.37.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb index 2ab5297949..d24f666bcf 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb @@ -3,16 +3,15 @@ HOMEPAGE = "https://www.jwz.org/xscreensaver/" LICENSE = "0BSD" LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=c3ce41cdff745eb1dc9d4fcfbffb4d51" -SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b" - -SRC_URI += " \ +SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz \ file://xscreensaver.service \ - file://0001-build-Do-not-build-po-files.patch \ - file://tweak-app-defaults.patch \ + file://0001-Tweak-app-defaults.patch \ + file://0002-build-Do-not-build-po-files.patch \ + file://0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch \ " +SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152" -DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam" +DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg" # These are only needed as part of the stopgap screensaver implementation: RDEPENDS:${PN} = " \ liberation-fonts \ @@ -25,9 +24,17 @@ inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check EXTRA_OECONF += "--with-app-defaults=${datadir}/X11/app-defaults --libdir=${STAGING_LIBDIR} \ --includedir=${STAGING_INCDIR} --with-pam --with-login-manager" -EXTRA_OEMAKE += "install_prefix=${D}" +EXTRA_OEMAKE += "install_prefix=${D} GTK_DATADIR=${datadir}" REQUIRED_DISTRO_FEATURES = "x11 pam" +PACKAGECONFIG = "png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" + +PACKAGECONFIG[systemd] = "--with-systemd=yes,--with-systemd=no,systemd" +PACKAGECONFIG[png] = "--with-png=yes,--with-png=no,libpng" + +CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)}" +EXTRA_OECONF:remove = "--disable-static" + do_install:append() { install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker |