meta-openembedded: subtree update:713e70bd25..5caca0f7bd

Andreas Müller (1):
      fluidsynth: upgrade 2.1.2 -> 2.1.3

Domarys Correa (6):
      python3-pytest: Update 5.3.5 -> 5.4.2
      python3-pytest-html: Update 1.6 -> 2.1.1
      python3-pytest-metadata: Update 1.8.0 -> 1.9.0
      python3-pytest-asyncio: Update 0.10.0 -> 0.12.0
      python3-pyudev: Update 0.21.0 -> 0.22.0
      python3-pyyaml: Update 5.3 -> 5.3.1

Hongxu Jia (1):
      multipath-tools: fix compiling parallel issue

Kai Kang (1):
      plymouth: disable systemd-integration for sysvinit

Khem Raj (1):
      dfu-util-native: Remove DEPLOY_DIR_TOOLS from sstate-outputdirs

Konrad Weihmann (14):
      pugixml: fix typo for homepage
      distuils-extra: fix typo for DESCRIPTION
      brotli: fix typo for DESCRIPTION
      wxwidgets: fix typo for DESCRIPTION
      passwdqc: remove double modify operation
      zbar: fix typo for DESCRIPTION
      sound-theme-freedesktop: remove double depends
      python3-cmd2: remove double colorama in RDEPENDS
      python3-smbus2: remove duplicate RDEPENDS settings
      python3-twisted: remove double var modification
      spawn-fcgi: fix typo in SUMMARY
      physfs: fix typo for HOMEPAGE
      rest: fix typo for HOMEPAGE
      proftpd: Fix typo for SRC_URI[md5sum]

Leon Anavi (4):
      python3-click: Upgrade 7.0 -> 7.1.2
      python3-dbussy: Upgrade 1.2.1 -> 1.3
      python3-imageio: Upgrade 2.6.0 -> 2.8.0
      python3-colorama: Upgrade 0.4.1 -> 0.4.3

Maciej Pijanowski (1):
      qpdf: fix typo in RDEPENDS

Martin Jansa (1):
      irssi: package libirc_proxy.a in PN-staticdev

Michael Haener (1):
      cockpit: 219 -> 220

Patrick Williams (1):
      net-snmp: refresh patches

Pierre-Jean Texier (2):
      libuv: upgrade 1.36.0 -> 1.38.0
      uftp: upgrade 4.10.2 -> 5.0

Robert P. J. Day (1):
      use weak assignments for PNBLACKLIST in recipe files

Shlomi Vaknin (1):
      add python bitstring package

Zang Ruochen (6):
      libgphoto2: upgrade 2.5.24 -> 2.5.25
      rsyslog: upgrade 8.2002 -> 8.2004
      mosquitto: upgrade 1.6.9 -> 1.6.10
      snort: upgrade 2.9.15 -> 2.9.16
      wireshark: upgrade 3.2.2 -> 3.2.4
      cpuid: upgrade 20200211 -> 20200427

Zheng Ruoqin (5):
      nano: upgrade 4.9.2 -> 4.9.3
      gsoap: upgrade 2.8.100 -> 2.8.103
      logwatch: upgrade 7.5.1 -> 7.5.3
      mcelog: upgrade 168 -> 170
      libnet-dns-perl: upgrade 1.23 -> 1.24

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I697f91df13d9e8d8cb15620aeccd644cdfe53a43

2 files changed, 24 insertions, 12 deletions

diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
index 73858b020..fcc9df8c3 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc
@@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594"
 
 SRC_URI = "git://github.com/FluidSynth/fluidsynth.git"
-SRCREV = "d9ad6a0725840388a48f45e38eda903a65ec1cf5"
+SRCREV = "19a20eb8526465fdf940b740b13462d71e190a1a"
 S = "${WORKDIR}/git"
-PV = "2.1.2"
+PV = "2.1.3"
 
 inherit cmake pkgconfig lib_package
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch
index 44612275c..cc73bdb1d 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth/0001-Do-not-build-gentables-helper-we-have-to-use-native-.patch
@@ -10,28 +10,40 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/CMakeLists.txt | 11 -----------
- 1 file changed, 11 deletions(-)
+ src/CMakeLists.txt | 23 +----------------------
+ 1 file changed, 1 insertion(+), 22 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a0ba53d1..1c626717 100644
+index 356bb734..58ff7635 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -359,14 +359,3 @@ else ( MACOSX_FRAMEWORK )
- )
+@@ -399,25 +399,4 @@ else ( MACOSX_FRAMEWORK )
     install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} )
  endif ( MACOSX_FRAMEWORK )
--
+ 
 -# ******* Auto Generated Lookup Tables ******
 -
 -include(ExternalProject)
+-
+-set (GENTAB_SDIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables)
+-set (GENTAB_BDIR ${CMAKE_CURRENT_BINARY_DIR}/gentables)
+-
+-# Use external project to ensure that cmake uses the host compiler when building make_tables.exe
+-# To fix cross-compiling fluidsynth from Win32 to ARM (using vcpkg), we need to pass the current generator
+-# on to the external project, otherwise (for some unknown reason) the target compiler will be used rather
+-# than the host compiler.
 -ExternalProject_Add(gentables
 -    DOWNLOAD_COMMAND ""
--    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables
--    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables
--    INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/"
+-    SOURCE_DIR ${GENTAB_SDIR}
+-    BINARY_DIR ${GENTAB_BDIR}
+-    CONFIGURE_COMMAND
+-        "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}"
+-    BUILD_COMMAND
+-        "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}"
+-    INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/"
 -)
 -add_dependencies(libfluidsynth-OBJ gentables)
++
 -- 
-2.14.5
+2.21.1