meta-openembedded: subtree update:76b83194b3..ae39f2e711
Adrian Bunk (3):
libpeas: gobject-introspection is mandatory and cannot be configured
gnome-settings-daemon: smartcard support is optional, and needs nss
gnome-settings-daemon: Remove duplicate outdated SRC_URI hashes
Alex Kiernan (1):
ostree: upgrade 2020.4 -> 2020.5
Andreas Müller (29):
xfce4-whiskermenu-plugin: upgrade 2.4.5 -> 2.4.6
xfwm4: upgrade 4.14.2 -> 4.14.3
xfce4-timer-plugin: upgrade 1.7.0 -> 1.7.1
gnome-desktop3: upgrade 3.36.3.1 -> 3.36.4
evolution-data-server: upgrade 3.36.3 -> 3.36.4
gnome-control-center: upgrade 3.36.3 -> 3.36.4
gtksourceview4: upgrade 4.6.0 -> 4.6.1
libnma: upgrade 1.8.28 -> 1.8.30
libgweather: upgrade 3.36.0 -> 3.36.1
evince: upgrade 3.36.5 -> 3.36.7
exiv2: upgrade 0.27.1 -> 0.27.3
poppler: upgrade 0.89.0 -> 0.90.1
live555: merge recipe with inc
live555: upgrade 20190828 -> 20200721
tumbler: upgrade 0.2.8 -> 0.2.9
xfwm4: upgrade 4.14.3 -> 4.14.4
geoclue: upgrade 2.5.3 -> 2.5.6
gnome-help.bbclass: remove double FILES_${PN}-help entry
gnome-calendar: initial add 3.36.2
imagemagick: upgrade 7.0.9_13 -> 7.0.10_25
libpeas: disable tests when introspection is not enabled/available
udisks2: upgrade 2.8.4+ -> 2.9.1
xfwm4: upgrade 4.14.4 -> 4.14.5
gnome-desktop3: upgrade 3.36.4 -> 3.36.5
file-roller: upgrade 3.36.2 -> 3.36.3
evolution-data-server: upgrade 3.36.4 -> 3.36.5
gnome-disk-utility: re-add 3.36.3
gdm: upgrade 3.36.2 -> 3.36.3
poppler: upgrade 0.90.1 -> 20.08.0
Andrey Konovalov (1):
libcamera: fix packaging and installation
Aníbal Limón (1):
meta-oe: opengl-es-cts install deqp test runners
Armin Kuster (2):
jsoncpp: add PE do to dunfell reverts
libpeas: this depends on gtk3+ add FEATURE CHECK
Arthur She (1):
xmlrpc-c: Upgrade 1.51.03 -> 1.54.02
Changqing Li (1):
mozjs: fix multilib conflict
Colin McAllister (6):
python3-paramiko: Added recipe
python3-lorem: Added recipe
python3-textparser: Added recipe
python3-jdatetime: Added recipe
python3-pynacl: Added recipe
autossh: Created recipe
Daniel Dragomir (1):
rasdaemon: update to 0.6.6 and fix SRC_URI broken link
Gianfranco (4):
dlt-daemon: update to 2.18.5
dlt-daemon: add new dlt-filetransfer PACKAGECONFIG option
dlt-daemon: fix build failure when dlt-dbus is enabled, due to missing service file.
dlt-daemon: enable some configurations by default in PACKAGECONFIG
Gianfranco Costamagna (2):
vboxguestdrivers: upgrade 6.1.6 -> 6.1.12
dlt-daemon: fix build with upstream-proposed patch for MUSL libc
Hongxu Jia (1):
vboxguestdrivers: fix failed to compile with kernel 5.8.0
Jack Mitchell (1):
python3-pybind11: install both python wheel and cmake build
Jacob Kroon (1):
abseil-cpp: Use SkipRecipe exception
James Feist (1):
boost-url: Add recipe
Jens Rehsack (1):
bearssl: add new recipe
Johan Jeppsson (1):
nngpp: Add recipe
Jyothi-k (1):
fmt: 7.0.1 -> 7.0.3
Kai Kang (2):
xfce4-eyes-plugin: 4.5.0 -> 4.5.1
rdist: fix parallel build
Khem Raj (82):
flashrom: Fix build failure with glibc 2.32
spdlog: Upgrade to 1.7.0
gerbera: Upgrade to 1.6.0
libqmi: Delete --enable-more-warnings configure option
gnome-settings-daemon: Drop using autotools specific option
gnome-settings-daemon: Add introspection to UNKNOWN_CONFIGURE_WHITELIST
iwd: Module load dir should be relative to root_dir
libcamera: Fix License names to match SPDX convention
satyr: Upgrade to 0.30
gpm: Upgrade to latest master
gensio: Upgrade to 2.1.4
freeglut: Use -fcommon always
xfsprogs: Upgrade to 5.7.0
freerdp: Upgrade to 2.2.0
htop: Fix build with -fno-common
dialog: Turn X11 support into a packageconfig option
x11vnc: Update to latest on master
vblade: Upgrade to version 24
netperf: Fix build with -fno-common
netplan: Update to latest to fix build with -fno-common
ncftp: Fix build with -fno-common
iscsi-initiator-utils: Upgrade to _2.1.2
tftp-hpa: Fix build with -fno-common
fwknop: Fix build with gcc10
dibbler: Update to latest
quagga: Use -fcommon to compile
drbd: Upgrade to 9.0.24-1
drbd-utils: Uphgrade to 9.13.1
snort: Upgrade to 2.9.16.1
daq: Upgrade to 2.0.7
openlldp: Update to latest master
iftop: Fix build with -fno-common
xfce4-sensors-plugin: Fix build with -fno-common
xfce4-cpufreq-plugin: Fix build with -fno-common
imsettings: Upgrade to 1.8.2
lcdproc: Fix compilation with GCC >= 10.x
openal-soft: Update to 1.20.1
mimic: Upgrade to 1.3.0.1
minidlna: Fix build with -fno-common
tvheadend: Update to latest tip
monkey: Upgrade to 1.6.9
klibc: Compile with -fcommon
kexecboot: Use -fcommon to compile
python3-matplotlib: Use lld for linking when using clang
python3-pandas: Add workaround to fix build with clang
memtester: Fix build with -fno-common
read-edid: Fix build with gcc-10+
owfs: Fix build with -fno-common
sharutils: Fix build with -fno-common
lprng: Fix build with -fno-common
fluentbit: Use -fcommon to compile
fbida: Upgrade to 2.14
ipmitool: Fix build with -fno-common
smstools3: Fix build with -fno-common
sblim-sfcb: Fix build with -fno-common
cdrkit: Fix build with -fno-common
openocd: Fix build with gcc10/-fno-common
liblbxutil: Fix build with gcc10/-fno-common
mg: Upgrade to 20200723 tag
libforms: Fix build with -fno-common
wifi-test-suite: Update to latest tip
xf86-video-ati: Fix link failure with gcc 10
ifplugd: Fix build with gcc10/-fno-common
tcsh: Fix build with -fno-common
makedumpfile: Fix build with -fno-common
nodejs: Upgrade to 12.18.3
opencl-headers: Upgrade to v2020.06.16
ocl-icd: Upgrade to latest
opencl-icd-loader: Update beyond 2020.06.16
fwts: Upgrade to 20.07.00
pegtl: Disable type-limits warning
opensaf: Fix build with -fno-common
crash: Fix arm64 build with -fno-common
minifi-cpp: Fix build with lto/clang
libyui-ncurses: Disable werror with clang
sedutils: Fix build with clang11
directfb: Disable dtor-typedef warning with clang11
gerbera: Disable PIE on rv64
opengl-es-cts: Use SECURITY_NOPIE_CFLAGS
opencv: Upgrade to 4.4.0
minifi-cpp: Fix linking with libxml2
sdbus-c++: Fix ptest packaging
Leon Anavi (80):
python3-pytest-metadata: Upgrade 1.9.0 -> 1.10.0
python3-cmd2: Upgrade 1.1.0 -> 1.2.1
python3-aenum: Upgrade 2.2.3 -> 2.2.4
python3-bitarray: Upgrade 1.4.1 -> 1.4.2
python3-colorlog: Upgrade 4.1.0 -> 4.2.1
python3-matplotlib: Upgrade 3.2.2 -> 3.3.0
python3-urllib3: Upgrade 1.25.9 -> 1.25.10
python3-pywbem: Upgrade 0.17.3 -> 0.17.4
python3-lxml: Upgrade 4.5.1 -> 4.5.2
python3-gmqtt: Upgarde 0.6.5 -> 0.6.7
python3-pyroute2: Upgrade 0.5.12 -> 0.5.13
python3-pymongo: Upgrade 3.10.1 -> 3.11.0
python3-pid: Upgrade 3.0.3 -> 3.0.4
python3-pychromecast: Upgrade 7.1.2 -> 7.2.0
python3-dynamic-dispatch: Upgrade 1.0.2 -> 1.0.3
python3-cbor2: Upgrade 5.1.1 -> 5.1.2
python3-xlsxwriter: Consolidate in a single file
python3-xlsxwriter: Upgrade 1.2.9 -> 1.3.0
python3-cffi: Upgrade 1.14.0 -> 1.14.1
python3-pandas: Upgrade 1.0.5 -> 1.1.0
python3-luma-core: Upgrade 1.14.0 -> 1.14.1
python3-tqdm: Upgrade 4.47.0 -> 4.48.0
python3-asn1crypto: Upgrade 1.3.0 -> 1.4.0
python3-pyalsaaudio: Consolidate in a single file
python3-pyalsaaudio: Upgrade 0.8.4 -> 0.9.0
python3-autobahn: Upgrade 20.6.2 -> 20.7.1
python3-isort: Upgrade 5.1.4 -> 5.2.2
python3-ujson: Upgrade 3.0.0 -> 3.1.0
python3-yarl: Upgrade 1.4.2 -> 1.5.1
python3-openpyxl: Upgrade 3.0.3 -> 3.0.4
python3-cryptography: Upgrade 2.8 -> 3.0
python3-dnspython: Upgrade 1.16.0 -> 2.0.0
python3-regex: Upgrade 2020.6.8 -> 2020.7.14
python3-lazy-object-proxy: Upgrade 1.5.0 -> 1.5.1
python3-xxhash: Upgrade 1.4.4 -> 2.0.0
xxhash: Upgrade 0.7.4 -> 0.8.0
python3-parso: Upgrade 0.7.1 -> 0.8.0
python3-argexec: Upgrade 1.0.2 -> 1.0.3
python3-xlsxwriter: Upgrade 1.3.0 -> 1.3.2
python3-cantools: Upgrade 35.1.0 -> 35.3.0
python3-wtforms: Upgrade 2.3.1 -> 2.3.3
python3-prompt-toolkit: Upgrade 3.0.5 -> 3.0.6
python3-cmd2: Upgrade 1.2.1 -> 1.3.1
python3-luma-core: Upgrade 1.14.1 -> 1.15.0
python3-hyperlink: Upgrade 19.0.0 -> 20.0.1
python3-bitarray: Upgrade 1.4.2 -> 1.5.1
python3-isort: Upgrade 5.2.2 -> 5.3.2
python3-gast: Upgrade 0.3.3 -> 0.4.0
python3-tqdm: Upgrade 4.48.0 -> 4.48.2
python3-sympy: Upgrade 1.6.1 -> 1.6.2
python3-parse: Upgrade 1.15.0 -> 1.16.0
python3-flask-login: Consolidate in a single file
python3-flask-login: Upgrade 0.4.1 -> 0.5.0
python3-graphviz: Upgrade 0.14 -> 0.14.1
python3-huey: Upgrade 2.2.0 -> 2.3.0
python3-rsa: Upgrade 3.4.2 -> 4.6
python3-cmd2: Upgrade 1.3.1 -> 1.3.2
python3-u-msgpack-python: Upgrade 2.6.0 -> 2.7.0
python3-pytest-timeout: Upgrade 1.4.1 -> 1.4.2
python3-javaobj-py3: Upgrade 0.4.0.1 -> 0.4.1
python3-sentry-sdk: Upgrade 0.16.0 -> 0.16.3
python3-coverage: Upgrade 5.2 -> 5.2.1
python3-redis: Upgrade 2.10.6 -> 3.5.3
mosquitto: Upgrade 1.6.10 -> 1.6.11
python3-matplotlib: Upgrade 3.3.0 -> 3.3.1
python3-humanize: Upgrade 2.5.0 -> 2.6.0
python3-bcrypt: Upgrade 3.1.7 -> 3.2.0
python3-isort: Upgrade 5.3.2 -> 5.4.2
python3-cffi: Upgrade 1.14.1 -> 1.14.2
python3-wheel: Upgrade 0.34.2 -> 0.35.1
python3-cmd2: Upgrade 1.3.2 -> 1.3.3
python3-google-api-python-client: Upgrade 1.9.3 -> 1.10.0
python3-bitarray: Upgrade 1.5.1 -> 1.5.2
python3-xlsxwriter: Upgrade 1.3.2 -> 1.3.3
python3-sqlalchemy: Upgrade 1.3.18 -> 1.3.19
python3-sentry-sdk: Upgrade 0.16.3 -> 0.16.5
python3-python-vlc: Upgrade 3.0.10114 -> 3.0.11115
python3-pytest-asyncio: Upgrade 0.12.0 -> 0.14.0
python3-djangorestframework: Consolidate in a single file
python3-djangorestframework: Upgrade 3.9.0 -> 3.11.1
Martin Jansa (2):
khronos-cts: add opengl to REQUIRED_DISTRO_FEATURES
lcov: fix lcov-native build
Mingli Yu (4):
mariadb: upgrade to 10.5.4
mariadb: not use the bundled libpcre2
freeradius: fix the occasional verification failure
fio: upgrade to 3.21
Oleksandr Kravchuk (49):
iwd: update to 1.8
nvme-cli: update to 1.12
dialog: update to 1.3-20200327
libqmi: update to 1.26.0
libmbim: update to 1.24.2
libwebsockets: update to 4.0.20
libkcapi: update to 1.2.0
libbytesize: update to 2.3
libvdpau: update to 1.4
libcec: update to 6.0.2
dctl: update v69
pmdk: update to 1.9
libzip: update to 1.7.3
tmux: update to 3.1b
libjcat: update to 0.1.3
leptonica: update to 1.79.0
libvncserver: update to 0.9.13
libopusenc: add recipe 0.2.1
broadcom-bt-firmware: update to 12.0.1.1105_p2
lsscsi: update to 0.31
opusfile: update to 0.12
libmpdclient: update to 2.19
crossguid: update to 0.2.2
libmediaart: update to 2.0_1.9.4
kronosnet: update to 1.18
keepalived: update to 2.1.5
valijson: update to 0.3
ostree: update to 2020.4
terminus-font: update to 4.48
libteam: update to 1.31
libimobiledevice: update to 1.3.0
libusbmuxd: update to 2.0.2
libplist: update to 2.2.0
usbmuxd: update to 1.1.1
ifuse: update to 1.1.4
libyui: update to 3.10.0
libyui-ncurses: update to 2.55.0
mpc: update to 0.33
ncmpc: update to 0.38
dhcpcd: update to 9.1.4
firewalld: update to 0.8.3
openconnect: update to 8.10
relayd: bump to latest revision
fping: update to 4.4
nano: update to 5.0
broadcom-bt-firmware: add PE back
libpeas: update to 1.26.0
ifenslave: update to 2.11
libupnp: update to 1.14.0
Shlomi Vaknin (11):
monit: Set monit files in temporary locations
python3-ipython: add recipe
python3-traitlets: add recipe
python3-ipython-genutils: add recipe
python3-jedi: add recipe
python3-pickleshare: add recipe
python3-backcall: add recipe
python3-parso: add recipe
prompt-toolkit: fix recipe
json-schema-validator: Add recipe
python3-pybind11-json: Add recipe
Slater, Joseph (4):
lvm2: allow for reproducible binary builds
python3-cryptography: fix two tests
mozjs: specify TMPDIR
aoetool: make builds reproducible
Vijay Khemka (1):
Adding recipe for exprtk
William A. Kennington III (3):
fmt: 6.2.0 -> 7.0.1
cli11: 1.9.0 -> 1.9.1
function2: 4.0.0 -> 4.1.0
Yi Zhao (2):
libldb: upgrade 1.5.7 -> 1.5.8
samba: upgrade 4.10.15 -> 4.10.17
Yue Tao (1):
lua: Security Advisory - lua - CVE-2020-15888
Zang Ruochen (25):
fping: upgrade 4.2 -> 4.3
capnproto: upgrade 0.7.0 -> 0.8.0
c-ares: upgrade 1.16.0 -> 1.16.1
iozone3: upgrade 489 -> 490
ser2net: upgrade 4.1.8 -> 4.2.0
apache-websocket: upgrade 0.1.1 -> 0.1.2
hiawatha: upgrade 10.10 -> 10.11
nostromo: upgrade 1.9.7 -> 1.9.9
purple-skypeweb: upgrade 1.5 -> 1.6
dnsmasq: upgrade 2.81 -> 2.82
linuxptp: upgrade 2.0 -> 3.0
nlohmann-json: upgrade 3.7.3 -> 3.9.0
paho-mqtt-c: upgrade 1.3.2 -> 1.3.4
zlog: upgrade 1.2.14 -> 1.2.15
jasper: upgrade 2.0.16 -> 2.0.19
dash: upgrade 0.5.11 -> 0.5.11.1
libbytesize: upgrade 2.3 -> 2.4
jsonrpc: Fix build with libmicrohttpd 0.9.71
libmicrohttpd: upgrade 0.9.70 -> 0.9.71
rdma-core: upgrade 28.0 -> 30.0
ipc-run: upgrade 20180523.0 -> 20200505.0
uhubctl: upgrade 2.1.0 -> 2.2.0
gsoap: upgrade 2.8.103 -> 2.8.105
libcgi-perl: upgrade 4.48 -> 4.50
redis: upgrade 6.0.5 -> 6.0.6
wonjong.lee (1):
minifi: Add recipe for c++ version
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I003021e0f4c267f79eedf704c43fbb6fdcdaf8b8
diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
index 65fd89e..f7dc668 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
+++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
@@ -28,6 +28,8 @@
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)}"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb
similarity index 80%
rename from meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
rename to meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb
index 0bf48ac..29d0f64 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb
@@ -6,20 +6,18 @@
SECTION = "utils"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39"
-DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif"
+DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman poppler libepoxy cairo"
SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \
file://0001-Avoid-using-host-path.patch \
file://fix-preprocessor.patch \
file://support-jpeg-turbo.patch \
- file://use-jpeg-turbo.patch \
+ file://cairo-weak-detect.patch \
+ file://fbida-gcc10.patch \
"
-SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018"
-SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6"
-
-B = "${WORKDIR}/build"
+SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438"
inherit pkgconfig
@@ -33,6 +31,10 @@
PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif"
PACKAGECONFIG[webp] = ",,libwebp"
PACKAGECONFIG[lirc] = ",,lirc"
+# This can only be enabled when cairo has egl enabled in its packageconfig support too
+PACKAGECONFIG[egl] = ",,"
+
+EXTRA_OEMAKE += ""${@bb.utils.contains('PACKAGECONFIG', 'egl', 'HAVE_CAIRO_GL=yes', 'HAVE_CAIRO_GL=no', d)}""
do_compile() {
sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile
diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch
new file mode 100644
index 0000000..c7c579c
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch
@@ -0,0 +1,17 @@
+OE configures cairo to disable EGL support, however fbida expects cairo with egl support
+this patch therefore makes it possible to set HAVE_CAIRO_GL via recipe
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -67,7 +67,7 @@ define make-config
+ LIB := $(LIB)
+ RESDIR := $(call ac_resdir)
+ HAVE_LINUX_FB_H := $(call ac_header,linux/fb.h)
+-HAVE_CAIRO_GL := $(call ac_pkg_config,cairo-gl)
++HAVE_CAIRO_GL ?= $(call ac_pkg_config,cairo-gl)
+ HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd)
+ HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif)
+ HAVE_LIBWEBP := $(call ac_pkg_config,libwebp)
diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch
new file mode 100644
index 0000000..1104289
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch
@@ -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);
diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch
index 909a0a6..cdeac99 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch
+++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch
@@ -1,14 +1,6 @@
-Index: fbida-2.13/GNUmakefile
-===================================================================
---- fbida-2.13.orig/GNUmakefile
-+++ fbida-2.13/GNUmakefile
-@@ -53,8 +53,7 @@ include $(srcdir)/mk/Autoconf.mk
-
- ac_jpeg_ver = $(shell \
- $(call ac_init,for libjpeg version);\
-- $(call ac_s_cmd,echo JPEG_LIB_VERSION \
-- | cpp -include jpeglib.h | tail -n 1);\
-+ $(call ac_s_cmd,cpp -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' ');\
- $(call ac_fini))
-
- define make-config
+--- 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' '
diff --git a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
index 851641c..6ef9f74 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb
@@ -12,6 +12,9 @@
# depends on virtual/libx11, virtual/libgl
REQUIRED_DISTRO_FEATURES = "x11 opengl"
+# Do not use -fno-common, check back when upgrading to new version it might not be needed
+CFLAGS += "-fcommon"
+
PROVIDES += "mesa-glut"
DEPENDS = "virtual/libx11 libxmu libxi virtual/libgl libglu libxrandr"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb
similarity index 92%
rename from meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb
rename to meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb
index 1d5a294..e121ae9 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb
@@ -4,7 +4,7 @@
LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb"
SRC_URI = "git://github.com/mdadams/jasper.git;protocol=https"
-SRCREV = "9aef6d91a82a8a6aecb575cbee57f74470603cc2"
+SRCREV = "7d8cfd8ac16d1af9b51e5ccd781e898f0fbf57cc"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb
similarity index 73%
rename from meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb
index 249e96f..a6de1f7 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb
@@ -3,9 +3,11 @@
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=34aa579294e8284b7b848c8d5d361e8f"
+UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases"
+
SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz"
-SRC_URI[md5sum] = "4f32be9bd2e2c142ba018037ab5d746f"
-SRC_URI[sha256sum] = "29c35426a416bf454413c6fec24c24a0b633e26144a17e98351b6dffaa4a833b"
+SRC_URI[md5sum] = "a545654b1dae7d29e2ea346b29095f84"
+SRC_URI[sha256sum] = "045966c9c5d60ebded314a9931007a56d9d2f7a6ac39cb5cc077c816f62300d8"
EXTRA_OECONF += " \
--without-libwebp \
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch
new file mode 100644
index 0000000..619bad6
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch
@@ -0,0 +1,46 @@
+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 +-
+ lib/flinternal.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 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;
+
+
+ /***************************************
+diff --git a/lib/flinternal.h b/lib/flinternal.h
+index 06d847e..577bd10 100644
+--- a/lib/flinternal.h
++++ b/lib/flinternal.h
+@@ -138,8 +138,8 @@ enum {
+
+ /* events.c or event related */
+
+-FL_OBJECT * fli_handled_obj;
+-FL_OBJECT * fli_handled_parent;
++extern FL_OBJECT * fli_handled_obj;
++extern FL_OBJECT * fli_handled_parent;
+
+ void fli_obj_queue_delete( void );
+
+--
+2.28.0
+
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb
index 999d53d..35029f5 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb
@@ -9,6 +9,7 @@
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 \
"
SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb
similarity index 95%
rename from meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb
rename to meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb
index dfdf824..11bba43 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb
@@ -45,8 +45,7 @@
inherit cmake
SRC_URI = "git://github.com/LibVNC/libvncserver"
-SRCREV = "1354f7f1bb6962dab209eddb9d6aac1f03408110"
-PV .= "+git${SRCPV}"
+SRCREV = "2aa20dad4c23c18948d3f63b33f9dfec1f837729"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb
similarity index 90%
rename from meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb
index 1a376a4..ba94a83 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb
@@ -10,7 +10,7 @@
SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
-SRCREV = "d5b64b6291b6f292871ad5c6df25c4f6896f7d50"
+SRCREV = "e89fcc53c27c3a3bf559d43190289c3ce4f335b1"
S = "${WORKDIR}/git"
@@ -20,6 +20,9 @@
BBCLASSEXTEND = "nativesdk"
+EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO"
+EXTRA_OECMAKE_append_toolchain-clang = "-DENABLE_WERROR=OFF"
+
do_configure_prepend () {
cd ${S}
git checkout bootstrap.sh
diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb
similarity index 95%
rename from meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb
index 7c6f4c1..d7f529e 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb
@@ -10,7 +10,7 @@
file://0001-Use-relative-install-paths-for-CMake.patch \
"
-SRCREV = "8459235919f592b1bc099ecf9a947cb6344b6fa5"
+SRCREV = "de9134007d2d029fe5809ce48f57fe218e6ffe16"
SRCREV_FORMAT = "default"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb
similarity index 74%
rename from meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
rename to meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb
index c460fc3..dc263fd 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb
@@ -6,13 +6,13 @@
SECTION = "fonts"
LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://OFL.TXT;md5=9cadb26f4c5c005618c5ae74f041ec54"
+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] = "a8e792fe6e84c86ed2b6ed3e2a12ba66"
-SRC_URI[sha256sum] = "f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7"
+SRC_URI[md5sum] = "a2cb88f6cf174f3d07de93b91e115a8d"
+SRC_URI[sha256sum] = "34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af"
inherit allarch fontcache
@@ -32,11 +32,11 @@
}
do_compile() {
- oe_runmake DESTDIR=${D} psf txt ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)}
+ oe_runmake DESTDIR=${D} psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)}
}
do_install() {
- oe_runmake DESTDIR=${D} install-psf install-acm ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)}
+ oe_runmake DESTDIR=${D} install-psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)}
}
PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb
similarity index 90%
rename from meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb
index 240949f..b6790a0 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb
@@ -5,7 +5,7 @@
DEPENDS = "virtual/libx11 libxext xorgproto"
-SRCREV = "f57a9904c43ef5d726320c77baa91d0c38361ed4"
+SRCREV = "c3d1a9dbafdfe6144ff474d0d523dc01b068750f"
SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau"
S = "${WORKDIR}/git"
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 bd75cdb..4a297c3 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
@@ -16,7 +16,9 @@
S = "${WORKDIR}/git"
-inherit pkgconfig cmake
+inherit pkgconfig cmake features_check
+
+REQUIRED_DISTRO_FEATURES += "opengl"
DEPENDS += "libpng zlib virtual/libgles2 virtual/egl"
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 3e336e4..0e50fd9 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
@@ -13,7 +13,16 @@
do_install() {
install -d ${D}/${CTSDIR}
cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR}
+
+ install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR}
+ install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR}
+ install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR}
+ install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR}
+ install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR}
+
rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles
rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles
rm -r ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles
}
+
+SECURITY_CFLAGS_riscv64 = "${SECURITY_NOPIE_CFLAGS}"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
deleted file mode 100644
index d44445f..0000000
--- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 8ab672ccc67b64058cffac2cd19a0d3b75d5aa25 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Nov 2019 11:43:32 -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: Submitted [https://github.com/LibVNC/x11vnc/pull/117]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/uinput.c | 28 ++++++++++++++++++++++++----
- 1 file changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/src/uinput.c b/src/uinput.c
-index 28fbad3..343b7c5 100644
---- a/src/uinput.c
-+++ b/src/uinput.c
-@@ -54,6 +54,11 @@ so, delete this exception statement from your version.
- #include <linux/input.h>
- #include <linux/uinput.h>
-
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- #if !defined(EV_SYN) || !defined(SYN_REPORT)
- #undef UINPUT_OK
- #endif
-@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) {
- static void ptr_move(int dx, int dy) {
- #ifdef UINPUT_OK
- struct input_event ev;
-+ struct timeval tval;
- int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
-
- if (injectable && strchr(injectable, 'M') == NULL) {
-@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) {
-
- if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d);
-
-- gettimeofday(&ev.time, NULL);
-+ gettimeofday(&tval, NULL);
-+ ev.input_event_sec = tval.tv_sec;
-+ ev.input_event_usec = tval.tv_usec;
- ev.type = EV_REL;
- ev.code = REL_Y;
- ev.value = dy;
-@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) {
- static void ptr_abs(int x, int y, int p) {
- #ifdef UINPUT_OK
- struct input_event ev;
-+ struct timeval tval;
- int x0, y0;
- int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
-
-@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) {
-
- if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d);
-
-- gettimeofday(&ev.time, NULL);
-+ gettimeofday(&tval, NULL);
-+ ev.input_event_sec = tval.tv_sec;
-+ ev.input_event_usec = tval.tv_usec;
- ev.type = EV_ABS;
- ev.code = ABS_Y;
- ev.value = y;
-@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;}
- static void button_click(int down, int btn) {
- #ifdef UINPUT_OK
- struct input_event ev;
-+ struct timeval tval;
- int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
-
- if (injectable && strchr(injectable, 'B') == NULL) {
-@@ -959,7 +971,12 @@ static void button_click(int down, int btn) {
- if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d);
-
- memset(&ev, 0, sizeof(ev));
-- gettimeofday(&ev.time, NULL);
-+ gettimeofday(&tval, NULL);
-+ gettimeofday(&tval, NULL);
-+ ev.input_event_sec = tval.tv_sec;
-+ ev.input_event_usec = tval.tv_usec;
-+ ev.input_event_sec = tval.tv_sec;
-+ ev.input_event_usec = tval.tv_usec;
- ev.type = EV_KEY;
- ev.value = down;
-
-@@ -1230,6 +1247,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) {
- void uinput_key_command(int down, int keysym, rfbClientPtr client) {
- #ifdef UINPUT_OK
- struct input_event ev;
-+ struct timeval tval;
- int scancode;
- allowed_input_t input;
- int d = direct_key_fd < 0 ? fd : direct_key_fd;
-@@ -1253,7 +1271,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
- if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d);
-
- memset(&ev, 0, sizeof(ev));
-- gettimeofday(&ev.time, NULL);
-+ gettimeofday(&tval, NULL);
-+ ev.input_event_sec = tval.tv_sec;
-+ ev.input_event_usec = tval.tv_usec;
- ev.type = EV_KEY;
- ev.code = (unsigned char) scancode;
- ev.value = down;
diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch
deleted file mode 100644
index a15f3fe..0000000
--- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 686491573827b98ba031adaa5da373366079d3d8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dagenais?= <jeff.dagenais@gmail.com>
-Date: Mon, 11 Feb 2019 11:42:59 -0500
-Subject: [PATCH] misc/Makefile.am: don't install Xdummy when configured
- --without-x
-
-Upstream-status: submitted https://github.com/jeff-dagenais/x11vnc/pull/1
-
-Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
----
- misc/Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/misc/Makefile.am b/misc/Makefile.am
-index c0b98c8..e4a22c1 100644
---- a/misc/Makefile.am
-+++ b/misc/Makefile.am
-@@ -18,7 +18,10 @@ EXTRA_DIST = \
- uinput.pl \
- ultravnc_repeater.pl \
- vcinject.pl \
-- x11vnc_loop \
-+ x11vnc_loop
-+
-+if HAVE_X11
-+EXTRA_DIST += \
- Xdummy.c \
- Xdummy.in
-
-@@ -32,3 +35,4 @@ do_dummy_c_subst = $(SED) \
- Xdummy: $(srcdir)/Xdummy.in $(srcdir)/Xdummy.c
- $(do_dummy_c_subst) < $< > $@.tmp
- mv -f $@.tmp $@
-+endif
---
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch
deleted file mode 100644
index 8e894bd..0000000
--- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 7be055c13c7d0d640941830a3291af3b404928c1 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Mon, 27 Jun 2016 04:44:14 -0400
-Subject: [PATCH] configure.ac: remove redundant RPATH
-
-It caused oe QA issue:
-...
-|ERROR: QA Issue: x11vnc: work/i586-poky-linux/x11vnc/0.9.13-r0/packages-split/
-x11vnc/usr/bin/x11vnc contains probably-redundant RPATH /usr/lib [useless-rpaths]
-...
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- configure.ac | 21 +++++----------------
- 1 file changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6f664d0..f986686 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -330,10 +330,8 @@ if test "x$with_crypto" != "xno" -a "x$with_ssl" != "xno"; then
- saved_LDFLAGS="$LDFLAGS"
- CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
-- if test "x$ld_minus_R" = "xno"; then
-+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
- :
-- elif test "x$GCC" = "xyes"; then
-- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
- else
- LDFLAGS="$LDFLAGS -R$with_ssl/lib"
- fi
-@@ -447,10 +445,8 @@ if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno
- fi
- if test "x$with_system_libvncserver" != "xyes"; then
- rflag=""
-- if test "x$ld_minus_R" = "xno"; then
-+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
- :
-- elif test "x$GCC" = "xyes"; then
-- rflag="-Xlinker -R$with_system_libvncserver/lib"
- else
- rflag="-R$with_system_libvncserver/lib"
- fi
-@@ -484,10 +480,8 @@ new enough.
- elif libvncserver-config --version 1>/dev/null 2>&1; then
- rflag=""
- rprefix=`libvncserver-config --prefix`
-- if test "x$ld_minus_R" = "xno"; then
-+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
- :
-- elif test "x$GCC" = "xyes"; then
-- rflag=" -Xlinker -R$rprefix/lib "
- else
- rflag=" -R$rprefix/lib "
- fi
-@@ -541,11 +535,8 @@ if test "x$with_jpeg" != "xno"; then
- saved_LDFLAGS="$LDFLAGS"
- CPPFLAGS="$CPPFLAGS -I$with_jpeg/include"
- LDFLAGS="$LDFLAGS -L$with_jpeg/lib"
-- if test "x$ld_minus_R" = "xno"; then
-+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
- :
-- elif test "x$GCC" = "xyes"; then
-- # this is not complete... in general a rat's nest.
-- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
- else
- LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
- fi
-@@ -590,10 +581,8 @@ if test "x$with_zlib" != "xno" -a "x$with_libz" != "xno"; then
- saved_LDFLAGS="$LDFLAGS"
- CPPFLAGS="$CPPFLAGS -I$with_zlib/include"
- LDFLAGS="$LDFLAGS -L$with_zlib/lib"
-- if test "x$ld_minus_R" = "xno"; then
-+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
- :
-- elif test "x$GCC" = "xyes"; then
-- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
- else
- LDFLAGS="$LDFLAGS -R$with_zlib/lib"
- fi
---
-2.8.1
-
diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch
deleted file mode 100644
index a571ba2..0000000
--- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Mon, 16 Mar 2020 20:04:06 +1100
-Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference
-
-xfc->width and xfc->height for the XFixes cursor image returned from
-XFixesGetCursorImage(dpy) are accessed without first checking that xfc
-is not NULL. This can result in the server sometimes crashing when
-moving a Google Chrome window.
-
-Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)")
-Upstream-Status: Accepted
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/cursor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cursor.c b/src/cursor.c
-index 39e73a6..74a08c6 100644
---- a/src/cursor.c
-+++ b/src/cursor.c
-@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) {
-
- /* retrieve the cursor info + pixels from server: */
- xfc = XFixesGetCursorImage(dpy);
-- {
-+ if (xfc) {
- /* 2017-07-09, Stephan Fuhrmann: This fixes an implementation flaw for 64 bit systems.
- * The XFixesCursorImage structure says xfc->pixels is (unsigned long*) in the structure, but
- * the protocol spec says it's 32 bit per pixel
diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
index e3a1914..50ce9a5 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
@@ -7,12 +7,11 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314"
-SRCREV = "4ca006fed80410bd9b061a1519bd5d9366bb0bc8"
+SRCREV = "87cd0530f438372dda3c70bb491a6fd19f09acc2"
+PV .= "+git${SRCPV}"
+
SRC_URI = "git://github.com/LibVNC/x11vnc \
file://starting-fix.patch \
- file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \
- file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
- file://src-cursor-fix-xfc-NULL-pointer-dereference.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
new file mode 100644
index 0000000..7dfa233
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch
@@ -0,0 +1,34 @@
+From cebbeaa9d0bdc18377faef27ea9ffd38e509d180 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 4 Feb 2020 16:38:06 -0500
+Subject: [PATCH] Fix link failure with gcc 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without the 'extern' this looks like a definition not just a
+declaration, in every file that includes the header. gcc 10 is stricter
+about this kind of multiple definition.
+
+Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=f223035f4ffcff2a9296d1e907a5193f8e8845a3]
+Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
+---
+ src/drmmode_display.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/drmmode_display.h b/src/drmmode_display.h
+index 96eaef0..8cd8a0a 100644
+--- a/src/drmmode_display.h
++++ b/src/drmmode_display.h
+@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type,
+ uint64_t *ust, uint32_t *result_seq);
+
+
+-miPointerSpriteFuncRec drmmode_sprite_funcs;
++extern miPointerSpriteFuncRec drmmode_sprite_funcs;
+
+
+ #endif
+--
+2.28.0
+
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
index 4042150..d339549 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb
@@ -12,6 +12,8 @@
inherit features_check
REQUIRED_DISTRO_FEATURES += "opengl"
+SRC_URI += "file://0001-Fix-link-failure-with-gcc-10.patch"
+
SRC_URI[md5sum] = "47eccf71823206ade9629cba69de7ef6"
SRC_URI[sha256sum] = "5cb6015d8664546ad1311bc9c363d7bc41ebf60e7046ceb44dd38e5b707961b0"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch
new file mode 100644
index 0000000..32a24b4
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch
@@ -0,0 +1,36 @@
+From 95ed4b743f197e20f1884a326d5a7128187a7ba6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 13 Aug 2020 17:56:30 -0700
+Subject: [PATCH] lbx_zlib: Mark declration with extern
+
+Fixes build with gcc10/-fno-common
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/lbx_zlib/lbx_zlib.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h
+index 8ae8956..bec3b96 100644
+--- a/src/lbx_zlib/lbx_zlib.h
++++ b/src/lbx_zlib/lbx_zlib.h
+@@ -136,9 +136,9 @@ extern void Xfree(pointer /*ptr*/);
+ #endif
+
+ /* lbx_zlib.c */
+-unsigned long stream_out_compressed;
+-unsigned long stream_out_uncompressed;
+-unsigned long stream_out_plain;
+-unsigned long stream_in_compressed;
+-unsigned long stream_in_uncompressed;
+-unsigned long stream_in_plain;
++extern unsigned long stream_out_compressed;
++extern unsigned long stream_out_uncompressed;
++extern unsigned long stream_out_plain;
++extern unsigned long stream_in_compressed;
++extern unsigned long stream_in_uncompressed;
++extern unsigned long stream_in_plain;
+--
+2.28.0
+
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
index 3e5c31a..58b4f31 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
@@ -7,7 +7,9 @@
PE = "1"
PR = "r11"
-SRC_URI += "file://mkg3states-1.1.patch"
+SRC_URI += "file://mkg3states-1.1.patch \
+ file://0001-lbx_zlib-Mark-declration-with-extern.patch \
+ "
SRC_URI[md5sum] = "273329a78c2e9ea189ac416c7fde94a1"
SRC_URI[sha256sum] = "c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae"