diff options
author | 2013-01-07 22:47:23 +0000 | |
---|---|---|
committer | 2013-01-07 22:47:23 +0000 | |
commit | 2c31e2c830b60da8342b0258a788976fcad81eb0 (patch) | |
tree | f505a782c83aa8f94df43b87f0332887b076f49b /games-arcade/performous | |
parent | QA: add missing inherit for user eclass (diff) | |
download | historical-2c31e2c830b60da8342b0258a788976fcad81eb0.tar.gz historical-2c31e2c830b60da8342b0258a788976fcad81eb0.tar.bz2 historical-2c31e2c830b60da8342b0258a788976fcad81eb0.zip |
old
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Diffstat (limited to 'games-arcade/performous')
10 files changed, 9 insertions, 344 deletions
diff --git a/games-arcade/performous/ChangeLog b/games-arcade/performous/ChangeLog index 761f7d64b35e..a82299365927 100644 --- a/games-arcade/performous/ChangeLog +++ b/games-arcade/performous/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-arcade/performous # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.12 2013/01/03 10:57:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.13 2013/01/07 22:47:18 mr_bones_ Exp $ + + 07 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> + -files/performous-0.6.1-boost150.patch, -files/performous-0.6.1-ffmpeg.patch, + -files/performous-0.6.1-gentoo.patch, -files/performous-0.6.1-glib232.patch, + -files/performous-0.6.1-libav.patch, -files/performous-0.6.1-libpng.patch, + -files/performous-0.6.1-linguas.patch, -performous-0.6.1.ebuild: + old 03 Jan 2013; Agostino Sarubbo <ago@gentoo.org> performous-0.7.0.ebuild: Stable for amd64, wrt bug #449932 diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest index f18959f879f5..84a9bf220007 100644 --- a/games-arcade/performous/Manifest +++ b/games-arcade/performous/Manifest @@ -1,21 +1,12 @@ -AUX performous-0.6.1-boost150.patch 4692 SHA256 a552c2dae10aafc8250a8d9e621d540f8af24bb76f348cd15accc03c861d6b01 SHA512 86b7633a76fb4e77a1c57a85fd42f74daf3c84d83a705b1346f43502856ad51acadc29eaa9cd3f3e1b6fa14b10903d33ae10ebd695ed12930cebfd59e8561834 WHIRLPOOL ed9bd8e6ce112a07293b86b1fb676939c34f0d15433591ab8b50d13c759e34f1b3faf96b1ba43167b2a11fed800de9e5a96a599a1834119c41a0d240609138d6 -AUX performous-0.6.1-ffmpeg.patch 795 SHA256 5d3eb46478096b15f982af3ed12bb6d00cb46011a5eb6435a333da4d2bb29399 SHA512 49efa9f144d3043d8058ca7e66cf6d64aaa8bf6421f906bdc197914bcbbe3a1bc321d9e131bc26e810a5c832bf49cfdf2ee56c2f6d77da3ee52192015606c959 WHIRLPOOL f0066460ae2d1a0167f19ec400218b9952330e5fe5209a4674b0eaeb9fdda8ecb43c9b230c570ca7e451f2ecc049e88eedb61b97df77096cfe3dcdd78f23ab18 -AUX performous-0.6.1-gentoo.patch 1445 SHA256 82d8bfcf56a0c495e51130817dbe3d327a2fc86ca3d1a5887ee890dcf543897f SHA512 576759fe71143480fbeee0abef4a147d5bc627d3a04d8207bdefcf41dd3276bbae26a614b3b865d7a1a3c5ae6b332f8b136afacfdec7f9d68fdae8e24b97939c WHIRLPOOL b6328a66155248360de74b5770c344cdde43239e310b5c865724138a53eb0c60c37955d7a8ca51fb86595a613fc90e4320e2f1d32bdde75689ca69ab5fdce49a -AUX performous-0.6.1-glib232.patch 268 SHA256 265da520ab6d02bd23bf7dba35ff75a6fbc9d3e7a76b719da0c4399b443ddca7 SHA512 980f85c279f2641c653b433d443f471f716578eebca06ee15770c170fe7b42f7f185f1c599f8df4ecc761a0d993f2963c0893b3c3c502ea55a96ab80c37b53e8 WHIRLPOOL c84c8901df339747ee537230f4628f4df6e113c50e480a09e7cb4e7d3645734c77bc5003bcdec590f3db4db82671b005d1c41fb5c291ad5baff1c4174096b3c9 -AUX performous-0.6.1-libav.patch 2038 SHA256 f0aa4df47ddd2e7f0725f06cc345a84787b6b1b0ee9c607bd3e80c71f04bdad1 SHA512 8460b2f8e054183e82130c01761499949a39cc67a33a42745b58d0e16e4a29293489a8fb2b3b63873daebb17a87a655e019e02474ae66981e3af632d3889a237 WHIRLPOOL 0506ded66223cb35026c14a874f50c2db7398bf455e33398a8aeded12a3aebc47c19e36f6a9d74975a52b1beebaa29b345c8aaaf21057e1ef5bb2b0fe3feb259 -AUX performous-0.6.1-libpng.patch 678 SHA256 0c60e3d3ce1b05d5a64642f697dc81489f9f22eb7f55c15fe509d61d0d155d22 SHA512 e6c38f1517e9946f2d3115f153a00e3dffb793a878932c57623a33a1aa97aa5e6bca555d71ab6e56548502953d0a84d87909ff1b15d836dc17cd4199fba717b7 WHIRLPOOL 9e8e4611fb2a080b1e20d3500512742be5da9fc0cde59405c4516f2413182b948b926266695e6236529e7af4dcaab29c3ee926ddff612b2e0eb8ad0bad5024b1 -AUX performous-0.6.1-linguas.patch 833 SHA256 52efe542b46c6b6f436d97d7ae567c8f6012586dc20d9ea5840e37561fa3811d SHA512 36f20e0dcc21d150cb8f81af83dde594965b1a5ff2bb033be13348061a1cdd67a7fcdeb1e7a9331c6d10102520faf9111d9ecfb89864c75f46f2d1ccdccd8682 WHIRLPOOL 31cedc7a727913f8614ca448617eb47ddbeaee2462841eb08f26ab353728fd21102dfc68c91d7e71a6194174f2af0bad7edb52754f6dd46b9b7798b86d22c784 AUX performous-0.7.0-desktop.patch 499 SHA256 d8ec0ea0bf824048dc38d831db13fe818cb51da1463407696323d1db839c1a9f SHA512 c4e92d1f6c0ebb5a438c51d17ef926924872112f9f0e5ca55b70c566f30bcd4f53a13ba25472af9de0a1e0686caaf0772e237ecab52db5fce816b4866f91ba49 WHIRLPOOL 45916a92e485d0ca7d00d19d2e08b4748fba3cc8d1b9d1b21534350579238c37364373530df0c3382533b5e233bfb7863eb9f6243578321ad912ee100ff61519 AUX performous-0.7.0-gentoo.patch 1445 SHA256 82d8bfcf56a0c495e51130817dbe3d327a2fc86ca3d1a5887ee890dcf543897f SHA512 576759fe71143480fbeee0abef4a147d5bc627d3a04d8207bdefcf41dd3276bbae26a614b3b865d7a1a3c5ae6b332f8b136afacfdec7f9d68fdae8e24b97939c WHIRLPOOL b6328a66155248360de74b5770c344cdde43239e310b5c865724138a53eb0c60c37955d7a8ca51fb86595a613fc90e4320e2f1d32bdde75689ca69ab5fdce49a AUX performous-0.7.0-libav.patch 2038 SHA256 f0aa4df47ddd2e7f0725f06cc345a84787b6b1b0ee9c607bd3e80c71f04bdad1 SHA512 8460b2f8e054183e82130c01761499949a39cc67a33a42745b58d0e16e4a29293489a8fb2b3b63873daebb17a87a655e019e02474ae66981e3af632d3889a237 WHIRLPOOL 0506ded66223cb35026c14a874f50c2db7398bf455e33398a8aeded12a3aebc47c19e36f6a9d74975a52b1beebaa29b345c8aaaf21057e1ef5bb2b0fe3feb259 AUX performous-0.7.0-linguas.patch 833 SHA256 52efe542b46c6b6f436d97d7ae567c8f6012586dc20d9ea5840e37561fa3811d SHA512 36f20e0dcc21d150cb8f81af83dde594965b1a5ff2bb033be13348061a1cdd67a7fcdeb1e7a9331c6d10102520faf9111d9ecfb89864c75f46f2d1ccdccd8682 WHIRLPOOL 31cedc7a727913f8614ca448617eb47ddbeaee2462841eb08f26ab353728fd21102dfc68c91d7e71a6194174f2af0bad7edb52754f6dd46b9b7798b86d22c784 -DIST Performous-0.6.1-Source.tar.bz2 3745265 SHA256 d210988f8d86797dc9ba5fbde2ffa237c5596eaa1daf9ddcd62bde7d1ab30c85 SHA512 012a7c5b6e0ca9910105d2760cdf13b28a71370e716ff6f18bf8f7110317051d7d244c36e2c6036ef7efa3567d28bf12cbaf5879303ce4387735fa1c3d8eac86 WHIRLPOOL 5e87c9e1afe78589f0474ee4ec6e35377cb2d36ed396d5b36e45595af4211176cd264a95c6e2199a52bbfd2746af6e87e461e03c4a661385455babd5b54b7c6a DIST performous-0.7.0.tar.bz2 5015164 SHA256 af4cb8268e608e7a8da178ef80537d6da09e643321878dcdf3f1a71002cb63ec SHA512 bded51d7f2883ea8f15c9ac8ab03f692d0dcdb45b85ae1c7d11d2600ca761962f6fb991f5a5d0a4dd5fbdf60e7ad711ca1e0480dfa14a04c5603897335762db8 WHIRLPOOL 56e464bd27be923022354a289239645c09505dc105a3f36b2a44564e3991f6c0fb45d1485db1a1e80f98f600a9808b97bc7cd6690cf70a455daf9682083427d8 DIST ultrastar-songs-jc-1.zip 242698201 SHA256 b3a6f980926c4f1ce40bc763a406040855600ad005f4daa54e0ac324ce99a9ba SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea WHIRLPOOL 13bd3761b80b2a9491c6dbe2e535dbdc1e0f53b51d5070a0caf776da94c45c62a5a6980b4d95f629e0cfe5d6ef985428e5dcf6d4ba2f0931e6ea1d39d7f6674c DIST ultrastar-songs-libre-3.zip 5289866 SHA256 739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66 WHIRLPOOL 48d48e82ec8bd02376b3def5a3f215331c49853cf00439686cd577ebd51321e4a4e8b213d40356a46e2a2bd2a1bf6c1cb07b09195209833f4eb004166937bfe5 DIST ultrastar-songs-restricted-3.zip 10242651 SHA256 e05d81333f85e2c6c271a67f90beac453d64eac78cd95eec7214721182257a82 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8 WHIRLPOOL cb83550395bbbadb45ad982fd4586a4dca49ae96bbe7adfab1b925301fa69eb5581c24f0c5c8d3593851a80b3e86137eea7658753f720ad76bae6e5809c2feba DIST ultrastar-songs-shearer-1.zip 50411551 SHA256 967c3dfae2da2915a66fd9dfee14da7191e13bb95e8b0820049d109c21f25628 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b WHIRLPOOL 868974ba4e68482dde0a25b338f0c8afd64435ddb872cd4a2ac7d5e8a984d16ebfdca530501779c24d1b2e4feb8151ee71f5db3052032fd706f42a88d31a46ab -EBUILD performous-0.6.1.ebuild 2635 SHA256 ca4e0d87fe24ed4f7a90c90691049548193f2f47c9b393a189a2b45d2d112406 SHA512 1159ab11687bacc230d8795482c5b5d5240b3a7e29c7c02632a04c58a364899236fec398663f0f975ee5228a133d32890df1e984ee785e3c796e2b7d3803a56d WHIRLPOOL a7b9143ab8598fa46da54a9bfe069b688231c42fc70f5123587c1c23a31c6e8e51bab67f87d426c18e65a8327f37d79810c0ac6aad27af533a683f7bc54b29ff EBUILD performous-0.7.0.ebuild 2537 SHA256 5ec8b27e2fad9d9a4dce0820794010761687fb850ed02c07f48219883d8e507c SHA512 67949e6309426e663e829e01c3c3bf5b010c36013224cce803f4741083f79b7c2c292adc4a16fa65070d14ae4ee1f3c4f46beb1290b49fa0adebfbd4d45e6bc0 WHIRLPOOL 7dc490728cd30055793ca621b87a91a00e4f06585c216ad124e6bcda76d8ab6f132d513590454473bc584be8ec7f1f94620877ec94837e41a4a6ec1aeddb2088 -MISC ChangeLog 2296 SHA256 18fc91adab5a47434efa48f6757dcac70bddbcb54a3be1f7452dae110c406bdb SHA512 1ea42b42cfc9673d2622cd6c97d536c705eba9c03b5bdb5bf6d1097ff85919bf55057fbbccaea0b20d35665da70d600e1a6066be0ac6bb873e6f939c09bac631 WHIRLPOOL 08d3b9ea45f88bcca7c4291e8fab1daeb3d4d40f2704fca9e0a9b2cf9fee767d5914f112bd7bd81f38beca975a34f89c5bb3a4d2ebb2d71b3e23fb5ddf2dad39 +MISC ChangeLog 2667 SHA256 f8b6662d3902c68ee7b6526bcfaeb487d77b2eb7fb1d950ee789cd2b972e3426 SHA512 69fa9344d0752062996ddf310454385d77f93b8825148b3ff1c48ba6eaf7d051abca1e55c939641ec492fe8dfbac49efb66e36b75fa598d150aed28800c238e2 WHIRLPOOL 8b01083732821495cb24179f55d2dd2bddb844953c303bf7ed4cc0ea4cd9b2e48fe90e338fee619921e2a5e2974574e819fa54fa9854f51c31df470a471b4149 MISC metadata.xml 462 SHA256 58703292296a89760bd19edb9d2e020dd6a1428fa555111372b446f0fdd1691f SHA512 fc60b67a82dee2ba6239ed99f9c217d4d3ae51d71c75f6b94dd62e335565979ae905dbf3bde8b5dfed8bc1c8164b4b6b59132a51c294e1ad1ca333c881b1a124 WHIRLPOOL 2ce0968588111cb4174b79d084fdb2c7e5c5d3a8a7b6ec47dcad2b83dc4ef89e53978e58697263703f072de45784cf9f1bdc8110f4ed2b4c8e8e8061ede0d7da diff --git a/games-arcade/performous/files/performous-0.6.1-boost150.patch b/games-arcade/performous/files/performous-0.6.1-boost150.patch deleted file mode 100644 index d34e1b1f36f4..000000000000 --- a/games-arcade/performous/files/performous-0.6.1-boost150.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- game/filemagic.hh.old 2012-11-05 12:05:34.723680403 +0100 -+++ game/filemagic.hh 2012-11-05 12:06:06.605860472 +0100 -@@ -71,7 +71,7 @@ - // For now, just check the extension an assume it's not lying. - - // Get file extension in lower case -- std::string ext = filename.extension(); -+ std::string ext = filename.extension().string(); - // somehow this does not convert the extension to lower case: - //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); - std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); ---- game/songparser-ini.cc.old 2012-11-05 11:58:15.792411732 +0100 -+++ game/songparser-ini.cc 2012-11-05 11:58:59.539974896 +0100 -@@ -94,7 +94,7 @@ - // Search the dir for the music files - for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { - boost::filesystem::path p = dirIt->path(); -- std::string name = p.leaf(); // File basename (notes.txt) -+ std::string name = p.filename().string(); // File basename (notes.txt) - if (regex_match(name.c_str(), match, midifile)) { - s.midifilename = name; - } else if (regex_match(name.c_str(), match, audiofile_background)) { ---- game/backgrounds.cc.old 2012-11-05 11:48:05.279711751 +0100 -+++ game/backgrounds.cc 2012-11-05 11:48:42.220736233 +0100 -@@ -55,8 +55,8 @@ - for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { - fs::path p = dirIt->path(); - if (fs::is_directory(p)) { reload_internal(p); continue; } -- std::string name = p.leaf(); // File basename -- std::string path = p.directory_string(); // Path without filename -+ std::string name = p.filename().string(); // File basename -+ std::string path = p.string(); // Path without filename - path.erase(path.size() - name.size()); - if (!regex_match(name.c_str(), match, expression)) continue; - { ---- game/xtime.hh.old 2012-11-05 11:04:23.511731845 +0100 -+++ game/xtime.hh 2012-11-05 11:19:13.960930800 +0100 -@@ -1,5 +1,6 @@ - #pragma once - -+#include <boost/version.hpp> - #include <boost/thread/xtime.hpp> - #include <cmath> - -@@ -20,7 +21,11 @@ - } - boost::xtime now() { - boost::xtime time; -+#if BOOST_VERSION >= 105000 -+ boost::xtime_get(&time, boost::TIME_UTC_); -+#else - boost::xtime_get(&time, boost::TIME_UTC); -+#endif - return time; - } - double seconds(boost::xtime const& time) { ---- game/fs.cc.old 2012-11-05 11:23:41.147282412 +0100 -+++ game/fs.cc 2012-11-05 11:24:55.219383768 +0100 -@@ -127,7 +127,7 @@ - - bool isThemeResource(fs::path filename){ - try { -- std::string themefile = getThemePath(filename.filename()); -+ std::string themefile = getThemePath(filename.filename().string()); - return themefile == filename; - } catch (...) { return false; } - } ---- game/cache.cc.old 2012-11-05 10:51:36.981446602 +0100 -+++ game/cache.cc 2012-11-05 10:51:53.491277792 +0100 -@@ -9,7 +9,7 @@ - fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ - fs::path cache_filename; - std::string const lod = (boost::format("%.2f") % factor).str(); -- std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; -+ std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; - - if (isThemeResource(svgfilename)) { - std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); ---- game/songs.cc.old 2012-11-05 11:35:51.876756665 +0100 -+++ game/songs.cc 2012-11-05 11:36:55.805536727 +0100 -@@ -67,8 +67,8 @@ - for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { - fs::path p = dirIt->path(); - if (fs::is_directory(p)) { reload_internal(p); continue; } -- std::string name = p.leaf(); // File basename (notes.txt) -- std::string path = p.directory_string(); // Path without filename -+ std::string name = p.filename().string(); // File basename (notes.txt) -+ std::string path = p.string(); // Path without filename - path.erase(path.size() - name.size()); - if (!regex_match(name.c_str(), match, expression)) continue; - try { ---- game/songparser.cc.old 2012-11-05 11:26:13.314214039 +0100 -+++ game/songparser.cc 2012-11-05 11:27:58.917214975 +0100 -@@ -101,7 +101,7 @@ - - for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { - boost::filesystem::path p = dirIt->path(); -- std::string name = p.leaf(); // File basename -+ std::string name = p.filename().string(); // File basename - if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { - m_song.cover = name; - } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { diff --git a/games-arcade/performous/files/performous-0.6.1-ffmpeg.patch b/games-arcade/performous/files/performous-0.6.1-ffmpeg.patch deleted file mode 100644 index 38adb751d3b1..000000000000 --- a/games-arcade/performous/files/performous-0.6.1-ffmpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- game/ffmpeg.cc.old 2012-02-19 09:01:01.086108323 +0100 -+++ game/ffmpeg.cc 2012-02-19 09:02:27.157984673 +0100 -@@ -60,8 +60,8 @@ - for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) { - AVCodecContext* cc = pFormatCtx->streams[i]->codec; - cc->workaround_bugs = FF_BUG_AUTODETECT; -- if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i; -- if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i; -+ if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i; -+ if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i; - } - if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found"); - if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found"); diff --git a/games-arcade/performous/files/performous-0.6.1-gentoo.patch b/games-arcade/performous/files/performous-0.6.1-gentoo.patch deleted file mode 100644 index e9a6fe316b95..000000000000 --- a/games-arcade/performous/files/performous-0.6.1-gentoo.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- game/CMakeLists.txt.old 2012-02-20 13:19:35.219635192 +0100 -+++ game/CMakeLists.txt 2012-02-20 13:20:06.025469808 +0100 -@@ -149,5 +149,5 @@ - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.hh" "${CMAKE_CURRENT_BINARY_DIR}/config.hh" @ONLY) - include_directories("${CMAKE_CURRENT_BINARY_DIR}") - --install(TARGETS performous DESTINATION bin) -+install(TARGETS performous DESTINATION @GENTOO_BINDIR@) - ---- game/fs.cc.old 2012-02-20 20:09:48.171892171 +0100 -+++ game/fs.cc 2012-02-20 20:16:14.197400202 +0100 -@@ -195,6 +195,7 @@ - if (root) config_list.push_back(std::string(root) + "/" SHARED_DATA_DIR + configFile.string()); - fs::path exec = plugin::execname(); - if (!exec.empty()) config_list.push_back(exec.parent_path().string() + "/../" SHARED_DATA_DIR + configFile.string()); -+ config_list.push_back(SHARED_DATA_DIR + configFile.string()); - ConfigList::const_iterator it = std::find_if(config_list.begin(), config_list.end(), static_cast<bool(&)(fs::path const&)>(fs::exists)); - if (it == config_list.end()) { - throw std::runtime_error("Could not find default config file " + configFile.string()); ---- game/fs.cc.old 2012-02-20 20:49:35.610728056 +0100 -+++ game/fs.cc 2012-02-20 20:57:03.117084432 +0100 -@@ -167,6 +167,7 @@ - - // Adding relative path from executable - dirs.push_back(plugin::execname().parent_path().parent_path() / shareDir); -+ dirs.push_back(shareDir); - #ifndef _WIN32 - // Adding XDG_DATA_DIRS - { diff --git a/games-arcade/performous/files/performous-0.6.1-glib232.patch b/games-arcade/performous/files/performous-0.6.1-glib232.patch deleted file mode 100644 index f69d52253fe4..000000000000 --- a/games-arcade/performous/files/performous-0.6.1-glib232.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- game/unicode.cc.old 2012-06-27 13:34:43.485706157 +0200 -+++ game/unicode.cc 2012-06-27 13:34:56.825769500 +0200 -@@ -2,7 +2,6 @@ - - #include <boost/scoped_ptr.hpp> - #include <glibmm/ustring.h> --#include <glib/gconvert.h> - #include <sstream> - #include <stdexcept> - diff --git a/games-arcade/performous/files/performous-0.6.1-libav.patch b/games-arcade/performous/files/performous-0.6.1-libav.patch deleted file mode 100644 index b598dc0a488a..000000000000 --- a/games-arcade/performous/files/performous-0.6.1-libav.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake ---- Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake 2012-05-16 13:44:26.112930173 +0200 -+++ Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake 2012-05-16 13:56:10.229914635 +0200 -@@ -25,9 +25,15 @@ - if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h") - set(AVUtil_INCLUDE "${suffix}avutil.h") - endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h") -+ if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h") -+ set(AVUtilMath_INCLUDE "${suffix}mathematics.h") -+ endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h") - endif(NOT AVUtil_INCLUDE) - endforeach(suffix) - -+ if(NOT AVUtilMath_INCLUDE) -+ message(FATAL_ERROR "Found mathematics.h include dir, but not the header file. Perhaps you need to clear CMake cache?") -+ endif(NOT AVUtilMath_INCLUDE) - if(NOT AVUtil_INCLUDE) - message(FATAL_ERROR "Found avutil.h include dir, but not the header file. Perhaps you need to clear CMake cache?") - endif(NOT AVUtil_INCLUDE) -diff -urN Performous-0.6.1-Source.old/game/config.cmake.hh Performous-0.6.1-Source/game/config.cmake.hh ---- Performous-0.6.1-Source.old/game/config.cmake.hh 2012-05-16 13:44:26.103930173 +0200 -+++ Performous-0.6.1-Source/game/config.cmake.hh 2012-05-16 13:59:24.552910345 +0200 -@@ -15,6 +15,7 @@ - #define AVCODEC_INCLUDE <@AVCodec_INCLUDE@> - #define AVFORMAT_INCLUDE <@AVFormat_INCLUDE@> - #define SWSCALE_INCLUDE <@SWScale_INCLUDE@> -+#define AVUTILMATH_INCLUDE <@AVUtilMath_INCLUDE@> - - #endif - -diff -urN Performous-0.6.1-Source.old/game/ffmpeg.cc Performous-0.6.1-Source/game/ffmpeg.cc ---- Performous-0.6.1-Source.old/game/ffmpeg.cc 2012-05-16 13:44:26.101930173 +0200 -+++ Performous-0.6.1-Source/game/ffmpeg.cc 2012-05-16 14:00:38.278908717 +0200 -@@ -10,6 +10,7 @@ - #include AVCODEC_INCLUDE - #include AVFORMAT_INCLUDE - #include SWSCALE_INCLUDE -+#include AVUTILMATH_INCLUDE - } - - // #define USE_FFMPEG_CRASH_RECOVERY diff --git a/games-arcade/performous/files/performous-0.6.1-libpng.patch b/games-arcade/performous/files/performous-0.6.1-libpng.patch deleted file mode 100644 index 2633e77c0fbb..000000000000 --- a/games-arcade/performous/files/performous-0.6.1-libpng.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- game/image.hh.old 2012-02-19 09:20:09.215987761 +0100 -+++ game/image.hh 2012-02-19 09:20:50.418077218 +0100 -@@ -26,7 +26,7 @@ - } - void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) { - if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed"); -- png_set_read_fn(pngPtr,(voidp)&file, readPngHelper); -+ png_set_read_fn(pngPtr,(png_voidp)&file, readPngHelper); - png_read_info(pngPtr, infoPtr); - png_set_expand(pngPtr); // Expand everything to RGB(A) - png_set_strip_16(pngPtr); // Strip everything down to 8 bit/component diff --git a/games-arcade/performous/files/performous-0.6.1-linguas.patch b/games-arcade/performous/files/performous-0.6.1-linguas.patch deleted file mode 100644 index 21836766d878..000000000000 --- a/games-arcade/performous/files/performous-0.6.1-linguas.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- lang/CMakeLists.txt -+++ lang/CMakeLists.txt -@@ -7,5 +7,11 @@ - set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo) - add_custom_command(OUTPUT ${mofile} COMMAND ${Msgfmt_BIN} -v "${pofile}" -o ${mofile} MAIN_DEPENDENCY ${pofile} COMMENT "Building ${language} locale" VERBATIM) - add_custom_target(locale_${language} ALL DEPENDS ${mofile}) # Make sure the mofiles are always built -- install(FILES ${mofile} DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo) - endforeach(language) -+foreach(language $ENV{LINGUAS}) -+ set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po) -+ if (EXISTS ${pofile}) -+ set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo) -+ install(FILES ${mofile} DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo) -+ endif() -+endforeach(language) diff --git a/games-arcade/performous/performous-0.6.1.ebuild b/games-arcade/performous/performous-0.6.1.ebuild deleted file mode 100644 index f1dfb9ee610f..000000000000 --- a/games-arcade/performous/performous-0.6.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.6.1.ebuild,v 1.10 2012/11/05 11:44:38 tupone Exp $ - -EAPI="3" - -inherit flag-o-matic base cmake-utils games - -MY_PN=Performous -MY_P=${MY_PN}-${PV} -SONGS_PN=ultrastar-songs - -DESCRIPTION="SingStar GPL clone" -HOMEPAGE="http://sourceforge.net/projects/performous/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}-Source.tar.bz2 - songs? ( - mirror://sourceforge/${PN}/${SONGS_PN}-restricted-3.zip - mirror://sourceforge/${PN}/${SONGS_PN}-jc-1.zip - mirror://sourceforge/${PN}/${SONGS_PN}-libre-3.zip - mirror://sourceforge/${PN}/${SONGS_PN}-shearer-1.zip - )" - -LICENSE="GPL-2 - songs? ( - CCPL-Attribution-ShareAlike-NonCommercial-2.5 - CCPL-Attribution-NonCommercial-NoDerivs-2.5 - )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="songs tools" - -RDEPEND="dev-cpp/glibmm - dev-cpp/libxmlpp - media-libs/portaudio - >=dev-libs/boost-1.36 - dev-libs/glib - dev-libs/libxml2 - gnome-base/librsvg - media-gfx/imagemagick - virtual/jpeg - media-libs/libpng - media-libs/libsdl - virtual/ffmpeg - virtual/opengl - virtual/glu - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/pango" -DEPEND="${RDEPEND} - media-libs/glew - sys-apps/help2man" - -S=${WORKDIR}/${MY_P}-Source - -PATCHES=( - "${FILESDIR}"/${P}-ffmpeg.patch - "${FILESDIR}"/${P}-libav.patch - "${FILESDIR}"/${P}-libpng.patch - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-linguas.patch - "${FILESDIR}"/${P}-glib232.patch - "${FILESDIR}"/${P}-boost150.patch -) - -src_prepare() { - base_src_prepare - sed -i \ - -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \ - game/CMakeLists.txt \ - || die - - strip-linguas -u lang - - # how do I hate boost? Let me count the ways... - local boost_ver=$(best_version ">=dev-libs/boost-1.36") - - boost_ver=${boost_ver/*boost-/} - boost_ver=${boost_ver%.*} - boost_ver=${boost_ver/./_} - - einfo "Using boost version ${boost_ver}" - append-cxxflags \ - -I/usr/include/boost-${boost_ver} - append-ldflags \ - -L/usr/$(get_libdir)/boost-${boost_ver} - export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}" - export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}" -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable tools TOOLS) - -DCMAKE_VERBOSE_MAKEFILE=TRUE - -DSHARE_INSTALL="${GAMES_DATADIR}"/${PN} - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - if use songs ; then - insinto "${GAMES_DATADIR}"/${PN} - doins -r "${WORKDIR}/songs" || die - fi - dodoc docs/{Authors,DeveloperReadme,instruments,TODO}.txt - prepgamesdirs -} |