From f63bab9182ce9e23a5f650f9d02c69cc03436dd6 Mon Sep 17 00:00:00 2001

From: Thomas Huth <huth@tuxfamily.org>

Date: Sun, 10 Feb 2019 15:30:27 +0100

Subject: [PATCH] Work-around problems with capslib 5.1

---

 src/CMakeLists.txt | 3 +++

 src/floppy_ipf.c   | 5 +++++

 2 files changed, 8 insertions(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index 36bb166b..2f684661 100644

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -59,6 +59,9 @@ if(X11_FOUND)

 	include_directories(${X11_INCLUDE_DIR})

 endif(X11_FOUND)

+if(CAPSIMAGE_FOUND)

+	include_directories(${CAPSIMAGE_INCLUDE_DIR})

+endif(CAPSIMAGE_FOUND)

 link_directories(${CMAKE_CURRENT_BINARY_DIR}/debug

 		 ${CMAKE_CURRENT_BINARY_DIR}/falcon

diff --git a/src/floppy_ipf.c b/src/floppy_ipf.c

index 4347a5c3..37bf0c4d 100644

--- a/src/floppy_ipf.c

+++ b/src/floppy_ipf.c

@@ -30,7 +30,12 @@ const char floppy_ipf_fileid[] = "Hatari floppy_ipf.c : " __DATE__ " " __TIME__;

 #ifdef HAVE_CAPSIMAGE

 #if CAPSIMAGE_VERSION == 5

+#ifndef __cdecl

+#define __cdecl  /* CAPS headers need this, but do not define it on their own */

+#endif

 #include <caps5/CapsLibAll.h>

+#define CapsLong SDWORD

+#define CapsULong UDWORD

 #else

 #include <caps/fdc.h>

 #define CAPS_LIB_RELEASE	4

-- 

2.30.0

	"${FILESDIR}"/${PN}-2.2.1-capslib-5.1-fix.patch