From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- dev-games/ogre/Manifest | 17 +- .../ogre/files/ogre-1.12.8-fix_Simple_demo.patch | 11 -- dev-games/ogre/files/ogre-1.12.8-media_path.patch | 14 -- .../ogre/files/ogre-1.12.8-resource_path.patch | 13 -- .../ogre/files/ogre-1.12.8-upgrade_imgui.patch | 28 --- .../ogre/files/ogre-1.12.9-fix_Simple_demo.patch | 11 ++ .../ogre-1.12.9-fix_config_window_height.patch | 11 ++ .../ogre-1.12.9-gentoolize_imgui_inclusion.patch | 27 +++ dev-games/ogre/files/ogre-1.12.9-media_path.patch | 14 ++ .../ogre/files/ogre-1.12.9-resource_path.patch | 13 ++ dev-games/ogre/metadata.xml | 7 +- dev-games/ogre/ogre-1.12.8.ebuild | 208 --------------------- dev-games/ogre/ogre-1.12.9.ebuild | 208 +++++++++++++++++++++ 13 files changed, 298 insertions(+), 284 deletions(-) delete mode 100644 dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch delete mode 100644 dev-games/ogre/files/ogre-1.12.8-media_path.patch delete mode 100644 dev-games/ogre/files/ogre-1.12.8-resource_path.patch delete mode 100644 dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-media_path.patch create mode 100644 dev-games/ogre/files/ogre-1.12.9-resource_path.patch delete mode 100644 dev-games/ogre/ogre-1.12.8.ebuild create mode 100644 dev-games/ogre/ogre-1.12.9.ebuild (limited to 'dev-games/ogre') diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 8d0cf0254b14..410aba461f9c 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,8 +1,9 @@ AUX ogre-1.10.12-use_system_tinyxml.patch 1617 BLAKE2B 0c0213b9ed63030d2538817ef73bb26d02a02e8e62d5acc923e748d9c1b9a24c4a9868e19816cc15c2b71a0b0c58974147ed0c7a019fbc5d1e5cb3640e9aabbf SHA512 b97040417bd1ec29e2b90a6b6a6ba82ab790786c08c994d77d1440d3c2054e7850b420850584f38d0783aa4c60f13b3ac8fcd32e3fc72f57554f6819e65b0bda -AUX ogre-1.12.8-fix_Simple_demo.patch 538 BLAKE2B bfdefb5064efe77db364f43eb6b212ac02eccdc1ff2053db9bb644d348448fbb536ae5e61fb8717b85db63fd6c27d270ca564a3619b3e51ad602d9d9ffefbd31 SHA512 4d67d349c566ace6ba310abdf53d36981f21cf1e176e003f3945afd34cde4d2728112f41c823c15b869e69df11390c3b45a898b3ca4ab92174dca9c613d24a27 -AUX ogre-1.12.8-media_path.patch 639 BLAKE2B b7480ae5661df88051b11223bb7fc65ebf4c56f4f015da47fbe3d44714d656b9df3376d5c33845d7306fa2a2fcda1b382a95a87068f2838f21781a2ed3b16597 SHA512 95c0d3b457c289724fd638c6627a50c28745bf54c5524bd70316901387e5e78b90542b1457073f263f7c62fcf184053a1c253733d0699d91550f70ab46fb879b -AUX ogre-1.12.8-resource_path.patch 518 BLAKE2B 06b0bdc7d5cde392ff59c4f2af0a6351740b0e08ed6816eb9b286573fae5201e9f502280815971eec9e957ee694871e10ea4274a1a532c867fb8fbd1ff6931fe SHA512 7b112f2a4d57159eff028e95a23aa615ad4a47280f2516cee1c5d38e5e476bba6acb0117cc716051cddb016c5b3a4218b283c60654bf3f80a1808a4d653b34ec -AUX ogre-1.12.8-upgrade_imgui.patch 1147 BLAKE2B 430764b1bbf91c47694cf986f70b22eed2d2be21d2d1f5341077248ce630089ffb7020be52fbb00129853505dc8669906f60f611a8f59cb7aaecc40d1b4ad280 SHA512 aea86520d72d0f85e1176ca08be1d3c15048f26cd4f27323f9cf3b11ded4e0056a2463b9ce3cc6803755258c00de2c7adc72fffa6b0d6b4f3ddb6054c674e459 +AUX ogre-1.12.9-fix_Simple_demo.patch 538 BLAKE2B bfdefb5064efe77db364f43eb6b212ac02eccdc1ff2053db9bb644d348448fbb536ae5e61fb8717b85db63fd6c27d270ca564a3619b3e51ad602d9d9ffefbd31 SHA512 4d67d349c566ace6ba310abdf53d36981f21cf1e176e003f3945afd34cde4d2728112f41c823c15b869e69df11390c3b45a898b3ca4ab92174dca9c613d24a27 +AUX ogre-1.12.9-fix_config_window_height.patch 648 BLAKE2B a7a6670ed4f068ac5fc02ddb40522e6399d829fa48dc1a46a4f5505b1e21285ed4b8795056814d4ae72f56ba01e3a557049ed9da75cfc4cd676628be87a51a35 SHA512 ed041cfe5b2c7694afed6e8ee0b4f232f950703cc589c3df796dc3d66257099ab46a324b09e24e518ea14bdc48805a86747bce40b836bb4018b6b0af1dd712a8 +AUX ogre-1.12.9-gentoolize_imgui_inclusion.patch 1084 BLAKE2B b1e47e13e33fb5f379d4af271f63f0e1b1c94aadef0c2b0c59c6d20fc3dcc43611522ec917c61f7574c3f10a1465bc98b466889b8355b59caccf9d0cdc3cc05e SHA512 3e24e1602b30db3bc06b5fb820669a57b53465a74a09203e64bc8a55d9c6df9b2ecc3cb71d9ad7cf1a268d17f4a017373c457ca95b21178eb60dca2521f622d9 +AUX ogre-1.12.9-media_path.patch 639 BLAKE2B b7480ae5661df88051b11223bb7fc65ebf4c56f4f015da47fbe3d44714d656b9df3376d5c33845d7306fa2a2fcda1b382a95a87068f2838f21781a2ed3b16597 SHA512 95c0d3b457c289724fd638c6627a50c28745bf54c5524bd70316901387e5e78b90542b1457073f263f7c62fcf184053a1c253733d0699d91550f70ab46fb879b +AUX ogre-1.12.9-resource_path.patch 518 BLAKE2B 06b0bdc7d5cde392ff59c4f2af0a6351740b0e08ed6816eb9b286573fae5201e9f502280815971eec9e957ee694871e10ea4274a1a532c867fb8fbd1ff6931fe SHA512 7b112f2a4d57159eff028e95a23aa615ad4a47280f2516cee1c5d38e5e476bba6acb0117cc716051cddb016c5b3a4218b283c60654bf3f80a1808a4d653b34ec AUX ogre-1.9.0-gcc52.patch 2392 BLAKE2B 3d41e4a6726dabd2f4861774c962a0b5e38cdc5403f3bd457b2ec4b003de6d3c59511a6b9590baee376b543520a00acd3df0839e5d045966d6aac8ba49c6a3dc SHA512 ade6885334698ea2df8a678b3b9058f2cd06aa6c32dd57645e5b28e3f22cbaacc4821bbd661e97ecc426f216114dd9595d9b98c9368061561afea82779a942c7 AUX ogre-1.9.0-remove_media_path_to_bindir.patch 545 BLAKE2B 162ca81d22dfa100f624f3c62095bb3cd8bfff884e0754991904fbbe37ab60177d920872ea4955d4c8e3fd95a81f6488ed6ba6894dd1b0c7fe0b376ac62d9105 SHA512 7248e6dba4837765ebf0bc1cd06c07891ea785a415ecbd279f1d6adc88b4a8aae0a12993635d9139697771e8b94739e709e2410754e0e004571d1a48a1bf614d AUX ogre-1.9.0-remove_resource_path_to_bindir.patch 452 BLAKE2B ef6aedfe4ee2bc1e17106164fec1d82a7fe927d5240e90c1db8a579dbf4fedc11e6b3cacb5138172fa198bf5681df09309412b6a48079353bd14568b667d5db4 SHA512 57cef0efbbbe791234b117556c6f56051ebeee90a1b1802a9fc8e106edabbfa53f96a2e43d4c332a8631b04954e87676444cdca417bcc8957f860d041f80d2b9 @@ -15,12 +16,12 @@ AUX ogre-2.1-fix_warnings.patch 873 BLAKE2B ab0aaff5855a7da70a42c4ee15e4e210b00e AUX ogre-2.1-media_path.patch 857 BLAKE2B 76b02d1aebd737dff20ac7616d324d28129e122f94d714c758e5f112fb2c52127ad76b47ebe8c96827d83dbb5130d3e75caed7466872385e6b2a482dc08efd29 SHA512 77fd07c9c1b51fc6925183eb0a62bc5c4690f964b4072c1f5d6864e436563ece25e498fba8d0b83126dfb56c967aca5b098cff219a2480b5c0c0f63646f62376 AUX ogre-2.1-resource_path.patch 570 BLAKE2B f37d65d0a9b0abccd487b150b48950f2d7cd885ee2aea2f7015a51af316dc28ba357f3e163af9bd1ddd3d982eb40e54ae065419cd8cc50599b12b6dffd233080 SHA512 b5f476e2fc8b48dc1e98794d443ffb4f9c485593f1d3357a0892a8d3bfa46a7a42cd6c7470383cae051d7c54f154f2f6e2e4db70094963085c5eceaa4d813494 AUX ogre-2.1-samples.patch 1108 BLAKE2B 0b3b5bdb93f58952993a9a92c52b6057ef37e308fa93cbf1833a564f1188448c7eccb725eb37a591c18a7d4bc6f752454e52d08308be231e8602669720019730 SHA512 586b18f301906a82acad1d8211c8f63a2fd0e587dfe160dbddf0821893f17b7b1f772f1d5116e1adedc62017eb27eedc5fc30e0e861ae1c2ba12bd3bcc662372 -DIST imgui-1.76.tar.gz 1256126 BLAKE2B 801e94e1007e41c5b7281bb30fc7da76ddf0e755bf3ec2c4eb90d730dd9c68685f3e4819f32acc2154fbcd4e32da9d1de6dac36b0cd8885a93457475576b4336 SHA512 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa -DIST ogre-1.12.8.tar.gz 125932831 BLAKE2B ffd4a443e374ad3f209b4f8a5e18a41b3dbfbb528d20581f48a4d31447e1e20a3b1cdde588b6345bd07d864c9b72ce1e51374de52523e7c4477408c01778af69 SHA512 c446c58b57874d3e2522f7e0315771b7a9f5ac8888449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2 +DIST imgui-1.77.tar.gz 1269147 BLAKE2B be0db9b77903664db0fadf1672ec23983dc89292fd261a1e89c1eab88b82e95de7c2af37eb7ef43cc994b889fdf7d7fb2dd1282b93c1f3b1166c7fe0d2dccaf5 SHA512 d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546 +DIST ogre-1.12.9.tar.gz 125955067 BLAKE2B 5676690d2d9db8c4c903b7bf3e7660ddf5c0675eb11e1b34f08a5a50739d6212e986c7b500173ad5edab4835d96c705f86cc0fd37e1ff1e64a161ab1ce8968df SHA512 a80525a4924a430ccac3f01f93a5f36b4b9d2f7671ef0629d7dd21d3651ea7a698d5cc520eb814c6ee4c0ee7efcd3f6a8f16688773300a25537636bb61eba286 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5 -EBUILD ogre-1.12.8.ebuild 5814 BLAKE2B 4e669001578ceee0c14018bf865cc2586758bf0703f902e19c2427132a4d8c9695105990fe49ef17a62d1414f4da99568c1c10e100562984755ff9ec70868ea4 SHA512 4fdd4bb4336fcd1e5e6d7a6e54c9e6b9c4dddcc544301ea22c123f91293e891b11cdc51e09a8d200881a11ba2cbbbf7f33dda0764c3828b2eb2ce68e8df57052 +EBUILD ogre-1.12.9.ebuild 5879 BLAKE2B 40ca82f07bade00a108b257ca17e04e14b96f1455e7145a67a93258c06e7f649c786503a4c2a6cd7362f576f33e33ce41088d17d87e27bfc936963ec41d08c08 SHA512 2ebd8d777ff2145fbd6987835dbd57be177aca764cf213c04d3547ecc069fa00eeda5ea1bd7bec20d22a6d0bd42140340c800427ed2b78a4aba39449a7aab1b9 EBUILD ogre-1.9.0-r1.ebuild 3791 BLAKE2B cea064e4607e7892d2af6a375b4a7b6845ca27490b0bff72a08beb898d5ff62eff0777f407f5038771bc9181e822a8bc3c825cae9fb59a5aebbe0e20d09b83e9 SHA512 16839c39f7295f039fb59fd2e7422e0e9545070e0cf33b393c7eacdb57e9b84afa8238415f043dc25f7b2eaa20e38f63fc152e63c3e0d1dbf68cdb00bee35c23 EBUILD ogre-1.9.0-r2.ebuild 3589 BLAKE2B c52ab761a94ebb2d5e6c8ac232d4071d1062b172d849fab6c6e4a55c21f27100899ee53d2ec9f36f9f78b20540d0b98e1c301d47c91db10a645ecfa045f4710a SHA512 32079693e35a493a3b6f093c1ca17f8602cde92a0dbaef82862258a12e3b92fe12ec4d4a55a59601065a9a5a5a1370e8b2d32983f62d7687338e52dcafba767a EBUILD ogre-2.1.ebuild 5949 BLAKE2B 26522e0c5d3ca1e01a9a533a1fb21d8ca21632abb3d05f26993a32a6c60aba27af8626cb88d537e968981f18429aaa3d2a400447baf4ddaafb962297ca269298 SHA512 50fd86fdc82b252c7ef9fab7c8c2bf99319d838efe4e8e124719658122a4c35213e723ec2d89dba0a8ae06c706867806caf4ae5e11920844a81bbc5323457769 -MISC metadata.xml 6671 BLAKE2B 5153819b38f65ae518bfaf3c7272ac3002113a393f6a8eb220d3e503fa630e09e746b964f74c9a33e8b9db7cb746202fdcaf43a5a2ef808b310ca98812edd5bd SHA512 1c390764a7697a74ff402a580f42087f1fa569cb6570194de9e56851bab9a075c17488490a60a793f2f59f3b243daf336f700faf3de0f70a1feddf6df7621213 +MISC metadata.xml 6849 BLAKE2B 078f3c5dbe0c558dab497c79b1698e3f9244b0cefadd7f0e2aa2126cc44a98b4dcc8059250765d2e8c662286de5519b7705e7167fd18fb2f4ba59b2dc2ed2c53 SHA512 0b41e4fe3601f07ca51954dd902d33ccc61b07834f8b98539e2f9b039bc9f9371ee58dd69736263a3f517063143fc9cffd0c985dde8696812e1a077bc213cf41 diff --git a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch deleted file mode 100644 index 49ed0190e0a1..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Samples/Simple/include/SSAO.h 2020-04-26 13:54:31.321908377 +0200 -+++ b/Samples/Simple/include/SSAO.h 2020-04-26 13:54:47.497909935 +0200 -@@ -65,7 +65,7 @@ - SSAOGBufferSchemeHandler() - { - mGBufRefMat = Ogre::MaterialManager::getSingleton().getByName("SSAO/GBuffer"); -- RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer"); -+ RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer", "OgreAutodetect"); - mGBufRefMat->load(); - } - diff --git a/dev-games/ogre/files/ogre-1.12.8-media_path.patch b/dev-games/ogre/files/ogre-1.12.8-media_path.patch deleted file mode 100644 index 3030cc5b9fad..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-media_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -Media paths are fine already, the removed lines would screw them up. - ---- a/CMake/InstallResources.cmake 2019-11-06 08:09:15.185821495 +0100 -+++ b/CMake/InstallResources.cmake 2019-11-06 08:10:41.169819050 +0100 -@@ -145,9 +145,6 @@ - - # CREATE CONFIG FILES - BUILD DIR VERSIONS - if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) -- set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media") -- set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media") -- set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media") - else () - # iOS needs to use relative paths in the config files - set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}") diff --git a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch b/dev-games/ogre/files/ogre-1.12.8-resource_path.patch deleted file mode 100644 index cf35e2f99e8e..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -These was already configured above, the BINARY paths are wrong! - ---- a/CMake/InstallResources.cmake 2019-11-06 08:12:01.271816772 +0100 -+++ b/CMake/InstallResources.cmake 2019-11-06 08:13:15.623814658 +0100 -@@ -163,8 +163,6 @@ - set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/") - set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/") - elseif (UNIX) -- set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib") -- set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib") - endif () - - if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN) diff --git a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch b/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch deleted file mode 100644 index 4c7803a0a2f2..000000000000 --- a/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Components/Overlay/CMakeLists.txt 2020-08-16 17:45:59.605165822 +0200 -+++ b/Components/Overlay/CMakeLists.txt 2020-08-16 17:48:45.796175402 +0200 -@@ -19,14 +19,14 @@ - file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") - - if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.73" CACHE PATH "") -+ set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.76" CACHE PATH "") - if(NOT EXISTS ${IMGUI_DIR}) - message(STATUS "Dowloading imgui") - file(DOWNLOAD -- https://github.com/ocornut/imgui/archive/v1.73.tar.gz -- ${PROJECT_BINARY_DIR}/imgui.tar.gz) -+ https://github.com/ocornut/imgui/archive/v1.76.tar.gz -+ ${PROJECT_SOURCE_DIR}/imgui.tar.gz) - execute_process(COMMAND ${CMAKE_COMMAND} -- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) -+ -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) - endif() - list(APPEND SOURCE_FILES - ${IMGUI_DIR}/imgui.cpp -@@ -84,4 +84,4 @@ - ) - install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip" - DESTINATION "${OGRE_MEDIA_PATH}/packs/" --) -\ Kein Zeilenumbruch am Dateiende. -+) diff --git a/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch new file mode 100644 index 000000000000..49ed0190e0a1 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch @@ -0,0 +1,11 @@ +--- a/Samples/Simple/include/SSAO.h 2020-04-26 13:54:31.321908377 +0200 ++++ b/Samples/Simple/include/SSAO.h 2020-04-26 13:54:47.497909935 +0200 +@@ -65,7 +65,7 @@ + SSAOGBufferSchemeHandler() + { + mGBufRefMat = Ogre::MaterialManager::getSingleton().getByName("SSAO/GBuffer"); +- RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer"); ++ RTShader::ShaderGenerator::getSingleton().validateMaterial("GBuffer", "SSAO/GBuffer", "OgreAutodetect"); + mGBufRefMat->load(); + } + diff --git a/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch b/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch new file mode 100644 index 000000000000..12b4ce86a86f --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-fix_config_window_height.patch @@ -0,0 +1,11 @@ +--- a/Components/Bites/src/OgreGLXConfigDialog.cpp 2020-09-21 15:17:33.783741691 +0200 ++++ b/Components/Bites/src/OgreGLXConfigDialog.cpp 2020-09-21 15:17:35.948741768 +0200 +@@ -74,7 +74,7 @@ + class GLXConfigurator { + /* GUI constants */ + static const int wWidth = 500; // Width of window +- static const int wHeight = 380; // Height of window ++ static const int wHeight = 340; // Height of window + static const int col1x = 20; // Starting x of column 1 (labels) + static const int col2x = 230; // Starting x of column 2 (options) + static const int col1w = 200; // Width of column 1 (labels) diff --git a/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch new file mode 100644 index 000000000000..765a53d4695c --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch @@ -0,0 +1,27 @@ +--- a/Components/Overlay/CMakeLists.txt 2020-09-20 16:13:41.280993468 +0200 ++++ b/Components/Overlay/CMakeLists.txt 2020-09-20 16:14:52.468997571 +0200 +@@ -19,14 +19,14 @@ + file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + + if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) +- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "") ++ set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.77" CACHE PATH "") + if(NOT EXISTS ${IMGUI_DIR}) + message(STATUS "Dowloading imgui") + file(DOWNLOAD + https://github.com/ocornut/imgui/archive/v1.77.tar.gz +- ${PROJECT_BINARY_DIR}/imgui.tar.gz) ++ ${PROJECT_SOURCE_DIR}/imgui.tar.gz) + execute_process(COMMAND ${CMAKE_COMMAND} +- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) ++ -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) + endif() + list(APPEND SOURCE_FILES + ${IMGUI_DIR}/imgui.cpp +@@ -80,4 +80,4 @@ + ) + install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip" + DESTINATION "${OGRE_MEDIA_PATH}/packs/" +-) +\ Kein Zeilenumbruch am Dateiende. ++) diff --git a/dev-games/ogre/files/ogre-1.12.9-media_path.patch b/dev-games/ogre/files/ogre-1.12.9-media_path.patch new file mode 100644 index 000000000000..3030cc5b9fad --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-media_path.patch @@ -0,0 +1,14 @@ +Media paths are fine already, the removed lines would screw them up. + +--- a/CMake/InstallResources.cmake 2019-11-06 08:09:15.185821495 +0100 ++++ b/CMake/InstallResources.cmake 2019-11-06 08:10:41.169819050 +0100 +@@ -145,9 +145,6 @@ + + # CREATE CONFIG FILES - BUILD DIR VERSIONS + if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) +- set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media") +- set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media") +- set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media") + else () + # iOS needs to use relative paths in the config files + set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}") diff --git a/dev-games/ogre/files/ogre-1.12.9-resource_path.patch b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch new file mode 100644 index 000000000000..cf35e2f99e8e --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch @@ -0,0 +1,13 @@ +These was already configured above, the BINARY paths are wrong! + +--- a/CMake/InstallResources.cmake 2019-11-06 08:12:01.271816772 +0100 ++++ b/CMake/InstallResources.cmake 2019-11-06 08:13:15.623814658 +0100 +@@ -163,8 +163,6 @@ + set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/") + set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/") + elseif (UNIX) +- set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib") +- set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib") + endif () + + if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN) diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml index 43330db8ca14..db70daa77363 100644 --- a/dev-games/ogre/metadata.xml +++ b/dev-games/ogre/metadata.xml @@ -77,12 +77,13 @@ Exporters * Maya (meshes) + Use media-libs/assimp to import assets from 3D files Enable boost support Enable GL state cache support NVIDIA toolkit plugin More precise calculations at the expense of speed Use egl instead of glx - + Build deprecated component 'HLMS' and nodeless positioning of Lights and Cameras. @@ -112,7 +113,9 @@ Exporters (default: case-insensitive + sensitive lookup in all groups) When USE=threads, use tbb for threading - Build and install MeshUpgrader, VRMLConverter and XMLConverter + + Build and install AssimpConverter (assimp USE flag is enabled), MeshUpgrader, VRMLConverter and XMLConverter + sinbad/ogre diff --git a/dev-games/ogre/ogre-1.12.8.ebuild b/dev-games/ogre/ogre-1.12.8.ebuild deleted file mode 100644 index d7a634ba0da9..000000000000 --- a/dev-games/ogre/ogre-1.12.8.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" -inherit cmake - -IMGUI_PN="imgui" -IMGUI_PV="1.76" -IMGUI_P="${IMGUI_PN}-${IMGUI_PV}" - -DESCRIPTION="Object-oriented Graphics Rendering Engine" -HOMEPAGE="https://www.ogre3d.org/" -SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/ocornut/${IMGUI_PN}/archive/v${IMGUI_PV}.tar.gz -> ${IMGUI_P}.tar.gz" - -LICENSE="MIT public-domain" -SLOT="0/1.12" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="+cache cg debug deprecated doc double-precision egl examples +freeimage - json openexr +opengl pch profile resman-pedantic tools" - -# Note: gles2 USE flag taken out for now. It seems like the Ogre Devs now rely -# on HLSL2GLSL (https://github.com/aras-p/hlsl2glslfork) unconditionally -# for GLES2. So unless we have an ebuild for that, gles2/3 are off the -# table. -# ~~sed 2020-04-26 (yamakuzure@gmx.net) -# -# Note: Without gles2 USE flag, the opengl USE flag is next to useless. But -# there are packages which enforce it, so it has to stay. -# -# USE="gles2" -# REQUIRED_USE=" -# || ( gles2 opengl ) -# " -REQUIRED_USE=" - examples? ( opengl ) -" - -RESTRICT="test" #139905 - -RDEPEND=" - dev-games/ois - dev-libs/pugixml - dev-libs/zziplib - media-libs/freetype:2 - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXrandr - x11-libs/libXt - cg? ( media-gfx/nvidia-cg-toolkit ) - egl? ( media-libs/mesa[egl] ) - freeimage? ( media-libs/freeimage ) - json? ( dev-libs/rapidjson ) - openexr? ( media-libs/openexr:= ) - opengl? ( - virtual/glu - virtual/opengl - ) - tools? ( dev-libs/tinyxml[stl] ) -" -# gles2? ( media-libs/mesa[gles2] ) -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -PATCHES=( - "${FILESDIR}"/${P}-media_path.patch - "${FILESDIR}"/${P}-resource_path.patch - "${FILESDIR}"/${P}-fix_Simple_demo.patch - "${FILESDIR}"/${P}-upgrade_imgui.patch - "${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch -) - -src_unpack() { - unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed" - - # Ogre 1.12.8 includes imgui, but as a submodule, it is not included - # in the release. The build system tries to download it, that may - # a) fail and - # b) uses an old release 1.73 - # So we are doing it ourselves. - cd "${S}" || die "Unpack incomplete" - unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed" -} - -src_prepare() { - local broken_png=( - Icon@2x-72.png - Default-Portrait~ipad.png - Default-Portrait@2x~ipad.png - Default-Landscape@2x~ipad.png - ) - - sed -i \ - -e "s:share/doc/OGRE:share/doc/${PF}:" \ - Docs/CMakeLists.txt || die - # In this series, the CMAKE_BUILD_TARGET is hard-wired to the - # installation. And only Debug, MinSizeRel and RelWithDebInfo - # are supported. - sed -i \ - -e "s/$(usex debug Debug Release)/Gentoo/g" \ - CMake/InstallResources.cmake \ - CMake/Utils/OgreConfigTargets.cmake \ - || die - - # Fix broken png files - einfo "Fixing broken png files." - pushd "${S}"/Samples/Common/misc 1>/dev/null 2>&1 - for png in "${broken_png[@]}"; do - pngfix -q --out=out.png ${png} - mv -f out.png "${png}" || die - done - popd 1>/dev/null 2>&1 - einfo "done ..." - - # Fix some path issues - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_INSTALL_RPATH=yes - -DOGRE_BUILD_COMPONENT_BITES=yes - -DOGRE_BUILD_COMPONENT_CSHARP=no - -DOGRE_BUILD_COMPONENT_HLMS=$(usex deprecated) - -DOGRE_BUILD_COMPONENT_JAVA=no - -DOGRE_BUILD_COMPONENT_OVERLAY=yes - -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes - -DOGRE_BUILD_COMPONENT_PAGING=yes - -DOGRE_BUILD_COMPONENT_PROPERTY=yes - -DOGRE_BUILD_COMPONENT_PYTHON=no - -DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=yes - -DOGRE_BUILD_COMPONENT_TERRAIN=yes - -DOGRE_BUILD_COMPONENT_VOLUME=yes - -DOGRE_BUILD_DEPENDENCIES=no - -DOGRE_BUILD_PLUGIN_CG=$(usex cg) - -DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage) - -DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr) - -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl) - -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl) - -DOGRE_BUILD_RENDERSYSTEM_GLES2=no - -DOGRE_BUILD_SAMPLES=$(usex examples) - -DOGRE_BUILD_TESTS=no - -DOGRE_BUILD_TOOLS=$(usex tools) - -DOGRE_CONFIG_DOUBLE=$(usex double-precision) - -DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache) - -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=no - -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=no - -DOGRE_CONFIG_THREADS=3 - -DOGRE_CONFIG_THREAD_PROVIDER=std - -DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch) - -DOGRE_INSTALL_DOCS=$(usex doc) - -DOGRE_INSTALL_SAMPLES=$(usex examples) - -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples) - -DOGRE_NODELESS_POSITIONING=$(usex deprecated) - -DOGRE_PROFILING=$(usex profile) - -DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2) - ) -# -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2) -# -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no) -# -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc ; then - eninja -C "${BUILD_DIR}" OgreDoc - fi -} - -src_install() { - cmake_src_install - - CONFIGDIR=/etc/OGRE - SHAREDIR=/usr/share/OGRE - - # plugins and resources are the main configuration - insinto "${CONFIGDIR}" - doins "${BUILD_DIR}"/bin/plugins.cfg - doins "${BUILD_DIR}"/bin/resources.cfg - dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg - dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg - - # These are only for the sample browser - if use examples ; then - insinto "${SHAREDIR}" - doins "${BUILD_DIR}"/bin/samples.cfg - doins "${BUILD_DIR}"/bin/tests.cfg - fi -} - -pkg_postinst() { - elog "If you experience crashes when starting /usr/bin/SampleBrowser," - elog "remove the cache directory at:" - elog " '~/.cache/OGRE Sample Browser'" - elog "first, before filing a bug report." -} diff --git a/dev-games/ogre/ogre-1.12.9.ebuild b/dev-games/ogre/ogre-1.12.9.ebuild new file mode 100644 index 000000000000..74d3cd557a69 --- /dev/null +++ b/dev-games/ogre/ogre-1.12.9.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" +inherit cmake + +IMGUI_PN="imgui" +IMGUI_PV="1.77" +IMGUI_P="${IMGUI_PN}-${IMGUI_PV}" + +DESCRIPTION="Object-oriented Graphics Rendering Engine" +HOMEPAGE="https://www.ogre3d.org/" +SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/ocornut/${IMGUI_PN}/archive/v${IMGUI_PV}.tar.gz -> ${IMGUI_P}.tar.gz" + +LICENSE="MIT public-domain" +SLOT="0/1.12" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="assimp +cache cg debug deprecated doc double-precision egl examples +freeimage + json openexr +opengl pch profile resman-pedantic tools" + +# Note: gles2 USE flag taken out for now. It seems like the Ogre Devs now rely +# on HLSL2GLSL (https://github.com/aras-p/hlsl2glslfork) unconditionally +# for GLES2. So unless we have an ebuild for that, gles2/3 are off the +# table. +# ~~sed 2020-04-26 (yamakuzure@gmx.net) +# +# Note: Without gles2 USE flag, the opengl USE flag is next to useless. But +# there are packages which enforce it, so it has to stay. +# +# USE="gles2" +# REQUIRED_USE=" +# || ( gles2 opengl ) +# " +REQUIRED_USE=" + examples? ( opengl ) +" + +RESTRICT="test" #139905 + +RDEPEND=" + dev-games/ois + dev-libs/pugixml + dev-libs/zziplib + media-libs/freetype:2 + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXrandr + x11-libs/libXt + assimp? ( media-libs/assimp ) + cg? ( media-gfx/nvidia-cg-toolkit ) + egl? ( media-libs/mesa[egl] ) + freeimage? ( media-libs/freeimage ) + json? ( dev-libs/rapidjson ) + openexr? ( media-libs/openexr:= ) + opengl? ( + virtual/glu + virtual/opengl + ) + tools? ( dev-libs/tinyxml[stl] ) +" +# gles2? ( media-libs/mesa[gles2] ) +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${P}-media_path.patch + "${FILESDIR}"/${P}-resource_path.patch + "${FILESDIR}"/${P}-fix_Simple_demo.patch + "${FILESDIR}"/${P}-gentoolize_imgui_inclusion.patch + "${FILESDIR}"/${P}-fix_config_window_height.patch + "${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch +) + +src_unpack() { + unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed" + + # Ogre 1.12.9 includes imgui, but as a submodule, it is not included + # in the release. The build system tries to download it, that may + # fail and so we are doing it ourselves. + cd "${S}" || die "Unpack incomplete" + unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed" +} + +src_prepare() { + local broken_png=( + Icon@2x-72.png + Default-Portrait~ipad.png + Default-Portrait@2x~ipad.png + Default-Landscape@2x~ipad.png + ) + + sed -i \ + -e "s:share/doc/OGRE:share/doc/${PF}:" \ + Docs/CMakeLists.txt || die + # In this series, the CMAKE_BUILD_TARGET is hard-wired to the + # installation. And only Debug, MinSizeRel and RelWithDebInfo + # are supported. + sed -i \ + -e "s/$(usex debug Debug Release)/Gentoo/g" \ + CMake/InstallResources.cmake \ + CMake/Utils/OgreConfigTargets.cmake \ + || die + + # Fix broken png files + einfo "Fixing broken png files." + pushd "${S}"/Samples/Common/misc 1>/dev/null 2>&1 + for png in "${broken_png[@]}"; do + pngfix -q --out=out.png ${png} + mv -f out.png "${png}" || die + done + popd 1>/dev/null 2>&1 + einfo "done ..." + + # Fix some path issues + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_INSTALL_RPATH=yes + -DOGRE_BUILD_COMPONENT_BITES=yes + -DOGRE_BUILD_COMPONENT_CSHARP=no + -DOGRE_BUILD_COMPONENT_HLMS=$(usex deprecated) + -DOGRE_BUILD_COMPONENT_JAVA=no + -DOGRE_BUILD_COMPONENT_OVERLAY=yes + -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes + -DOGRE_BUILD_COMPONENT_PAGING=yes + -DOGRE_BUILD_COMPONENT_PROPERTY=yes + -DOGRE_BUILD_COMPONENT_PYTHON=no + -DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=yes + -DOGRE_BUILD_COMPONENT_TERRAIN=yes + -DOGRE_BUILD_COMPONENT_VOLUME=yes + -DOGRE_BUILD_DEPENDENCIES=no + -DOGRE_BUILD_PLUGIN_CG=$(usex cg) + -DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage) + -DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr) + -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl) + -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl) + -DOGRE_BUILD_RENDERSYSTEM_GLES2=no + -DOGRE_BUILD_SAMPLES=$(usex examples) + -DOGRE_BUILD_TESTS=no + -DOGRE_BUILD_TOOLS=$(usex tools) + -DOGRE_CONFIG_DOUBLE=$(usex double-precision) + -DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache) + -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=no + -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=no + -DOGRE_CONFIG_THREADS=3 + -DOGRE_CONFIG_THREAD_PROVIDER=std + -DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch) + -DOGRE_INSTALL_DOCS=$(usex doc) + -DOGRE_INSTALL_SAMPLES=$(usex examples) + -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples) + -DOGRE_NODELESS_POSITIONING=$(usex deprecated) + -DOGRE_PROFILING=$(usex profile) + -DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2) + ) +# -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2) +# -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no) +# -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc ; then + eninja -C "${BUILD_DIR}" OgreDoc + fi +} + +src_install() { + cmake_src_install + + CONFIGDIR=/etc/OGRE + SHAREDIR=/usr/share/OGRE + + # plugins and resources are the main configuration + insinto "${CONFIGDIR}" + doins "${BUILD_DIR}"/bin/plugins.cfg + doins "${BUILD_DIR}"/bin/resources.cfg + dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg + dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg + + # These are only for the sample browser + if use examples ; then + insinto "${SHAREDIR}" + doins "${BUILD_DIR}"/bin/samples.cfg + doins "${BUILD_DIR}"/bin/tests.cfg + fi +} + +pkg_postinst() { + elog "If you experience crashes when starting /usr/bin/SampleBrowser," + elog "remove the cache directory at:" + elog " '~/.cache/OGRE Sample Browser'" + elog "first, before filing a bug report." +} -- cgit v1.2.3