diff options
author | Julian Ospald <hasufell@gentoo.org> | 2013-11-19 01:35:40 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2013-11-19 01:35:40 +0000 |
commit | 52e326dffd1121ac907390fda18122f96c7925ab (patch) | |
tree | d1423cb5ea26501b4ee00784698dab16cff5f5b8 /games-strategy | |
parent | Version bump. (diff) | |
download | historical-52e326dffd1121ac907390fda18122f96c7925ab.tar.gz historical-52e326dffd1121ac907390fda18122f96c7925ab.tar.bz2 historical-52e326dffd1121ac907390fda18122f96c7925ab.zip |
version bump
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-strategy')
-rw-r--r-- | games-strategy/megaglest/ChangeLog | 10 | ||||
-rw-r--r-- | games-strategy/megaglest/Manifest | 21 | ||||
-rw-r--r-- | games-strategy/megaglest/files/megaglest-3.9.0.3-Waddress.patch | 11 | ||||
-rw-r--r-- | games-strategy/megaglest/files/megaglest-3.9.0.3-fribidi.patch | 289 | ||||
-rw-r--r-- | games-strategy/megaglest/files/megaglest-3.9.0.3-static-build.patch | 48 | ||||
-rw-r--r-- | games-strategy/megaglest/megaglest-3.9.0.3.ebuild | 167 | ||||
-rw-r--r-- | games-strategy/megaglest/metadata.xml | 1 |
7 files changed, 540 insertions, 7 deletions
diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog index c0eaf2551c49..86e82d935480 100644 --- a/games-strategy/megaglest/ChangeLog +++ b/games-strategy/megaglest/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-strategy/megaglest # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.15 2013/10/12 03:27:22 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.16 2013/11/19 01:35:35 hasufell Exp $ + +*megaglest-3.9.0.3 (19 Nov 2013) + + 19 Nov 2013; Julian Ospald <hasufell@gentoo.org> +megaglest-3.9.0.3.ebuild, + +files/megaglest-3.9.0.3-Waddress.patch, + +files/megaglest-3.9.0.3-fribidi.patch, + +files/megaglest-3.9.0.3-static-build.patch: + version bump 12 Oct 2013; Sergei Trofimovich <slyfox@gentoo.org> +files/megaglest-3.7.1-gcc47.patch, megaglest-3.7.1.ebuild: diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index 465160b0fe1e..0e172b0c5c32 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -12,18 +12,27 @@ AUX megaglest-3.7.1-as-needed.patch 905 SHA256 2add7ce9a6fb69c16a5da4513c57839a6 AUX megaglest-3.7.1-gcc47.patch 1033 SHA256 3b68d2cc802ef53a47570faf3d15164efa94e941a40f69b188af56a7d1c09596 SHA512 113671cb7b15c56337b14e561a6a55704c10cfcf8f7897bcf78600e827030bb5108ba8e3d6b39ae5dd21a5a0f156fbdce97c4cb881bdc984e93f0545f7a94370 WHIRLPOOL ce02363705ed2504d6d6e2fd6e9482705f186018e343655dc7505350692d2fd3b69118863b7a656b3e280267102ddaf85284119cdc8c5dbb5d5d60281f921bd8 AUX megaglest-3.7.1-miniupnpc-1.8.patch 6273 SHA256 d93fcd76a9fdbbb72b6b6c9bc2abde64433727f5833bf9e3adf145091beb05d7 SHA512 54c5c45dfe211ec462ec38c67696bbd40b630ea8976bc06d3bd704773d14aefbab7a2e60ab7e80b092b384da7ce19955cd8d5c6c140f4201ec9adefd6a9f67b3 WHIRLPOOL 9b9841aebb853fec5cf711af79f31fc5413f9626f4998822f76cd23e9624daf44cbd061cf4b467b8a019b75df7966a789cf53771dd8761bb3bdcc6efee4bf454 AUX megaglest-3.7.1-static-build.patch 4008 SHA256 8067115f3424ce213c87ed476d227aebe5f910de935d65bb96c079b6faf44cff SHA512 0403e04783009c66a0199b2c3c793b74dd11cc89189b29494e56b826297afab8349a4e4ad1c5c5c6dc302e9d1b82b62f010ec379e28d6760c0ee89803ceef571 WHIRLPOOL 0bc7c36b10d9256dd5cc49b2c0fba93f2874b7cbf26aed7dd91f20675dff4d742736866960138d66516c4e27ca63be69f0248f82376e32494967f7125af9d291 +AUX megaglest-3.9.0.3-Waddress.patch 326 SHA256 1262257d0bc6c80d3138045e94b934be71bbd17108a651c22367414e40c94bf6 SHA512 2808238cd6a07160e1d0b828aef5490004677221dd06e4f6f32c61ad009e050316425399409bdf4a2d3d394ca3d900795831d0b7e42e4585a82da43d7b297358 WHIRLPOOL 397e2bf9ed01aee1e8a8c7d29b6734b809a4caf84ef4b76a6585c2061ee7d9e1a0928f3aead951ab6ac7aec70032657daa0780f5f370a19ea5b3cd80aa60b60c +AUX megaglest-3.9.0.3-fribidi.patch 9201 SHA256 b66e034949179034c7961def5d93b6b68bef5bfd125e253c719d349d107c8e28 SHA512 04d7d9a8565c58aa7c85a453c6d93ad6d8674e7133fce1d2d333c8f8d968b0a9cc1fb4c0147ff43b4f3d9e1c7419b0668ecbef808bff22d8ceac1fd9e16beb38 WHIRLPOOL 1471f4d5ed977847842bc859ce7a7f34016add4a0b3d6c947f7c9875e9db5554da48df6ab978635994208f9819bea352a166d8b7939b21182dd64e4143613b78 +AUX megaglest-3.9.0.3-static-build.patch 1445 SHA256 0061a7511f1d388c0bd945862884a71082d6497b7324b1fe52eac2b443d62984 SHA512 eef76c0f8576f1fa0bbbeec5e3cfb5caf5de8e56e45d2b9e9e64baf184470e97ceca46605873a52cea6a945e2fa2a09f7c9da2d247a093586fc5578e9c2b618e WHIRLPOOL 7b8892f847e6040a2d9b8602ee61b9b88e498419b9055a175967026c4b2e285fd5930b4ac15eb68ab83141e8c3c5dbcdf85668c19dc7a482f76580031d615862 DIST megaglest-source-3.6.0.3.tar.xz 1336432 SHA256 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7 SHA512 0152457444c8d4ed65ed2ae565a73a2921a3706bb653fa818be03fb15d6fac196d50fc616583ce4c6fe7e76d4fb82cc83eb7c16809a90edf705701bab9c95387 WHIRLPOOL e452cd6dafb9024b663c62c9c3077af725601c6bc7b34b54cef641feb7ecbf2d1c1b6625e016e6e149055782d303a7bff78b59f29eb3c72d010c2a8b8a554b6f DIST megaglest-source-3.7.0.tar.xz 1442444 SHA256 5fdf2ed072c8a207a42b280929a7ce097ed6f966b2b85a7f0a89e741ac5cca23 SHA512 113bb59a4f8ec2b0d83b30952f7723c8a9a835b4854a083327c13a87f69c45d66184025bc0dd1af4ebfebeaa6d8ea7f488b859bcb8c04a8ecc5bcad8ac8bb35c WHIRLPOOL 16c5c56c0b8b9374b024178a3d780a21b7594398acb27f4d32ede39567edb6238a1122baaa57272134e62ae2de7c855db8384efd31d6171b7dbc4717249f63a6 DIST megaglest-source-3.7.1.tar.xz 1439864 SHA256 0222196c6a274cfd1b5fd074206a6bedcf3da4f343345f3e2682e704f94adc26 SHA512 b285421175d7eeb7c52c45c9397d270ed4352ec1c9f547b5a18ec596d676a8fd00b54d7138c9b6ccba07bc8218054587ccb9822c30216a846d4da64c7a2ae600 WHIRLPOOL a8d50d49b9470aaf29121e427ee9137980f0fcbc11f962217581d679d6e7d10c2daa5a68648b45c5384ff1bfed7cfa73fb2600cf872b12f64f59729ca759872f +DIST megaglest-source-3.9.0.3.tar.xz 1594540 SHA256 236da12ccf27ff38ad5d7c0412904cf08fbcc9b9d0b8b0e4830e07c62f1f081c SHA512 fe3992f8cec64e0dec12fcdd0320d929f2ba507bd35d70501414ac10b60f4e820d75f0d9b699d1cb179f0bf05e383898f480fe5e36d32b9aa4298bae4cd12cec WHIRLPOOL c0dcfca9ca51a02cc692d229d052c764dc6e2e848bee711ea6e6c4c222d88f3ce714169db2ffd12772b5c0520a75408a3f6ef314f2dfc4d3fb98ab4eccd1008a EBUILD megaglest-3.6.0.3.ebuild 4602 SHA256 c50a057a15587f88127fa1dedf42135f79724e1a33d272745b574d33dc3b1564 SHA512 6d35db30ce2a3be436caccf727865644b9a89ac0ba6319fea76ce17d26c5be501fdad7e2bc4931db2d2754fc5325faed167103fbfa6578a798abde31d0b6527a WHIRLPOOL 5953781d35153af0a0d965f16f37c07aeefb21ba8575d6a51b5e664216c304843f313c7a69f3f4d6d95a405d1a814d082ab843211cab7b69518a63c9c48fd659 EBUILD megaglest-3.7.0.ebuild 4289 SHA256 3f7182b2e27c82b1f7a11b07dd1d66394a60927cd338e0daa239544a1a936b95 SHA512 bf212ca8fd71f91f1c85320041e94c5db66035b98a4e373c20e790615f30cc58692e43afd52dd0ad9a7c5d0ec94571135bcae7a37506547bb9e032c92c9a73c5 WHIRLPOOL 71c11c44fb40f21b03c0180fc49a780a31791947febae24cb3f2bcbe7b7081de7766c7d7cb978bd2d5543c33ed2f9588029710cfef70920217158e79d7fc7045 EBUILD megaglest-3.7.1.ebuild 4298 SHA256 2e15b02937254c66fa8a0420b92f8b779fc100148c75845274e185f8551cc34c SHA512 adbc8a83747ba78c57e3b7cd3d46f3dba3dde1a2944c43866c121fb20fc4ca0a0b717cb44a6746780ee7ffec97ccf5077919a6099d307857ce46e7ae135849bf WHIRLPOOL f70beefbdbb5ed3967b656c63c8cb0a5bf5e9e62c98d5a0f984cc9c2410337db1072338df3d5874bfb1d7c5c45285ff3f8f3b124f51b61fa423392ba5d0c1cff -MISC ChangeLog 2538 SHA256 7f63c29fa222d1e604ed7d2e6b6d063d2d09257f125bb6a4296ebef5a730c29d SHA512 d15a2f05cff3e75dc4030d66cefa458541fe55125e919caa03652460e24d0e3fa6d7b40a0f7cf2c2e50dbda9798d65dfbfbfb207d82860259e2b9f99f6fc5a41 WHIRLPOOL 61e2f79e1c466e84ab6e751e0e4c4fbc1fc11f73892f584743820db56820463fa3209a4ce6baffc122c788a664cdd94d1fd635f96e85dc1fdb33e710b21526e4 -MISC metadata.xml 1550 SHA256 ea7604fb5e9f322911cbb140fe67410a5e8e40f4854c9691c984331d60e3bf2a SHA512 e8b697d2c6af8e42a7dd304e8c3f2325ce676bfe50f2eb626933f95ebe50fd656964f0f497451bda3be269e743f642714e9b2660f42ca23352b909af0670d7bb WHIRLPOOL 2109e05f6de9b86a543b08025bdc26987354983fed4bc2e6315d27a4254f07ea8291af1e4587a07162c8ad9d5795f5b2915b523fc617259af4de65d61c13eb61 +EBUILD megaglest-3.9.0.3.ebuild 4486 SHA256 9b4d4966530bb761182168fa9c1e217f0d3a7935851230db0ef78f77aec4e775 SHA512 66921cbfa6f6049aeadff62cd2302df83090f49b5cb1a9bf4a84c243050ca350dcd0b5f7cf05891edc9c13de254a87b436d0555030a9ed643f997e4ff7b90f3b WHIRLPOOL c5da4d07885f34f4b0c187b0c333d8e6cd8713a9561ad6e2c7c84f9cf2f47d9083ba6900204c09d41a171b005edf3794333b7e84c643334cecc5f3d356f7ee37 +MISC ChangeLog 2800 SHA256 0a40befff5bfe79fbb1407a99af59713cef3465ace4c4a0ef781582a3c27de71 SHA512 c7b7c7ae0192730ebc3c70c34c9293fbfd68b41e18a8a8d358ea08d813a40805602b141b967dcfe41f492c6b00f264bb06d8f357c85cbbcad52e883208ff2411 WHIRLPOOL 83faedf015504f9f1354246610d21bbd0f7233005e73b1ed5c0bbbb5537dfb3c3470d129966b92eaec3d9442a5371347623c626232ca736b5690835cb1d31926 +MISC metadata.xml 1603 SHA256 f73b1ed75f710c55fa073350554f4214aba02e2f8127ac3cf1f13bc9c5833735 SHA512 3c7746bdca2816d93fe3627452d22cbbe95606de20dca0278cb3c04abc4b98c0bbeac56f658ace1b97bbf876975f523ace126f636950b30a73facb18b6e1783e WHIRLPOOL 8676431de745d6ab986298c29eba0a58131af8736dd5551259faf3b12cd06ec5c90fdfee619a97c7103c5409aeb7c8c1dbce89b77f080d96ddbfdf850ba652ea -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJYwKEACgkQcaHudmEf86qrEwCfejfbf99qZZ4pIJanoHmZsWq4 -00gAn31ZPT9h8shq/9G0YRgocYQ74miI -=CMfP +iQEcBAEBCAAGBQJSisBtAAoJEFpvPKfnPDWzuqIH/1MT7sonM3oMb7AoMDxtlJU2 +FpUN1O6XEJsY5a7fBkFOqFPohcjxphJm/hHFEA/pRRtvAhozI3MSNY6IWhR5qbuO +4CLO+JdZ+EVYlFOf+uQlObtxenvdGTPJwbJGf1LuuPaMfXrUVwmWGvSGfzQTmmPI +ZcCxEPtoNgcMv9W5X9EnqYrICS7Nfa2x8dIQYKq8K7tywy3b93zLCAoefv/ZWGRS +BA5ITAC3X4TXuxLGCS+KBbGvaXogC1zT5aA7KLnQD84s8y4dAOjASxkHmi/lya49 +wVo5+e26eBkqYwHaItJwjzEl8ulhFKxYFfEDVYMJxZGEM5AHm3uvwV7+Zw62Lvw= +=bTue -----END PGP SIGNATURE----- diff --git a/games-strategy/megaglest/files/megaglest-3.9.0.3-Waddress.patch b/games-strategy/megaglest/files/megaglest-3.9.0.3-Waddress.patch new file mode 100644 index 000000000000..a56a32266e1d --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.9.0.3-Waddress.patch @@ -0,0 +1,11 @@ +--- a/source/shared_lib/sources/platform/sdl/window.cpp ++++ b/source/shared_lib/sources/platform/sdl/window.cpp +@@ -1034,7 +1034,7 @@ + wchar_t keyW = c; + wchar_t textAppend[] = { keyW, 0 }; + +- if(textAppend) { ++ if(textAppend[0]) { + wchar_t newKey = textAppend[0]; + if (newKey < 0x80) { + result.push_back(1); diff --git a/games-strategy/megaglest/files/megaglest-3.9.0.3-fribidi.patch b/games-strategy/megaglest/files/megaglest-3.9.0.3-fribidi.patch new file mode 100644 index 000000000000..106d46c2ef98 --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.9.0.3-fribidi.patch @@ -0,0 +1,289 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Tue Nov 19 00:58:41 UTC 2013 +Subject: fix fribidi checks + +--- a/mk/cmake/Modules/FindFriBiDi.cmake ++++ b/mk/cmake/Modules/FindFriBiDi.cmake +@@ -28,9 +28,9 @@ + SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi) + + OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) +-IF(WANT_STATIC_LIBS) +- SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) +-ENDIF() ++# IF(WANT_STATIC_LIBS) ++ # SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES}) ++# ENDIF() + + FIND_LIBRARY(FRIBIDI_LIBRARY + NAMES ${FRIBIDI_NAMES} +@@ -40,40 +40,20 @@ + IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR) + SET(CMAKE_REQUIRED_INCLUDES ${FRIBIDI_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${FRIBIDI_LIBRARY}) +- CHECK_SYMBOL_EXISTS(fribidi_utf8_to_unicode fribidi.h FOUND_fribidi_utf8_to_unicode) +- CHECK_SYMBOL_EXISTS(fribidi_charset_to_unicode fribidi.h FOUND_fribidi_charset_to_unicode) +- CHECK_SYMBOL_EXISTS(FRIBIDI_CHAR_SET_UTF8 fribidi.h FOUND_FRIBIDI_CHAR_SET_UTF8) ++ FIND_PACKAGE(GLIB2 REQUIRED) + +- # FriBiDi provides both fribidi_utf8_to_unicode and fribidi_charset_to_unicode. +- # The difference is that +- # 1. fribidi >= 0.10.5 has FRIBIDI_CHAR_SET_UTF8. +- # 2. fribidi <= 0.10.4 has FRIBIDI_CHARSET_UTF8. ++ CHECK_LIBRARY_EXISTS(fribidi fribidi_utf8_to_unicode "" FOUND_fribidi_utf8_to_unicode) ++ CHECK_LIBRARY_EXISTS(fribidi fribidi_charset_to_unicode "" FOUND_fribidi_charset_to_unicode) + +- # Newer versions of fribidi (not tested the initial version which has the +- # issue, but at least 0.19.2 has the issue) no longer have the symbol +- # FRIBIDI_CHAR_SET_UTF8. But the symbol is build with some macros confusing +- # cmake. To test for that case let the compiler give its verdict. +- if(FOUND_fribidi_charset_to_unicode AND NOT FOUND_FRIBIDI_CHAR_SET_UTF8) +- file(WRITE "${CMAKE_BINARY_DIR}/fribidi_test.c" +- "#include <fribidi.h>\nint main(){FriBidiCharSet s = FRIBIDI_CHAR_SET_UTF8;}" +- ) +- try_compile(FOUND_FRIBIDI_CHAR_SET_UTF8 +- "${CMAKE_BINARY_DIR}" +- "${CMAKE_BINARY_DIR}/fribidi_test.c" +- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${FRIBIDI_INCLUDE_DIR}" +- ) +- +- file(REMOVE "${CMAKE_BINARY_DIR}/fribidi_test.c") +- +- endif(FOUND_fribidi_charset_to_unicode AND NOT FOUND_FRIBIDI_CHAR_SET_UTF8) +- +- if(FOUND_fribidi_charset_to_unicode AND FOUND_FRIBIDI_CHAR_SET_UTF8) ++ if(FOUND_fribidi_charset_to_unicode) + # fribidi >= 0.10.5 + SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY}) ++ SET(FRIBIDI_INCLUDE_DIR ${FRIBIDI_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS}) + SET(FRIBIDI_FOUND "YES") + elseif(FOUND_fribidi_utf8_to_unicode) + # fribidi <= 0.10.4 +- SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY}) ++ SET(FRIBIDI_INCLUDE_DIR ${FRIBIDI_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS}) ++ SET(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY} ${GLIB2_LIBRARIES}) + SET(FRIBIDI_FOUND "YES") + add_definitions(-DOLD_FRIBIDI) + MESSAGE(STATUS "Legacy FriBiDi: ${FRIBIDI_LIBRARY}") +--- /dev/null ++++ b/mk/cmake/Modules/FindGLIB2.cmake +@@ -0,0 +1,219 @@ ++# http://opensource.bolloretelecom.eu/projects/boc-wimax/browser/cmake/modules/FindGLIB2.cmake?rev=8f5b254534bd304923d4cc7bc7e9d6552c119ea2 ++ ++# - Try to find GLib2 ++# Once done this will define ++# ++# GLIB2_FOUND - system has GLib2 ++# GLIB2_INCLUDE_DIRS - the GLib2 include directory ++# GLIB2_LIBRARIES - Link these to use GLib2 ++# ++# HAVE_GLIB_GREGEX_H glib has gregex.h header and ++# supports g_regex_match_simple ++# ++# Copyright (c) 2006 Andreas Schneider <mail@cynapses.org> ++# Copyright (c) 2006 Philippe Bernery <philippe.bernery@gmail.com> ++# Copyright (c) 2007 Daniel Gollub <dgollub@suse.de> ++# Copyright (c) 2007 Alban Browaeys <prahal@yahoo.com> ++# Copyright (c) 2008 Michael Bell <michael.bell@web.de> ++# Copyright (c) 2008 Bjoern Ricks <bjoern.ricks@googlemail.com> ++# ++# Redistribution and use is allowed according to the terms of the New ++# BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++# ++ ++ ++IF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS ) ++ # in cache already ++ SET(GLIB2_FOUND TRUE) ++ELSE (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS ) ++ ++ INCLUDE(FindPkgConfig) ++ ++ ## Glib ++ IF ( GLIB2_FIND_REQUIRED ) ++ SET( _pkgconfig_REQUIRED "REQUIRED" ) ++ ELSE ( GLIB2_FIND_REQUIRED ) ++ SET( _pkgconfig_REQUIRED "" ) ++ ENDIF ( GLIB2_FIND_REQUIRED ) ++ ++ IF ( GLIB2_MIN_VERSION ) ++ PKG_SEARCH_MODULE( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0>=${GLIB2_MIN_VERSION} ) ++ ELSE ( GLIB2_MIN_VERSION ) ++ PKG_SEARCH_MODULE( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0 ) ++ ENDIF ( GLIB2_MIN_VERSION ) ++ IF ( PKG_CONFIG_FOUND ) ++ IF ( GLIB2_FOUND ) ++ SET ( GLIB2_CORE_FOUND TRUE ) ++ ELSE ( GLIB2_FOUND ) ++ SET ( GLIB2_CORE_FOUND FALSE ) ++ ENDIF ( GLIB2_FOUND ) ++ ENDIF ( PKG_CONFIG_FOUND ) ++ ++ # Look for glib2 include dir and libraries w/o pkgconfig ++ IF ( NOT GLIB2_FOUND AND NOT PKG_CONFIG_FOUND ) ++ FIND_PATH( ++ _glibconfig_include_DIR ++ NAMES ++ glibconfig.h ++ PATHS ++ /opt/gnome/lib64 ++ /opt/gnome/lib ++ /opt/lib/ ++ /opt/local/lib ++ /sw/lib/ ++ /usr/lib64 ++ /usr/lib ++ /usr/local/include ++ ${CMAKE_LIBRARY_PATH} ++ PATH_SUFFIXES ++ glib-2.0/include ++ ) ++ ++ FIND_PATH( ++ _glib2_include_DIR ++ NAMES ++ glib.h ++ PATHS ++ /opt/gnome/include ++ /opt/local/include ++ /sw/include ++ /usr/include ++ /usr/local/include ++ PATH_SUFFIXES ++ glib-2.0 ++ ) ++ ++ #MESSAGE(STATUS "Glib headers: ${_glib2_include_DIR}") ++ ++ FIND_LIBRARY( ++ _glib2_link_DIR ++ NAMES ++ glib-2.0 ++ glib ++ PATHS ++ /opt/gnome/lib ++ /opt/local/lib ++ /sw/lib ++ /usr/lib ++ /usr/local/lib ++ ) ++ IF ( _glib2_include_DIR AND _glib2_link_DIR ) ++ SET ( _glib2_FOUND TRUE ) ++ ENDIF ( _glib2_include_DIR AND _glib2_link_DIR ) ++ ++ ++ IF ( _glib2_FOUND ) ++ SET ( GLIB2_INCLUDE_DIRS ${_glib2_include_DIR} ${_glibconfig_include_DIR} ) ++ SET ( GLIB2_LIBRARIES ${_glib2_link_DIR} ) ++ SET ( GLIB2_CORE_FOUND TRUE ) ++ ELSE ( _glib2_FOUND ) ++ SET ( GLIB2_CORE_FOUND FALSE ) ++ ENDIF ( _glib2_FOUND ) ++ ++ # Handle dependencies ++ # libintl ++ IF ( NOT LIBINTL_FOUND ) ++ FIND_PATH(LIBINTL_INCLUDE_DIR ++ NAMES ++ libintl.h ++ PATHS ++ /opt/gnome/include ++ /opt/local/include ++ /sw/include ++ /usr/include ++ /usr/local/include ++ ) ++ ++ FIND_LIBRARY(LIBINTL_LIBRARY ++ NAMES ++ intl ++ PATHS ++ /opt/gnome/lib ++ /opt/local/lib ++ /sw/lib ++ /usr/local/lib ++ /usr/lib ++ ) ++ ++ IF (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR) ++ SET (LIBINTL_FOUND TRUE) ++ ENDIF (LIBINTL_LIBRARY AND LIBINTL_INCLUDE_DIR) ++ ENDIF ( NOT LIBINTL_FOUND ) ++ ++ # libiconv ++ IF ( NOT LIBICONV_FOUND ) ++ FIND_PATH(LIBICONV_INCLUDE_DIR ++ NAMES ++ iconv.h ++ PATHS ++ /opt/gnome/include ++ /opt/local/include ++ /opt/local/include ++ /sw/include ++ /sw/include ++ /usr/local/include ++ /usr/include ++ PATH_SUFFIXES ++ glib-2.0 ++ ) ++ ++ FIND_LIBRARY(LIBICONV_LIBRARY ++ NAMES ++ iconv ++ PATHS ++ /opt/gnome/lib ++ /opt/local/lib ++ /sw/lib ++ /usr/lib ++ /usr/local/lib ++ ) ++ ++ IF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR) ++ SET (LIBICONV_FOUND TRUE) ++ ENDIF (LIBICONV_LIBRARY AND LIBICONV_INCLUDE_DIR) ++ ENDIF ( NOT LIBICONV_FOUND ) ++ ++ IF (LIBINTL_FOUND) ++ SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBINTL_LIBRARY}) ++ SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR}) ++ ENDIF (LIBINTL_FOUND) ++ ++ IF (LIBICONV_FOUND) ++ SET (GLIB2_LIBRARIES ${GLIB2_LIBRARIES} ${LIBICONV_LIBRARY}) ++ SET (GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${LIBICONV_INCLUDE_DIR}) ++ ENDIF (LIBICONV_FOUND) ++ ++ ENDIF ( NOT GLIB2_FOUND AND NOT PKG_CONFIG_FOUND ) ++ ## ++ ++ IF (GLIB2_CORE_FOUND AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) ++ SET (GLIB2_FOUND TRUE) ++ ENDIF (GLIB2_CORE_FOUND AND GLIB2_INCLUDE_DIRS AND GLIB2_LIBRARIES) ++ ++ IF (GLIB2_FOUND) ++ IF (NOT GLIB2_FIND_QUIETLY) ++ MESSAGE (STATUS "Found GLib2: ${GLIB2_LIBRARIES} ${GLIB2_INCLUDE_DIRS}") ++ ENDIF (NOT GLIB2_FIND_QUIETLY) ++ ELSE (GLIB2_FOUND) ++ IF (GLIB2_FIND_REQUIRED) ++ MESSAGE (SEND_ERROR "Could not find GLib2") ++ ENDIF (GLIB2_FIND_REQUIRED) ++ ENDIF (GLIB2_FOUND) ++ ++ # show the GLIB2_INCLUDE_DIRS and GLIB2_LIBRARIES variables only in the advanced view ++ MARK_AS_ADVANCED(GLIB2_INCLUDE_DIRS GLIB2_LIBRARIES) ++ MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR LIBICONV_LIBRARY) ++ MARK_AS_ADVANCED(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARY) ++ ++ENDIF (GLIB2_LIBRARIES AND GLIB2_INCLUDE_DIRS) ++ ++IF ( GLIB2_FOUND ) ++ # Check if system has a newer version of glib ++ # which supports g_regex_match_simple ++ INCLUDE( CheckIncludeFiles ) ++ SET( CMAKE_REQUIRED_INCLUDES ${GLIB2_INCLUDE_DIRS} ) ++ CHECK_INCLUDE_FILES ( glib/gregex.h HAVE_GLIB_GREGEX_H ) ++ # Reset CMAKE_REQUIRED_INCLUDES ++ SET( CMAKE_REQUIRED_INCLUDES "" ) ++ENDIF( GLIB2_FOUND ) diff --git a/games-strategy/megaglest/files/megaglest-3.9.0.3-static-build.patch b/games-strategy/megaglest/files/megaglest-3.9.0.3-static-build.patch new file mode 100644 index 000000000000..a649b037d590 --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.9.0.3-static-build.patch @@ -0,0 +1,48 @@ +commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a +Author: hasufell <hasufell@gentoo.org> +Date: Mon Nov 18 21:54:54 2013 +0100 + + fix static build + +diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake +index 2a026cc..8ca8a23 100644 +--- a/mk/cmake/Modules/FindOGG.cmake ++++ b/mk/cmake/Modules/FindOGG.cmake +@@ -19,11 +19,11 @@ + + FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) + +-#IF (OGG_STATIC AND NOT OGG_LIBRARY) +-# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) +-#ELSE() +- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) +-#ENDIF() ++IF (OGG_STATIC AND NOT OGG_LIBRARY) ++ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) ++ELSE() ++ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) ++ENDIF() + + #IF (OGG_STATIC AND NOT VORBIS_LIBRARY) + # FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) +--- a/mk/cmake/Modules/FindXercesC.cmake ++++ b/mk/cmake/Modules/FindXercesC.cmake +@@ -83,6 +83,9 @@ + /usr/lib + /usr/local/lib + ) ++ ++ FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a) ++ FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a) + + IF (XERCESC_INCLUDE AND XERCESC_LIBRARY) + MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]") +@@ -90,7 +93,7 @@ + + IF(UNIX AND NOT APPLE) + #SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata") +- SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}") ++ SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY} ${ICUDATA_LIBRARY}") + ENDIF() + ENDIF() + ENDIF() diff --git a/games-strategy/megaglest/megaglest-3.9.0.3.ebuild b/games-strategy/megaglest/megaglest-3.9.0.3.ebuild new file mode 100644 index 000000000000..759a5cc4ec69 --- /dev/null +++ b/games-strategy/megaglest/megaglest-3.9.0.3.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.9.0.3.ebuild,v 1.1 2013/11/19 01:35:35 hasufell Exp $ + +# google-breakpad +# TODO: fribidi, libvorbis static + +EAPI=5 +VIRTUALX_REQUIRED="manual" +inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games + +DESCRIPTION="Cross-platform 3D realtime strategy game" +HOMEPAGE="http://www.megaglest.org/" +SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.xz" + +LICENSE="GPL-3 BitstreamVera" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +editor fribidi sse sse2 sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos" + +RDEPEND=" + >=dev-lang/lua-5.1 + dev-libs/libxml2 + media-libs/fontconfig + media-libs/freetype + media-libs/libsdl[X,audio,joystick,opengl,video] + media-libs/libvorbis + media-libs/openal + net-libs/gnutls + sys-libs/zlib + virtual/opengl + virtual/glu + x11-libs/libX11 + x11-libs/libXext + editor? ( x11-libs/wxGTK:2.8[X,opengl] ) + fribidi? ( dev-libs/fribidi ) + model-viewer? ( x11-libs/wxGTK:2.8[X] ) + !static? ( + dev-libs/icu + dev-libs/xerces-c[icu] + media-libs/ftgl + media-libs/glew + media-libs/libpng:0 + net-libs/libircclient + >=net-libs/miniupnpc-1.8 + net-misc/curl + virtual/jpeg + ) + videos? ( media-video/vlc )" +DEPEND="${RDEPEND} + sys-apps/help2man + virtual/pkgconfig + editor? ( ${VIRTUALX_DEPEND} ) + model-viewer? ( ${VIRTUALX_DEPEND} ) + static? ( + dev-libs/icu[static-libs] + dev-libs/xerces-c[icu,static-libs] + media-libs/ftgl[static-libs] + media-libs/glew[static-libs] + media-libs/libpng:0[static-libs] + net-libs/libircclient[static-libs] + net-libs/miniupnpc[static-libs] + net-misc/curl[static-libs] + virtual/jpeg[static-libs] + )" +PDEPEND="~games-strategy/${PN}-data-3.9.0" + +S=${WORKDIR}/${PN}-3.9.0 + +src_prepare() { + if use editor || use model-viewer ; then + WX_GTK_VER="2.8" + need-wxwidgets unicode + fi + + epatch "${FILESDIR}"/${P}-{static-build,Waddress,fribidi}.patch +} + +src_configure() { + if use sse3; then + SSE=3 + elif use sse2; then + SSE=2 + elif use sse; then + SSE=1 + else + SSE=0 + fi + + local mycmakeargs=( + $(cmake-utils_use_enable fribidi FRIBIDI) + $(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR) + $(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS) + $(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER) + $(cmake-utils_use_with videos VLC) + -DMAX_SSE_LEVEL_DESIRED="${SSE}" + -DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}" + -DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}" + # icons are used at runtime, wrong default location share/pixmaps + -DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}" + -DUSE_FTGL=ON + $(cmake-utils_use_want static STATIC_LIBS) + $(cmake-utils_use_want streflop STREFLOP) + -DWANT_SVN_STAMP=off + $(cmake-utils_use static wxWidgets_USE_STATIC) + $(cmake-utils_use unicode wxWidgets_USE_UNICODE) + $(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL) + + $(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "") + ) + + # support CMAKE_BUILD_TYPE=Gentoo + append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"' + + cmake-utils_src_configure +} + +src_compile() { + if use editor || use model-viewer; then + VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake + else + cmake-utils_src_compile + fi +} + +src_install() { + # rebuilds some targets randomly without fast option + emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast + + dodoc {AUTHORS.source_code,CHANGELOG,README}.txt + doicon -s 48 ${PN}.png + + use editor && + make_desktop_entry ${PN}_editor "MegaGlest Map Editor" + use model-viewer && + make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer" + + # provided by megaglest-data + rm "${ED%/}/${GAMES_DATADIR}"/${PN}/${PN}.bmp || die + + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + einfo + elog 'Note about Configuration:' + elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini' + elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride' + elog 'values in these files.' + elog + elog 'If you have an older graphics card which only supports OpenGL 1.2, and the' + elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"' + elog 'Some graphics cards may require setting Max Lights to 1.' + einfo + + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-strategy/megaglest/metadata.xml b/games-strategy/megaglest/metadata.xml index cea582a3be2b..32dac0ac2166 100644 --- a/games-strategy/megaglest/metadata.xml +++ b/games-strategy/megaglest/metadata.xml @@ -13,6 +13,7 @@ </upstream> <use> <flag name='editor'>Build map editor</flag> + <flag name='fribidi'>Enable FriBIDi support</flag> <flag name='streflop'>Use the library streflop. Out of synchs may occur if not enabled.</flag> <flag name='tools'>Build model import/export tools</flag> |