From ad9cc190c7e172a18ddd62635883fffbe5698c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 9 Dec 2021 00:50:35 +0100
Subject: [PATCH] dosbox-x: upgrade 0.83.19 -> 0.83.20
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-x.bb          |  4 +--
 .../0001-use-pkgconfig-to-find-sdl2.patch     | 28 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/recipes-emulators/dosbox/dosbox-x.bb b/recipes-emulators/dosbox/dosbox-x.bb
index 4f591ea..3f1da8a 100644
--- a/recipes-emulators/dosbox/dosbox-x.bb
+++ b/recipes-emulators/dosbox/dosbox-x.bb
@@ -23,8 +23,8 @@ SRC_URI = " \
     file://0001-use-pkgconfig-to-find-sdl2.patch \
     file://0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch \
 "
-SRCREV = "f51bf24c4a3f695bdc3fb77f8d813f620893291d"
-PV = "0.83.19"
+SRCREV = "71ebd3b0df3362085ba04e908d2630f951f8733d"
+PV = "0.83.20"
 S = "${WORKDIR}/git"
 
 EXTRA_OECONF = " \
diff --git a/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch b/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch
index b536a14..9f0562a 100644
--- a/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch
+++ b/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch
@@ -1,6 +1,6 @@
 From 94c1308880c9bed9f7ddecf930e8f1e771a9f552 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Fri, 16 Oct 2020 23:41:09 +0200
+Date: Wed, 8 Dec 2021 23:34:23 +0100
 Subject: [PATCH] use pkgconfig to find sdl2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- acinclude.m4 | 64 ++++------------------------------------------------
- 1 file changed, 4 insertions(+), 60 deletions(-)
+ acinclude.m4 | 63 ++++------------------------------------------------
+ 1 file changed, 4 insertions(+), 59 deletions(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index a7424b901..edf15214e 100644
+index faf376e2c..23f260630 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -12,37 +12,9 @@ AC_ARG_ENABLE(sdl2,     [  --enable-sdl2           Enable SDL 2.x],
@@ -36,9 +36,9 @@ index a7424b901..edf15214e 100644
 -      fi
 -    fi
 -
--    if test -x vs2015/sdl2/linux-host/bin/sdl2-config ; then
--      SDL2_CONFIG=vs2015/sdl2/linux-host/bin/sdl2-config
--      PATH=vs2015/sdl2/linux-host/bin:$PATH
+-    if test -x vs/sdl2/linux-host/bin/sdl2-config ; then
+-      SDL2_CONFIG=vs/sdl2/linux-host/bin/sdl2-config
+-      PATH=vs/sdl2/linux-host/bin:$PATH
 -    fi
 -
 -    AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no)
@@ -57,11 +57,9 @@ index a7424b901..edf15214e 100644
    fi
  
    AC_SUBST(SDL2_CFLAGS)
-@@ -67,37 +39,9 @@ AC_ARG_ENABLE(sdl, [  --enable-sdl            Enable SDL 1.x],
+@@ -69,35 +41,8 @@ AC_ARG_ENABLE(sdl, [  --enable-sdl            Enable SDL 1.x],
  
-   AH_TEMPLATE(C_SDL1,[Set to 1 to enable SDL 1.x support])
- 
--  SDL_CONFIG=no
+   SDL_CONFIG=no
    if test x$enable_sdlenable = xyes ; then
 -    if test x$sdl_exec_prefix != x ; then
 -      sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
@@ -76,9 +74,9 @@ index a7424b901..edf15214e 100644
 -      fi
 -    fi
 -
--    if test -x vs2015/sdl/linux-host/bin/sdl-config ; then
--      SDL_CONFIG=vs2015/sdl/linux-host/bin/sdl-config
--      PATH=vs2015/sdl/linux-host/bin:$PATH
+-    if test -x vs/sdl/linux-host/bin/sdl-config ; then
+-      SDL_CONFIG=vs/sdl/linux-host/bin/sdl-config
+-      PATH=vs/sdl/linux-host/bin:$PATH
 -    fi
 -
 -    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
@@ -98,5 +96,5 @@ index a7424b901..edf15214e 100644
  
    AC_SUBST(SDL_CFLAGS)
 -- 
-2.26.2
+2.31.1