From 3df243d8ba94aede1fb40683c0b56d6e1cfc6c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 28 Feb 2016 00:06:26 +0100 Subject: [PATCH] dosbox: initial add 0.74 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Icon and desktop file are based upon [1]. [1] http://pkgs.fedoraproject.org/cgit/rpms/dosbox.git/tree/ Signed-off-by: Andreas Müller --- recipes-emulators/dosbox/dosbox_0.74.bb | 27 +++++++++ .../0001-use-pkgconfig-to-find-sdl.patch | 52 ++++++++++++++++++ ...nclude-dos_inc.h-add-missing-include.patch | 35 ++++++++++++ recipes-emulators/dosbox/files/dosbox.desktop | 8 +++ recipes-emulators/dosbox/files/dosbox.png | Bin 0 -> 206 bytes 5 files changed, 122 insertions(+) create mode 100644 recipes-emulators/dosbox/dosbox_0.74.bb create mode 100644 recipes-emulators/dosbox/files/0001-use-pkgconfig-to-find-sdl.patch create mode 100644 recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch create mode 100644 recipes-emulators/dosbox/files/dosbox.desktop create mode 100644 recipes-emulators/dosbox/files/dosbox.png diff --git a/recipes-emulators/dosbox/dosbox_0.74.bb b/recipes-emulators/dosbox/dosbox_0.74.bb new file mode 100644 index 0000000..fdcbb2c --- /dev/null +++ b/recipes-emulators/dosbox/dosbox_0.74.bb @@ -0,0 +1,27 @@ +SUMMARY = "OSBox is a DOS-emulator that uses the SDL-library" +HOMEPAGE = "http://www.dosbox.com/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "libsdl libsdl-net libpng" + +inherit autotools pkgconfig + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ + file://dosbox.desktop \ + file://dosbox.png \ + file://0001-use-pkgconfig-to-find-sdl.patch \ + file://0002-include-dos_inc.h-add-missing-include.patch \ +" +SRC_URI[md5sum] = "b9b240fa87104421962d14eee71351e8" +SRC_URI[sha256sum] = "13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05" + +do_install_append() { + install -d ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/*.desktop ${D}/${datadir}/applications + + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps +} diff --git a/recipes-emulators/dosbox/files/0001-use-pkgconfig-to-find-sdl.patch b/recipes-emulators/dosbox/files/0001-use-pkgconfig-to-find-sdl.patch new file mode 100644 index 0000000..071618a --- /dev/null +++ b/recipes-emulators/dosbox/files/0001-use-pkgconfig-to-find-sdl.patch @@ -0,0 +1,52 @@ +From 032998923ef3a8e3267d64063723482679a7f736 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 26 Feb 2016 22:49:19 +0100 +Subject: [PATCH] use pkgconfig to find sdl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Andreas Müller +--- + configure.in | 20 +------------------- + 1 file changed, 1 insertion(+), 19 deletions(-) + +diff --git a/configure.in b/configure.in +index 016ea95..79341e5 100644 +--- a/configure.in ++++ b/configure.in +@@ -28,28 +28,10 @@ if test x$host = xi386-pc-os2-emx ; then + fi + + dnl Check for SDL +-SDL_VERSION=1.2.0 +-AM_PATH_SDL($SDL_VERSION, +- :, +- AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) +-) ++PKG_CHECK_MODULES([SDL], [sdl]) + LIBS="$LIBS $SDL_LIBS" + CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" + +-dnl Check if SDL is 1.2.x (1.3 not supported) +-AC_MSG_CHECKING([SDL version only being 1.2.X]) +-AC_COMPILE_IFELSE([ +-#include "SDL.h" +-void blah(){ +-#if SDL_MINOR_VERSION != 2 +-#error "Only SDL 1.2 supported" +-#endif +-; +-} +-],AC_MSG_RESULT([yes]),[ +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([Only libSDL 1.2.X supported])]) +- + dnl Checks for header files. + + dnl Checks for typedefs, structures, and compiler characteristics. +-- +2.5.0 + diff --git a/recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch b/recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch new file mode 100644 index 0000000..86e30c2 --- /dev/null +++ b/recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch @@ -0,0 +1,35 @@ +From 9502307543db1329af0d7d6aadb0ee67d4089f52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 ++ + #ifdef _MSC_VER + #pragma pack (1) + #endif +-- +2.5.0 + diff --git a/recipes-emulators/dosbox/files/dosbox.desktop b/recipes-emulators/dosbox/files/dosbox.desktop new file mode 100644 index 0000000..040b442 --- /dev/null +++ b/recipes-emulators/dosbox/files/dosbox.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=DOSBox +Comment=An x86/DOS emulator with sound/graphics +Exec=dosbox +Icon=dosbox.png +Terminal=false +Type=Application +Categories=System;Emulator;Game; diff --git a/recipes-emulators/dosbox/files/dosbox.png b/recipes-emulators/dosbox/files/dosbox.png new file mode 100644 index 0000000000000000000000000000000000000000..5945b2c902092b08650e68ed5bb43667c87c2a79 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk@BpAX3RW*PVQ_-+hvdX)YTa{dr!~!^Yp7*`i-vb(K$~RCkp5D yG=6xpY7)cdc83GMlTt&ro^|i+zN&uz8QUctxs=uKH}wFmV(@hJb6Mw<&;$URr$#aW literal 0 HcmV?d00001