diff options
Diffstat (limited to 'dev-games')
18 files changed, 315 insertions, 107 deletions
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz Binary files differindex 21417c464d91..de22b51752a1 100644 --- a/dev-games/Manifest.gz +++ b/dev-games/Manifest.gz diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 8722cae855b4..8d0cf0254b14 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,20 +1,26 @@ AUX ogre-1.10.12-use_system_tinyxml.patch 1617 BLAKE2B 0c0213b9ed63030d2538817ef73bb26d02a02e8e62d5acc923e748d9c1b9a24c4a9868e19816cc15c2b71a0b0c58974147ed0c7a019fbc5d1e5cb3640e9aabbf SHA512 b97040417bd1ec29e2b90a6b6a6ba82ab790786c08c994d77d1440d3c2054e7850b420850584f38d0783aa4c60f13b3ac8fcd32e3fc72f57554f6819e65b0bda -AUX ogre-1.12.4-fix_sample_source_install.patch 823 BLAKE2B 1fb07cb5cb48998df9dc338bfd650bf6ff7f4a7a0b50c11d04e115ac1671ea065ba6fd642439fa286d67441ff028f85f68c52063dbdc05bfc606106d3dac37ba SHA512 80b9503caa2bb16514a6484ad0fe19b1ae4c3bc8be212d87363f43b4f33bddb5e9c3628c7772033517b0a61a0a04e5544c7e5689b62c9494a027208f5c1ca538 -AUX ogre-1.12.4-media_path.patch 639 BLAKE2B b7480ae5661df88051b11223bb7fc65ebf4c56f4f015da47fbe3d44714d656b9df3376d5c33845d7306fa2a2fcda1b382a95a87068f2838f21781a2ed3b16597 SHA512 95c0d3b457c289724fd638c6627a50c28745bf54c5524bd70316901387e5e78b90542b1457073f263f7c62fcf184053a1c253733d0699d91550f70ab46fb879b -AUX ogre-1.12.4-resource_path.patch 518 BLAKE2B 06b0bdc7d5cde392ff59c4f2af0a6351740b0e08ed6816eb9b286573fae5201e9f502280815971eec9e957ee694871e10ea4274a1a532c867fb8fbd1ff6931fe SHA512 7b112f2a4d57159eff028e95a23aa615ad4a47280f2516cee1c5d38e5e476bba6acb0117cc716051cddb016c5b3a4218b283c60654bf3f80a1808a4d653b34ec +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.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 AUX ogre-1.9.0-samples.patch 225 BLAKE2B 4fc9cead31892e565b04ac35a00739cdbfcd638f65df185d6ebe47e329409c0efa0a25c4685724856b5f914953e9cd46746c13f2117a9a6b9ec31f1d271e71c2 SHA512 089060f157488628c136a7f4f0ac764fcdcd30fbaf6e62a1dcb2b952df2c6753cfe107f3bb5b1fc2424964f1cb423176fd69e098a835ade3f18dc3303b24be96 +AUX ogre-2.1-d1c1116.patch 2988 BLAKE2B 8016912a20f0e3250e379495c4e1364f9fd7ed39838952ea54a666b6a325b0ccb159b496600a2ce91d65443efd12cd952b1035e2585f36f9e2c615cd9175f611 SHA512 0e20b345f043ce693bb60f28d9a7f7f99c3bfbb66101f22ab8eb69039872e1004a0537ee54cba91be0fb8379f118a5be6f558e7ed3b47e92d0d90743b56b805b AUX ogre-2.1-enhance_config_loading.patch 1303 BLAKE2B f03e3b00ee9f13bbcc4cfa9a8db318aa7e675ed3974751460060f8789f5a1ba38d47e9612eebbc164e81fd7b341c64ba3d2df79b499a05248207a8fbb8df9564 SHA512 c1db8c919d33e7e96b44ad44f0e5a51abc7920178a3b3119fbad5ff42e79f9f986ee3cffb55e6065a6b01dbc5d9b5060b757acd597d77aa9068df476c51eca14 +AUX ogre-2.1-fix_compilation_issues.patch 2999 BLAKE2B 153306ff20705ccdf673691465c215ecd6f84b282d4112465f5c02167a480c73b25aec9fa5247f08862ce3b3972b963d9031fbcfb3e3e0573a1928ec5dcc5c93 SHA512 d32ae3d6cb90eca5b06c23f2005399df0f1a2e6af705b33ad16eeb7470f7ae6642c8ccc47c4bc035dc0cf915b8b6f704a6c462704f85a92c68b8acc8bd940262 +AUX ogre-2.1-fix_opengl_search.patch 486 BLAKE2B 97882fa1b23b8870e28be829b4e16999f715a24b043aca5fecf04971a22cb96e0ed776fba568f81dc481cee70fe9536c807326a1682e004f7c0d4ce618a79f23 SHA512 9810bc6103c697ca2a458bd2cfdeff443973935d0c87e99ea52b2c76fbe671ab9fc0f226077fe6447b2bd8576c896ba88b4713147125b22009ae47539a6c1e2f +AUX ogre-2.1-fix_warnings.patch 873 BLAKE2B ab0aaff5855a7da70a42c4ee15e4e210b00e7ab072edb508c823f6e8b283bc30a3bbc90b81bafe55a6c2f47cdae8c29d4ea84e83dfafb4388c1fb6249c4e6f5a SHA512 2c63c328e0084763705f47e761576c58526be5ebc062d8e58e52ce7cbee558222e5f5f72a34a19431325a3d179f07fb5b0d3b30cdff1053e2a9ed10ded639574 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.74.tar.gz 1224024 BLAKE2B 794bd9aa0fdd1793fe9fa012c4b915731e3fe43ad32315421c2f5da2c2225f5dc6eb2c9618b999e0a4b8922b7a2b74fe2dbc5b5dc19de5aa0b6cee9d2ea67154 SHA512 e49e5cbe55899c0d0abc9b66c4e6e3e9941542af542d0ed3304bd3bde34c769baa2367355b77b91acb7fca56f9bcfd233dfc99881cfc8f5f6a2e2e6839990832 -DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8 +DIST imgui-1.76.tar.gz 1256126 BLAKE2B 801e94e1007e41c5b7281bb30fc7da76ddf0e755bf3ec2c4eb90d730dd9c68685f3e4819f32acc2154fbcd4e32da9d1de6dac36b0cd8885a93457475576b4336 SHA512 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa +DIST ogre-1.12.8.tar.gz 125932831 BLAKE2B ffd4a443e374ad3f209b4f8a5e18a41b3dbfbb528d20581f48a4d31447e1e20a3b1cdde588b6345bd07d864c9b72ce1e51374de52523e7c4477408c01778af69 SHA512 c446c58b57874d3e2522f7e0315771b7a9f5ac8888449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde -EBUILD ogre-1.12.4.ebuild 5518 BLAKE2B 84b7d5a2e8b10ae7d063d36a930196ca01d9e99a09917c9504e2283980cfc9ff107fe337066e26259158c3719912c5bfc9437b2c485e91f4be33c20d6f1592c5 SHA512 c61a09921af13186da2e91c70d7d365acfda99240c193f9a3d268c8c5450750f99b8e11d2c5e8950ff6364511638fcd4c58b7df2cd3653039619e6126151ca28 +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.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_pre20191212.ebuild 5255 BLAKE2B bfbd657263121a8ecaa9809d3aa5f537b79ef4469d8cb939c25b3f85df1b04f5a97251e8ea650a42dbd25189717e033fd3229a0947fa4a87a4c47bacb9b95c94 SHA512 d536e0b44787db04e49e34c37ec8645304a7495e605324ff06cfce6a019000c3a27fde4697f1abc748d4e133075cab60c796c5a8a9f28f2e41ebf2f8a7b3bafd -MISC metadata.xml 6451 BLAKE2B dc2f1adf01141b6822e59ce0db1869c3daadeb3aff3213f00cb47ad395f6348d975147c95db25e6f4d8228ffa032409f42edd086853252fdfe51e1716f227840 SHA512 947ab8607fe112318f65acb848c9615aa1afbcb58562166c6b982f13b87598be6d00366d039112bad4b9eeecd7b37824967dc057efeb3272e5aaec6276372521 +EBUILD ogre-2.1.ebuild 5949 BLAKE2B 26522e0c5d3ca1e01a9a533a1fb21d8ca21632abb3d05f26993a32a6c60aba27af8626cb88d537e968981f18429aaa3d2a400447baf4ddaafb962297ca269298 SHA512 50fd86fdc82b252c7ef9fab7c8c2bf99319d838efe4e8e124719658122a4c35213e723ec2d89dba0a8ae06c706867806caf4ae5e11920844a81bbc5323457769 +MISC metadata.xml 6671 BLAKE2B 5153819b38f65ae518bfaf3c7272ac3002113a393f6a8eb220d3e503fa630e09e746b964f74c9a33e8b9db7cb746202fdcaf43a5a2ef808b310ca98812edd5bd SHA512 1c390764a7697a74ff402a580f42087f1fa569cb6570194de9e56851bab9a075c17488490a60a793f2f59f3b243daf336f700faf3de0f70a1feddf6df7621213 diff --git a/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch deleted file mode 100644 index 616a5e33680b..000000000000 --- a/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch +++ /dev/null @@ -1,15 +0,0 @@ -The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25) - ---- a/Samples/CMakeLists.txt 2018-04-25 07:30:38.211048775 +0200 -+++ b/Samples/CMakeLists.txt 2018-04-25 07:32:32.842049802 +0200 -@@ -97,10 +97,6 @@ - PATTERN "scripts" EXCLUDE - ) - # install a new CMakeLists.txt file to allow building of samples -- configure_file(${OGRE_TEMPLATES_DIR}/SDK_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt @ONLY) -- configure_file(${OGRE_TEMPLATES_DIR}/SDK_Samples_CMakeLists.txt.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt @ONLY) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/../CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}/../) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt DESTINATION ${OGRE_SAMPLES_DIR}) - endif () - - # Install sample headers, some people rely on these 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 new file mode 100644 index 000000000000..49ed0190e0a1 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.8-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.4-media_path.patch b/dev-games/ogre/files/ogre-1.12.8-media_path.patch index 3030cc5b9fad..3030cc5b9fad 100644 --- a/dev-games/ogre/files/ogre-1.12.4-media_path.patch +++ b/dev-games/ogre/files/ogre-1.12.8-media_path.patch diff --git a/dev-games/ogre/files/ogre-1.12.4-resource_path.patch b/dev-games/ogre/files/ogre-1.12.8-resource_path.patch index cf35e2f99e8e..cf35e2f99e8e 100644 --- a/dev-games/ogre/files/ogre-1.12.4-resource_path.patch +++ b/dev-games/ogre/files/ogre-1.12.8-resource_path.patch 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 new file mode 100644 index 000000000000..4c7803a0a2f2 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch @@ -0,0 +1,28 @@ +--- 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-2.1-d1c1116.patch b/dev-games/ogre/files/ogre-2.1-d1c1116.patch new file mode 100644 index 000000000000..6fbf5ecda4d0 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-d1c1116.patch @@ -0,0 +1,62 @@ +From d1c1116924ca537c1f061ed5422dd9a5207d989a Mon Sep 17 00:00:00 2001 +From: "Matias N. Goldberg" <dark_sylinc@yahoo.com.ar> +Date: Mon, 24 Feb 2020 17:23:25 -0300 +Subject: [PATCH] Bugfix: Bone::_getDerivedTransform using uninitialized values + causing asserts to trigger Also prefer using Mathlib::LAST_AFFINE_COLUMN in + ArrayMatrixAf4x3::store + +--- + .../include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h | 6 +----- + .../include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h | 6 +----- + OgreMain/src/Animation/OgreBone.cpp | 4 ++-- + 3 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h +index 137b7cb5b2..2e2468149d 100644 +--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h ++++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h +@@ -217,11 +217,7 @@ namespace Ogre + vst1q_f32( dstPtr, mChunkBase[0] ); + vst1q_f32( dstPtr + 4, mChunkBase[1] ); + vst1q_f32( dstPtr + 8, mChunkBase[2] ); +- dstPtr += 12; +- *dstPtr++ = 0; +- *dstPtr++ = 0; +- *dstPtr++ = 0; +- *dstPtr++ = 1; ++ vst1q_f32( dstPtr + 12, MathlibNEON::LAST_AFFINE_COLUMN ); + } + + /// Assumes dst is aligned +diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h +index 01b75b2730..a96d9a11e0 100644 +--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h ++++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h +@@ -217,11 +217,7 @@ namespace Ogre + _mm_store_ps( dstPtr, mChunkBase[0] ); + _mm_store_ps( dstPtr + 4, mChunkBase[1] ); + _mm_store_ps( dstPtr + 8, mChunkBase[2] ); +- dstPtr += 12; +- *dstPtr++ = 0; +- *dstPtr++ = 0; +- *dstPtr++ = 0; +- *dstPtr++ = 1; ++ _mm_store_ps( dstPtr + 12, MathlibSSE2::LAST_AFFINE_COLUMN ); + } + + /// Assumes dst is aligned +diff --git a/OgreMain/src/Animation/OgreBone.cpp b/OgreMain/src/Animation/OgreBone.cpp +index 588c6cb442..8735ed2a2f 100644 +--- a/OgreMain/src/Animation/OgreBone.cpp ++++ b/OgreMain/src/Animation/OgreBone.cpp +@@ -257,8 +257,8 @@ namespace Ogre { + OGRE_ALIGNED_DECL( Matrix4, localSpaceBone, OGRE_SIMD_ALIGNMENT ); + OGRE_ALIGNED_DECL( Matrix4, parentNodeTransform, OGRE_SIMD_ALIGNMENT ); + +- mTransform.mDerivedTransform[mTransform.mIndex].store4x3( &localSpaceBone ); +- mTransform.mParentNodeTransform[mTransform.mIndex]->store4x3( &parentNodeTransform ); ++ mTransform.mDerivedTransform[mTransform.mIndex].store( &localSpaceBone ); ++ mTransform.mParentNodeTransform[mTransform.mIndex]->store( &parentNodeTransform ); + + parentNodeTransform.concatenateAffine( localSpaceBone ); + diff --git a/dev-games/ogre/files/ogre-2.1-fix_compilation_issues.patch b/dev-games/ogre/files/ogre-2.1-fix_compilation_issues.patch new file mode 100644 index 000000000000..4f2248dd1a36 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-fix_compilation_issues.patch @@ -0,0 +1,67 @@ +--- a/Components/Paging/src/OgreGrid3DPageStrategy.cpp 2020-04-28 09:31:06.301940556 +0200 ++++ b/Components/Paging/src/OgreGrid3DPageStrategy.cpp 2020-04-28 09:40:51.777904025 +0200 +@@ -367,9 +367,9 @@ + { + mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); + Pass* pass = mat->getTechnique(0)->getPass(0); +- pass->setLightingEnabled(false); ++ //pass->setLightingEnabled(false); + pass->setVertexColourTracking(TVC_AMBIENT); +- pass->setDepthWriteEnabled(false); ++ //pass->setDepthWriteEnabled(false); + mat->load(); + } + +@@ -383,7 +383,7 @@ + else + { + mo = p->getParentSection()->getSceneManager()->createManualObject(); +- mo->begin(matName, RenderOperation::OT_LINE_STRIP); ++ mo->begin(matName, OperationType::OT_LINE_STRIP); + } + + ColourValue vcol = ColourValue::Green; +--- a/Components/Paging/src/OgreGrid2DPageStrategy.cpp 2020-04-28 09:43:23.119894582 +0200 ++++ b/Components/Paging/src/OgreGrid2DPageStrategy.cpp 2020-04-28 09:44:00.844892228 +0200 +@@ -405,9 +405,9 @@ + { + mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); + Pass* pass = mat->getTechnique(0)->getPass(0); +- pass->setLightingEnabled(false); ++ //pass->setLightingEnabled(false); + pass->setVertexColourTracking(TVC_AMBIENT); +- pass->setDepthWriteEnabled(false); ++ //pass->setDepthWriteEnabled(false); + mat->load(); + } + +@@ -416,7 +416,7 @@ + if (sn->numAttachedObjects() == 0) + { + mo = p->getParentSection()->getSceneManager()->createManualObject(); +- mo->begin(matName, RenderOperation::OT_LINE_STRIP); ++ mo->begin(matName, OperationType::OT_LINE_STRIP); + } + else + { +--- a/OgreMain/src/OgrePVRTCCodec.cpp 2020-04-27 20:00:44.816974345 +0200 ++++ b/OgreMain/src/OgrePVRTCCodec.cpp 2020-04-27 20:03:49.186962841 +0200 +@@ -33,6 +33,7 @@ + #include "OgreException.h" + #include "OgreLogManager.h" + #include "OgreBitwise.h" ++#include "OgreDataStream.h" + + #define FOURCC(c0, c1, c2, c3) (c0 | (c1 << 8) | (c2 << 16) | (c3 << 24)) + #define PVR_TEXTURE_FLAG_TYPE_MASK 0xff +--- a/OgreMain/src/OgrePlatformInformation.cpp 2020-08-23 17:39:09.971041355 +0200 ++++ b/OgreMain/src/OgrePlatformInformation.cpp 2020-08-23 17:40:11.594044907 +0200 +@@ -42,7 +42,7 @@ + #if OGRE_PLATFORM != OGRE_PLATFORM_WIN32 + #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID + #include <linux/sysctl.h> +- #else ++ #elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS + #include <sys/sysctl.h> + #endif + #endif diff --git a/dev-games/ogre/files/ogre-2.1-fix_opengl_search.patch b/dev-games/ogre/files/ogre-2.1-fix_opengl_search.patch new file mode 100644 index 000000000000..e5a09804407b --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-fix_opengl_search.patch @@ -0,0 +1,12 @@ +--- a/CMake/Dependencies.cmake 2020-04-27 15:59:25.005877828 +0200 ++++ b/CMake/Dependencies.cmake 2020-04-27 15:59:42.572876732 +0200 +@@ -111,6 +111,9 @@ + ####################################################################### + + # Find OpenGL ++if(POLICY CMP0072) ++ cmake_policy(SET CMP0072 NEW) ++endif() + if(NOT ANDROID AND NOT EMSCRIPTEN) + find_package(OpenGL) + macro_log_feature(OPENGL_FOUND "OpenGL" "Support for the OpenGL render system" "http://www.opengl.org/" FALSE "" "") diff --git a/dev-games/ogre/files/ogre-2.1-fix_warnings.patch b/dev-games/ogre/files/ogre-2.1-fix_warnings.patch new file mode 100644 index 000000000000..a76687998889 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-fix_warnings.patch @@ -0,0 +1,15 @@ +--- a/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/TerrainCell.cpp 2020-04-28 18:10:40.416995414 +0200 ++++ b/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/TerrainCell.cpp 2020-04-28 18:30:46.074920186 +0200 +@@ -133,7 +133,11 @@ + gpuPtr[0] = m_verticesPerLine; + gpuPtr[1] = m_lodLevel; + gpuPtr[2] = vao->getPrimitiveCount() / m_verticesPerLine - 2u; +- gpuPtr[3] = *reinterpret_cast<uint32*>( &m_parentTerra->m_skirtSize ); ++ /* Triggers: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] ++ * gpuPtr[3] = *reinterpret_cast<uint32*>( &m_parentTerra->m_skirtSize ); ++ * See: http://zaynar.co.uk/docs/float-aliasing.html ++ */ ++ memcpy(&gpuPtr[3], &m_parentTerra->m_skirtSize, sizeof(gpuPtr[3])); + + //ivec4 xzTexPosBounds + ((int32*RESTRICT_ALIAS)gpuPtr)[4] = m_gridX; diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml index 6d7e9fc14ebf..43330db8ca14 100644 --- a/dev-games/ogre/metadata.xml +++ b/dev-games/ogre/metadata.xml @@ -82,17 +82,17 @@ Exporters <flag name="cg">NVIDIA toolkit plugin</flag> <flag name="double-precision">More precise calculations at the expense of speed</flag> <flag name="egl">Use egl instead of glx</flag> - <flag name="experimental" restrict="<dev-games/ogre-1.11"> - Build experimental BETA components 'Bites' and 'HLMS' + <flag name="deprecated" restrict="~dev-games/ogre-1.12.6"> + Build deprecated component 'HLMS' and nodeless positioning of Lights and Cameras. + </flag> + <flag name="fine-granularity" restrict="~dev-games/ogre-2.1"> + Enable fine light mask granularity. This impacts on performance and should + not be enabled unless an application really needs it. </flag> - <flag name="experimental">Build experimental BETA component 'HLMS'</flag> <flag name="freeimage">Support images via media-libs/freeimage</flag> <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag> - <flag name="gles2" restrict=">dev-games/ogre-1.10"> - Build OpenGL ES 2.x RenderSystem plus ES 3.x features if available. - </flag> - <flag name="gles2">Build OpenGL ES 2.x RenderSystem</flag> - <flag name="gles3">Enable OpenGL ES 3.x Features</flag> + <flag name="gles2" restrict="~dev-games/ogre-1.9.0">Build OpenGL ES 2.x RenderSystem</flag> + <flag name="gles3" restrict="~dev-games/ogre-1.9.0">Enable OpenGL ES 3.x Features</flag> <flag name="json">Use dev-libs/rapidjson (needed by Hlms JSON materials)</flag> <flag name="legacy-animations"> Use the skeletal animation from 1.x. It's much slower, but the new system @@ -100,17 +100,19 @@ Exporters </flag> <flag name="ois">Pull in Object-oriented Input System library dev-games/ois for samples</flag> <flag name="poco">When USE=threads, use poco for threading</flag> + <!-- Not yet available? Needs testing! (Note: Shouldn't this be EGL instead of GLES2?) <flag name="mobile"> Build for OpenGL ES 2.0 only and use the mobile variants of the PBS and unlit material systems. </flag> + --> <flag name="resman-pedantic"> Resource Manager PEDANTIC : require an explicit resource group. Case sensitive lookup. Some demos might not work with this setting. (default: case-insensitive + sensitive lookup in all groups) </flag> <flag name="tbb">When USE=threads, use tbb for threading</flag> - <flag name="tools">Build and install helper tools</flag> + <flag name="tools">Build and install MeshUpgrader, VRMLConverter and XMLConverter</flag> </use> <upstream> <remote-id type="bitbucket">sinbad/ogre</remote-id> diff --git a/dev-games/ogre/ogre-1.12.4.ebuild b/dev-games/ogre/ogre-1.12.8.ebuild index 5a8d78edfa97..d7a634ba0da9 100644 --- a/dev-games/ogre/ogre-1.12.4.ebuild +++ b/dev-games/ogre/ogre-1.12.8.ebuild @@ -7,7 +7,7 @@ CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" inherit cmake IMGUI_PN="imgui" -IMGUI_PV="1.74" +IMGUI_PV="1.76" IMGUI_P="${IMGUI_PN}-${IMGUI_PV}" DESCRIPTION="Object-oriented Graphics Rendering Engine" @@ -19,11 +19,24 @@ LICENSE="MIT public-domain" SLOT="0/1.12" KEYWORDS="~amd64 ~arm ~x86" -IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage - gles2 json openexr +opengl pch profile resman-pedantic tools" - +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=" - || ( gles2 opengl ) + examples? ( opengl ) " RESTRICT="test" #139905 @@ -40,7 +53,6 @@ RDEPEND=" cg? ( media-gfx/nvidia-cg-toolkit ) egl? ( media-libs/mesa[egl] ) freeimage? ( media-libs/freeimage ) - gles2? ( media-libs/mesa[gles2] ) json? ( dev-libs/rapidjson ) openexr? ( media-libs/openexr:= ) opengl? ( @@ -49,6 +61,7 @@ RDEPEND=" ) tools? ( dev-libs/tinyxml[stl] ) " +# gles2? ( media-libs/mesa[gles2] ) DEPEND=" ${RDEPEND} x11-base/xorg-proto @@ -61,21 +74,21 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-media_path.patch "${FILESDIR}"/${P}-resource_path.patch - "${FILESDIR}"/${P}-fix_sample_source_install.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.3 includes imgui, but as a submodule, it is not included - # in the release. - cd "${S}"/Components/Overlay/src || die "Unpack incomplete" + # 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" - - # Without this 'rm', mv puts imgui-1.73 *into* imgui/ instead of renaming. - rm -rf "${IMGUI_PN}" || die "Removing ${IMGUI_PN} failed" - mv "${IMGUI_P}" "${IMGUI_PN}" || die "Moving ${IMGUI_P} to ${IMGUI_PN} failed" } src_prepare() { @@ -92,25 +105,11 @@ src_prepare() { # In this series, the CMAKE_BUILD_TARGET is hard-wired to the # installation. And only Debug, MinSizeRel and RelWithDebInfo # are supported. - if use debug; then - sed -i \ - -e 's/Debug/Gentoo/g' \ - CMake/InstallResources.cmake \ - || die - sed -i \ - -e 's/Debug/Gentoo/g' \ - CMake/Utils/OgreConfigTargets.cmake \ - || die - else - sed -i \ - -e 's/MinSizeRel/Gentoo/g' \ - CMake/InstallResources.cmake \ - || die - sed -i \ - -e 's/MinSizeRel/Gentoo/g' \ - CMake/Utils/OgreConfigTargets.cmake \ - || die - fi + 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." @@ -131,7 +130,7 @@ src_configure() { -DCMAKE_SKIP_INSTALL_RPATH=yes -DOGRE_BUILD_COMPONENT_BITES=yes -DOGRE_BUILD_COMPONENT_CSHARP=no - -DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental) + -DOGRE_BUILD_COMPONENT_HLMS=$(usex deprecated) -DOGRE_BUILD_COMPONENT_JAVA=no -DOGRE_BUILD_COMPONENT_OVERLAY=yes -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes @@ -147,24 +146,27 @@ src_configure() { -DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr) -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl) -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl) - -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2) + -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=$(usex gles2 $(usex cg) no) - -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2) + -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_GLSUPPORT_USE_EGL=$(usex egl) -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 } @@ -193,8 +195,8 @@ src_install() { # These are only for the sample browser if use examples ; then insinto "${SHAREDIR}" - doins "${BUILD_DIR}"/bin/quakemap.cfg doins "${BUILD_DIR}"/bin/samples.cfg + doins "${BUILD_DIR}"/bin/tests.cfg fi } @@ -202,5 +204,5 @@ 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 filling a bug report." + elog "first, before filing a bug report." } diff --git a/dev-games/ogre/ogre-2.1_pre20191212.ebuild b/dev-games/ogre/ogre-2.1.ebuild index d4823f71e9b1..6b173719ca73 100644 --- a/dev-games/ogre/ogre-2.1_pre20191212.ebuild +++ b/dev-games/ogre/ogre-2.1.ebuild @@ -5,30 +5,26 @@ EAPI=7 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" -inherit cmake flag-o-matic git-r3 +inherit cmake flag-o-matic + +MY_PN="${PN}-next" +MY_P="${MY_PN}-${PV}" DESCRIPTION="Object-oriented Graphics Rendering Engine" HOMEPAGE="https://www.ogre3d.org/" - -EGIT_BRANCH="v2-1" -EGIT_COMMIT="5b682fb90c9e8e660e2fbf92bbf7797a9246700d" -EGIT_REPO_URI="https://github.com/OGRECave/ogre-next.git" -EGIT_SUBMODULES=() +SRC_URI="https://github.com/OGRECave/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT public-domain" SLOT="0/2.1" KEYWORDS="~amd64" -IUSE="+cache debug doc egl examples +freeimage gles2 json - legacy-animations mobile +opengl profile tools" +IUSE="+cache debug doc double-precision egl examples fine-granularity +freeimage json + legacy-animations +opengl profile tools" # USE flags that do not work, as their options aren't ported, yet. # cg -# double-precision - -REQUIRED_USE=" - || ( gles2 opengl ) - mobile? ( egl gles2 !opengl )" +# gles2 +# mobile RESTRICT="test" #139905 @@ -42,7 +38,6 @@ RDEPEND=" x11-libs/libXt egl? ( media-libs/mesa[egl] ) freeimage? ( media-libs/freeimage ) - gles2? ( media-libs/mesa[gles2] ) json? ( dev-libs/rapidjson ) opengl? ( virtual/glu @@ -52,6 +47,7 @@ RDEPEND=" " # Dependencies for USE flags that do not work, yet. # cg? ( media-gfx/nvidia-cg-toolkit ) +# gles2? ( media-libs/mesa[gles2] ) DEPEND=" ${RDEPEND} @@ -67,16 +63,27 @@ PATCHES=( "${FILESDIR}/${PN}-2.1-resource_path.patch" "${FILESDIR}/${PN}-2.1-media_path.patch" "${FILESDIR}/${PN}-2.1-enhance_config_loading.patch" + "${FILESDIR}/${PN}-2.1-fix_opengl_search.patch" + "${FILESDIR}/${PN}-2.1-fix_compilation_issues.patch" + "${FILESDIR}/${PN}-2.1-fix_warnings.patch" + "${FILESDIR}/${PN}-2.1-d1c1116.patch" ) +S=${WORKDIR}/${MY_P} + src_prepare() { sed -i \ -e "s:share/OGRE/docs:share/doc/${PF}:" \ Docs/CMakeLists.txt || die - # Stupid build system hardcodes release names + + # In this series, the CMAKE_BUILD_TARGET is hard-wired to the + # installation. And only Release, Debug, MinSizeRel and RelWithDebInfo + # are supported. sed -i \ - -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \ - CMake/Utils/OgreConfigTargets.cmake || die + -e "s/$(usex debug Debug Release)/Gentoo/g" \ + CMake/InstallResources.cmake \ + CMake/Utils/OgreConfigTargets.cmake \ + || die # Fix some path issues cmake_src_prepare @@ -84,29 +91,26 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DOGRE_BUILD_COMPONENT_HLMS_PBS=$( usex mobile no yes) - -DOGRE_BUILD_COMPONENT_HLMS_PBS_MOBILE=$( usex mobile) - -DOGRE_BUILD_COMPONENT_HLMS_UNLIT=$( usex mobile no yes) - -DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile) + -DOGRE_BUILD_COMPONENT_HLMS_PBS=yes + -DOGRE_BUILD_COMPONENT_HLMS_PBS_MOBILE=no + -DOGRE_BUILD_COMPONENT_HLMS_UNLIT=yes + -DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=no -DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=yes -DOGRE_BUILD_COMPONENT_SCENE_FORMAT=yes -DOGRE_BUILD_PLATFORM_NACL=no -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl) - -DOGRE_BUILD_RENDERSYSTEM_GLES=no - -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2) + -DOGRE_BUILD_RENDERSYSTEM_GLES2=no -DOGRE_BUILD_SAMPLES2=$(usex examples) - -DOGRE_BUILD_TESTS=no + -DOGRE_BUILD_TESTS=$(usex debug) -DOGRE_BUILD_TOOLS=$(usex tools) -DOGRE_CONFIG_ALLOCATOR=$(usex debug 5 1) - -DOGRE_CONFIG_ENABLE_FINE_LIGHT_MASK_GRANULARITY=yes + -DOGRE_CONFIG_ENABLE_FINE_LIGHT_MASK_GRANULARITY=$(usex fine-granularity) -DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage) -DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache) - -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(\ - usex gles2 $(\ - usex mobile no yes) no) -DOGRE_CONFIG_ENABLE_JSON=$(usex json) -DOGRE_CONFIG_MEMTRACK_DEBUG=$(usex debug) - -DOGRE_CONFIG_THREADS=2 + -DOGRE_CONFIG_MEMTRACK_RELEASE=no + -DOGRE_CONFIG_THREADS=0 -DOGRE_CONFIG_THREAD_PROVIDER=std -DOGRE_FULL_RPATH=no -DOGRE_INSTALL_DOCS=$(usex doc) @@ -115,10 +119,17 @@ src_configure() { -DOGRE_LEGACY_ANIMATIONS=$(usex legacy-animations) -DOGRE_PROFILING_PROVIDER=$(usex profile none internal) -DOGRE_USE_BOOST=no + -DOGRE_CONFIG_DOUBLE=$(usex double-precision) + -DOGRE_SIMD_NEON=$(usex double-precision no yes) + -DOGRE_SIMD_SSE2=$(usex double-precision no yes) ) - # The double-precision mode can not be enabled, yet. - # -DOGRE_CONFIG_DOUBLE=$(usex double-precision) + # GLES2 is not supported, yet + # -DOGRE_BUILD_COMPONENT_HLMS_PBS=$( usex mobile no yes) + # -DOGRE_BUILD_COMPONENT_HLMS_PBS_MOBILE=$( usex mobile) + # -DOGRE_BUILD_COMPONENT_HLMS_UNLIT=$( usex mobile no yes) + # -DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile) + # -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2) # The CgFxScriptLoader doesn't seem to be completely ported, yet. # USE flag disabled. @@ -139,6 +150,13 @@ src_configure() { -DOGRE_BUILD_COMPONENT_VOLUME=no ) + # In Release builds the system moans about unknown flags. Lets help! + if use debug; then + append-flags -DOGRE_DEBUG_MODE=1 -DDEBUG=1 -D_DEBUG=1 + else + append-flags -DOGRE_DEBUG_MODE=0 + fi + # Take out the warning about deprecated copy, as Ogre emits thousands of # those. But using a deprecated way of doing things isn't an error and # mainly of interest for developers. diff --git a/dev-games/openscenegraph-qt/Manifest b/dev-games/openscenegraph-qt/Manifest index 26d46c894ae6..bd10570ae55d 100644 --- a/dev-games/openscenegraph-qt/Manifest +++ b/dev-games/openscenegraph-qt/Manifest @@ -3,5 +3,5 @@ AUX openscenegraph-qt-3.5.5-qt-5.11b3.patch 1115 BLAKE2B 0a90b65caf3209d51ec6994 DIST osgQt-3.5.5.tar.gz 1003973 BLAKE2B 4646fc0d01a5fc3023acb4be9d8b9e9982faf3849b9c7dbe775ff06642b9540559ef67189f31ebcf6a2fe49d24066d744ce9cfd409e76c9143ac16867648a620 SHA512 50faee9a1539c1e29bb1c244fa32194b22cbe43f43980b7c270aa45cd225ac5e3fe9445d63b1efb767c8a2ce8e5ffa417783d1a446ed965b23a06100a241d498 DIST osgQt-3.5.7.tar.gz 1000217 BLAKE2B f0279b122fc9492d29ea0c55afa81376d2ad4a35c42b301312137ca6d375fd2ef519efacfaf2f77b9dc3a7a26313b3d3213fc0589359c89695835f12488e6efb SHA512 5698b824f6e747eaf19b970784dce6e38fbe50176e6c5d0cab86dab417c8831036c0f050fc52f1ab2a79925f8356dd43559aa123aab4b70a4df28273125e4d03 EBUILD openscenegraph-qt-3.5.5.ebuild 970 BLAKE2B ad265f5b646fd029a3a40038fdf39262a93a3e7da58b44a09bc2a183327cd2f4e71e2c201dcb12891c141b25197616a4ff6b1f870acdc0673b76e144123ace04 SHA512 88d9a8a78277e6335dc8a064fb6f05e7f63c687cd1436c68bba56c03e9005bd42cfecdb418d87d9c82b35440d4cfcaec84c67178c02afeb8ce29b5937c3d411a -EBUILD openscenegraph-qt-3.5.7.ebuild 1021 BLAKE2B 3931d69c4c80a96baabaf63422c6aff847689e6b5a4c8c63095c9bcee43efc3333f144922506c600f93a386e8bee1a3a742a862f790d17ad81c59516fc6f8122 SHA512 6aab0c4c491c76566364a0642ec9712daa2a741a6d4e060e909581c40208c2496cd1020ab8c1ac6a47b2f315278b3d49dc2734639655ac3c45e53f356e2b177a +EBUILD openscenegraph-qt-3.5.7.ebuild 1020 BLAKE2B 538bfd2f8970ac5294e95aaf955accb5c28183915044be546c58682c8c0101cd7243274d2375471296b3a53a839ab31d842fbd7bf8d893f972b5bf2c7263b8cd SHA512 a9a9a4aaf9bc253919051c049dc193ff0cf770073525f02694ff30145e47bbb4a16d5343ed1c1243ddfa811cd20b94845d2c543c8d34f74e7cb3696b7949fbe3 MISC metadata.xml 997 BLAKE2B fbb3c9765491c15ebd269fde3aa01ef177d038f1a0f1d1f189adfb457aab8dfd69774c074235a7f95d6d02c53dfa6ba5872d50cdcbafc03141a8b5ba44d823dd SHA512 3b5f9b2f408f6f68a28f3427d463d0036d1b6286df549d189ed4d88ebe0a607a3d570f98fa11035f440e684f55f6d7d3f1383b281c37a1be3f611cfb8d530169 diff --git a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild index 1b03f59b8409..e900872d10cc 100644 --- a/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild +++ b/dev-games/openscenegraph-qt/openscenegraph-qt-3.5.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/openscenegraph/${MY_PN}/archive/${PV}.tar.gz -> ${MY LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc64 x86" IUSE="examples webkit" RDEPEND=" diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest index 282aedc31485..b4a5f62444de 100644 --- a/dev-games/openscenegraph/Manifest +++ b/dev-games/openscenegraph/Manifest @@ -6,6 +6,6 @@ DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571 DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b EBUILD openscenegraph-3.5.5.ebuild 3638 BLAKE2B 27b665585e57612457eff670f7e0d0dd90814701fb69853285d140bfc08ee9849dbc9754cb90e9397aeda63b8bf2b40f45a9d80e693484d27f815439e5d0e500 SHA512 bf13b1b1bef914464df6730f1ff2b702b30c986a54fa0d673aed6cabdae04139eb09ed57197d4f7facb2033fc9a3a7ac1a454c2fdff18274aacd29951b817c0a -EBUILD openscenegraph-3.6.4.ebuild 4088 BLAKE2B d8123470276fd6d53fe64cc06d5ad30e65de37462ad04ab3e62d43912c6f43846d141dd6b95305084c45a5bc15e2fd6bcd1bdf654b2ecf9a1e3a5f5d51e62051 SHA512 067562eb6d010a1c2545d9f3f2467eea8e6724d8da9444cf675bcde9e438e22cb8a303e8fc5139bf0510b9f98fd10f8f5126a534fc21e0a5b6eccda884983b37 +EBUILD openscenegraph-3.6.4.ebuild 4086 BLAKE2B 358547b9f17c9199013e4ca554ff46f6b740df15c6988f332113e808386ecbcf162f7a2ae06d5a8b82cfd1d88f4560894cdbd97ca42b8af0f8b1df3f53e8da30 SHA512 e514a59dfbc66715d4d30b9abb40cacc5e4c219d0834c0984380a738803031db53e04ee3394b28e97d60e02239dd1c6df5091782a9f4fc1d2a010e930733007f EBUILD openscenegraph-3.6.5.ebuild 3999 BLAKE2B 164e857edb269a18453ce00da9d7c80ff8f4cf4c3daf765a10eaae2ed4f46bfdb3841a4fbbb10170139417a664b5aa1fcff5270889f6283a7e8e494a845da9ac SHA512 af11df69e1e7c948ddca05c59653534f99c7644887ce0c4340b83b69873e5e81a0fa0701496b38df30a3e65d6ddde052525b2f52f02cb6bc75e1d070f8a10dc7 MISC metadata.xml 1759 BLAKE2B 6cdfd94a0888ac7716c282b7a473fdc23b00542bf55fe0b7b271d81dac36e1dbe6ef6923a3f6a48d6730b27fccbe6a197ebdce0c3611d736cd6674aec9ae35a8 SHA512 48f68b29d2d8ab7aeb31bdd7322ba39f1c5f9c4c14a301c828c084a774e80a818e2366bbaf2728d1a32a9d20b62bda2a45ab49a331c160d4359c1175787a9999 diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild index 694ca9a6e5e0..36dfec836e1a 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz" LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~hppa ppc ~ppc64 x86" IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib" |