diff --git a/games/devilutionx/Makefile b/games/devilutionx/Makefile index f855de03daf..6556bb05175 100644 --- a/games/devilutionx/Makefile +++ b/games/devilutionx/Makefile @@ -5,6 +5,7 @@ CATEGORIES = games x11 GH_ACCOUNT = diasurgical GH_PROJECT = devilutionX GH_TAGNAME = 1.1.0 +REVISION = 0 MAINTAINER = Brian Callahan @@ -26,7 +27,8 @@ LIB_DEPENDS = devel/sdl2-mixer \ CONFIGURE_ARGS = -DBINARY_RELEASE=ON \ -DDEBUG=OFF \ -DDISABLE_LTO=ON \ - -DVERSION_NUM="${GH_TAGNAME}" + -DVERSION_NUM="${GH_TAGNAME}" \ + -DSDL2_INCLUDE_DIR=${LOCALBASE}/include/SDL2 NO_TEST = Yes diff --git a/games/devilutionx/patches/patch-CMakeLists_txt b/games/devilutionx/patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..7c647491e82 --- /dev/null +++ b/games/devilutionx/patches/patch-CMakeLists_txt @@ -0,0 +1,12 @@ +EXPERIMENTAL: don't link SDL2::SDL2main (removed in SDL 2.24.0) +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -479,7 +479,6 @@ foreach(target devilution ${BIN_TARGET}) + target_compile_definitions(${target} PRIVATE USE_SDL1) + else() + target_link_libraries(${target} PRIVATE +- SDL2::SDL2main + SDL2::SDL2_ttf + SDL2::SDL2_mixer) + endif() diff --git a/games/devilutionx/patches/patch-CMake_FindSDL2_cmake b/games/devilutionx/patches/patch-CMake_FindSDL2_cmake new file mode 100644 index 00000000000..a3ef6999879 --- /dev/null +++ b/games/devilutionx/patches/patch-CMake_FindSDL2_cmake @@ -0,0 +1,14 @@ +comment out set_property to avoid error "set_property can not be used on an +ALIAS target" + +Index: CMake/FindSDL2.cmake +--- CMake/FindSDL2.cmake.orig ++++ CMake/FindSDL2.cmake +@@ -251,5 +251,5 @@ mark_as_advanced(SDL2_LIBRARY + SDL2_MWINDOWS_LIBRARY) + + find_package(Threads REQUIRED) +-set_property(TARGET SDL2::SDL2 APPEND PROPERTY +- INTERFACE_LINK_LIBRARIES Threads::Threads) ++#set_property(TARGET SDL2::SDL2 APPEND PROPERTY ++# INTERFACE_LINK_LIBRARIES Threads::Threads)