diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /games-emulation/hatari/files | |
parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) |
gentoo resync : 15.06.2021
Diffstat (limited to 'games-emulation/hatari/files')
-rw-r--r-- | games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch | 18 | ||||
-rw-r--r-- | games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch | 12 |
2 files changed, 30 insertions, 0 deletions
diff --git a/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch b/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch new file mode 100644 index 000000000000..a12207b09583 --- /dev/null +++ b/games-emulation/hatari/files/hatari-2.3.1-caps5-include-path.patch @@ -0,0 +1,18 @@ +Gentoo's spsdeclib ebuild installs headers in caps5/ +while upstream now expects them in caps/ + +See: https://github.com/hatari/hatari/commit/367a87b +--- a/cmake/FindCapsImage.cmake ++++ b/cmake/FindCapsImage.cmake +@@ -6,3 +6,3 @@ + +-SET(CAPSIMAGE_DIR caps) ++SET(CAPSIMAGE_DIR caps5) + FIND_PATH(CAPSIMAGE_INCLUDE_DIR ${CAPSIMAGE_DIR}/CapsAPI.h) +--- a/src/floppy_ipf.c ++++ b/src/floppy_ipf.c +@@ -34,3 +34,3 @@ + #endif +-#include <caps/CapsLibAll.h> ++#include <caps5/CapsLibAll.h> + #define CapsLong SDWORD diff --git a/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch b/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch new file mode 100644 index 000000000000..39da11ea307d --- /dev/null +++ b/games-emulation/hatari/files/hatari-2.3.1-cmake-include-checksym.patch @@ -0,0 +1,12 @@ +Fix edge case build failure triggered by passing every +DISABLE_FIND_PACKAGE, including disabling the normally +always-enabled readline. + +CMake Error at CMakeLists.txt:229 (check_symbol_exists): + Unknown CMake command "check_symbol_exists". +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,2 +12,3 @@ + include(CheckStructHasMember) ++include(CheckSymbolExists) + include(CheckCCompilerFlag) |