Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-action/minetest/files: minetest-0.4.8-as-needed.patch minetest-0.4.8-lua-luajit-option.patch minetest-0.4.8-shared-irrlicht.patch
Date: Sun, 24 Nov 2013 23:42:58
Message-Id: 20131124234251.A1AB52004B@flycatcher.gentoo.org
1 hasufell 13/11/24 23:42:51
2
3 Added: minetest-0.4.8-as-needed.patch
4 minetest-0.4.8-lua-luajit-option.patch
5 minetest-0.4.8-shared-irrlicht.patch
6 Log:
7 version bump wrt #492466
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
10
11 Revision Changes Path
12 1.1 games-action/minetest/files/minetest-0.4.8-as-needed.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.8-as-needed.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.8-as-needed.patch?rev=1.1&content-type=text/plain
16
17 Index: minetest-0.4.8-as-needed.patch
18 ===================================================================
19 commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
20 Author: hasufell <hasufell@g.o>
21 Date: Mon Nov 25 00:28:55 2013 +0100
22
23 CMAKE: fix linking order
24
25 this also fixes linking with as-needed wrt
26 https://github.com/minetest/minetest/issues/617
27
28 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
29 index a1fee7a..a72bd4a 100644
30 --- a/src/CMakeLists.txt
31 +++ b/src/CMakeLists.txt
32 @@ -427,18 +427,18 @@ if(BUILD_CLIENT)
33 target_link_libraries(
34 ${PROJECT_NAME}
35 ${ZLIB_LIBRARIES}
36 - ${IRRLICHT_LIBRARY}
37 + ${X11_LIBRARIES}
38 ${OPENGL_LIBRARIES}
39 + ${OPENGLES2_LIBRARIES}
40 ${JPEG_LIBRARIES}
41 ${BZIP2_LIBRARIES}
42 ${PNG_LIBRARIES}
43 - ${X11_LIBRARIES}
44 + ${IRRLICHT_LIBRARY}
45 ${GETTEXT_LIBRARY}
46 ${SOUND_LIBRARIES}
47 ${SQLITE3_LIBRARY}
48 ${LUA_LIBRARY}
49 ${JSON_LIBRARY}
50 - ${OPENGLES2_LIBRARIES}
51 ${PLATFORM_LIBS}
52 ${CLIENT_PLATFORM_LIBS}
53 )
54
55
56
57 1.1 games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch
58
59 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch?rev=1.1&view=markup
60 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.8-lua-luajit-option.patch?rev=1.1&content-type=text/plain
61
62 Index: minetest-0.4.8-lua-luajit-option.patch
63 ===================================================================
64 commit d8dbda3636a91eba52c97450b58f767d5a4a376e
65 Author: hasufell <hasufell@g.o>
66 Date: Mon Nov 25 00:25:55 2013 +0100
67
68 add USE_LUAJIT option
69
70 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
71 index a30dc98..a1fee7a 100644
72 --- a/src/CMakeLists.txt
73 +++ b/src/CMakeLists.txt
74 @@ -179,24 +179,29 @@ if(USE_FREETYPE)
75 endif(USE_FREETYPE)
76
77
78 -find_library(LUA_LIBRARY luajit
79 - NAMES luajit-5.1)
80 -find_path(LUA_INCLUDE_DIR luajit.h
81 - NAMES luajit.h
82 - PATH_SUFFIXES luajit-2.0)
83 -message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
84 -message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
85 +option(USE_LUAJIT "Use luajit instead of lua" OFF)
86
87 set(USE_LUAJIT 0)
88 -if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
89 - message (STATUS "LuaJIT found.")
90 - set(USE_LUAJIT 1)
91 -else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
92 - message (STATUS "LuaJIT not found, using bundled Lua.")
93 - set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
94 - set(LUA_LIBRARY "lua")
95 - add_subdirectory(lua)
96 -endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
97 +if(USE_LUAJIT)
98 + find_library(LUA_LIBRARY luajit
99 + NAMES luajit-5.1)
100 + find_path(LUA_INCLUDE_DIR luajit.h
101 + NAMES luajit.h
102 + PATH_SUFFIXES luajit-2.0)
103 + if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
104 + message (STATUS "LuaJIT found")
105 + set(USE_LUAJIT 1)
106 + else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
107 + message (FATAL_ERROR "LuaJIT not found!")
108 + endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
109 +else(USE_LUAJIT)
110 + find_package(Lua51)
111 + if(LUA51_FOUND)
112 + message (STATUS "Lua51 found")
113 + else(LUA51_FOUND)
114 + message (FATAL_ERROR "Lua51 not found!")
115 + endif(LUA51_FOUND)
116 +endif(USE_LUAJIT)
117
118 mark_as_advanced(LUA_LIBRARY)
119 mark_as_advanced(LUA_INCLUDE_DIR)
120
121
122
123 1.1 games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch
124
125 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch?rev=1.1&view=markup
126 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/minetest/files/minetest-0.4.8-shared-irrlicht.patch?rev=1.1&content-type=text/plain
127
128 Index: minetest-0.4.8-shared-irrlicht.patch
129 ===================================================================
130 commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
131 Author: hasufell <julian.ospald@××××××××××.com>
132 Date: Sat Jun 8 13:40:30 2013 +0200
133
134 CMAKE: use shared lib from Irrlicht
135
136 diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
137 index bd00422..4632993 100644
138 --- a/cmake/Modules/FindIrrlicht.cmake
139 +++ b/cmake/Modules/FindIrrlicht.cmake
140 @@ -50,10 +50,11 @@ else()
141 /usr/include/irrlicht
142 )
143
144 - FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
145 + FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
146 PATHS
147 /usr/local/lib
148 /usr/lib
149 + /usr/lib64
150 )
151 endif()
Report Message
Find on MARC Find on Google Groups