summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-04-20 20:16:07 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-04-20 20:16:07 +0000
commit44c8ee8a64bd4b80f724cf749584a13660be1876 (patch)
tree2ab315edd9b132679be962059d51075302414c16 /games-action
parentDrop old (diff)
downloadhistorical-44c8ee8a64bd4b80f724cf749584a13660be1876.tar.gz
historical-44c8ee8a64bd4b80f724cf749584a13660be1876.tar.bz2
historical-44c8ee8a64bd4b80f724cf749584a13660be1876.zip
old
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Diffstat (limited to 'games-action')
-rw-r--r--games-action/minetest/ChangeLog9
-rw-r--r--games-action/minetest/Manifest19
-rw-r--r--games-action/minetest/files/minetest-0.4.9-as-needed.patch35
-rw-r--r--games-action/minetest/files/minetest-0.4.9-freetype.patch87
-rw-r--r--games-action/minetest/files/minetest-0.4.9-lua-luajit-option.patch56
-rw-r--r--games-action/minetest/files/minetest-0.4.9-opengles.patch163
-rw-r--r--games-action/minetest/files/minetest-0.4.9-shared-irrlicht.patch23
-rw-r--r--games-action/minetest/minetest-0.4.9.ebuild144
-rw-r--r--games-action/minetest_game/ChangeLog6
-rw-r--r--games-action/minetest_game/Manifest14
-rw-r--r--games-action/minetest_game/minetest_game-0.4.9.ebuild31
11 files changed, 15 insertions, 572 deletions
diff --git a/games-action/minetest/ChangeLog b/games-action/minetest/ChangeLog
index 0ac38f76639f..de63bcf2b5ac 100644
--- a/games-action/minetest/ChangeLog
+++ b/games-action/minetest/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for games-action/minetest
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/ChangeLog,v 1.19 2015/04/19 06:58:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/ChangeLog,v 1.20 2015/04/20 20:15:58 mr_bones_ Exp $
+
+ 20 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ -files/minetest-0.4.9-as-needed.patch, -files/minetest-0.4.9-freetype.patch,
+ -files/minetest-0.4.9-lua-luajit-option.patch,
+ -files/minetest-0.4.9-opengles.patch,
+ -files/minetest-0.4.9-shared-irrlicht.patch, -minetest-0.4.9.ebuild:
+ old
19 Apr 2015; Pacho Ramos <pacho@gentoo.org> minetest-0.4.10-r1.ebuild:
x86 stable wrt bug #522906
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 71a0177c4591..dd07733b1f6f 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,27 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX minetest-0.4.10-as-needed.patch 871 SHA256 63f21e5c28952cfae2ec3fa2844afe1a8ca42f726f6183eb3bbeebf18594202d SHA512 470189ca203eb679e62f0e4ff204a57aeedac87b9efa45edfa147efd01f0bad43808a30594589b1b2f0bab8dc9803096b2d51faf593c4cc2d9486b6b12286f45 WHIRLPOOL 8a6bfe894f17be2d0c8ab314d61621162128e676b7506db105b9ee9f47d7c17c00c912b7ca294ffda6bf82a57777883c80f2c7e4d53f5b4d69cc15c796728c3f
AUX minetest-0.4.10-shared-irrlicht.patch 614 SHA256 12d03fb8f9523028dacd5fd45d74dfe901b6d659698cf90aafa8f164018f28cc SHA512 d737d076db32bf62df73f6568f7423511ee27573c08fb975c8d876f7cd56a8f942804ed667b9988f3048cb1efdb52fca0ae9a4f1ff1e912607c7d3765b6149e7 WHIRLPOOL 33452e4c94744f20abebe4ce8db75260c83efb2588ba7235844a3a02dab72f3c6c5a60e62383c3dc3fd04db7cbc9b60bf2ebccd7f173fb12220223c9e9fa5546
AUX minetest-0.4.10-system-lua.patch 1060 SHA256 444d406183c3e5c6139386bfc870faef7062067a2a1cb3250c3ef41f02ff9b94 SHA512 0716ea12458533b5687d84ac6b3047d8b257b9c1ccef807586dee7ef392ffbd19157e04a63c67ce3d3f221111c5ff12c02e8f9b224a31a7653ebd3f073487e79 WHIRLPOOL a90d3680a242f57719c7f8752dafab07ae221bd0e52a0862e11437dff87da71147d76c22e5b7e647a6e63dd8cc7d638dd681ed7a67059835545963466a8e70f6
-AUX minetest-0.4.9-as-needed.patch 876 SHA256 9be3034a8360300855d4c317e295d19e41ac3907cf852e135d6836cc616a7458 SHA512 c148df8878c1ab10fee8ed57029bc705db7c2343172ca0c7821b6bf87c3b755e3397ce1ea28e10200413604591e6a221702b1d097359156ec4adc4e5672f24c3 WHIRLPOOL c32e687f805cf7d4434a44066c975eeaa4f48615343a2e716ed2ee79219addba7649ce3947197da95eb3b1ec208bc925a9496af49401f0ce83336e8e464930eb
-AUX minetest-0.4.9-freetype.patch 2375 SHA256 61576746b304452416d077c936f06f24639a790500a2452a33fd0e8f563e650a SHA512 4626ff076c7b1f344ef5ca4f3e002f92a8563b55091c422f374d4efe3d424205057bf0b5fd75e5349d4d73e76ea0d94189c23b26946f4a165b3234d78f7e7bc6 WHIRLPOOL 8a70bf654019eb4e4431ef4f9e6b3ebb0f22e868787743e439e3396d33bd8c7843c154d6b6d18b940d0483bdcb6d87b316ca466273917ae938371214cd5c1913
-AUX minetest-0.4.9-lua-luajit-option.patch 1638 SHA256 27e28f42da7deb231f8d385e4b78e93942f3eed6650fd9c1a6b1392e955b854b SHA512 062436decb8c89dc0ea32399166579ef5e6e62ed4af180c8cc67f48f6e63988bf70b0c3e9a4bf465a4babf083fdad334f1fdfeebb6fa5d7a7b79f4f8484475c6 WHIRLPOOL beb1acec98145a0b9e0db2e4bc7ef32929961bd468c2354845f6d517d2504752350a0a9809ebd1af4ea140a68f5d469074538cd306ce869bc702fed2610f6dc2
-AUX minetest-0.4.9-opengles.patch 4598 SHA256 04745c490eb1a0b940cc1d655e41a62c4c5bece7d99997fd41f58c2a39e44499 SHA512 4a0a39ecb15b647a582c71efeb7624e06b72ab892d8d474705d8de30b34bbbbf2562fe183d8c82799dd3b64f7f10871286ee99444a805182a8355533479b711b WHIRLPOOL 3d15be5dd7db7019d5484cdee758cbbecab576176cc4ebc627337bd06d35cedde12586ba08ff50dacdb1e3f380662766aee041d1a9f243e81e1121f367c68165
-AUX minetest-0.4.9-shared-irrlicht.patch 614 SHA256 12d03fb8f9523028dacd5fd45d74dfe901b6d659698cf90aafa8f164018f28cc SHA512 d737d076db32bf62df73f6568f7423511ee27573c08fb975c8d876f7cd56a8f942804ed667b9988f3048cb1efdb52fca0ae9a4f1ff1e912607c7d3765b6149e7 WHIRLPOOL 33452e4c94744f20abebe4ce8db75260c83efb2588ba7235844a3a02dab72f3c6c5a60e62383c3dc3fd04db7cbc9b60bf2ebccd7f173fb12220223c9e9fa5546
AUX minetestserver.confd 313 SHA256 b360d2f80fb9793994a33778ef907a5b9220ba0a6a8a312d75499718cb9b5f81 SHA512 96fe764d78b383f294bce81e8631861057f309fd9d13f9397ca0c715396f3793f201f313a3507c0b190f41891441eb4fe418b5888cb73ffdea0d27969d0172c3 WHIRLPOOL 6be18593d29f593904760e19486eb77b3ac6bb6b02eaf7de54aba7f5cc117ebafa6ab355787015d3fc2baec6ef8368b3dc8e37bf5df9a901595ccc082adae941
AUX minetestserver.initd 682 SHA256 5c808e03db1d234922b960a1691326bdcd8195593edd6c9d5edec878d60f6e8d SHA512 08c652e7f32194b957220ebba6bd8aceb02f9da69cb5e513aedbc6942671df1d4371282a2798f7b83c9d38fbd2c16e46147b963219b8b456881517920cb446f2 WHIRLPOOL 30fc5942a292a6aaed846e9fa44038cc5e8bc3d4466d5ff17f7bf6c0fd753e13a8c484a6fa3de5705e2ec4633ba45895ff6ab25f41b07228eebd7c9e96b3f19a
DIST minetest-0.4.10.tar.gz 5291236 SHA256 05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6 SHA512 0d2f2590df530df9bed11a08a3e67dfa39dae1987b8c1f6a4f4f2ace2c40dea3b5afce445e3b2e17b2bd8a426bdd53d717989018f5da531b1eb10965d953c3bf WHIRLPOOL 016c2bc6f9aed44943f238491c445f48013f76a74f9c09e56c1e70e03fa3ded72b042b9dffa0bed81a9dcdc84358a9be88bbf32119dd45a1e2a9873031be1009
-DIST minetest-0.4.9.tar.gz 5195312 SHA256 b394eeb054aa6cd0f022535e486a0c61504039f48671791da2a84da4bc5b2a26 SHA512 8d4185c99425ffd9de18abbe6de14189e0a7818aa5e554bcef05d66ab3ff16a63b0ce8105eca55609738867d518c95c7fcee08fb62ee424ecbef057a71424bcf WHIRLPOOL 84de3bf1b9287173e7e046e7f293b282aab8fdd23e9b899ea2bb1adcbf80fe9ae8cc76709142c46f6519574fe915037e13154dc4488ebe0b3db9596e6f9c93f8
EBUILD minetest-0.4.10-r1.ebuild 3577 SHA256 97db471533766417182a019095aea476dea0fac252b729f41d4b64d868158adb SHA512 31f8d25ae5f9a47345cacbc4d67f66cc70449ae7062d4d97c4c8fd22d762e71e1db40bf72dbf58e9af2f39b0791adb469403806371c3488aca6d090f2c9305db WHIRLPOOL 6e7b7303b758edbddf64489fd013933f7f3a92bd67bbc6d2cd59057d2d17b9bbc2d7d036c76e3fe4efe3fb78aae162c8e1d6aae29ffd008a782959b0e648c145
EBUILD minetest-0.4.10-r2.ebuild 3466 SHA256 b87469713f0bd96f7e70764e2a2f01015df763484cb25b01b1d81f8dc8c6dda2 SHA512 9ab4d43d67df346c6399887d58a5543bbe4feda38d80bb2ce8d122adaed35600014fc7dc7d16d95fa4203c2995b1794bcfbef5351ad7fca887d74ff82b8887b6 WHIRLPOOL 06a1add578a6d6fb312454d29b26225f280603ee73376b6e7e1e49668134f600544f2e4d01d7946cbca0e316e3ca58ab930b83b51b00096b38981b25b446085d
-EBUILD minetest-0.4.9.ebuild 3392 SHA256 599d0805b5d4052c2767db31158a499bfc5b54e985aac8c76caa83c2fa149da3 SHA512 b1dfcde2c051e48dfa06a6f2b61624f339cb8df08bc81da71cc81e33429f06ca979f6dce24444006ab671d8986356e0a5adc4a5e9e5285e424fca2cf691a7f33 WHIRLPOOL 2243d0db2092a866e87733bfc9d4ae28581c66ee3536e485f05b9dd46e344da730587e2638913cdbe234486fa90d03f93034496db8a6d4707d76d44b8170f8d2
-MISC ChangeLog 3542 SHA256 1a5613ef7f265281a087336c53f24d45c2f77174d59443d168540c3049dd4f43 SHA512 c4eaff74fc2a56af598506d7aa2bb6062213b8e342297cbd52475ff6342001078f770493f7c833831d691b506e90f17f3ad16714057103d119b4a914f992cab2 WHIRLPOOL 5093e2089646319eeabc47674b9329e2bab0f9f239bf2c7abb96b96e8d72b380e4370d9e79bd52d027584247ec383c1348dc5d62f279293e1d7b8b1a50ceeb5e
+MISC ChangeLog 3847 SHA256 9c5eb89173b2d8920d729299224df2a373be35825b883a659be5fa29ed51f91b SHA512 c7aafe63ca7d769fa73ba1a937717063793334bcb9b4238870f0f36e9759d52d0690984978f493c532e656dcae2d3659a468c709de1d4ccd8022683a63a7857e WHIRLPOOL ab58dafe2c08e6021681a44bea35b47e4bdcfebd4298515509e21f2f48a738a4b8c6977e612a269fe2c6aca5b2b06dcebcf7a140f3345516f05eea3f2878a214
MISC metadata.xml 2094 SHA256 8b67735fc0c2bcdbdd600a488fd806c2397c0a20b16da620f68516221f7c2b57 SHA512 4029841547460aeb5392d3d3a7eee427fbf4f2b09f25addbfe61a5f5ebaf16c179c79a275e7f135f13c15268b0df3b1212460b05d4aefd83e2714ded8e953113 WHIRLPOOL ad8675487005e5ac1b13ce698eb325af90cc32685ac5856908c15e4c74b99ed4387fc7ed7f8934574a8333a769b2b2b6122d95aa25edd843cf44e3901edda183
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlUzUi8ACgkQCaWpQKGI+9RwIgCeOs/2oNKMw379Ju2AF3RnAZfZ
-sA4An0L45iCEbqbGsvQc33VzkexfUEIX
-=fFf8
------END PGP SIGNATURE-----
diff --git a/games-action/minetest/files/minetest-0.4.9-as-needed.patch b/games-action/minetest/files/minetest-0.4.9-as-needed.patch
deleted file mode 100644
index 803ea0284827..000000000000
--- a/games-action/minetest/files/minetest-0.4.9-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
-Author: hasufell <hasufell@gentoo.org>
-Date: Mon Nov 25 00:28:55 2013 +0100
-
- CMAKE: fix linking order
-
- this also fixes linking with as-needed wrt
- https://github.com/minetest/minetest/issues/617
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a1fee7a..a72bd4a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -427,18 +427,18 @@ if(BUILD_CLIENT)
- target_link_libraries(
- ${PROJECT_NAME}
- ${ZLIB_LIBRARIES}
-- ${IRRLICHT_LIBRARY}
-+ ${X11_LIBRARIES}
- ${OPENGL_LIBRARIES}
-+ ${OPENGLES2_LIBRARIES}
- ${JPEG_LIBRARIES}
- ${BZIP2_LIBRARIES}
- ${PNG_LIBRARIES}
-- ${X11_LIBRARIES}
-+ ${IRRLICHT_LIBRARY}
- ${GETTEXT_LIBRARY}
- ${SOUND_LIBRARIES}
- ${SQLITE3_LIBRARY}
- ${LUA_LIBRARY}
- ${JSON_LIBRARY}
-- ${OPENGLES2_LIBRARIES}
- ${PLATFORM_LIBS}
- ${CLIENT_PLATFORM_LIBS}
- )
diff --git a/games-action/minetest/files/minetest-0.4.9-freetype.patch b/games-action/minetest/files/minetest-0.4.9-freetype.patch
deleted file mode 100644
index 9ca8e68f862b..000000000000
--- a/games-action/minetest/files/minetest-0.4.9-freetype.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Dec 8 19:28:11 UTC 2013
-Subject: prefer pkg-config for freetype2 detection
-
-https://github.com/minetest/minetest/pull/1042
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -173,7 +173,22 @@
- find_package(OpenGLES2)
-
- if(USE_FREETYPE)
-- find_package(Freetype REQUIRED)
-+ if(UNIX)
-+ include(FindPkgConfig)
-+ if(PKG_CONFIG_FOUND)
-+ pkg_check_modules(FREETYPE QUIET freetype2)
-+ if(FREETYPE_FOUND)
-+ SET(FREETYPE_PKGCONFIG_FOUND TRUE)
-+ SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES})
-+ # because cmake is idiotic
-+ string(REPLACE ";" " " FREETYPE_CFLAGS_STR ${FREETYPE_CFLAGS})
-+ string(REPLACE ";" " " FREETYPE_LDFLAGS_STR ${FREETYPE_LDFLAGS})
-+ endif(FREETYPE_FOUND)
-+ endif(PKG_CONFIG_FOUND)
-+ endif(UNIX)
-+ if(NOT FREETYPE_FOUND)
-+ find_package(Freetype REQUIRED)
-+ endif(NOT FREETYPE_FOUND)
- set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont")
- set(CGUITTFONT_LIBRARY cguittfont)
- endif(USE_FREETYPE)
-@@ -446,6 +461,12 @@
- )
- endif(USE_CURL)
- if(USE_FREETYPE)
-+ if(FREETYPE_PKGCONFIG_FOUND)
-+ set_target_properties(${PROJECT_NAME}
-+ PROPERTIES
-+ COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
-+ )
-+ endif(FREETYPE_PKGCONFIG_FOUND)
- target_link_libraries(
- ${PROJECT_NAME}
- ${FREETYPE_LIBRARY}
---- a/src/cguittfont/CMakeLists.txt
-+++ b/src/cguittfont/CMakeLists.txt
-@@ -1,17 +1,29 @@
--include_directories(
-- ${IRRLICHT_INCLUDE_DIR}
-- ${FREETYPE_INCLUDE_DIRS}
--)
--
- # CGUITTFont authors, y u no include headers you use?
- # Do not add CGUITTFont.cpp to the line below.
- # xCGUITTFont.cpp is a wrapper file that includes
- # additional required headers.
- add_library(cguittfont xCGUITTFont.cpp)
-
-+if(FREETYPE_PKGCONFIG_FOUND)
-+ set_target_properties(cguittfont
-+ PROPERTIES
-+ COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
-+ LINK_FLAGS "${FREETYPE_LDFLAGS_STR}"
-+ )
-+
-+ include_directories(
-+ ${IRRLICHT_INCLUDE_DIR}
-+ )
-+else(FREETYPE_PKGCONFIG_FOUND)
-+ include_directories(
-+ ${IRRLICHT_INCLUDE_DIR}
-+ ${FREETYPE_INCLUDE_DIRS}
-+ )
-+endif(FREETYPE_PKGCONFIG_FOUND)
-+
- target_link_libraries(
-- cguittfont
-- ${IRRLICHT_LIBRARY}
-- ${FREETYPE_LIBRARY}
-- ${ZLIB_LIBRARIES} # needed by freetype, repeated here for safety
--)
-+ cguittfont
-+ ${IRRLICHT_LIBRARY}
-+ ${FREETYPE_LIBRARY}
-+ ${ZLIB_LIBRARIES} # needed by freetype, repeated here for safety
-+ )
diff --git a/games-action/minetest/files/minetest-0.4.9-lua-luajit-option.patch b/games-action/minetest/files/minetest-0.4.9-lua-luajit-option.patch
deleted file mode 100644
index 8603c50343c2..000000000000
--- a/games-action/minetest/files/minetest-0.4.9-lua-luajit-option.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit d8dbda3636a91eba52c97450b58f767d5a4a376e
-Author: hasufell <hasufell@gentoo.org>
-Date: Mon Nov 25 00:25:55 2013 +0100
-
- add USE_LUAJIT option
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a30dc98..a1fee7a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -179,24 +179,29 @@ if(USE_FREETYPE)
- endif(USE_FREETYPE)
-
-
--find_library(LUA_LIBRARY luajit
-- NAMES luajit-5.1)
--find_path(LUA_INCLUDE_DIR luajit.h
-- NAMES luajit.h
-- PATH_SUFFIXES luajit-2.0)
--message (STATUS "LuaJIT library: ${LUA_LIBRARY}")
--message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
-+option(USE_LUAJIT "Use luajit instead of lua" OFF)
-
- set(USE_LUAJIT 0)
--if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-- message (STATUS "LuaJIT found.")
-- set(USE_LUAJIT 1)
--else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-- message (STATUS "LuaJIT not found, using bundled Lua.")
-- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
-- set(LUA_LIBRARY "lua")
-- add_subdirectory(lua)
--endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+if(USE_LUAJIT)
-+ find_library(LUA_LIBRARY luajit
-+ NAMES luajit-5.1)
-+ find_path(LUA_INCLUDE_DIR luajit.h
-+ NAMES luajit.h
-+ PATH_SUFFIXES luajit-2.0)
-+ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+ message (STATUS "LuaJIT found")
-+ set(USE_LUAJIT 1)
-+ else(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+ message (FATAL_ERROR "LuaJIT not found!")
-+ endif(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-+else(USE_LUAJIT)
-+ find_package(Lua51)
-+ if(LUA51_FOUND)
-+ message (STATUS "Lua51 found")
-+ else(LUA51_FOUND)
-+ message (FATAL_ERROR "Lua51 not found!")
-+ endif(LUA51_FOUND)
-+endif(USE_LUAJIT)
-
- mark_as_advanced(LUA_LIBRARY)
- mark_as_advanced(LUA_INCLUDE_DIR)
diff --git a/games-action/minetest/files/minetest-0.4.9-opengles.patch b/games-action/minetest/files/minetest-0.4.9-opengles.patch
deleted file mode 100644
index eebfe280f967..000000000000
--- a/games-action/minetest/files/minetest-0.4.9-opengles.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Nov 29 19:34:37 UTC 2013
-
-This patch is currently not needed in this form, because gentoo irrlicht
-does not yet have gles2 support. However this will be needed
-once it does, so we can add a gles2 useflag.
-
-Also fixes
-https://bugs.gentoo.org/show_bug.cgi?id=492804
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -7,6 +7,7 @@
- mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY)
-
- option(ENABLE_CURL "Enable cURL support for fetching media" 1)
-+option(ENABLE_GLES2 "Enable GLES2 support with irrlicht" 0)
-
- if (NOT ENABLE_CURL)
- mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
-@@ -170,7 +171,10 @@
-
- find_package(Sqlite3 REQUIRED)
- find_package(Json REQUIRED)
--find_package(OpenGLES2)
-+if(ENABLE_GLES2 AND BUILD_CLIENT)
-+ find_package(OpenGLES2 REQUIRED)
-+ add_definitions( -DWITH_GLES2 )
-+endif(ENABLE_GLES2 AND BUILD_CLIENT)
-
- if(USE_FREETYPE)
- find_package(Freetype REQUIRED)
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -1331,10 +1331,12 @@
- else if(driverstring == "ogles1")
- driverType = video::EDT_OGLES1;
- #endif
-+#ifdef WITH_GLES2
- #ifdef _IRR_COMPILE_WITH_OGLES2_
- else if(driverstring == "ogles2")
- driverType = video::EDT_OGLES2;
- #endif
-+#endif
- else
- {
- errorstream<<"WARNING: Invalid video_driver specified; defaulting "
---- a/cmake/Modules/FindOpenGLES2.cmake
-+++ b/cmake/Modules/FindOpenGLES2.cmake
-@@ -19,6 +19,7 @@
- # win32, apple, android NOT TESED
- # linux tested and works
-
-+
- IF (WIN32)
- IF (CYGWIN)
-
-@@ -47,51 +48,57 @@
-
- ELSE(APPLE)
-
-- FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
-- /usr/openwin/share/include
-- /opt/graphics/OpenGL/include /usr/X11R6/include
-- /usr/include
-- )
--
-- FIND_LIBRARY(OPENGLES2_gl_LIBRARY
-- NAMES GLESv2
-- PATHS /opt/graphics/OpenGL/lib
-+ # prefer pkg-config
-+ INCLUDE(FindPkgConfig)
-+ IF (PKG_CONFIG_FOUND)
-+ pkg_check_modules(OPENGLES2 QUIET glesv2 egl)
-+ ELSE (PKG_CONFIG_FOUND)
-+ FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
-+ /usr/openwin/share/include
-+ /opt/graphics/OpenGL/include /usr/X11R6/include
-+ /usr/include
-+ )
-+
-+ FIND_LIBRARY(OPENGLES2_gl_LIBRARY
-+ NAMES GLESv2
-+ PATHS /opt/graphics/OpenGL/lib
- /usr/openwin/lib
- /usr/shlib /usr/X11R6/lib
- /usr/lib
-- )
-+ )
-
-- IF (NOT BUILD_ANDROID)
-- FIND_PATH(EGL_INCLUDE_DIR EGL/egl.h
-- /usr/openwin/share/include
-- /opt/graphics/OpenGL/include /usr/X11R6/include
-- /usr/include
-- )
--
-- FIND_LIBRARY(EGL_egl_LIBRARY
-- NAMES EGL
-- PATHS /opt/graphics/OpenGL/lib
-- /usr/openwin/lib
-- /usr/shlib /usr/X11R6/lib
-- /usr/lib
-- )
--
-- # On Unix OpenGL most certainly always requires X11.
-- # Feel free to tighten up these conditions if you don't
-- # think this is always true.
-- # It's not true on OSX.
--
-- IF (OPENGLES2_gl_LIBRARY)
-- IF(NOT X11_FOUND)
-- INCLUDE(FindX11)
-- ENDIF(NOT X11_FOUND)
-- IF (X11_FOUND)
-- IF (NOT APPLE)
-- SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
-- ENDIF (NOT APPLE)
-- ENDIF (X11_FOUND)
-- ENDIF (OPENGLES2_gl_LIBRARY)
-- ENDIF ()
-+ IF (NOT BUILD_ANDROID)
-+ FIND_PATH(EGL_INCLUDE_DIR EGL/egl.h
-+ /usr/openwin/share/include
-+ /opt/graphics/OpenGL/include /usr/X11R6/include
-+ /usr/include
-+ )
-+
-+ FIND_LIBRARY(EGL_egl_LIBRARY
-+ NAMES EGL
-+ PATHS /opt/graphics/OpenGL/lib
-+ /usr/openwin/lib
-+ /usr/shlib /usr/X11R6/lib
-+ /usr/lib
-+ )
-+
-+ # On Unix OpenGL most certainly always requires X11.
-+ # Feel free to tighten up these conditions if you don't
-+ # think this is always true.
-+ # It's not true on OSX.
-+
-+ IF (OPENGLES2_gl_LIBRARY)
-+ IF(NOT X11_FOUND)
-+ INCLUDE(FindX11)
-+ ENDIF(NOT X11_FOUND)
-+ IF (X11_FOUND)
-+ IF (NOT APPLE)
-+ SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
-+ ENDIF (NOT APPLE)
-+ ENDIF (X11_FOUND)
-+ ENDIF (OPENGLES2_gl_LIBRARY)
-+ ENDIF (NOT BUILD_ANDROID)
-+ ENDIF (PKG_CONFIG_FOUND)
-
- ENDIF(APPLE)
- ENDIF (WIN32)
-@@ -126,5 +133,5 @@
- IF(OPENGLES2_FOUND)
- MESSAGE(STATUS "Found system opengles2 library ${OPENGLES2_LIBRARIES}")
- ELSE ()
-- SET(OPENGLES2_LIBRARIES "")
-+ MESSAGE(FATAL_ERROR "OpenGLES2 not found!")
- ENDIF ()
diff --git a/games-action/minetest/files/minetest-0.4.9-shared-irrlicht.patch b/games-action/minetest/files/minetest-0.4.9-shared-irrlicht.patch
deleted file mode 100644
index b552c0937039..000000000000
--- a/games-action/minetest/files/minetest-0.4.9-shared-irrlicht.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
-Author: hasufell <julian.ospald@googlemail.com>
-Date: Sat Jun 8 13:40:30 2013 +0200
-
- CMAKE: use shared lib from Irrlicht
-
-diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
-index bd00422..4632993 100644
---- a/cmake/Modules/FindIrrlicht.cmake
-+++ b/cmake/Modules/FindIrrlicht.cmake
-@@ -50,10 +50,11 @@ else()
- /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()
-
diff --git a/games-action/minetest/minetest-0.4.9.ebuild b/games-action/minetest/minetest-0.4.9.ebuild
deleted file mode 100644
index 19b5de873283..000000000000
--- a/games-action/minetest/minetest-0.4.9.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.9.ebuild,v 1.4 2014/09/15 19:02:47 hasufell Exp $
-
-EAPI=5
-inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
-
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
-HOMEPAGE="http://minetest.net/"
-SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+curl dedicated leveldb luajit nls +server +sound +truetype"
-
-RDEPEND="dev-db/sqlite:3
- >=dev-games/irrlicht-1.8-r2
- sys-libs/zlib
- curl? ( net-misc/curl )
- !dedicated? (
- app-arch/bzip2
- media-libs/libpng:0
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- )
- truetype? ( media-libs/freetype:2 )
- )
- leveldb? ( dev-libs/leveldb )
- luajit? ( dev-lang/luajit:2 )
- !luajit? ( >=dev-lang/lua-5.1.4[deprecated] )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- games_pkg_setup
-
- if use server || use dedicated ; then
- enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
- fi
-}
-
-src_unpack() {
- vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-lua-luajit-option.patch \
- "${FILESDIR}"/${P}-shared-irrlicht.patch \
- "${FILESDIR}"/${P}-as-needed.patch \
- "${FILESDIR}"/${P}-opengles.patch \
- "${FILESDIR}"/${P}-freetype.patch
-
- # correct gettext behavior
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *) ; do
- if ! has ${i} ${LINGUAS} ; then
- rm -r po/${i} || die
- fi
- done
- fi
-
- # jthread is modified
- # json is modified
- rm -r src/{lua,sqlite} || die
-
- # set paths
- sed \
- -e "s#@BINDIR@#${GAMES_BINDIR}#g" \
- -e "s#@GROUP@#${GAMES_GROUP}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GLES2=0
- -DRUN_IN_PLACE=0
- -DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${PN}"
- -DCUSTOM_BINDIR="${GAMES_BINDIR}"
- -DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="/usr/share/locale"
- $(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
- $(cmake-utils_use_enable nls GETTEXT)
- $(cmake-utils_use_enable curl CURL)
- $(cmake-utils_use_use luajit LUAJIT)
- $(cmake-utils_use_enable truetype FREETYPE)
- $(cmake-utils_use_enable sound SOUND)
- $(cmake-utils_use_enable leveldb LEVELDB)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server || use dedicated ; then
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
- newconfd "${T}"/minetestserver.confd minetest-server
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if ! use dedicated ; then
- elog
- elog "optional dependencies:"
- elog " games-action/minetest_game (official mod)"
- elog
- fi
-
- if use server || use dedicated ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
- elog "Default logfile is ~/minetest-server.log"
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-action/minetest_game/ChangeLog b/games-action/minetest_game/ChangeLog
index 53c40d9315cd..3bbeb2ad130e 100644
--- a/games-action/minetest_game/ChangeLog
+++ b/games-action/minetest_game/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/minetest_game
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/ChangeLog,v 1.16 2015/04/19 06:59:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/ChangeLog,v 1.17 2015/04/20 20:14:24 mr_bones_ Exp $
+
+ 20 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ -minetest_game-0.4.9.ebuild:
+ old
19 Apr 2015; Pacho Ramos <pacho@gentoo.org> minetest_game-0.4.10.ebuild:
x86 stable wrt bug #522906
diff --git a/games-action/minetest_game/Manifest b/games-action/minetest_game/Manifest
index 6b29e1d09ba8..9e5e245071f9 100644
--- a/games-action/minetest_game/Manifest
+++ b/games-action/minetest_game/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST minetest_game-0.4.10.tar.gz 901448 SHA256 7624a1e64124c4438256719ccecfc44fe5139733a076394aedad1f785e50019f SHA512 eaff1fbee4e46811649293534ed2e496f40451bd1cc6527feb66da6d916ad31233b561ddae9bf631b41730ae04a17fe67c3f74ca95e527ca8eb6f45fe5dc0c86 WHIRLPOOL c9cc5b321eb6bbf7f60894f28f84d5ace5b17db34b696f0afe978bd19ee4e9b5b7202775d00b597661ec038fcc6160c0f27aa03ff1a38c559e6d3f9968c82aa7
-DIST minetest_game-0.4.9.tar.gz 753451 SHA256 00a02676105ccfca60db6dc712eacc945b089cb80f81ee333d111de6b1746a0b SHA512 8ebaae71f8ad01bac36c172e9ca56c3976329972b1f85a19c557125cbf1b516a10e742d93fd1c4541ee37e75a923480795a63fa63d3beda8a12f60bdf976ada4 WHIRLPOOL 03a335e556f61c0b3896d767225d988e06701accdc17b3bf53a157fee02f5b7db2d88a9fb08d80fcecb981a2ab96bfdd38b48fa3b82ce3eb71cbc89ff97bc684
EBUILD minetest_game-0.4.10.ebuild 790 SHA256 2b4ace5b32d2d351d86d9e9d9ad84909deb121150d1de66ca7d1c1f0f281dc7a SHA512 8d1cb648fc9c4478f72fd240515933a6eb458f4ba0a840b4ee9bff5dce7229442bb2e8ffa35147bdbc021f4925671c48e89fe038354d63b9429607c7039ad74b WHIRLPOOL 88d2b83ac456e0f75a0c198dfcc8b8d3dbe3eecfa59ce64f126b5650a2c00a2d14d71067f689eeafda2f4bec510a140c96bdd5d825bab931b5991b02e70c3a62
-EBUILD minetest_game-0.4.9.ebuild 760 SHA256 d8691f17cc1e8be4b2873d759b99ed9cb479827f6b42ce1b623eb8e3f073ca01 SHA512 30b26fe06e370ca01f070ac60fbdf27f3d07f7f96232b5733974f6fdc081227a73cc6829e31e319e4a8598b72041c3ec68292156a11976e54c68421ccc3973b1 WHIRLPOOL aac9dda09c0be49dfd29f907f2ae807122416a31a44a86f7089daaedfdc7a3428b520b0091b77e901df385590c3504c8d0c95fa970703890aa8d6e73da0d001f
-MISC ChangeLog 2066 SHA256 1bf9c5cf20d387391e844f328ca1601ee7cb1aadf6a79a2d0a8bc0dabce8c856 SHA512 653d4a166c239afa749e609e38713cd9d0320accd99b79d346c78bf475a3e883c2cb858af8044fadbe7ddf799bb0c6775e6bd6002e43fe7a2dc393b9ebada9b7 WHIRLPOOL 5bae523b34da24c9c64b4e4fce6493c1c483f06e7e044400312058867cb42a05895647f7074cfeef8d0ac8d92465f120240087a77421be80535c3f9d6852987c
+MISC ChangeLog 2163 SHA256 a5ddc4784a2bd97c69a25c307ce6e82ef8d0f885fc2413c624bbf24a2f8d95fc SHA512 37419200a7648226655b5be68227a5ba76d3ff608ebed558f7d8fa5b406ef9c3f694efbc04ddb92c23cc013639b7710b30e170b2d443ec5f84b779b47c44e7fd WHIRLPOOL b0f97bcacc238bbcb0e2275ddf5f17971aafaab62a08abe98a516324a2a4aad658361f253843f74aa75d66027e6b1f28e1ebd1647456cfdccf3714cc812a2e89
MISC metadata.xml 515 SHA256 7e7ad859c3f5c876e4aa15d05ad620b9316e977712abe447e81b59c36f488080 SHA512 88e06b7da3d26f4a7ce16b0776990191b20abafbeb527b92acab9b736fb3e713212bd9bf58c646eb696de489ff636c55267d06e84feb229d4f8ad4f114394e3e WHIRLPOOL c9d2f663cb70ce043e7354aeb30170c05524e6a892cea9ed54583ee9371dc715fb3d442f137b820d7e819c118bf7a09ae0ac7456e10be0201dae9e8308f6b76e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlUzUjYACgkQCaWpQKGI+9S8qgCdGNlHPPaYLFfeBgmk8oYfKqlP
-2DcAn2pD4MuASBsaB8A37PsY1T2un9Nk
-=AGhv
------END PGP SIGNATURE-----
diff --git a/games-action/minetest_game/minetest_game-0.4.9.ebuild b/games-action/minetest_game/minetest_game-0.4.9.ebuild
deleted file mode 100644
index bac1b394ed6e..000000000000
--- a/games-action/minetest_game/minetest_game-0.4.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest_game/minetest_game-0.4.9.ebuild,v 1.3 2014/04/05 11:11:08 ago Exp $
-
-EAPI=5
-inherit vcs-snapshot games
-
-DESCRIPTION="The main game for the Minetest game engine"
-HOMEPAGE="http://github.com/minetest/minetest_game"
-SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="~games-action/minetest-${PV}[-dedicated]"
-
-src_unpack() {
- vcs-snapshot_src_unpack
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/minetest/games/${PN}
- doins -r mods menu
- doins game.conf
-
- dodoc README.txt
-
- prepgamesdirs
-}