walnascar and whinlatter support

.github/workflows/CI_github.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       matrix:
         dotnet_version: [8.0.406, 6.0.428]
-        mono_version: [6.12.0.206]
-        branch: [styhead]
+        mono_version: [6.14.1]
+        branch: [walnascar, master]
         arch: [x86-64, arm, arm64]
     env:
       name: build-and-test

classes/mono.bbclass

@@ -31,12 +31,12 @@ FILES:${PN}-doc:append = " \
   ${libdir}/monodoc/* \
 "
 
-export MONO_CFG_DIR="${STAGING_ETCDIR_NATIVE}"
+export MONO_CFG_DIR = "${STAGING_ETCDIR_NATIVE}"
 
 # NuGet uses $HOME/.nuget/packages to store packages by default
 # but we should not use anything outside the build root of packages.
-export NUGET_PACKAGES="${UNPACKDIR}/mono-nuget-packages"
-export NUGET_HTTP_CACHE_PATH="${UNPACKDIR}/mono-nuget-http-cache"
+export NUGET_PACKAGES = "${UNPACKDIR}/mono-nuget-packages"
+export NUGET_HTTP_CACHE_PATH = "${UNPACKDIR}/mono-nuget-http-cache"
 
 do_configure:prepend() {
 	mkdir -p ${NUGET_PACKAGES} ${NUGET_HTTP_CACHE_PATH}

conf/layer.conf

@@ -10,8 +10,8 @@ BBFILE_PATTERN_mono := "^${LAYERDIR}/"
 BBFILE_PRIORITY_mono = "5"
 
 # Default tested with qemux86/qemuarm
-PREFERRED_VERSION_mono ?= "6.12.0.206"
-PREFERRED_VERSION_mono-native ?= "6.12.0.206"
+PREFERRED_VERSION_mono ?= "6.14.1"
+PREFERRED_VERSION_mono-native ?= "6.14.1"
 
 PREFERRED_VERSION_libgdiplus ?= "6.0.5"
 PREFERRED_VERSION_libgdiplus-native ?= "6.0.5"
@@ -30,4 +30,9 @@ INSANE_SKIP:msbuild-dev += "buildpaths"
 INSANE_SKIP:python3-clr-loader += "buildpaths"
 INSANE_SKIP:python3-pythonnet += "buildpaths"
 
-LAYERSERIES_COMPAT_mono = "styhead"
+LAYERSERIES_COMPAT_mono = "styhead walnascar whinlatter"
+
+MONO_WHINLATTER_S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
+MONO_NON_WHINLATTER_S = "${WORKDIR}/git"
+
+MONO_GIT_S = '${@bb.utils.contains_any("LAYERSERIES_CORENAMES", "whinlatter", d.getVar("MONO_WHINLATTER_S"), d.getVar("MONO_NON_WHINLATTER_S"), d)}'

recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb

@@ -11,7 +11,7 @@ SRCREV = "9a72bb67fff7e4845b7bb430a608282668c3e4da"
 SRC_URI = "git://github.com/mono/gtk-sharp.git;protocol=https;branch=master \
            file://0001-fixup-gmcs-to-mcs.patch"
 
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"
 
 do_configure:prepend() {
   export PROFILER_CFLAGS="-D_REENTRANT -I${STAGING_DIR_TARGET}/usr/include/glib-2.0 -I${STAGING_DIR_TARGET}/usr/lib/glib-2.0 -I${STAGING_DIR_TARGET}/usr/lib/glib-2.0/include -I${STAGING_DIR_TARGET}/usr/include/mono-2.0"

recipes-mono/libgdiplus/libgdiplus-common.inc

@@ -11,7 +11,7 @@ SRC_URI = " \
 	gitsm://github.com/mono/libgdiplus.git;protocol=https;branch=${BRANCH} \
 "
 
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"
 
 inherit autotools pkgconfig
 

recipes-mono/mono-addins/mono-addins-xbuild.inc

@@ -13,7 +13,7 @@ SRCBRANCH = "master"
 
 SRC_URI = "git://github.com/mono/mono-addins.git;protocol=https;branch=${SRCBRANCH}"
 
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"
 
 do_configure() {
 }

recipes-mono/mono-addins/mono-addins.inc

@@ -14,7 +14,7 @@ SRCBRANCH = "master"
 SRC_URI = "git://github.com/mono/mono-addins.git;protocol=https;branch=${SRCBRANCH} \
 	   file://0001-configure-mcs.patch"
 
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"
 
 inherit autotools-brokensep pkgconfig
 inherit mono

recipes-mono/mono-helloworld/mono-helloworld_git.bb.disabled

@@ -2,4 +2,4 @@ require mono-helloworld.inc
 
 SRCREV = "${AUTOREV}"
 SRC_URI =  "git://github.com/DynamicDevices/mono-helloworld.git" 
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"

recipes-mono/mono-upnp/mono-upnp.inc

@@ -16,7 +16,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
 SRC_URI = "git://github.com/mono/mono-upnp.git;protocol=https;branch=${SRCBRANCH} \
 "
 
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"
 
 inherit autotools-brokensep pkgconfig
 

recipes-mono/mono-xsp/mono-xsp_git.bb

@@ -1,7 +1,7 @@
 require mono-xsp-3.x.inc
 
-SRCREV= "e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
+SRCREV = "e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
 SRC_URI = "git://github.com/mono/xsp.git;branch=main;protocol=https \
 	  "
 
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"

recipes-mono/mono/mono-4.xx.inc

@@ -94,4 +94,4 @@ FILES:${PN}-staticdev			+= " ${libdir}/*.a"
 RDEPENDS:${PN}-dev =+ "bash"
 
 # Workaround for observed race in `make install`
-PARALLEL_MAKEINST=""
+PARALLEL_MAKEINST = ""

recipes-mono/mono/mono-5.xx.inc

@@ -106,7 +106,7 @@ RDEPENDS:${PN}-dev =+ "bash"
 RDEPENDS:${PN}-libs =+ "zlib"
 
 # Workaround for observed race in `make install`
-PARALLEL_MAKEINST=""
+PARALLEL_MAKEINST = ""
 
 # Otherwise the full path to bash is written to the first line of doltlibtool script
 # which causes build failures with deeply nested build directories

recipes-mono/mono/mono-6.12.0.206.inc

@@ -1,3 +1,3 @@
-S = "${UNPACKDIR}/git"
+S = "${MONO_GIT_S}"
 
 DEPENDS += " cmake-native"

recipes-mono/mono/mono-6.14.1.inc

@@ -0,0 +1,6 @@
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f815b59fe41d3bd82da1b0fa87ffcd9f"
+SRC_URI[sha256sum] = "3024c97c0bc8cbcd611c401d5f994528704108ceb31f31b28dea4783004d0820"
+
+S = "${UNPACKDIR}/mono-${PV}"
+
+DEPENDS += " cmake-native"

recipes-mono/mono/mono-6.14.1/0001-Add-libusb-1.0-mapping.patch

@@ -0,0 +1,32 @@
+From 611f269ab768407965311ad3be56edf912c36e95 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
+ <zboszor@gmail.com>
+Date: Tue, 22 Oct 2024 07:36:06 +0200
+Subject: [PATCH] Add libusb-1.0 mapping
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes using USB devices with LibUsbDotNet and MonoLibUsb.
+
+Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
+Upstream-Status: Submitted [https://github.com/mono/mono/pull/21807]
+---
+ data/config.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/config.in b/data/config.in
+index 2718b6e9f45..66cfd55ab76 100644
+--- a/data/config.in
++++ b/data/config.in
+@@ -33,6 +33,7 @@
+ 	<dllmap dll="libcairo-2.dll" target="$mono_libdir/libcairo.2.dylib" os="osx" />
+ 	<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
+ 	<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
++	<dllmap dll="libusb-1.0" target="libusb-1.0.so.0" os="!windows"/>
+ 	<dllmap dll="i:kernel32.dll">
+ 		<dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/>
+ 		<dllentry dll="__Internal" name="FillMemory" target="mono_win32_compat_FillMemory"/>
+-- 
+2.47.0
+