git: c325f70161eb - main - graphics/milton: fix build with SDL2 2.24.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 07 Sep 2022 17:23:10 UTC
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c325f70161ebd084691806a572e8e388239c509a
commit c325f70161ebd084691806a572e8e388239c509a
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-09-07 15:22:37 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-09-07 17:22:36 +0000
graphics/milton: fix build with SDL2 2.24.0
---
graphics/milton/files/patch-CMakeLists.txt | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/graphics/milton/files/patch-CMakeLists.txt b/graphics/milton/files/patch-CMakeLists.txt
index d619b8e3f494..66957d412056 100644
--- a/graphics/milton/files/patch-CMakeLists.txt
+++ b/graphics/milton/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig 2019-03-15 04:11:43 UTC
+--- CMakeLists.txt.orig 2019-10-27 22:02:14 UTC
+++ CMakeLists.txt
@@ -41,7 +41,7 @@ else()
endif()
@@ -9,7 +9,7 @@
message(STATUS "Building ${CMAKE_BUILD_TYPE}")
-@@ -71,13 +71,14 @@ if(UNIX)
+@@ -71,13 +71,15 @@ if(UNIX)
${UnixCFlags})
endif()
@@ -22,29 +22,30 @@
find_library(XINPUT_LIBRARY libXi.so)
find_package(Threads REQUIRED)
+ find_package(SDL2 REQUIRED)
++ find_package(SDL2_image REQUIRED)
if(XINPUT_LIBRARY STREQUAL "XINPUT_LIBRARY-NOTFOUND")
message(FATAL_ERROR "Could not find libXi.so")
-@@ -98,7 +99,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+@@ -98,7 +100,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
target_include_directories(Milton PRIVATE
${GTK2_INCLUDE_DIRS}
${X11_INCLUDE_DIR}
- ${SDL2DIR}/build/linux64/include/SDL2
-+ ${SDL2_INCLUDE_DIRS}
${OPENGL_INCLUDE_DIR}
)
-@@ -107,8 +108,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+@@ -107,8 +108,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
${X11_LIBRARIES}
${OPENGL_LIBRARIES}
${XINPUT_LIBRARY}
- ${SDL2DIR}/build/linux64/lib/libSDL2maind.a
- ${SDL2DIR}/build/linux64/lib/libSDL2d.a
-+ ${SDL2_LIBRARIES} SDL2_image
++ SDL2::SDL2
++ SDL2_image::SDL2_image
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_DL_LIBS}
)
-@@ -132,11 +132,8 @@ if(WIN32 OR APPLE)
+@@ -132,11 +133,8 @@ if(WIN32 OR APPLE)
endif()
add_custom_command(TARGET Milton POST_BUILD