From f964cc8cdcb4467da47a6e56ac836b3a2f289340 Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Wed, 10 Apr 2013 16:22:13 +0400
Subject: [PATCH] Minetest 0.4.6: CMake patch.

---
 games-action/minetest/Manifest                |  1 +
 .../minetest/files/minetest-0.4.6-cmake.patch | 88 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 games-action/minetest/files/minetest-0.4.6-cmake.patch

diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 596d1372..791bcce4 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,5 +1,6 @@
 AUX minetest-0.4.5-cmake.patch 2623 SHA256 4befb69b403a875d9774258d307fb846eb7c829f86458c7b7eceb8683c204d78 SHA512 d7f38de0e9d785523a6af89af3f6c0ed40035825d913b9bd3db8655152604413ffcaac9d194b3edc6f441bc6dd463e1997c742400272d2c4097b2c70528b5473 WHIRLPOOL 41f5d058064b16a9df6e81366968fdfaf2b9ae318a2a548217ac1e328a5b0a3057327a855cc836e9b0d5f4db503ca3cce09ec9e7a2891ea2014337c5586b0d76
 AUX minetest-0.4.5-unbundle.patch 727 SHA256 155c98a1345de0d9d7ddf394505a5b1201bbea8e3c28894aa493fd0519cbb695 SHA512 0a97298d67690ce3e2073015cdce95c17c426a9cfd989dd377135b834749ffa1fce3b6c8d4037b2432cce1035e786193a21e773c4a7f6d9de5b3c980754a46c1 WHIRLPOOL 4d873dc98ca1505ed61da8b1142f53e489ae344fbb78925fa02d85bd86b9dbd7a09432917c603dd4e28cf6c1058ac3f5d63fbf2f3d1356e645a5826543ac655d
+AUX minetest-0.4.6-cmake.patch 2623 SHA256 4befb69b403a875d9774258d307fb846eb7c829f86458c7b7eceb8683c204d78 SHA512 d7f38de0e9d785523a6af89af3f6c0ed40035825d913b9bd3db8655152604413ffcaac9d194b3edc6f441bc6dd463e1997c742400272d2c4097b2c70528b5473 WHIRLPOOL 41f5d058064b16a9df6e81366968fdfaf2b9ae318a2a548217ac1e328a5b0a3057327a855cc836e9b0d5f4db503ca3cce09ec9e7a2891ea2014337c5586b0d76
 AUX minetest-0.4.6-unbundle.patch 727 SHA256 155c98a1345de0d9d7ddf394505a5b1201bbea8e3c28894aa493fd0519cbb695 SHA512 0a97298d67690ce3e2073015cdce95c17c426a9cfd989dd377135b834749ffa1fce3b6c8d4037b2432cce1035e786193a21e773c4a7f6d9de5b3c980754a46c1 WHIRLPOOL 4d873dc98ca1505ed61da8b1142f53e489ae344fbb78925fa02d85bd86b9dbd7a09432917c603dd4e28cf6c1058ac3f5d63fbf2f3d1356e645a5826543ac655d
 AUX minetestserver.confd 313 SHA256 b360d2f80fb9793994a33778ef907a5b9220ba0a6a8a312d75499718cb9b5f81 SHA512 96fe764d78b383f294bce81e8631861057f309fd9d13f9397ca0c715396f3793f201f313a3507c0b190f41891441eb4fe418b5888cb73ffdea0d27969d0172c3 WHIRLPOOL 6be18593d29f593904760e19486eb77b3ac6bb6b02eaf7de54aba7f5cc117ebafa6ab355787015d3fc2baec6ef8368b3dc8e37bf5df9a901595ccc082adae941
 AUX minetestserver.initd 570 SHA256 15d567577377cb8c2d6dc6e38b90e83aa08217ce4aa01e5f77b2b636c81c9e41 SHA512 dc0f106812bc52eec9436a9367b8eba0814642e8b74109c870046f8f9575ebb29561c168e05fe2b1faf12c17329cdc6b76442707ffe7dbe8fb7ee8cd4bb797c2 WHIRLPOOL 2ba91a77122142512c3123efc34dd19fd1437b68bcc1a51e17cd40040f3f6fc955927533472b98be047536db26679e45d5d54c2ad8512e9fe67bffd84a655e4e
diff --git a/games-action/minetest/files/minetest-0.4.6-cmake.patch b/games-action/minetest/files/minetest-0.4.6-cmake.patch
new file mode 100644
index 00000000..7b5f80bd
--- /dev/null
+++ b/games-action/minetest/files/minetest-0.4.6-cmake.patch
@@ -0,0 +1,88 @@
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -387,6 +387,9 @@
+ 			${CGUITTFONT_LIBRARY}
+ 		)
+ 	endif(USE_FREETYPE)
++	set_target_properties(${PROJECT_NAME}
++		PROPERTIES COMPILE_FLAGS "${JTHREAD_CFLAGS}"
++		LINK_FLAGS "${JTHREAD_LDFLAGS}")
+ endif(BUILD_CLIENT)
+ 
+ if(BUILD_SERVER)
+@@ -407,6 +410,9 @@
+ 			${CURL_LIBRARY}
+ 		)
+ 	endif(USE_CURL)
++	set_target_properties(${PROJECT_NAME}server
++		PROPERTIES COMPILE_FLAGS "${JTHREAD_CFLAGS}"
++		LINK_FLAGS "${JTHREAD_LDFLAGS}")
+ endif(BUILD_SERVER)
+ 
+ 
+--- cmake/Modules/FindJthread.cmake
++++ cmake/Modules/FindJthread.cmake
+@@ -1,16 +1,41 @@
+ # Look for jthread, use our own if not found
+ 
+-FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h)
+ 
+-FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
++option(WITH_SYSTEM_JTHREAD "Use systm JThread copy" OFF)
+ 
+-IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
+-	SET( JTHREAD_FOUND TRUE )
+-ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
++IF(WITH_SYSTEM_JTHREAD)
++	IF(UNIX)
++		# try to use pkgconfig file first
++		FIND_PACKAGE(PkgConfig QUIET)
++		pkg_check_modules(_PC_JTHREAD jthread)
++		IF(_PC_JTHREAD_FOUND)
++			SET(JTHREAD_FOUND TRUE)
++			# use CFLAGS/LDFLAGS instead of INCLUDE_DIR/LIBRARY
++			# because we want the full dependencies
++			SET(JTHREAD_CFLAGS ${_PC_JTHREAD_CFLAGS})
++			SET(JTHREAD_LDFLAGS ${_PC_JTHREAD_LDFLAGS})
++		ENDIF(_PC_JTHREAD_FOUND)
++	ENDIF(UNIX)
++
++	# fall back to cmake macros
++	IF(NOT JTHREAD_FOUND)
++		FIND_PATH(JTHREAD_INCLUDE_DIR jthread.h PATHS /usr/include/jthread)
++		FIND_LIBRARY(JTHREAD_LIBRARY NAMES jthread)
++
++		IF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
++			SET( JTHREAD_FOUND TRUE )
++		ENDIF(JTHREAD_LIBRARY AND JTHREAD_INCLUDE_DIR)
++	ENDIF(NOT JTHREAD_FOUND)
++ENDIf(WITH_SYSTEM_JTHREAD)
+ 
+ IF(JTHREAD_FOUND)
+-	MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
+-	MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
++	IF(_PC_JTHREAD_FOUND)
++		MESSAGE(STATUS "Found system jthread:  ${_PC_JTHREAD_VERSION}")
++	ELSE(_PC_JTHREAD_FOUND)
++		MESSAGE(STATUS "Found system jthread header file in ${JTHREAD_INCLUDE_DIR}")
++		MESSAGE(STATUS "Found system jthread library ${JTHREAD_LIBRARY}")
++	ENDIF(_PC_JTHREAD_FOUND)
++# fall back to bundled jthread
+ ELSE(JTHREAD_FOUND)
+ 	SET(JTHREAD_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/jthread)
+ 	SET(JTHREAD_LIBRARY jthread)
+--- cmake/Modules/FindIrrlicht.cmake
++++ cmake/Modules/FindIrrlicht.cmake
+@@ -50,10 +50,11 @@
+ 		/usr/include/irrlicht
+ 	)
+ 
+-	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
++	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
+ 		PATHS
+ 		/usr/local/lib
+ 		/usr/lib
++		/usr/lib64
+ 	)
+ endif()
+