From 1df54430441714f268d1980f289e70ddc4b1872a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 1 Jan 2022 14:28:39 +0100
Subject: [PATCH] dosbox-staging: upgrade 0.77.1 -> 0.78.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-emulators/dosbox/dosbox-staging.bb    | 11 +++-----
 .../0001-Fix-missing-include.patch            | 25 -------------------
 2 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-emulators/dosbox/dosbox-staging/0001-Fix-missing-include.patch

diff --git a/recipes-emulators/dosbox/dosbox-staging.bb b/recipes-emulators/dosbox/dosbox-staging.bb
index 4d0e34d..b80941e 100644
--- a/recipes-emulators/dosbox/dosbox-staging.bb
+++ b/recipes-emulators/dosbox/dosbox-staging.bb
@@ -14,24 +14,21 @@ DEPENDS = " \
     fluidsynth \
     opusfile \
     munt \
+    libslirp \
 "
 
 inherit meson pkgconfig gtk-icon-cache features_check
 
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
-SRC_URI = " \
-    git://github.com/dosbox-staging/dosbox-staging.git;branch=kc/release-0.77.1;protocol=https \
-    file://0001-Fix-missing-include.patch \
-"
-SRCREV = "30d8752ac518182b83af945b3dd372eb4fc9b08d"
-PV = "0.77.1"
+SRC_URI = "git://github.com/dosbox-staging/dosbox-staging.git;branch=main;protocol=https"
+SRCREV = "656e98edaf0fd2269c3d74792a568f277180e6d0"
+PV = "0.78.0"
 S = "${WORKDIR}/git"
 
 DYNCORE ?= "-Ddynamic_core=dynrec"
 
 EXTRA_OEMESON = " \
-    -Duse_pcap=true \
     ${DYNCORE} \
 "
 
diff --git a/recipes-emulators/dosbox/dosbox-staging/0001-Fix-missing-include.patch b/recipes-emulators/dosbox/dosbox-staging/0001-Fix-missing-include.patch
deleted file mode 100644
index fa21df2..0000000
--- a/recipes-emulators/dosbox/dosbox-staging/0001-Fix-missing-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5b23877f74f9cbfc8a6442e19c672ba91229f923 Mon Sep 17 00:00:00 2001
-From: Dan Church <amphetamachine@gmail.com>
-Date: Thu, 8 Jul 2021 16:15:37 -0500
-Subject: [PATCH] Fix missing include
-
-Upstream-Status: Accepted[https://github.com/dosbox-staging/dosbox-staging/commit/5b23877f74f9cbfc8a6442e19c672ba91229f923]
----
- src/hardware/ne2000.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hardware/ne2000.cpp b/src/hardware/ne2000.cpp
-index 7b4dcec4..3f68fe79 100644
---- a/src/hardware/ne2000.cpp
-+++ b/src/hardware/ne2000.cpp
-@@ -26,6 +26,7 @@
- 
- #if C_NE2000
- 
-+#include <cstdarg>
- #include <cstdio>
- #include <cstring>
- 
--- 
-2.31.1
-