[PATCH 1/4] mime-support: upgrade 3.48 -> 3.62

[PATCH 1/4] mime-support: upgrade 3.48 -> 3.62

[Andreas Müller]

* Many changes since 2009 (!!!) - most notable:
  CVE-2014-7209: run-mailcap shellcommand injection.
* They added Bellcore license for mailcap.man
* There is a later version 3.66 available but tarball is almost empty because
  with 3.65 they splitted mime-support into several packages

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/licenses/Bellcore                     | 13 +++++++
 ...e-support_3.48.bb => mime-support_3.62.bb} | 35 ++++++++++---------
 2 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 meta-oe/licenses/Bellcore
 rename meta-oe/recipes-support/mime-support/{mime-support_3.48.bb => mime-support_3.62.bb} (62%)

diff --git a/meta-oe/licenses/Bellcore b/meta-oe/licenses/Bellcore
new file mode 100644
index 000000000..6bbbf94e6
--- /dev/null
+++ b/meta-oe/licenses/Bellcore
@@ -0,0 +1,13 @@
+Copyright: (c) 1991 Bell Communications Research, Inc. (Bellcore)
+License: Bellcore
+ Permission to use, copy, modify, and distribute this material 
+ for any purpose and without fee is hereby granted, provided 
+ that the above copyright notice and this permission notice 
+ appear in all copies, and that the name of Bellcore not be 
+ used in advertising or publicity pertaining to this 
+ material without the specific, prior written permission 
+ of an authorized representative of Bellcore.  BELLCORE 
+ MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
+ OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
+ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
+
diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
similarity index 62%
rename from meta-oe/recipes-support/mime-support/mime-support_3.48.bb
rename to meta-oe/recipes-support/mime-support/mime-support_3.62.bb
index 1137f5012..858521b65 100644
--- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
+++ b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
@@ -1,13 +1,17 @@
 SECTION = "base"
 SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs"
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://debian/README;md5=36bbe2ace0a05c3fb684b73208fbf30b"
+LICENSE = "PD & Bellcore"
+LICENSE_${PN} = "PD"
+# mailcap.man's license is Bellcore
+LICENSE_${PN}-doc = "PD & Bellcore"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=53c851e31d27c3ea8a6217073a5ff01c"
 
 DEPENDS = "file"
 RDEPENDS_${PN} = "perl"
 RRECOMMENDS_${PN} = "file"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz"
+SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a"
 S = "${WORKDIR}/${BPN}"
 
 inherit update-alternatives
@@ -27,22 +31,22 @@ do_install () {
     install -d ${D}${mandir}/man8
     install -m 644 mime.types         ${D}${sysconfdir}/
     install -m 644 mailcap            ${D}${libdir}/mime/
-    install -m 644 mailcap.order           ${D}${sysconfdir}/
+    install -m 644 mailcap.order      ${D}${sysconfdir}/
     install -m 644 mailcap.man        ${D}${mandir}/man5/mailcap.5
-    install -m 644 mailcap.order.man    ${D}${mandir}/man5/mailcap.order.5
-#    install -m 755 install-mime        ${D}${sbindir}/
-#    install -m 644 install-mime.man        ${D}${mandir}/man8/install-mime.8
+    install -m 644 mailcap.order.man  ${D}${mandir}/man5/mailcap.order.5
+#    install -m 755 install-mime       ${D}${sbindir}/
+#    install -m 644 install-mime.man   ${D}${mandir}/man8/install-mime.8
     install -m 755 update-mime        ${D}${sbindir}/
-    install -m 644 update-mime.man        ${D}${mandir}/man8/update-mime.8
+    install -m 644 update-mime.man    ${D}${mandir}/man8/update-mime.8
     install -m 755 run-mailcap        ${D}${bindir}/
-    install -m 644 run-mailcap.man        ${D}${mandir}/man1/run-mailcap.1
-#    install -m 644 rfcs/*            ${D}${docdir}/
-    install -m 644 debian/changelog        ${D}${docdir}/changelog.Debian
-    install -m 644 debian/README        ${D}${docdir}/copyright
+    install -m 644 run-mailcap.man    ${D}${mandir}/man1/run-mailcap.1
+#    install -m 644 rfcs/*             ${D}${docdir}/
+    install -m 644 debian/changelog   ${D}${docdir}/changelog.Debian
+    install -m 644 debian/copyright   ${D}${docdir}/copyright
     install -m 755 debian-view        ${D}${libdir}/mime/
-    install -m 755 playaudio        ${D}${libdir}/mime/
+    install -m 755 playaudio          ${D}${libdir}/mime/
     install -m 755 playdsp            ${D}${libdir}/mime/
-    install -m 644 mailcap.entries        ${D}${libdir}/mime/packages/mime-support
+    install -m 644 mailcap.entries    ${D}${libdir}/mime/packages/mime-support
     cd ${D}${mandir}; gzip -9fv */*
     cd ${D}${docdir}; gzip -9v *
     cd ${D}${docdir}; gunzip copyright.gz
@@ -56,9 +60,6 @@ do_install () {
     cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz
 }
 
-SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d"
-SRC_URI[sha256sum] = "a529c7892cb786f514af71f4ca5a4c3ebc58b538a49ff959c0d97592d38f040a"
-
 ALTERNATIVE_PRIORITY = "90"
 ALTERNATIVE_${PN} = "mime.types"
 ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types"
-- 
2.31.1

[PATCH 2/4] mpv: upgrade 0.32.0 -> 0.33.1

[Andreas Müller]

Some PACKAGECONFIG / configuration changes were necessary:
* libass is mandatory
* luajit on aarch64 is fine
* wayland requires egl
* --disable-libsmbclient is gone

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../mplayer/{mpv_0.32.0.bb => mpv_0.33.1.bb}  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)
 rename meta-oe/recipes-multimedia/mplayer/{mpv_0.32.0.bb => mpv_0.33.1.bb} (89%)

diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb
similarity index 89%
rename from meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
rename to meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb
index 171eef7b7..1a9150479 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb
@@ -3,7 +3,13 @@ DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features wi
 SECTION = "multimedia"
 HOMEPAGE = "http://www.mpv.io/"
 
-DEPENDS = "zlib ffmpeg jpeg libv4l"
+DEPENDS = " \
+    zlib \
+    ffmpeg \
+    jpeg \
+    libv4l \
+    libass \
+"
 
 DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' virtual/libx11 xsp libxv libxscrnsaver libxinerama', '', d)} \
@@ -12,9 +18,9 @@ DEPENDS += " \
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb"
 
-SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7"
+SRCREV_mpv = "b5d3e43198b9d57af5620b63537885aaa41fa8cd"
 SRC_URI = " \
-    git://github.com/mpv-player/mpv;name=mpv \
+    git://github.com/mpv-player/mpv;name=mpv;branch=release/0.33;protocol=https \
     https://waf.io/waf-2.0.20;name=waf;subdir=git \
 "
 SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f"
@@ -27,18 +33,16 @@ LDFLAGS_append_riscv64 = " -latomic"
 
 LUA ?= "lua"
 LUA_mips64  = ""
-LUA_aarch64  = ""
 LUA_powerpc64  = ""
 LUA_powerpc64le  = ""
 LUA_riscv64  = ""
 LUA_riscv32  = ""
 LUA_powerpc  = ""
 
-# Note: both lua and libass are required to get on-screen-display (controls)
+# Note: lua is required to get on-screen-display (controls)
 PACKAGECONFIG ??= " \
     ${LUA} \
-    libass \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \
 "
@@ -46,11 +50,10 @@ PACKAGECONFIG ??= " \
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11"
 PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv"
 PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
-PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,"
+PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
 PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm"
 PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm"
 PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit"
-PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
 PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive"
 PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack"
 PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
@@ -90,7 +93,6 @@ EXTRA_OECONF = " \
     --confdir=${sysconfdir} \
     --datadir=${datadir} \
     --disable-manpage-build \
-    --disable-libsmbclient \
     --disable-libbluray \
     --disable-dvdnav \
     --disable-cdda \
-- 
2.31.1

[PATCH 3/4] renderdoc: upgrade 1.7 -> 1.13

[Andreas Müller]

* backported patch can go
* license checksum was changed by update of copyright year

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...-glslang-pool_allocator-setAllocator.patch | 31 -------------------
 .../{renderdoc_1.7.bb => renderdoc_1.13.bb}   | 10 +++---
 2 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch
 rename meta-oe/recipes-graphics/renderdoc/{renderdoc_1.7.bb => renderdoc_1.13.bb} (72%)

diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch
deleted file mode 100644
index 6ba1e4268..000000000
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-Remove-glslang-pool_allocator-setAllocator.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 49dd914109fd1ee9e1e917890bf18f85dd95ff31 Mon Sep 17 00:00:00 2001
-From: Reid Kleckner <rnk@google.com>
-Date: Sun, 29 Dec 2019 23:17:16 -0800
-Subject: [PATCH] Remove glslang::pool_allocator::setAllocator
-
-TPoolAllocator is not copy assignable, so this setter could never have
-been used. After a recent change (878a24ee2), new versions of Clang
-reject this code outright.
-
-Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/0de87ee9a5bf5d094a3faa1a71fd9080e80b6be0]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h
-index 0e237a6a2..b8eccb883 100644
---- a/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h
-+++ b/renderdoc/3rdparty/glslang/glslang/Include/PoolAlloc.h
-@@ -304,7 +304,6 @@ public:
-     size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
-     size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
- 
--    void setAllocator(TPoolAllocator* a) { allocator = *a; }
-     TPoolAllocator& getAllocator() const { return allocator; }
- 
- protected:
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb
similarity index 72%
rename from meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb
rename to meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb
index 6ea632d06..fa74fb39e 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb
@@ -2,12 +2,12 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd"
 DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger"
 HOMEPAGE = "https://github.com/baldurk/renderdoc"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e"
 
-SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2"
-SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \
-	   file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \
-	   file://0001-Remove-glslang-pool_allocator-setAllocator.patch \
+SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd"
+SRC_URI = " \
+    git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \
+    file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \
 "
 S = "${WORKDIR}/git"
 
-- 
2.31.1

[PATCH 4/4] xfce4-screenshooter: upgrade 1.9.8 -> 1.9.9

[Andreas Müller]

- Add link to Imgur ToS (#54)
- Add notice about imgur (#53)
- Add launchable tag to appdata.xml
- Update help message for --save option
- Add combobox with file extensions (#6)
- Add option to capture window border or not (#4)
- Preserve last used extension
- Save screenshots according to the extension (#6)
- Avoid save dialog loop if action was specified from CLI (#41)
- Respect windows scaling (!18)
- Fix compilation warnings
- Add version check for pango
- Correctly calculate dimensions of size window (#37)
- Add option to disable Imgur upload (#20)
- Translation Updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...fce4-screenshooter_1.9.8.bb => xfce4-screenshooter_1.9.9.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.8.bb => xfce4-screenshooter_1.9.9.bb} (86%)

diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb
similarity index 86%
rename from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb
rename to meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb
index dbd7a0b40..722dd2910 100644
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb
@@ -7,7 +7,7 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup
 
 inherit xfce-app
 
-SRC_URI[sha256sum] = "6f029d614ad3b63fbcf742984dc6c976f3008e7d88fa487d49ed544f56f62c50"
+SRC_URI[sha256sum] = "33c8aeb53fbdb82dbd7d40bca77a8affbb4116ba0993cd59474b554558e5daa4"
 
 do_compile_prepend() {
     mkdir -p lib
-- 
2.31.1