From e43925c734625972c7f2c2c7baabc809ad09d8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 9 Sep 2018 22:42:06 +0200 Subject: [PATCH] dosbox: upgrade 0.74 -> 0.74-2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../{dosbox_0.74.bb => dosbox_0.74-2.bb} | 9 +++-- .../0001-use-pkgconfig-to-find-sdl.patch | 29 +++++++-------- ...nclude-dos_inc.h-add-missing-include.patch | 35 ------------------- 3 files changed, 19 insertions(+), 54 deletions(-) rename recipes-emulators/dosbox/{dosbox_0.74.bb => dosbox_0.74-2.bb} (76%) delete mode 100644 recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch diff --git a/recipes-emulators/dosbox/dosbox_0.74.bb b/recipes-emulators/dosbox/dosbox_0.74-2.bb similarity index 76% rename from recipes-emulators/dosbox/dosbox_0.74.bb rename to recipes-emulators/dosbox/dosbox_0.74-2.bb index 9a462ba..b38fb08 100644 --- a/recipes-emulators/dosbox/dosbox_0.74.bb +++ b/recipes-emulators/dosbox/dosbox_0.74-2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.dosbox.com/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libsdl libsdl-net libpng libglu" +DEPENDS = "libsdl libsdl-net libpng" inherit autotools pkgconfig @@ -13,16 +13,15 @@ SRC_URI = " \ 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" +SRC_URI[md5sum] = "7110ee24a45a2b4951ad52eb1a3722be" +SRC_URI[sha256sum] = "7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf" PACKAGECONFIG ??= " \ ${@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() { install -d ${D}/${datadir}/applications 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 index 071618a..c7dbaa7 100644 --- a/recipes-emulators/dosbox/files/0001-use-pkgconfig-to-find-sdl.patch +++ b/recipes-emulators/dosbox/files/0001-use-pkgconfig-to-find-sdl.patch @@ -1,6 +1,6 @@ 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 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 9 Sep 2018 22:31:41 +0200 Subject: [PATCH] use pkgconfig to find sdl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,19 +8,20 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [oe specific] -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- - configure.in | 20 +------------------- - 1 file changed, 1 insertion(+), 19 deletions(-) + configure.ac | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 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 +diff --git a/configure.ac b/configure.ac +index a723222..3b28be1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,29 +26,10 @@ if test x$host = xi386-pc-os2-emx ; then + LDFLAGS="$LDFLAGS -Zomf -Zmt" fi - dnl Check for SDL +-dnl Check for SDL -SDL_VERSION=1.2.0 -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) -AC_MSG_CHECKING([SDL version only being 1.2.X]) --AC_COMPILE_IFELSE([ +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -#include "SDL.h" -void blah(){ -#if SDL_MINOR_VERSION != 2 @@ -40,7 +41,7 @@ index 016ea95..79341e5 100644 -#endif -; -} --],AC_MSG_RESULT([yes]),[ +-])],AC_MSG_RESULT([yes]),[ - AC_MSG_RESULT([no]) - 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. -- -2.5.0 +2.14.4 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 deleted file mode 100644 index 86e30c2..0000000 --- a/recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 -