zepto-forks/meta-retro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dosbox: upgrade 0.74 -> 0.74-2

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-09-09 22:42:06 +02:00
parent d9388d17dc
commit e43925c734
3 changed files with 19 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
recipes-emulators/dosbox/dosbox_0.74.bb → recipes-emulators/dosbox/dosbox_0.74-2.bb
View File

@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.dosbox.com/"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libsdl libsdl-net libpng libglu" DEPENDS = "libsdl libsdl-net libpng"
inherit autotools pkgconfig inherit autotools pkgconfig
@@ -13,16 +13,15 @@ SRC_URI = " \
file://dosbox.desktop \ file://dosbox.desktop \
file://dosbox.png \ file://dosbox.png \
file://0001-use-pkgconfig-to-find-sdl.patch \ file://0001-use-pkgconfig-to-find-sdl.patch \
file://0002-include-dos_inc.h-add-missing-include.patch \
" "
SRC_URI[md5sum] = "b9b240fa87104421962d14eee71351e8" SRC_URI[md5sum] = "7110ee24a45a2b4951ad52eb1a3722be"
SRC_URI[sha256sum] = "13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05" SRC_URI[sha256sum] = "7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf"
PACKAGECONFIG ??= " \ PACKAGECONFIG ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
" "
PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl" PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
do_install_append() { do_install_append() {
install -d ${D}/${datadir}/applications install -d ${D}/${datadir}/applications

29
recipes-emulators/dosbox/files/0001-use-pkgconfig-to-find-sdl.patch
View File

@@ -1,6 +1,6 @@
From 032998923ef3a8e3267d64063723482679a7f736 Mon Sep 17 00:00:00 2001 From 032998923ef3a8e3267d64063723482679a7f736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 26 Feb 2016 22:49:19 +0100 Date: Sun, 9 Sep 2018 22:31:41 +0200
Subject: [PATCH] use pkgconfig to find sdl Subject: [PATCH] use pkgconfig to find sdl
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
@@ -8,19 +8,20 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific] Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
--- ---
configure.in | 20 +------------------- configure.ac | 21 +--------------------
1 file changed, 1 insertion(+), 19 deletions(-) 1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/configure.in b/configure.in diff --git a/configure.ac b/configure.ac
index 016ea95..79341e5 100644 index a723222..3b28be1 100644
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -28,28 +28,10 @@ if test x$host = xi386-pc-os2-emx ; then @@ -26,29 +26,10 @@ if test x$host = xi386-pc-os2-emx ; then
LDFLAGS="$LDFLAGS -Zomf -Zmt"
fi fi
dnl Check for SDL -dnl Check for SDL
-SDL_VERSION=1.2.0 -SDL_VERSION=1.2.0
-AM_PATH_SDL($SDL_VERSION, -AM_PATH_SDL($SDL_VERSION,
- :, - :,
@@ -32,7 +33,7 @@ index 016ea95..79341e5 100644
-dnl Check if SDL is 1.2.x (1.3 not supported) -dnl Check if SDL is 1.2.x (1.3 not supported)
-AC_MSG_CHECKING([SDL version only being 1.2.X]) -AC_MSG_CHECKING([SDL version only being 1.2.X])
-AC_COMPILE_IFELSE([ -AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include "SDL.h" -#include "SDL.h"
-void blah(){ -void blah(){
-#if SDL_MINOR_VERSION != 2 -#if SDL_MINOR_VERSION != 2
@@ -40,7 +41,7 @@ index 016ea95..79341e5 100644
-#endif -#endif
-; -;
-} -}
-],AC_MSG_RESULT([yes]),[ -])],AC_MSG_RESULT([yes]),[
- AC_MSG_RESULT([no]) - AC_MSG_RESULT([no])
- AC_MSG_ERROR([Only libSDL 1.2.X supported])]) - AC_MSG_ERROR([Only libSDL 1.2.X supported])])
- -
@@ -48,5 +49,5 @@ index 016ea95..79341e5 100644
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
-- --
2.5.0 2.14.4

35
recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch
View File

@@ -1,35 +0,0 @@
From 9502307543db1329af0d7d6aadb0ee67d4089f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 26 Feb 2016 22:57:57 +0100
Subject: [PATCH] include/dos_inc.h: add missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
More or less taken from [1]
[1] http://pkgs.fedoraproject.org/cgit/rpms/dosbox.git/tree/dosbox-0.74-gcc46.patch
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
include/dos_inc.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/dos_inc.h b/include/dos_inc.h
index 290d76b..b16a164 100644
--- a/include/dos_inc.h
+++ b/include/dos_inc.h
@@ -28,6 +28,8 @@
#include "mem.h"
#endif
+#include <stddef.h>
+
#ifdef _MSC_VER
#pragma pack (1)
#endif
--
2.5.0