From 72956edabebd4188f98e3b0d9f8ce727e8d13ea3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Jan 2021 16:11:14 -0600 Subject: meta-openembedded: subtree update:936f2380bb..4599fea881 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alexander Vickberg (1): mbedtls: upgrade to 2.25.0 Andreas Müller (44): xfce4-panel-profiles: upgrade 1.0.10 -> 1.0.12 mousepad: upgrade 0.4.2 -> 0.5.2 xfce4-screenshooter: upgrade 1.9.7 -> 1.9.8 xfce4-taskmanager: upgrade 1.2.3 -> 1.4.0 xfce4-calculator-plugin: upgrade 0.7.0 -> 0.7.1 xfce4-cpugraph-plugin: upgrade 1.1.0 -> 1.2.0 xfce4-datetime-plugin: upgrade 0.8.0 -> 0.8.1 xfce4-diskperf-plugin: upgrade 2.6.2 -> 2.6.3 xfce4-fsguard-plugin: upgrade 1.1.1 -> 1.1.2 xfce4-smartbookmark-plugin: upgrade 0.5.1 -> 0.5.2 xfce4-systemload-plugin: upgrade 1.2.3 -> 1.2.4 xfce4-verve-plugin: upgrade 2.0.0 -> 2.0.1 xfce4-wavelan-plugin: upgrade 0.6.1 -> 0.6.2 xfce4-whiskermenu-plugin: upgrade 2.4.6 -> 2.5.1 xfce4-xkb-plugin: upgrade 0.8.1 -> 0.8.2 xfce4-mount-plugin: upgrade 1.1.3 -> 1.1.5 xfce4-dev-tools: upgrade 4.14.0 -> 4.16.0 libxfce4util: upgrade 4.14.0 -> 4.16.0 xfconf: upgrade 4.14.3 -> 4.16.0 libxfce4ui: upgrade 4.14.1 -> 4.16.0 exo: upgrade 0.12.11 -> 4.16.0 garcon: upgrade 0.7.0 -> 0.8.0 xfwm4: upgrade 4.14.5 -> 4.16.0 xfce4-settings: upgrade 4.14.3 -> 4.16.0 xfce4-panel: upgrade 4.14.4 -> 4.16.0 xfce4-session: upgrade 4.14.2 -> 4.16.0 xfdesktop: upgrade 4.14.2 -> 4.16.0 xfce4-power-manager: upgrade 1.6.6 -> 4.16.0 tumbler: upgrade 0.3.1 -> 4.16.0 thunar-volman: upgrade 0.9.5 -> 4.16.0 thunar: upgrade 1.8.15 -> 4.16.0 xfce4-appfinder: upgrade 4.14.0 -> 4.16.0 xfce4-terminal: 0.8.9.2 -> 0.8.10 xfce4-screensaver: upgrade 0.1.10 -> 4.16.0 xfce4-taskmanager: remove exo-native from DEPENDS xfce4-closebutton-plugin: upgrade 0.1.0+ -> 4.16.0 xfce4-sensors-plugin: upgrade 1.3.92 -> 1.3.95 xfce4-genmon-plugin: upgrade 4.0.2 -> 4.1.0 xfce4-hotcorner-plugin: remove xfce4-embed-plugin: remove for now xfce4-equake-plugin: remove for now xfce4-notes-plugin: remove for now fluidsynth: upgrade 2.1.5 -> 2.1.6 blueman: upgrade 2.1.3 -> 2.1.4 Bruce Ashfield (1): vboxguestdrivers: fix build against kernel v5.10+ Caio Toledo (3): Add recipe for dbus-cxx Add dbus-cxx to packagegroup-meta-oe Fix dbus-cxx build for musl Changqing Li (1): libssh2: enhance ptest Chen Qi (1): tclap: fix branch Chencheng Zhang (1): tclap: align version to tag v1.2.2 Diego Santa Cruz (2): gssdp: Upgrade to 1.2.2 -> 1.2.3 gupnp: Upgrade to 1.2.2 -> 1.2.4 Dmitry Baryshkov (11): android-tools-conf-configfs: add an alternative to anrdoid-tools-conf android-tools-conf: fix android-tools build-deps warning conf/layer.conf: provide default PREFERRED_PROVIDER_android-tools-conf imlib2: add image manipulation libray from englightenment project feh: imlib2 based image viewer obconf: Openbox configuration tool xterm: install xterm and uxterm desktop files xterm: update to version 362 xterm: provide virtual/x-terminal-emulator layer.conf: add gnome-layer dynamic entry openbox-xdgmenu: Openbox menu generator He Zhe (2): ebtables: Add symbol link /sbin/ebtables lmbench: Fix setting LDLIBS failure Hongxu Jia (2): flatbuffers: add python3 support python3-wrapt: add native support Joe Slater (1): multipath-tools: fix error handling for udev_monitor_set_receive_buffer_size Khem Raj (9): pidgin-sipe: Do not add native libdir to pkgconfig search path sdbus-c++-libsystemd: Fix reallocarray check in meson networkmanager: Fix reallocarray check in meson and configure redis: Update to 6.0.9 python3-matplotlib: Disable LTO on mips/clang cyrus-sasl: Disable ntlm plugin by default postgresql: Use /dev/urandom when openssl is not used xrdp: Upgrade to 0.9.14 iwd: Upgrade to 1.10 Leon Anavi (33): python3-stevedore: Upgrade 3.2.2 -> 3.3.0 python3-pychromecast: Upgrade 7.5.1 -> 7.6.0 python3-humanize: Upgrade 3.1.0 -> 3.2.0 python3-fasteners: Upgrade 0.15 -> 0.16 python3-luma-core: Upgrade 2.0.1 -> 2.2.0 python3-chardet: Upgrade 3.0.4 -> 4.0.0 python3-watchdog: Upgrade 0.10.3 -> 1.0.2 python3-natsort: Upgrade 7.0.1 -> 7.1.0 python3-gmqtt: Upgrade 0.6.8 -> 0.6.9 python3-pymongo: Upgrade 3.11.0 -> 3.11.2 python3-requests: Upgrade 2.25.0 -> 2.25.1 python3-nocasedict: Upgrade 1.0.1 -> 1.0.2 python3-soupsieve: Upgrade 2.0.1 -> 2.1 python3-jsonpatch: Upgrade 1.26 -> 1.28 python3-psutil: Upgrade 5.7.3 -> 5.8.0 python3-argcomplete: Upgrade 1.12.1 -> 1.12.2 python3-multidict: Upgrade 5.0.0 -> 5.1.0 python3-nocaselist: Upgrade 1.0.3 -> 1.0.4 python3-prompt-toolkit: Upgrade 3.0.8 -> 3.0.9 python3-pychromecast: Upgrade 7.6.0 -> 7.7.1 python3-txaio: Upgrade 20.4.1 -> 20.12.1 python3-croniter: Upgrade 0.3.36 -> 0.3.37 python3-pandas: Upgrade 1.1.4 -> 1.2.0 python3-sympy: Upgrade 1.6.2 -> 1.7.1 python3-twine: Upgrade 3.2.0 -> 3.3.0 python3-humanfriendly: Upgrade 8.2 -> 9.1 python3-sqlalchemy: Upgrade 1.3.20 -> 1.3.22 python3-transitions: Upgrade 0.8.5 -> 0.8.6 python3-pytest-metadata: Upgrade 1.10.0 -> 1.11.0 python3-smbus2: Upgrade 0.3.0 -> 0.4.0 python3-cantools: Upgrade 35.5.0 -> 36.1.0 python3-sentry-sdk: Upgrade 0.19.1 -> 0.19.5 python3-babel: Upgrade 2.8.0 -> 2.9.0 Mark Jonas (1): beep: Update to 1.4.9 in new repository Martin Jansa (1): linuxconsole: move jscal to separate package, add to packagegroup Michael Vetter (1): jasper: upgrade 2.0.23 -> 2.0.24 Mingli Yu (3): traceroute: change the ALTERNATIVE_PRIORITY tftp-hpa: change the ALTERNATIVE_PRIORITY python3-astor: switch to python3 Ola X Nilsson (1): python3-idna Remove 2.8 Qi.Chen@windriver.com (1): python3-requests: upgrade to 2.25.0 Ramon Fried (2): bitwise: add new recipe yaml-cpp: add new recipe Roland Hieber (3): openct: remove lines that resulted in a no-op openct: clean up do_install openct: allow building as native package Sean Nyekjaer (1): nodejs: 12.19.1 -> 12.20.1 Stacy Gaikovaia (1): nodejs: 12.19.0 -> 12.19.1 Trevor Woerner (1): glmark2: fix precision handling bugs Wang Mingyu (1): zabbix: CVE-2020-15803 Security Advisory Wenlin Kang (1): syslog-ng: add bison-native to dependencies Yi Zhao (9): ebtables: do not install /etc/ethertypes yaffs2-utils: update to latest git rev f2fs-tools: upgrade 1.13.0 -> 1.14.0 dracut: upgrade 049 -> 051 ebtables: add missing file ebtables.common ebtables: remove upstream ebtables-legacy-save ebtables: do not install /etc/ethertypes tcpdump: add UPSTREAM_CHECK_REGEX phpmyadmin: 5.0.2 -> 5.0.4 Zang Ruochen (5): mcpp: Normalize the patch format of CVE python3-aenum: upgrade 2.2.4 -> 2.2.6 python3-autobahn: upgrade 20.7.1 -> 20.12.3 python3-bandit: upgrade 1.6.2 -> 1.7.0 python3-cachetools: upgrade 4.1.1 -> 4.2.0 Zheng Ruoqin (5): samba: CVE-2020-14318 Security Advisory samba: CVE-2020-14383 Security Advisory php: CVE-2020-7070 php: CVE-2020-7069 poppler: upgrade 20.11.0 -> 20.12.1 changqing.li@windriver.com (3): postgresql: upgrade 12.4 -> 13.1 nginx: upgrade 1.16.1 -> 1.18.0 nginx: upgrade 1.17.8 -> 1.19.6 jabdoa2 (2): libsdl2-mixer: Fix ogg/vorbis support in libsdl2-mixer libsdl2-mixer: set --disable-music-ogg-shared to link statically lumag (2): android-tools: fix package split android-tools: split adbd to the separate package zangrc (35): fuse3: upgrade 3.10.0 -> 3.10.1 openipmi: upgrade 2.0.29 -> 2.0.30 vblade: upgrade 24 -> 25 dumb-init: upgrade 1.2.2 -> 1.2.5 fio: upgrade 3.24 -> 3.25 hwdata: upgrade 0.341 -> 0.342 nano: upgrade 5.3 -> 5.4 ocl-icd: upgrade 2.2.13 -> 2.2.14 ebtables: upgrade 2.0.10-4 -> 2.0.11 iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3 opencl-headers: upgrade 2020.06.16 -> 2020.12.18 opencl-icd-loader: upgrade 2020.06.16 -> 2020.12.18 c-periphery: upgrade 2.2.5 -> 2.3.0 opencl-clhpp: upgrade 2.0.12 -> 2.0.13 uthash: upgrade 2.1.0 -> 2.2.0 libtalloc: upgrade 2.3.0 -> 2.3.1 libtevent: upgrade 0.10.1 -> 0.10.2 ace: upgrade 6.5.10 -> 6.5.12 python3-ldap: upgrade 3.2.0 -> 3.3.1 wolfssl: upgrade 4.5.0 -> 4.6.0 asio: upgrade 1.18.0 -> 1.18.1 dash: upgrade 0.5.11.2 -> 0.5.11.3 geoclue: upgrade 2.5.6 -> 2.5.7 libmicrohttpd: upgrade 0.9.71 -> 0.9.72 nss: upgrade 3.59 -> 3.60 paho-mqtt-c: upgrade 1.3.7 -> 1.3.8 terminus-font: upgrade 4.48 -> 4.49.1 libnet-ldap-perl: upgrade 0.66 -> 0.67 rdma-core: upgrade 32.0 -> 33.0 can-utils: upgrade 2020.11.0 -> 2020.12.0 cpprest: upgrade 2.10.16 -> 2.10.17 haveged: upgrade 1.9.13 -> 1.9.14 live555: upgrade 20201105 -> 20210101 smartmontools: upgrade 7.1 -> 7.2 openjpeg: upgrade 2.3.1 -> 2.4.0 zhengruoqin (12): pugixml: upgrade 1.11 -> 1.11.2 spdlog: upgrade 1.8.1 -> 1.8.2 spitools: upgrade 0.8.5 -> 0.8.6 uhubctl: upgrade 2.2.0 -> 2.3.0 xserver-xorg-cvt-native: upgrade 1.20.9 -> 1.20.10 zchunk: upgrade 1.1.7 -> 1.1.8 libencode-perl: upgrade 3.07 -> 3.08 bridge-utils: upgrade 1.6 -> 1.7 netplan: upgrade 0.100 -> 0.101 opensaf: upgrade 5.20.08 -> 5.20.11 cppzmq: upgrade 4.7.0 -> 4.7.1 gperftools: upgrade 2.8 -> 2.8.1 Signed-off-by: Andrew Geissler Change-Id: I53939ad487155ca87e27cfd77d65962458d892e0 --- .../meta-oe/recipes-graphics/feh/feh_3.6.1.bb | 31 +++++++++++++ .../meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 39 +++++++++++++++++ .../recipes-graphics/jasper/jasper_2.0.23.bb | 24 ---------- .../recipes-graphics/jasper/jasper_2.0.24.bb | 24 ++++++++++ .../recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb | 2 +- .../meta-oe/recipes-graphics/openbox/obconf_git.bb | 33 ++++++++++++++ ...fixed-include-dir-to-usr-include-.-Obviou.patch | 36 +++++++++++++++ .../openjpeg/openjpeg/CVE-2020-15389.patch | 51 ---------------------- .../openjpeg/openjpeg/CVE-2020-6851.patch | 36 --------------- .../openjpeg/openjpeg/CVE-2020-8112.patch | 50 --------------------- .../recipes-graphics/openjpeg/openjpeg_2.3.1.bb | 23 ---------- .../recipes-graphics/openjpeg/openjpeg_2.4.0.bb | 21 +++++++++ .../terminus-font/terminus-font_4.48.bb | 45 ------------------- .../terminus-font/terminus-font_4.49.1.bb | 45 +++++++++++++++++++ .../meta-oe/recipes-graphics/xorg-app/xterm_353.bb | 36 --------------- .../meta-oe/recipes-graphics/xorg-app/xterm_362.bb | 48 ++++++++++++++++++++ 16 files changed, 278 insertions(+), 266 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb (limited to 'meta-openembedded/meta-oe/recipes-graphics') diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb new file mode 100644 index 000000000..1e49e68f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "X11 image viewer aimed mostly at console users" +AUTHOR = "Tom Gilbert & Daniel Friesel" +HOMEPAGE = "https://feh.finalrewind.org/" +SECTION = "x11/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=f91bd06901085c94bdc50649d98c5059" +DEPENDS = "\ + imlib2 \ + virtual/libx11 libxt\ +" + +SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" +SRC_URI[sha256sum] = "9b1edec52cbae97b17530cb5db10666abfb9983f51a5d820c89added6f7b1ea8" + +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" diff --git a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb new file mode 100644 index 000000000..b44b03ce8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "A graphic library for file loading, saving, rendering, and manipulation" + +HOMEPAGE = "https://sourceforge.net/projects/enlightenment/" +SECTION = "libs" +LICENSE = "MIT & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" + +DEPENDS = "freetype " +PROVIDES = "virtual/imlib2" +PV = "1.7.1" +SRCREV = "v1.7.1" + +inherit autotools pkgconfig lib_package + +AUTO_LIBNAME_PKGS = "" + +SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https" +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[bzip2] = "--with-bzip2,--without-bzip2,bzip2" +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" diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb deleted file mode 100644 index 2abd11a4c..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.23.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Jpeg 2000 implementation" -HOMEPAGE = "https://jasper-software.github.io/jasper/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" - -SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" -SRCREV = "cc02d63dde901e06d1f866984fd0e80601deaa13" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" -PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" - -EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" - -do_install_append() { - chrpath -d ${D}${bindir}/jasper - chrpath -d ${D}${bindir}/imginfo - chrpath -d ${D}${bindir}/imgcmp - chrpath -d ${D}${libdir}/libjasper.so.* -} diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb new file mode 100644 index 000000000..2071c1fbd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.24.bb @@ -0,0 +1,24 @@ +SUMMARY = "Jpeg 2000 implementation" +HOMEPAGE = "https://jasper-software.github.io/jasper/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" + +SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" +SRCREV = "9a2835a81ce9c41a48f36dadce79f110da8d6c75" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "" +PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" +PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" + +EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" + +do_install_append() { + chrpath -d ${D}${bindir}/jasper + chrpath -d ${D}${bindir}/imginfo + chrpath -d ${D}${bindir}/imgcmp + chrpath -d ${D}${libdir}/libjasper.so.* +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index aa246f999..8f1960d8a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/SDL2_mixer-${PV}" inherit autotools-brokensep pkgconfig EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}" PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb new file mode 100644 index 000000000..53c589821 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "Openbox configuration tool" +AUTHOR = "Dana Jansens & Tim Riley & Javeed Shaikh" +HOMEPAGE = "http://openbox.org/wiki/ObConf:About" +SECTION = "x11/wm" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = " \ + openbox \ + startup-notification \ + gtk+3 \ +" +PV = "2.0.4+git${SRCPV}" + +SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" +SRC_URI = " \ + git://git.openbox.org/dana/obconf \ +" + +S = "${WORKDIR}/git" + +inherit autotools gettext pkgconfig mime mime-xdg features_check +# depends on openbox, which is X11-only +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_AUTORECONF = "" + +FILES_${PN} += "\ + ${datadir}/mime \ +" + +do_install_append () { + rm -rf ${D}${datadir}/mimelnk +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch new file mode 100644 index 000000000..663f499df --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch @@ -0,0 +1,36 @@ +From 3e4fe4c42d4d63c36df966baea87da6fbc032553 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 7 Jan 2021 16:05:28 +0900 +Subject: [PATCH] This patch fixed include dir to /usr/include/. Obviously, it + is not suitble for cross-compile. So, removed this patch temporarily. +https://github.com/uclouvain/openjpeg/issues/1174 + +Upsteam-Status: Pending +https://github.com/uclouvain/openjpeg/issues/1320 + +Signed-off-by: Lei Maohui +--- + cmake/OpenJPEGConfig.cmake.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in +index 8a726697..2925108a 100644 +--- a/cmake/OpenJPEGConfig.cmake.in ++++ b/cmake/OpenJPEGConfig.cmake.in +@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) + # This is an install tree + include(${SELF_DIR}/OpenJPEGTargets.cmake) + ++ # We find a relative path from the PKG directory to header files. ++ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") + set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") +- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE) ++ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") ++ ++ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) + + else() + if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) +-- +2.25.1 + 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 deleted file mode 100644 index f5ce11a27..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-15389.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e8e258ab049240c2dd1f1051b4e773b21e2d3dc0 Mon Sep 17 00:00:00 2001 -From: Even Rouault -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 - ---- -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/CVE-2020-6851.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch deleted file mode 100644 index 1e14149c8..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 11 Jan 2020 01:51:19 +0100 -Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose - coordinates are beyond INT_MAX (fixes #1228) - -CVE: CVE-2020-6851 - -Signed-off-by: Mingde (Matthew) Zeng - ---- - src/lib/openjp2/j2k.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c -index 14f6ff41..922550eb 100644 ---- a/src/lib/openjp2/j2k.c -+++ b/src/lib/openjp2/j2k.c -@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim - l_img_comp = p_image->comps; - for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { - OPJ_INT32 l_h, l_w; -+ if (p_image->x0 > (OPJ_UINT32)INT_MAX || -+ p_image->y0 > (OPJ_UINT32)INT_MAX || -+ p_image->x1 > (OPJ_UINT32)INT_MAX || -+ p_image->y1 > (OPJ_UINT32)INT_MAX) { -+ opj_event_msg(p_manager, EVT_ERROR, -+ "Image coordinates above INT_MAX are not supported\n"); -+ return OPJ_FALSE; -+ } - - l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, - (OPJ_INT32)l_img_comp->dx); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch deleted file mode 100644 index 6158601af..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Thu, 30 Jan 2020 00:59:57 +0100 -Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow - -That could lead to later assertion failures. - -Fixes #1231 / CVE-2020-8112 - -CVE: CVE-2020-8112 - -Signed-off-by: Mingde (Matthew) Zeng ---- - src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c -index deecc4df..aa419030 100644 ---- a/src/lib/openjp2/tcd.c -+++ b/src/lib/openjp2/tcd.c -@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, - /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ - l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; - l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; -- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; -- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; -+ { -+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, -+ (OPJ_INT32)l_pdx)) << l_pdx; -+ if (tmp > (OPJ_UINT32)INT_MAX) { -+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); -+ return OPJ_FALSE; -+ } -+ l_br_prc_x_end = (OPJ_INT32)tmp; -+ } -+ { -+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, -+ (OPJ_INT32)l_pdy)) << l_pdy; -+ if (tmp > (OPJ_UINT32)INT_MAX) { -+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); -+ return OPJ_FALSE; -+ } -+ l_br_prc_y_end = (OPJ_INT32)tmp; -+ } - /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ - - l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( --- -2.20.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 deleted file mode 100644 index a0740a274..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" -HOMEPAGE = "http://www.openjpeg.org" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" - -DEPENDS = "libpng tiff lcms zlib" - -SRC_URI = " \ - git://github.com/uclouvain/openjpeg.git \ - 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" - -inherit cmake - -# for multilib -EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" - -FILES_${PN} += "${libdir}/openjpeg*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb new file mode 100644 index 000000000..8e264bf71 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" +HOMEPAGE = "http://www.openjpeg.org" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" + +DEPENDS = "libpng tiff lcms zlib" + +SRC_URI = " \ + git://github.com/uclouvain/openjpeg.git \ + file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ + file://0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch \ +" +SRCREV = "37ac30ceff6640bbab502388c5e0fa0bff23f505" +S = "${WORKDIR}/git" + +inherit cmake + +# for multilib +EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', '')}" + +FILES_${PN} += "${libdir}/openjpeg*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb deleted file mode 100644 index dc263fda4..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Terminus fonts packages (console and X11)" -DESCRIPTION = "Terminus Font is a clean, fixed width bitmap font, designed for \ - long (8 and more hours per day) work with computers." -HOMEPAGE = "http://terminus-font.sourceforge.net/" -AUTHOR = "Dimitar Zhekov" -SECTION = "fonts" - -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://OFL.TXT;md5=9b226721636fde0db38ea656c2aae4bf" - -DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "a2cb88f6cf174f3d07de93b91e115a8d" -SRC_URI[sha256sum] = "34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af" - -inherit allarch fontcache - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "" - -# Don't use font cache mecanism for console packages -FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" - -# Hand made configure script. Don't need oe_runconf -do_configure() { - chmod +x ${S}/configure - ${S}/configure --prefix=${prefix} \ - --psfdir=${datadir}/consolefonts \ - --acmdir=${datadir}/consoletrans \ - --x11dir=${datadir}/fonts/terminus -} - -do_compile() { - oe_runmake DESTDIR=${D} psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} -} - -do_install() { - oe_runmake DESTDIR=${D} install-psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} -} - -PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf" -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-pcf = "${datadir}/fonts/terminus" diff --git a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb new file mode 100644 index 000000000..789e7eb99 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb @@ -0,0 +1,45 @@ +SUMMARY = "Terminus fonts packages (console and X11)" +DESCRIPTION = "Terminus Font is a clean, fixed width bitmap font, designed for \ + long (8 and more hours per day) work with computers." +HOMEPAGE = "http://terminus-font.sourceforge.net/" +AUTHOR = "Dimitar Zhekov" +SECTION = "fonts" + +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://OFL.TXT;md5=f57e6cca943dbc6ef83dc14f1855bdcc" + +DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "1b6acbd221957e33c8a792ebfaf3a659" +SRC_URI[sha256sum] = "d961c1b781627bf417f9b340693d64fc219e0113ad3a3af1a3424c7aa373ef79" + +inherit allarch fontcache + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "" + +# Don't use font cache mecanism for console packages +FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" + +# Hand made configure script. Don't need oe_runconf +do_configure() { + chmod +x ${S}/configure + ${S}/configure --prefix=${prefix} \ + --psfdir=${datadir}/consolefonts \ + --acmdir=${datadir}/consoletrans \ + --x11dir=${datadir}/fonts/terminus +} + +do_compile() { + oe_runmake DESTDIR=${D} psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} +} + +do_install() { + oe_runmake DESTDIR=${D} install-psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} +} + +PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf" +FILES_${PN}-consolefonts = "${datadir}/consolefonts" +FILES_${PN}-consoletrans = "${datadir}/consoletrans" +FILES_${PN}-pcf = "${datadir}/fonts/terminus" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb deleted file mode 100644 index 6de704d0b..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_353.bb +++ /dev/null @@ -1,36 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc -SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses" - -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ - " - -SRC_URI[md5sum] = "247c30ebfa44623f3a2d100e0cae5c7f" -SRC_URI[sha256sum] = "e521d3ee9def61f5d5c911afc74dd5c3a56ce147c7071c74023ea24cac9bb768" -PACKAGECONFIG ?= "" -PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" - -EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ - --disable-imake \ - --disable-rpath-hack \ - --disable-setuid \ - --with-app-defaults=${datadir}/X11/app-defaults \ - " - -B = "${S}" - -do_configure() { - gnu-configize --force - sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure - oe_runconf -} - -# busybox can supply resize too -inherit update-alternatives - -ALTERNATIVE_${PN} = "resize" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb new file mode 100644 index 000000000..2bbcd9211 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_362.bb @@ -0,0 +1,48 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = "xterm is the standard terminal emulator for the X Window System" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" + +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ + file://0001-Add-configure-time-check-for-setsid.patch \ + " + +SRC_URI[md5sum] = "ee6710bbbe18000236c6e6d7b55b54d5" +SRC_URI[sha256sum] = "1d4ffe226fa8f021859bbc3007788ff63a46a31242d9bd9a7bd7ebe24e81aca2" +PACKAGECONFIG ?= "" +PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" + +# Let xterm install .desktop files +inherit mime-xdg + +EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ + --disable-imake \ + --disable-rpath-hack \ + --disable-setuid \ + --with-app-defaults=${datadir}/X11/app-defaults \ + " + +B = "${S}" + +do_configure() { + gnu-configize --force + sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure + oe_runconf +} + +do_install_append() { + oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" +} + +RPROVIDES_${PN} = "virtual/x-terminal-emulator" + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE_${PN} = "resize x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" +# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. +ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" -- cgit v1.2.3