[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 7f9cae11a9f1f4ede5fba3603e2f4f48b4f01b1d Author: Sven Eden prydeworx com> AuthorDate: Fri Jan 27 07:13:40 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jan 29 13:34:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9cae11 dev-games/ogre: Bump to 13.6.1 Bump Stable OGRE to the current stable release v13.6.1 Closes: https://bugs.gentoo.org/885733 Closes: https://github.com/gentoo/gentoo/pull/28652 Signed-off-by: Sven Eden prydeworx.com> Signed-off-by: Joonas Niilola gentoo.org> dev-games/ogre/Manifest| 5 +- .../ogre-13.5.3-gentoolize_imgui_inclusion.patch | 27 +++ dev-games/ogre/files/ogre-13.5.3-media_path.patch | 12 ++ .../ogre/files/ogre-13.5.3-resource_path.patch | 13 ++ dev-games/ogre/metadata.xml| 28 +-- dev-games/ogre/ogre-13.6.1.ebuild | 198 + 6 files changed, 259 insertions(+), 24 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index abe2b0d79948..362251d8f596 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,4 +1,3 @@ -DIST imgui-1.77.tar.gz 1269147 BLAKE2B be0db9b77903664db0fadf1672ec23983dc89292fd261a1e89c1eab88b82e95de7c2af37eb7ef43cc994b889fdf7d7fb2dd1282b93c1f3b1166c7fe0d2dccaf5 SHA512 d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546 -DIST ogre-1.12.9.tar.gz 125955067 BLAKE2B 5676690d2d9db8c4c903b7bf3e7660ddf5c0675eb11e1b34f08a5a50739d6212e986c7b500173ad5edab4835d96c705f86cc0fd37e1ff1e64a161ab1ce8968df SHA512 a80525a4924a430ccac3f01f93a5f36b4b9d2f7671ef0629d7dd21d3651ea7a698d5cc520eb814c6ee4c0ee7efcd3f6a8f16688773300a25537636bb61eba286 +DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde -DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5 +DIST ogre-13.6.1.tar.gz 91951783 BLAKE2B a345de5b6cb4e7be3c565f77bf7f541684733b21d862a234687ccffcc2b6c0ecf5b0fdd9fd42ddbee11c0e81388aee21d550a7e33550cd46fb17dbccfb6bb7f6 SHA512 c868a171c75adacf5eee54ee6be70faf8d5f8734dc5f1f01cd475faa78d4f9796860cfb20d486f53f20aaca5ea5306795bb5a2e1c5ded2dcb38612d5ca2550b4 diff --git a/dev-games/ogre/files/ogre-13.5.3-gentoolize_imgui_inclusion.patch b/dev-games/ogre/files/ogre-13.5.3-gentoolize_imgui_inclusion.patch new file mode 100644 index ..13e65963193a --- /dev/null +++ b/dev-games/ogre/files/ogre-13.5.3-gentoolize_imgui_inclusion.patch @@ -0,0 +1,27 @@ +--- a/Components/Overlay/CMakeLists.txt2022-12-13 08:16:21.006454596 +0100 b/Components/Overlay/CMakeLists.txt2022-12-13 08:16:41.416455669 +0100 +@@ -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.87" CACHE PATH "") ++ set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.87" CACHE PATH "") + if(NOT EXISTS ${IMGUI_DIR}) + message(STATUS "Downloading imgui") + file(DOWNLOAD + https://github.com/ocornut/imgui/archive/v1.87.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 +@@ -103,4 +103,4 @@ + ) + install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip" + DESTINATION "${OGRE_MEDIA_PATH}/packs/" +-) +\ No newline at end of file ++) diff --git a/dev-games/ogre/files/ogre-13.5.3-media_path.patch b/dev-games/ogre/files/ogre-13.5.3-media_path.patch new file mode 100644 index ..84fd2d871cb8 --- /dev/null +++ b/dev-games/ogre/files/ogre-13.5.3-media_path.patch @@ -0,0 +1,12 @@ +--- a/CMake/InstallResources.cmake 2022-12-13 07:54:58.845387208 +0100 b/CMake/InstallResources.cmake 2022-12-13 07:56:02.083390532 +0100 +@@ -174,9 +174,6 @@ + + # CREATE CONFIG FILES - BUILD DIR VERSIONS + if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 4fabe03b92554b7724f098026f0086fb1fbf2923 Author: Joonas Niilola gentoo org> AuthorDate: Sun Jan 29 13:33:46 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jan 29 13:34:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fabe03b dev-games/ogre: fix MissingManifest, UnknownUseFlags Signed-off-by: Joonas Niilola gentoo.org> dev-games/ogre/Manifest | 3 +++ dev-games/ogre/metadata.xml | 10 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 362251d8f596..333bba06d603 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,3 +1,6 @@ +DIST imgui-1.77.tar.gz 1269147 BLAKE2B be0db9b77903664db0fadf1672ec23983dc89292fd261a1e89c1eab88b82e95de7c2af37eb7ef43cc994b889fdf7d7fb2dd1282b93c1f3b1166c7fe0d2dccaf5 SHA512 d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546 DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 +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-13.6.1.tar.gz 91951783 BLAKE2B a345de5b6cb4e7be3c565f77bf7f541684733b21d862a234687ccffcc2b6c0ecf5b0fdd9fd42ddbee11c0e81388aee21d550a7e33550cd46fb17dbccfb6bb7f6 SHA512 c868a171c75adacf5eee54ee6be70faf8d5f8734dc5f1f01cd475faa78d4f9796860cfb20d486f53f20aaca5ea5306795bb5a2e1c5ded2dcb38612d5ca2550b4 +DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5 diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml index 9ffeae644f30..10134612ebf8 100644 --- a/dev-games/ogre/metadata.xml +++ b/dev-games/ogre/metadata.xml @@ -83,15 +83,23 @@ Exporters Enable GL state cache support NVIDIA toolkit plugin More precise calculations at the expense of speed -Use egl instead of glx Build deprecated nodeless positioning of Lights and Cameras. +Use egl instead of glx + +Enable fine light mask granularity. This impacts on performance and should +not be enabled unless an application really needs it. + Support images via media-libs/freeimage Build OpenGL 3+ RenderSystem Build OpenGL ES 2.x RenderSystem Enable OpenGL ES 3.x Features Use dev-libs/rapidjson (needed by Hlms JSON materials) + +Use the skeletal animation from 1.x. It's much slower, but the new system +is still experimental. + Pull in Object-oriented Input System library dev-games/ois for samples When USE=threads, use poco for threading
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 6ba08246e7ba54b28bbf60eec9e674c26ce802ae Author: Bernd Waibel posteo net> AuthorDate: Tue Nov 15 06:00:52 2022 + Commit: John Helmert III gentoo org> CommitDate: Wed Nov 16 03:26:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba08246 dev-games/ogre: drop openexr support The package needs OpenEXR-2, and blocks the removal of old versions of OpenEXR/IlmBase. Following the suggestion in https://bugs.gentoo.org/877901#c3 support is droppend, rather than depending on https://bugs.gentoo.org/877901 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28277 Signed-off-by: John Helmert III gentoo.org> dev-games/ogre/{ogre-1.12.9-r2.ebuild => ogre-1.12.9-r3.ebuild} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-games/ogre/ogre-1.12.9-r2.ebuild b/dev-games/ogre/ogre-1.12.9-r3.ebuild similarity index 97% rename from dev-games/ogre/ogre-1.12.9-r2.ebuild rename to dev-games/ogre/ogre-1.12.9-r3.ebuild index 6cd667645f9a..f91630e20d82 100644 --- a/dev-games/ogre/ogre-1.12.9-r2.ebuild +++ b/dev-games/ogre/ogre-1.12.9-r3.ebuild @@ -20,7 +20,7 @@ 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" + json +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 @@ -55,7 +55,6 @@ RDEPEND=" egl? ( media-libs/mesa[egl(+)] ) freeimage? ( media-libs/freeimage ) json? ( dev-libs/rapidjson ) - openexr? ( media-libs/openexr:= ) opengl? ( virtual/glu virtual/opengl @@ -143,7 +142,7 @@ src_configure() { -DOGRE_BUILD_DEPENDENCIES=no -DOGRE_BUILD_PLUGIN_CG=$(usex cg) -DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage) - -DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr) + -DOGRE_BUILD_PLUGIN_EXRCODEC=no -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl) -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl) -DOGRE_BUILD_RENDERSYSTEM_GLES2=no
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 422056e44f5d1d54cbbeceddf8bc2f56d3f116c2 Author: Joonas Niilola gentoo org> AuthorDate: Fri Jun 3 12:26:43 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Jun 3 12:34:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422056e4 dev-games/ogre: subslot binder media-libs/assimp:= Signed-off-by: Joonas Niilola gentoo.org> dev-games/ogre/{ogre-1.12.9-r1.ebuild => ogre-1.12.9-r2.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/ogre/ogre-1.12.9-r1.ebuild b/dev-games/ogre/ogre-1.12.9-r2.ebuild similarity index 98% rename from dev-games/ogre/ogre-1.12.9-r1.ebuild rename to dev-games/ogre/ogre-1.12.9-r2.ebuild index 0c297f1f519d..6cd667645f9a 100644 --- a/dev-games/ogre/ogre-1.12.9-r1.ebuild +++ b/dev-games/ogre/ogre-1.12.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -50,7 +50,7 @@ RDEPEND=" x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt - assimp? ( media-libs/assimp ) + assimp? ( media-libs/assimp:= ) cg? ( media-gfx/nvidia-cg-toolkit ) egl? ( media-libs/mesa[egl(+)] ) freeimage? ( media-libs/freeimage )
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: a75e161cf68b1b96526b6188c83ab5075e9f7239 Author: Jakov Smolić gentoo org> AuthorDate: Sat Feb 12 12:11:37 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sat Feb 12 12:11:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75e161c dev-games/ogre: keyword 2.1-r1 for ~x86 Bug: https://bugs.gentoo.org/740424 Signed-off-by: Jakov Smolić gentoo.org> dev-games/ogre/ogre-2.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/ogre/ogre-2.1-r1.ebuild b/dev-games/ogre/ogre-2.1-r1.ebuild index 2bf0d553581a..7757566b9317 100644 --- a/dev-games/ogre/ogre-2.1-r1.ebuild +++ b/dev-games/ogre/ogre-2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/OGRECave/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="MIT public-domain" SLOT="0/2.1" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="+cache debug doc double-precision egl examples fine-granularity +freeimage json legacy-animations +opengl profile tools"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: dcefab179a1230eed77c6732e355a1e32edd1950 Author: Sam James gentoo org> AuthorDate: Sun Jan 16 02:11:48 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jan 16 02:11:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcefab17 dev-games/ogre: workaround 1.9.0 USE=examples failure with GCC 11 Fixed properly in newer versions. Closes: https://bugs.gentoo.org/829253 Signed-off-by: Sam James gentoo.org> dev-games/ogre/ogre-1.9.0-r3.ebuild | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dev-games/ogre/ogre-1.9.0-r3.ebuild b/dev-games/ogre/ogre-1.9.0-r3.ebuild index 4adb836a28a4..cb80cd8c754e 100644 --- a/dev-games/ogre/ogre-1.9.0-r3.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" -inherit cmake vcs-snapshot +inherit cmake flag-o-matic vcs-snapshot DESCRIPTION="Object-oriented Graphics Rendering Engine" HOMEPAGE="https://www.ogre3d.org/; @@ -114,6 +114,11 @@ src_configure() { done fi + if use examples ; then + # bug #829253 + append-cxxflags -std=c++14 + fi + cmake_src_configure }
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: a2856598fab5e01690563a3c7602bb01d038bb85 Author: Sam James gentoo org> AuthorDate: Fri Oct 29 22:13:39 2021 + Commit: Sam James gentoo org> CommitDate: Fri Oct 29 22:22:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2856598 dev-games/ogre: add tbb subslot operator Signed-off-by: Sam James gentoo.org> dev-games/ogre/{ogre-1.9.0-r2.ebuild => ogre-1.9.0-r3.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ogre/ogre-1.9.0-r2.ebuild b/dev-games/ogre/ogre-1.9.0-r3.ebuild similarity index 99% rename from dev-games/ogre/ogre-1.9.0-r2.ebuild rename to dev-games/ogre/ogre-1.9.0-r3.ebuild index 3201d8cebed..4adb836a28a 100644 --- a/dev-games/ogre/ogre-1.9.0-r2.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r3.ebuild @@ -46,7 +46,7 @@ RDEPEND=" ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) - tbb? ( dev-cpp/tbb ) + tbb? ( dev-cpp/tbb:= ) ) tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib )"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 07f020ef0089e9ad08fedaaf83921db9d85a18de Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 18 20:07:52 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 18 20:12:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f020ef dev-games/ogre: Drop 1.9.0-r1 Bug: https://bugs.gentoo.org/770586 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-games/ogre/ogre-1.9.0-r1.ebuild | 133 1 file changed, 133 deletions(-) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild deleted file mode 100644 index dd3d2ee065a..000 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -CMAKE_REMOVE_MODULES="yes" -CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" - -inherit eutils cmake-utils vcs-snapshot - -DESCRIPTION="Object-oriented Graphics Rendering Engine" -HOMEPAGE="https://www.ogre3d.org/; -SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="MIT public-domain" -SLOT="0/1.9.0" -KEYWORDS="amd64 ~arm x86" - -# gles1 currently broken wrt bug #418201 -# gles1 does not even build wrt bug #506058 -IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip" - -REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) - examples? ( ois ) - poco? ( threads ) - tbb? ( threads ) - gl3plus? ( !gles2 !gles3 ) - gles3? ( gles2 ) - gl3plus? ( opengl )" - -RESTRICT="test" #139905 - -RDEPEND=" - media-libs/freetype:2 - virtual/opengl - virtual/glu - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXrandr - x11-libs/libXt - boost? ( dev-libs/boost:= ) - cg? ( media-gfx/nvidia-cg-toolkit ) - freeimage? ( media-libs/freeimage ) - gles2? ( >=media-libs/mesa-9.0.0[gles2] ) - gles3? ( >=media-libs/mesa-10.0.0[gles2] ) - gl3plus? ( >=media-libs/mesa-9.2.5 ) - ois? ( dev-games/ois ) - threads? ( - poco? ( dev-libs/poco ) - tbb? ( dev-cpp/tbb ) - ) - tools? ( dev-libs/tinyxml[stl] ) - zip? ( sys-libs/zlib dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" - "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" - "${FILESDIR}/${P}-gcc52.patch" - "${FILESDIR}/${P}-samples.patch" -) - -src_prepare() { - sed -i \ - -e "s:share/OGRE/docs:share/doc/${PF}:" \ - Docs/CMakeLists.txt || die - # Stupid build system hardcodes release names - sed -i \ - -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \ - CMake/Utils/OgreConfigTargets.cmake || die - - # make sure we're not using the included tinyxml - rm -f Tools/XMLConverter/{include,src}/tiny*.* - - # Fix some path issues - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DOGRE_FULL_RPATH=NO - $(cmake-utils_use boost OGRE_USE_BOOST) - $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG) - $(cmake-utils_use doc OGRE_INSTALL_DOCS) - $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE) - $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE) - $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL) - $(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS) - -DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE - $(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2) - $(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT) - $(cmake-utils_use profile OGRE_PROFILING) - $(cmake-utils_use examples OGRE_BUILD_SAMPLES) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE) - -DOGRE_BUILD_TESTS=FALSE - -DOGRE_CONFIG_THREADS=$(usex threads 2 0) - $(cmake-utils_use tools OGRE_BUILD_TOOLS) - $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP) - ) - - if use threads ; then - local f - for f in boost poco tbb ; do - use ${f} || continue - mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} ) - break - done - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - CONFIGDIR=/etc/OGRE - SHAREDIR=/usr/share/OGRE - - # plugins and
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: b9f542f79b2c3817c98ff0bb293f88d5fc1575f5 Author: Sam James gentoo org> AuthorDate: Sun Feb 14 19:52:34 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 14 19:52:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f542f7 dev-games/ogre: Stabilize 1.9.0-r2 x86, #770586 Signed-off-by: Sam James gentoo.org> dev-games/ogre/ogre-1.9.0-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/ogre/ogre-1.9.0-r2.ebuild b/dev-games/ogre/ogre-1.9.0-r2.ebuild index 024f38575f1..4e296d965a3 100644 --- a/dev-games/ogre/ogre-1.9.0-r2.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.b LICENSE="MIT public-domain" SLOT="0/1.9.0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm x86" # gles1 currently broken wrt bug #418201 # gles1 does not even build wrt bug #506058
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 099e98fe1e981a2eb44477e53933fa768f2b3834 Author: Sven Eden prydeworx com> AuthorDate: Sun Sep 20 14:39:00 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Mon Sep 21 21:08:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099e98fe dev-games/ogre: Version bump to 1.12.9 This bump includes the following upgrades * IMGUI version bumped to 1.77 ; That's what upstream bumped to * Added USE flag "assimp" to pull in media-libs/assimp This also enables building of the AssimpConverter if the USE flag "assimp" is enabled. Bug: https://bugs.gentoo.org/743742 Closes: https://bugs.gentoo.org/743742 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Sven Eden prydeworx.com> Closes: https://github.com/gentoo/gentoo/pull/17619 Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/Manifest| 4 ++-- ...Simple_demo.patch => ogre-1.12.9-fix_Simple_demo.patch} | 0 .../ogre/files/ogre-1.12.9-fix_config_window_height.patch | 11 +++ patch => ogre-1.12.9-gentoolize_imgui_inclusion.patch} | 13 ++--- 12.8-media_path.patch => ogre-1.12.9-media_path.patch} | 0 ...resource_path.patch => ogre-1.12.9-resource_path.patch} | 0 dev-games/ogre/metadata.xml| 7 +-- dev-games/ogre/{ogre-1.12.8.ebuild => ogre-1.12.9.ebuild} | 14 +++--- 8 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 851d395c412..abe2b0d7994 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,4 +1,4 @@ -DIST imgui-1.76.tar.gz 1256126 BLAKE2B 801e94e1007e41c5b7281bb30fc7da76ddf0e755bf3ec2c4eb90d730dd9c68685f3e4819f32acc2154fbcd4e32da9d1de6dac36b0cd8885a93457475576b4336 SHA512 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa -DIST ogre-1.12.8.tar.gz 125932831 BLAKE2B ffd4a443e374ad3f209b4f8a5e18a41b3dbfbb528d20581f48a4d31447e1e20a3b1cdde588b6345bd07d864c9b72ce1e51374de52523e7c4477408c01778af69 SHA512 c446c58b57874d3e2522f7e0315771b7a9f5ac449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2 +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 diff --git a/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch b/dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch similarity index 100% rename from dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch rename to dev-games/ogre/files/ogre-1.12.9-fix_Simple_demo.patch 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 000..12b4ce86a86 --- /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.8-upgrade_imgui.patch b/dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch similarity index 63% rename from dev-games/ogre/files/ogre-1.12.8-upgrade_imgui.patch rename to
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/ogre/files/
commit: 089bef6fa06174418903e7ce6ce0e8be242efbb7 Author: Sven Eden gmx net> AuthorDate: Sun Apr 26 12:46:19 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Aug 25 21:59:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=089bef6f dev-games/ogre: 1.12.8 version bump plus fixes/additions Changes: * imgui version has been raised to 1.76 * gles2 USE flag has been removed. Ogre with GLES2/3 support now depends on HLSL2GLSL unconditionally. The flags and their config options have been 'backed up' as comments for easy re-integration once we have an ebuild for HLSL2GLSL. ( See: https://github.com/aras-p/hlsl2glslfork ) * 'experimental' USE flag renamed to 'deprecated'. The HLMS component has switched from experimental to deprecated. * quakemap.cfg is gone * tests.cfg has been added Fixes: * The 'Simple' demo has been fixed to compile with pedantic resource manager. Bug: https://bugs.gentoo.org/728458 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Sven Eden gmx.net> Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/Manifest| 4 +- .../ogre-1.12.4-fix_sample_source_install.patch| 15 .../ogre/files/ogre-1.12.8-fix_Simple_demo.patch | 11 +++ ...dia_path.patch => ogre-1.12.8-media_path.patch} | 0 ..._path.patch => ogre-1.12.8-resource_path.patch} | 0 .../ogre/files/ogre-1.12.8-upgrade_imgui.patch | 28 dev-games/ogre/metadata.xml| 5 +- .../{ogre-1.12.4.ebuild => ogre-1.12.8.ebuild} | 82 +++--- 8 files changed, 85 insertions(+), 60 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 0fa39921ef9..32e62fd3783 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,3 +1,3 @@ -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 c446c58b57874d3e2522f7e0315771b7a9f5ac449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde 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 616a5e33680..000 --- 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 000..49ed0190e0a --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.8-fix_Simple_demo.patch @@ -0,0 +1,11 @@ +--- a/Samples/Simple/include/SSAO.h2020-04-26 13:54:31.321908377 +0200 b/Samples/Simple/include/SSAO.h2020-04-26 13:54:47.497909935 +0200 +@@ -65,7 +65,7
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/ogre/files/
commit: 2e8d95ccd9fba724a65aea0dee63ee3752afddcb Author: Sven Eden gmx net> AuthorDate: Wed Apr 29 07:30:45 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Aug 25 21:59:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e8d95cc dev-games/ogre: Bump to 2.1 - First major 2.1 release Changes from the pre-release: * gles2 USE flag is gone, the GLES2 render system is not ported, yet * Added "fine-granularity" USE flag to enable which has a noticable performance impact. * double-precision USE flag is back in. But if activated, both OGRE_SIMD_NEON and OGRE_SIMD_SSE2 must be disabled, so the performance impact is quite big. * mobile USE flag is gone, this needs further testing. Also I think that building for mobile devices is not really interesting on Gentoo, is it? * Fixed a few warnings and issues, and spoke with upstream about them. ( See: https://github.com/OGRECave/ogre-next/issues/90 ) * Fixed a missing include compilation issue and reported it to upstream. ( See: OGRECave/ogre-next#132 ) Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Sven Eden gmx.net> Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/Manifest| 1 + dev-games/ogre/files/ogre-2.1-d1c1116.patch| 62 + .../files/ogre-2.1-fix_compilation_issues.patch| 67 ++ .../ogre/files/ogre-2.1-fix_opengl_search.patch| 12 dev-games/ogre/files/ogre-2.1-fix_warnings.patch | 15 dev-games/ogre/metadata.xml| 13 ++-- ...ogre-2.1_pre20191212.ebuild => ogre-2.1.ebuild} | 80 +- 7 files changed, 214 insertions(+), 36 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 32e62fd3783..851d395c412 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,3 +1,4 @@ DIST imgui-1.76.tar.gz 1256126 BLAKE2B 801e94e1007e41c5b7281bb30fc7da76ddf0e755bf3ec2c4eb90d730dd9c68685f3e4819f32acc2154fbcd4e32da9d1de6dac36b0cd8885a93457475576b4336 SHA512 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa DIST ogre-1.12.8.tar.gz 125932831 BLAKE2B ffd4a443e374ad3f209b4f8a5e18a41b3dbfbb528d20581f48a4d31447e1e20a3b1cdde588b6345bd07d864c9b72ce1e51374de52523e7c4477408c01778af69 SHA512 c446c58b57874d3e2522f7e0315771b7a9f5ac449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde +DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5 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 000..6fbf5ecda4d --- /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" +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 +---
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: fcabaafec032cac309959f2cb0a978864549834a Author: Sven Eden gmx net> AuthorDate: Tue Jun 16 13:11:36 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Aug 25 22:00:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcabaafe dev-games/ogre: Specify what the "tools" USE flag does Users should know, that the "tools" USE flag builds and install the MeshUpgrader, VRMLConverter and XMLConverter tools. Thus users not in need of either can safely deactivate that USE flag. Bug: https://bugs.gentoo.org/600734 Closes: https://bugs.gentoo.org/600734 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Sven Eden gmx.net> Closes: https://github.com/gentoo/gentoo/pull/15527 Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml index d793b5753b3..43330db8ca1 100644 --- a/dev-games/ogre/metadata.xml +++ b/dev-games/ogre/metadata.xml @@ -112,7 +112,7 @@ Exporters (default: case-insensitive + sensitive lookup in all groups) When USE=threads, use tbb for threading -Build and install helper tools +Build and install MeshUpgrader, VRMLConverter and XMLConverter sinbad/ogre
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: e7c557a5fc2e6af23329b913f73b52412e60c4f2 Author: Jonas Stein gentoo org> AuthorDate: Mon Aug 24 17:43:42 2020 + Commit: Jonas Stein gentoo org> CommitDate: Mon Aug 24 17:45:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c557a5 dev-games/ogre: Maintainer retired Proxied maintainer retired due to inactivity. Bug: https://bugs.gentoo.org/633138 Package-Manager: Portage-3.0.4, Repoman-2.3.23 Signed-off-by: Jonas Stein gentoo.org> dev-games/ogre/metadata.xml | 8 1 file changed, 8 deletions(-) diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml index 0821402dc0e..6d7e9fc14eb 100644 --- a/dev-games/ogre/metadata.xml +++ b/dev-games/ogre/metadata.xml @@ -1,14 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -yamakuz...@gmx.net -Sven Eden - - -proxy-ma...@gentoo.org -Proxy Maintainers - ga...@gentoo.org Gentoo Games Project
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 60fd22922ec02d9a74c22c6cb6dad58c79092dae Author: Sven Eden gmx net> AuthorDate: Wed Nov 6 23:12:03 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 7 22:57:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fd2292 dev-games/ogre: New ebuild for latest stable release 1.12.4 Also moved to github. In this release we have to also fetch the current release of imlib, as the tree has it as a submodule which is not included in the ogre release zip. And finally I have put myself into metadata.xml, as I am proxy- maintaining ogre. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Bug: https://bugs.gentoo.org/699770 Closes: https://bugs.gentoo.org/699770 Signed-off-by: Sven Eden gmx.de> Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/Manifest| 2 + .../ogre-1.12.4-fix_sample_source_install.patch| 15 +++ dev-games/ogre/files/ogre-1.12.4-media_path.patch | 14 +++ .../ogre/files/ogre-1.12.4-resource_path.patch | 13 +++ dev-games/ogre/metadata.xml| 12 ++- dev-games/ogre/ogre-1.10.12.ebuild | 4 +- dev-games/ogre/ogre-1.11.2.ebuild | 6 +- .../{ogre-1.11.2.ebuild => ogre-1.12.4.ebuild} | 107 - dev-games/ogre/ogre-2.1_pre20180901.ebuild | 6 +- 9 files changed, 146 insertions(+), 33 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 1b26aeec681..aa4b1ac188e 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,4 +1,6 @@ +DIST imgui-1.74.tar.gz 1224024 BLAKE2B 794bd9aa0fdd1793fe9fa012c4b915731e3fe43ad32315421c2f5da2c2225f5dc6eb2c9618b999e0a4b8922b7a2b74fe2dbc5b5dc19de5aa0b6cee9d2ea67154 SHA512 e49e5cbe55899c0d0abc9b66c4e6e3e9941542af542d0ed3304bd3bde34c769baa2367355b77b91acb7fca56f9bcfd233dfc99881cfc8f5f6a2e2e6839990832 DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2 +DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde DIST ogre-2.1_pre20180901.tar.bz2 152746767 BLAKE2B 758d31fca2e5e31080c688ba758948fb5998a8fe49b9052f79de6791786501d02d7079e8f55ed37dc1a93f360af1003d2a28a260ba687c60c75a1340b95232a7 SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04 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 new file mode 100644 index 000..616a5e33680 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.4-fix_sample_source_install.patch @@ -0,0 +1,15 @@ +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.4-media_path.patch b/dev-games/ogre/files/ogre-1.12.4-media_path.patch new file mode 100644 index 000..3030cc5b9fa --- /dev/null +++ b/dev-games/ogre/files/ogre-1.12.4-media_path.patch @@ -0,0 +1,14 @@ +Media paths are fine already, the removed lines would screw them up. + +--- a/CMake/InstallResources.cmake
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: f57c386f31b8a8e1b83382ca897ec480e4f6aedd Author: James Le Cuirot gentoo org> AuthorDate: Tue Jan 7 22:20:57 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 7 22:58:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57c386f dev-games/ogre: Apply BDEPEND to all unstable versions Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/ogre-1.12.4.ebuild | 10 +++--- dev-games/ogre/ogre-1.9.0-r2.ebuild| 10 +++--- dev-games/ogre/ogre-2.1_pre20191212.ebuild | 10 +++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dev-games/ogre/ogre-1.12.4.ebuild b/dev-games/ogre/ogre-1.12.4.ebuild index 7d8c48cadd8..5a8d78edfa9 100644 --- a/dev-games/ogre/ogre-1.12.4.ebuild +++ b/dev-games/ogre/ogre-1.12.4.ebuild @@ -49,10 +49,14 @@ RDEPEND=" ) tools? ( dev-libs/tinyxml[stl] ) " -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND=" + ${RDEPEND} x11-base/xorg-proto - doc? ( app-doc/doxygen )" +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" PATCHES=( "${FILESDIR}"/${P}-media_path.patch diff --git a/dev-games/ogre/ogre-1.9.0-r2.ebuild b/dev-games/ogre/ogre-1.9.0-r2.ebuild index 1840540157e..024f38575f1 100644 --- a/dev-games/ogre/ogre-1.9.0-r2.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r2.ebuild @@ -50,10 +50,14 @@ RDEPEND=" ) tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND=" + ${RDEPEND} x11-base/xorg-proto - doc? ( app-doc/doxygen )" +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" PATCHES=( "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" diff --git a/dev-games/ogre/ogre-2.1_pre20191212.ebuild b/dev-games/ogre/ogre-2.1_pre20191212.ebuild index 4973a50d793..d4823f71e9b 100644 --- a/dev-games/ogre/ogre-2.1_pre20191212.ebuild +++ b/dev-games/ogre/ogre-2.1_pre20191212.ebuild @@ -53,10 +53,14 @@ RDEPEND=" # Dependencies for USE flags that do not work, yet. # cg? ( media-gfx/nvidia-cg-toolkit ) -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND=" + ${RDEPEND} x11-base/xorg-proto - doc? ( app-doc/doxygen )" +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" PATCHES=( "${FILESDIR}/${PN}-2.1-samples.patch"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: f5337cdf544c153250ab4602f297a390a4b0ca29 Author: Sven Eden gmx net> AuthorDate: Sun Nov 10 15:43:00 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 7 22:58:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5337cdf dev-games/ogre: Bump 2.1 to pre20191212 and move to GitHub Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Sven Eden gmx.de> Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/Manifest| 1 - dev-games/ogre/files/ogre-2.1-media_path.patch | 14 + dev-games/ogre/files/ogre-2.1-resource_path.patch | 9 +-- ...20180901.ebuild => ogre-2.1_pre20191212.ebuild} | 65 ++ 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index aa4b1ac188e..0c2635641c1 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -3,4 +3,3 @@ DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308 DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2 DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde -DIST ogre-2.1_pre20180901.tar.bz2 152746767 BLAKE2B 758d31fca2e5e31080c688ba758948fb5998a8fe49b9052f79de6791786501d02d7079e8f55ed37dc1a93f360af1003d2a28a260ba687c60c75a1340b95232a7 SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04 diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch index 5e7ad276ac0..a51d0576c98 100644 --- a/dev-games/ogre/files/ogre-2.1-media_path.patch +++ b/dev-games/ogre/files/ogre-2.1-media_path.patch @@ -1,6 +1,8 @@ +Media paths are fine already, the removed lines would screw them up. + --- a/CMake/InstallResources.cmake 2018-03-23 10:49:24.620486243 +0100 +++ b/CMake/InstallResources.cmake 2018-03-23 10:50:52.089485597 +0100 -@@ -186,15 +186,16 @@ +@@ -186,15 +186,6 @@ # CREATE CONFIG FILES - BUILD DIR VERSIONS if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) @@ -13,16 +15,6 @@ - endif() - set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") - set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") -+# No, they were fine already -+# if( NOT APPLE ) -+# set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") -+# set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") -+# else() -+# set(OGRE_MEDIA_DIR_REL "Contents/Resources") -+# set(OGRE_MEDIA_DIR_DBG "Contents/Resources") -+# endif() -+# set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") -+# set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") else () # iOS needs to use relative paths in the config files set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}") diff --git a/dev-games/ogre/files/ogre-2.1-resource_path.patch b/dev-games/ogre/files/ogre-2.1-resource_path.patch index 32cfef0d8d1..32cbc94e7d0 100644 --- a/dev-games/ogre/files/ogre-2.1-resource_path.patch +++ b/dev-games/ogre/files/ogre-2.1-resource_path.patch @@ -1,6 +1,8 @@ +These was already configured above, the BINARY paths are wrong! + --- a/CMake/InstallResources.cmake 2018-03-23 10:48:44.371486540 +0100 +++ b/CMake/InstallResources.cmake 2018-03-23 10:49:08.333486363 +0100 -@@ -226,10 +226,11 @@ +@@ -226,10 +226,6 @@ set(OGRE_SAMPLES_DIR_REL "") set(OGRE_SAMPLES_DIR_DBG "") elseif (UNIX) @@ -8,11 +10,6 @@ - set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib") - set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") - set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib") -+# No, this was already configured above, the BINARY paths are wrong! -+# set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") -+# set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib") -+# set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") -+# set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib") endif () if (WINDOWS_STORE OR WINDOWS_PHONE) diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: aa2d2531f94b42c1308b15e38052ecd1ed9471e2 Author: Sven Eden gmx net> AuthorDate: Sun Nov 10 18:09:34 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 7 22:58:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa2d2531 dev-games/ogre: Remove obsolete ebuilds and patches Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Sven Eden gmx.de> Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/Manifest| 2 - dev-games/ogre/files/ogre-1.10.11-media_path.patch | 18 --- .../ogre/files/ogre-1.10.11-resource_path.patch| 18 --- dev-games/ogre/files/ogre-1.10.11-samples.patch| 13 -- .../ogre-1.11.2-fix_sample_source_install.patch| 18 --- dev-games/ogre/files/ogre-1.11.2-media_path.patch | 18 --- .../ogre/files/ogre-1.11.2-resource_path.patch | 14 -- dev-games/ogre/metadata.xml| 5 - dev-games/ogre/ogre-1.10.12.ebuild | 124 -- dev-games/ogre/ogre-1.11.2.ebuild | 143 - 10 files changed, 373 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 0c2635641c1..0fa39921ef9 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,5 +1,3 @@ DIST imgui-1.74.tar.gz 1224024 BLAKE2B 794bd9aa0fdd1793fe9fa012c4b915731e3fe43ad32315421c2f5da2c2225f5dc6eb2c9618b999e0a4b8922b7a2b74fe2dbc5b5dc19de5aa0b6cee9d2ea67154 SHA512 e49e5cbe55899c0d0abc9b66c4e6e3e9941542af542d0ed3304bd3bde34c769baa2367355b77b91acb7fca56f9bcfd233dfc99881cfc8f5f6a2e2e6839990832 -DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 -DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2 DIST ogre-1.12.4.tar.gz 127168699 BLAKE2B 40040f3a514aef449615203c327728d2b990be82b43ef0129192f20bd0f603b284906af94286ba7902bae96c657aba99d4f4f3f93580d249733af951e9bb902e SHA512 46406be3b57bd1aea8f657802e2d63f777dd4a723b291c5bb6c8f9eac62ba27fe18d43260093f1120ce75fc32997feb72b10388e8983b9c9d2b7cdb15231cdd8 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde diff --git a/dev-games/ogre/files/ogre-1.10.11-media_path.patch b/dev-games/ogre/files/ogre-1.10.11-media_path.patch deleted file mode 100644 index 4d2547ab75a..000 --- a/dev-games/ogre/files/ogre-1.10.11-media_path.patch +++ /dev/null @@ -1,18 +0,0 @@ a/CMake/InstallResources.cmake 2014-10-29 12:43:49.0 +0100 -+++ b/CMake/InstallResources.cmake 2014-10-29 12:46:10.017611431 +0100 -@@ -165,10 +165,11 @@ - - # CREATE CONFIG FILES - BUILD DIR VERSIONS - if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) -- set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") -- set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") -- set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") -- set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") -+# No, they were fine already -+# set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") -+# set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") -+# set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") -+# set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_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.10.11-resource_path.patch b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch deleted file mode 100644 index 9c39dfc0762..000 --- a/dev-games/ogre/files/ogre-1.10.11-resource_path.patch +++ /dev/null @@ -1,18 +0,0 @@ a/CMake/InstallResources.cmake 2013-12-01 18:28:12.0 +0100 -+++ b/CMake/InstallResources.cmake 2014-10-29 12:38:29.963602465 +0100 -@@ -189,10 +189,11 @@ - set(OGRE_SAMPLES_DIR_REL "") - set(OGRE_SAMPLES_DIR_DBG "") - elseif (UNIX) -- set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") -- set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib") -- set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib") -- set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib") -+# No, this was already configured above, the BINARY paths are wrong! -+# set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib") -+# set(OGRE_PLUGIN_DIR_DBG
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/ogre/files/
commit: bd845a620c2c15a98e72e66bace7a1e3217cf868 Author: Sven Eden gmx net> AuthorDate: Mon Jan 6 14:17:08 2020 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 7 22:57:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd845a62 dev-games/ogre: Fix ebuild for 1.9.0 (EAPI 7) Signed-off-by: Sven Eden gmx.net> Closes: https://github.com/gentoo/gentoo/pull/13655 Signed-off-by: James Le Cuirot gentoo.org> dev-games/ogre/files/ogre-1.9.0-samples.patch | 4 +- dev-games/ogre/ogre-1.9.0-r2.ebuild | 133 ++ 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dev-games/ogre/files/ogre-1.9.0-samples.patch b/dev-games/ogre/files/ogre-1.9.0-samples.patch index d7573d7662b..0bf886b27d7 100644 --- a/dev-games/ogre/files/ogre-1.9.0-samples.patch +++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch @@ -1,5 +1,5 @@ CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt b/CMakeLists.txt @@ -519,7 +519,9 @@ endif () diff --git a/dev-games/ogre/ogre-1.9.0-r2.ebuild b/dev-games/ogre/ogre-1.9.0-r2.ebuild new file mode 100644 index 000..1840540157e --- /dev/null +++ b/dev-games/ogre/ogre-1.9.0-r2.ebuild @@ -0,0 +1,133 @@ +# 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 vcs-snapshot + +DESCRIPTION="Object-oriented Graphics Rendering Engine" +HOMEPAGE="https://www.ogre3d.org/; +SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="MIT public-domain" +SLOT="0/1.9.0" +KEYWORDS="~amd64 ~arm ~x86" + +# gles1 currently broken wrt bug #418201 +# gles1 does not even build wrt bug #506058 +IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip" + +REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) + examples? ( ois ) + poco? ( threads ) + tbb? ( threads ) + gl3plus? ( !gles2 !gles3 ) + gles3? ( gles2 ) + gl3plus? ( opengl )" + +RESTRICT="test" #139905 + +RDEPEND=" + media-libs/freetype:2 + virtual/opengl + virtual/glu + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXrandr + x11-libs/libXt + boost? ( dev-libs/boost:= ) + cg? ( media-gfx/nvidia-cg-toolkit ) + freeimage? ( media-libs/freeimage ) + gles2? ( >=media-libs/mesa-9.0.0[gles2] ) + gles3? ( >=media-libs/mesa-10.0.0[gles2] ) + gl3plus? ( >=media-libs/mesa-9.2.5 ) + ois? ( dev-games/ois ) + threads? ( + poco? ( dev-libs/poco ) + tbb? ( dev-cpp/tbb ) + ) + tools? ( dev-libs/tinyxml[stl] ) + zip? ( sys-libs/zlib dev-libs/zziplib )" +DEPEND="${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto + doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" + "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" + "${FILESDIR}/${P}-gcc52.patch" + "${FILESDIR}/${P}-samples.patch" +) + +src_prepare() { + sed -i \ + -e "s:share/OGRE/docs:share/doc/${PF}:" \ + Docs/CMakeLists.txt || die + # Stupid build system hardcodes release names + sed -i \ + -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \ + CMake/Utils/OgreConfigTargets.cmake || die + + # make sure we're not using the included tinyxml + rm -f Tools/XMLConverter/{include,src}/tiny*.* + + # Fix some path issues + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DOGRE_FULL_RPATH=NO + -DOGRE_USE_BOOST=$(usex boost) + -DOGRE_BUILD_PLUGIN_CG=$(usex cg) + -DOGRE_INSTALL_DOCS=$(usex doc) + -DOGRE_CONFIG_DOUBLE=$(usex double-precision) + -DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage) + -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl) + -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex gl3plus) + -DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE + -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2) + -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles3) + -DOGRE_PROFILING=$(usex profile) + -DOGRE_BUILD_SAMPLES=$(usex examples) + -DOGRE_INSTALL_SAMPLES=$(usex examples) + -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples) + -DOGRE_BUILD_TESTS=FALSE + -DOGRE_CONFIG_THREADS=$(usex threads 2 0) + -DOGRE_BUILD_TOOLS=$(usex tools) + -DOGRE_CONFIG_ENABLE_ZIP=$(usex zip) + ) + + if use threads ; then + local f + for f in boost poco tbb ; do + use ${f} || continue + mycmakeargs+=(
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/ogre/files/
commit: 6951cd9bba219de923a83bcd5c7ca4c18346c89f Author: Sven Eden gmx net> AuthorDate: Fri Sep 7 06:27:06 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 7 18:22:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6951cd9b dev-games/ogre: 1.11.2 version bump This is the second stable release of the current 1.11 series. Apart from stabilizing Ogre BITES, this series also adds json material support. Bug: https://bugs.gentoo.org/647266 Signed-off-by: Sven Eden prydeworx.com> Package-Manager: Portage-2.3.48, Repoman-2.3.10 Closes: https://github.com/gentoo/gentoo/pull/9474 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-games/ogre/Manifest| 1 + .../ogre-1.11.2-fix_sample_source_install.patch| 18 +++ dev-games/ogre/files/ogre-1.11.2-media_path.patch | 18 +++ .../ogre/files/ogre-1.11.2-resource_path.patch | 14 ++ dev-games/ogre/metadata.xml| 6 +- dev-games/ogre/ogre-1.11.2.ebuild | 143 + 6 files changed, 199 insertions(+), 1 deletion(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 93a14df137a..8b173e90d4f 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,2 +1,3 @@ DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 +DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde diff --git a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch new file mode 100644 index 000..6e4a476fbb4 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch @@ -0,0 +1,18 @@ +--- 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,11 @@ + 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}) ++# The SDK_CMakeLists.txt.in file does not exist at the moment (sed - 2018-04-25) ++# 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.11.2-media_path.patch b/dev-games/ogre/files/ogre-1.11.2-media_path.patch new file mode 100644 index 000..aea15218c17 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.11.2-media_path.patch @@ -0,0 +1,18 @@ +--- a/CMake/InstallResources.cmake 2018-04-03 19:39:31.586129013 +0200 b/CMake/InstallResources.cmake 2018-04-03 19:40:28.169128923 +0200 +@@ -170,10 +170,11 @@ + + # CREATE CONFIG FILES - BUILD DIR VERSIONS + if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) +- set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") +- set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") +- set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") +- set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") ++ # No, they are fine already ++ # set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") ++ # set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") ++ # set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") ++ # set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") + else () + # iOS needs to use relative paths in the config files
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/ogre/files/
commit: caa70850f4a747a5a5b9f8bd6d0e541e1f2b4310 Author: Sven Eden gmx net> AuthorDate: Fri Sep 7 06:32:24 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 7 18:22:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa70850 dev-games/ogre: Pre 2.1 release snapshot 2018-09-01 added As the future of Ogre changes a lot of the old API, it is important to have access to the new system as early as possible. The current development state is quite usable already, although not all components have been ported, yet. Providing an ebuild for the new 2.1 series to interested users and developers, everybody gets the chance to adapt their project to the future of Ogre. This is done using snapshot ebuilds, because not all commits in the Ogre tree provide buildable revisions. Further it is easier to test newly ported components when snapshot ebuilds are used. Bug: https://bugs.gentoo.org/647266 Closes: https://bugs.gentoo.org/647266 Signed-off-by: Sven Eden prydeworx.com> Package-Manager: Portage-2.3.48, Repoman-2.3.10 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-games/ogre/Manifest| 1 + .../files/ogre-2.1-enhance_config_loading.patch| 29 dev-games/ogre/files/ogre-2.1-media_path.patch | 28 dev-games/ogre/files/ogre-2.1-resource_path.patch | 18 +++ dev-games/ogre/files/ogre-2.1-samples.patch| 26 dev-games/ogre/metadata.xml| 8 ++ dev-games/ogre/ogre-2.1_pre20180901.ebuild | 153 + 7 files changed, 263 insertions(+) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 8b173e90d4f..1b26aeec681 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,3 +1,4 @@ DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 DIST ogre-1.11.2.zip 127409383 BLAKE2B 7493892f434847ea4afda580868b2a8572d65c9ea9de3709aacd789229531803450dbd78994ff0fae29a9435912a80029edba51db035c7a175c860ce07912968 SHA512 dc6a7e14ee515d5a5c218aa3f31cefc8ad95a175604fb5fb252185220c6fd537f7094d3a1086d5eb5e9515f8c528c7f6e2ccc95594ef9882204c666b87fae4e2 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde +DIST ogre-2.1_pre20180901.tar.bz2 152746767 BLAKE2B 758d31fca2e5e31080c688ba758948fb5998a8fe49b9052f79de6791786501d02d7079e8f55ed37dc1a93f360af1003d2a28a260ba687c60c75a1340b95232a7 SHA512 c3cb5630a35e0ddf8c688a972ab5f2821d62545b4febc013235157eaf5268b3ceac1b94c403d0298131991f3d80d1c9b3800212a49647c652ba02bd176f6cc04 diff --git a/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch new file mode 100644 index 000..365aa7c69d6 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch @@ -0,0 +1,29 @@ +--- a/OgreMain/src/OgreConfigFile.cpp 2018-07-27 07:52:31.121337386 +0200 b/OgreMain/src/OgreConfigFile.cpp 2018-07-27 07:59:51.301317661 +0200 +@@ -62,8 +62,25 @@ + //--- + void ConfigFile::load(const String& filename, const String& separators, bool trimWhitespace) + { +-loadDirect(filename, separators, trimWhitespace); ++// Try automatic loading first ++try { ++loadDirect(filename, separators, trimWhitespace); ++} catch (Exception ) { ++// Try /etc/OGRE/ next ++try { ++loadDirect("/etc/OGRE/" + filename, separators, trimWhitespace); ++return; ++} catch (...) { /* was just a test */ } ++// Try /usr/share/OGRE/ last ++try { ++loadDirect("/usr/share/OGRE/" + filename, separators, trimWhitespace); ++return; ++} catch (...) { /* was just a test */ } ++/* dammit... */ ++throw e; ++} + } ++ + //--- + void ConfigFile::load(const String& filename, const String& resourceGroup, + const String& separators, bool trimWhitespace) diff --git a/dev-games/ogre/files/ogre-2.1-media_path.patch b/dev-games/ogre/files/ogre-2.1-media_path.patch new file mode 100644 index 000..5e7ad276ac0 --- /dev/null +++ b/dev-games/ogre/files/ogre-2.1-media_path.patch @@ -0,0 +1,28 @@ +--- a/CMake/InstallResources.cmake 2018-03-23 10:49:24.620486243 +0100
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 220665f8a33f57b0c3c00301c120c5e248661e9a Author: Sven Eden gmx net> AuthorDate: Mon Aug 6 06:13:01 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 7 11:22:50 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220665f8 dev-games/ogre: drop obsolete 1.10.11 dev-games/ogre/Manifest| 1 - ...ogre-1.10.11-fix_double_precision-88f0d5b.patch | 29 -- dev-games/ogre/ogre-1.10.11.ebuild | 116 - 3 files changed, 146 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index fa7ffd7cf96..93a14df137a 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,3 +1,2 @@ -DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54 DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch deleted file mode 100644 index 53d7a0925d5..000 --- a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User niparx -# Date 1515160111 -7200 -# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159 -# Parent bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c -[OGRE-592] RTShaderSystem compile error when using double precision (#622) - -RTShaderSystem: compile error when using double precision - -https://ogre3d.atlassian.net/browse/OGRE-592 - -diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp -+++ b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp -@@ -654,8 +654,12 @@ - curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN); - } - else --{ -- curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN); -+{ -+ curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r, -+ (Real)colourValue.g, -+ (Real)colourValue.b, -+ (Real)colourValue.a)), -+ Operand::OPS_IN); - } - - curFuncInvocation->pushOperand(arg, Operand::OPS_OUT); diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild deleted file mode 100644 index 3094851d1f6..000 --- a/dev-games/ogre/ogre-1.10.11.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Object-oriented Graphics Rendering Engine" -HOMEPAGE="https://www.ogre3d.org/; -SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip" - -LICENSE="MIT public-domain" -SLOT="0/1.10.0" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl profile tools" - -REQUIRED_USE="examples? ( ois ) - gles3? ( gles2 ) - gl3plus? ( opengl )" - -RESTRICT="test" #139905 - -RDEPEND=" - dev-libs/boost - dev-libs/zziplib - media-libs/freetype:2 - virtual/glu - virtual/opengl - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXrandr - x11-libs/libXt - cg? ( media-gfx/nvidia-cg-toolkit ) - freeimage? ( media-libs/freeimage ) - gl3plus? ( >=media-libs/mesa-9.2.5 ) - gles2? ( >=media-libs/mesa-9.0.0[gles2] ) - gles3? ( >=media-libs/mesa-10.0.0[gles2] ) - ois? ( dev-games/ois ) - tools? ( dev-libs/tinyxml[stl] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? (
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/ogre/files/
commit: 758ad2b0cd811e2340786b0eb12346872ee2cc4c Author: Sven Eden gmx net> AuthorDate: Mon Aug 6 06:11:24 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 7 11:22:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758ad2b0 dev-games/ogre: 1.10.12 version bump The latest stable release of the Ogre-1.10.x series comes with a largely overhauled ebuild regarding its USE flags and the Ogre configuration. * Either USE flag gles2, opengl or both must be selected now. * Removed gles3 and gl3pus USE flugs, as they are implied now. * USE flag "egl" added to select egl over glx. * Users can now select whether Ogre shall include support for a GL state cache or not. * The behavior of the Ogre resource manager can now be selected. * Added a patch to unbundle TinyXML again. Upstream removed that possibility. Bug: https://bugs.gentoo.org/647266 Package-Manager: Portage-2.3.48, Repoman-2.3.10 dev-games/ogre/Manifest| 1 + .../files/ogre-1.10.12-use_system_tinyxml.patch| 42 +++ dev-games/ogre/metadata.xml| 34 -- dev-games/ogre/ogre-1.10.12.ebuild | 124 + 4 files changed, 192 insertions(+), 9 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 1ecfcfeea79..fa7ffd7cf96 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,2 +1,3 @@ DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54 +DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde diff --git a/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch b/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch new file mode 100644 index 000..ef15931940d --- /dev/null +++ b/dev-games/ogre/files/ogre-1.10.12-use_system_tinyxml.patch @@ -0,0 +1,42 @@ +--- a/CMake/Dependencies.cmake 2018-09-04 07:50:49.091120793 +0200 b/CMake/Dependencies.cmake 2018-09-04 07:51:55.429118519 +0200 +@@ -383,6 +383,10 @@ + find_package(Softimage) + macro_log_feature(Softimage_FOUND "Softimage" "Softimage SDK needed for building XSIExporter" FALSE "6.0" "") + ++# Find TinyXML ++find_package(TinyXML) ++macro_log_feature(TINYXML_FOUND "TinyXML" "TinyXML needed for building OgreXMLConverter" FALSE "" "") ++ + ### + # Tests + ### +--- /dev/null 2018-09-03 08:18:52.571907158 +0200 b/CMake/Packages/FindTinyXML.cmake 2018-09-04 19:15:06.392129319 +0200 +@@ -0,0 +1,26 @@ ++# - Find TinyXML ++# Find the native TinyXML includes and library ++# ++# TINYXML_FOUND - True if TinyXML found. ++# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc. ++# TINYXML_LIBRARIES - List of libraries when using TinyXML. ++# ++ ++IF( TINYXML_INCLUDE_DIR ) ++# Already in cache, be silent ++SET( TinyXML_FIND_QUIETLY TRUE ) ++ENDIF( TINYXML_INCLUDE_DIR ) ++ ++FIND_PATH( TINYXML_INCLUDE_DIR "tinyxml.h" ++ PATH_SUFFIXES "tinyxml" ) ++ ++FIND_LIBRARY( TINYXML_LIBRARIES ++ NAMES "tinyxml" ++ PATH_SUFFIXES "tinyxml" ) ++ ++# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if ++# all listed variables are TRUE ++INCLUDE( "FindPackageHandleStandardArgs" ) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARIES ) ++ ++MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARIES ) diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml index 42d8eb1e79b..9e726e9a8d3 100644 --- a/dev-games/ogre/metadata.xml +++ b/dev-games/ogre/metadata.xml @@ -77,18 +77,34 @@ Exporters * Maya (meshes) -enable boost support +Enable boost support +Enable GL state cache support NVIDIA toolkit plugin -more precise calculations at the expense of speed -support images via freeimage +More precise calculations at the expense of speed +Use egl instead of glx +Build experimental BETA components 'Bites' and 'HLMS' +Support images via media-libs/freeimage Build OpenGL
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 56eb120ed955d25b33a0045145f55ca7ce8cab56 Author: Sven Eden gmx net> AuthorDate: Wed Apr 25 05:58:45 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 17 18:44:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56eb120e dev-games/ogre: Add ebuild for the latest release v1.10.11 This is the latest stable release of Ogre3D, released on 2017-12-31. Bug: https://bugs.gentoo.org/647266 Tested-by: Sven Eden yamakuzure gmx.net Package-Manager: Portage-2.3.28, Repoman-2.3.9 dev-games/ogre/Manifest| 1 + ...ogre-1.10.11-fix_double_precision-88f0d5b.patch | 29 ++ dev-games/ogre/files/ogre-1.10.11-media_path.patch | 18 .../ogre/files/ogre-1.10.11-resource_path.patch| 18 dev-games/ogre/files/ogre-1.10.11-samples.patch| 13 +++ dev-games/ogre/ogre-1.10.11.ebuild | 115 + 6 files changed, 194 insertions(+) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index f1c372e1438..1ecfcfeea79 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1 +1,2 @@ +DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch new file mode 100644 index 000..53d7a0925d5 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch @@ -0,0 +1,29 @@ +# HG changeset patch +# User niparx +# Date 1515160111 -7200 +# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159 +# Parent bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c +[OGRE-592] RTShaderSystem compile error when using double precision (#622) + +RTShaderSystem: compile error when using double precision + +https://ogre3d.atlassian.net/browse/OGRE-592 + +diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp +--- a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp +@@ -654,8 +654,12 @@ + curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN); + } + else +-{ +- curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN); ++{ ++ curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r, ++ (Real)colourValue.g, ++ (Real)colourValue.b, ++ (Real)colourValue.a)), ++ Operand::OPS_IN); + } + + curFuncInvocation->pushOperand(arg, Operand::OPS_OUT); diff --git a/dev-games/ogre/files/ogre-1.10.11-media_path.patch b/dev-games/ogre/files/ogre-1.10.11-media_path.patch new file mode 100644 index 000..4d2547ab75a --- /dev/null +++ b/dev-games/ogre/files/ogre-1.10.11-media_path.patch @@ -0,0 +1,18 @@ +--- a/CMake/InstallResources.cmake 2014-10-29 12:43:49.0 +0100 b/CMake/InstallResources.cmake 2014-10-29 12:46:10.017611431 +0100 +@@ -165,10 +165,11 @@ + + # CREATE CONFIG FILES - BUILD DIR VERSIONS + if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE)) +- set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") +- set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") +- set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") +- set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media") ++# No, they were fine already ++# set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media") ++# set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media") ++# set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media") ++# set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_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.10.11-resource_path.patch b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch new file mode 100644 index
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: ceb58944b986a6442c9b09e2f92d5ff6342c4188 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 17 18:26:50 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 17 18:44:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb58944 dev-games/ogre: Sort DEPENDs Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-games/ogre/ogre-1.10.11.ebuild | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild index 950be9db539..47a4496f939 100644 --- a/dev-games/ogre/ogre-1.10.11.ebuild +++ b/dev-games/ogre/ogre-1.10.11.ebuild @@ -22,26 +22,27 @@ REQUIRED_USE="examples? ( ois ) RESTRICT="test" #139905 RDEPEND=" - cg? ( media-gfx/nvidia-cg-toolkit ) dev-libs/boost dev-libs/zziplib - freeimage? ( media-libs/freeimage ) - gl3plus? ( >=media-libs/mesa-9.2.5 ) - gles2? ( >=media-libs/mesa-9.0.0[gles2] ) - gles3? ( >=media-libs/mesa-10.0.0[gles2] ) media-libs/freetype:2 - ois? ( dev-games/ois ) - tools? ( dev-libs/tinyxml[stl] ) virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr - x11-libs/libXt" + x11-libs/libXt + cg? ( media-gfx/nvidia-cg-toolkit ) + freeimage? ( media-libs/freeimage ) + gl3plus? ( >=media-libs/mesa-9.2.5 ) + gles2? ( >=media-libs/mesa-9.0.0[gles2] ) + gles3? ( >=media-libs/mesa-10.0.0[gles2] ) + ois? ( dev-games/ois ) + tools? ( dev-libs/tinyxml[stl] )" DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) virtual/pkgconfig - x11-base/xorg-proto" + x11-base/xorg-proto + doc? ( app-doc/doxygen )" + PATCHES=( "${FILESDIR}/${P}-samples.patch" "${FILESDIR}/${P}-resource_path.patch"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 9ae5559f0662ebc9862342caf475388b4e07a83b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 17 18:27:42 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 17 18:44:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae5559f dev-games/ogre: Drop unused eclasses Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-games/ogre/ogre-1.10.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild index 47a4496f939..3094851d1f6 100644 --- a/dev-games/ogre/ogre-1.10.11.ebuild +++ b/dev-games/ogre/ogre-1.10.11.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit eutils cmake-utils vcs-snapshot +inherit cmake-utils DESCRIPTION="Object-oriented Graphics Rendering Engine" HOMEPAGE="https://www.ogre3d.org/;
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/, dev-games/openscenegraph/, dev-games/clanlib/, ...
commit: bc5f95c4b692be4f0f1584b3f0882154462a8546 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Apr 30 19:28:55 2018 + Commit: Matt Turner gentoo org> CommitDate: Mon Apr 30 20:50:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5f95c4 dev-games/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). dev-games/clanlib/clanlib-0.8.1.ebuild | 4 ++-- dev-games/irrlicht/irrlicht-1.8.4.ebuild | 5 ++--- dev-games/ogre/ogre-1.9.0-r1.ebuild | 2 +- dev-games/openscenegraph/openscenegraph-3.5.5.ebuild | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild index dbd437a41db..32096e028f5 100644 --- a/dev-games/clanlib/clanlib-0.8.1.ebuild +++ b/dev-games/clanlib/clanlib-0.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -30,7 +30,7 @@ RDEPEND="media-libs/libpng:0 mikmod? ( media-libs/libmikmod ) vorbis? ( media-libs/libvorbis )" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" S=${WORKDIR}/ClanLib-${PV} diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild index 185d6517ccc..e843c52e456 100644 --- a/dev-games/irrlicht/irrlicht-1.8.4.ebuild +++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,8 +23,7 @@ RDEPEND="virtual/jpeg:0 x11-libs/libXxf86vm" DEPEND="${RDEPEND} app-arch/unzip - x11-proto/xproto - x11-proto/xf86vidmodeproto" + x11-base/xorg-proto" S=${WORKDIR}/${P}/source/${PN^} diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 5714d1a67a4..dd3d2ee065a 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -51,8 +51,8 @@ RDEPEND=" tools? ( dev-libs/tinyxml[stl] ) zip? ( sys-libs/zlib dev-libs/zziplib )" DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto virtual/pkgconfig + x11-base/xorg-proto doc? ( app-doc/doxygen )" PATCHES=( diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index fa98c6bb2e3..7b066c0abf2 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild @@ -74,9 +74,8 @@ RDEPEND=" DEPEND="${RDEPEND} app-arch/unzip virtual/pkgconfig - x11-proto/xextproto + x11-base/xorg-proto doc? ( app-doc/doxygen ) - xrandr? ( x11-proto/randrproto ) " S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 9faa216ae2d2ff3a7c9271fa1d20f9f6a830079a Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Apr 15 08:29:57 2018 + Commit: David Seifert gentoo org> CommitDate: Sun Apr 15 11:32:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9faa216a dev-games/ogre: use HTTPS Closes: https://github.com/gentoo/gentoo/pull/8011 dev-games/ogre/ogre-1.9.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 85c350c407d..5714d1a67a4 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" inherit eutils cmake-utils vcs-snapshot DESCRIPTION="Object-oriented Graphics Rendering Engine" -HOMEPAGE="http://www.ogre3d.org/; +HOMEPAGE="https://www.ogre3d.org/; SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> ${P}.tar.bz2" LICENSE="MIT public-domain"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 10d3073fdc5b00f01753bad082aee312c63c26ff Author: Michał Górny gentoo org> AuthorDate: Sat Aug 19 18:00:12 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Aug 19 18:07:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d3073f dev-games/ogre: Fix typo in REQUIRED_USE dev-games/ogre/ogre-1.9.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 6e4e520a324..812a8bd94ce 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) examples? ( ois ) poco? ( threads ) tbb? ( threads ) - gl3plus ( !gles2 !gles3 ) + gl3plus? ( !gles2 !gles3 ) gles3? ( gles2 ) gl3plus? ( opengl )"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 46390e0bed7911c493e5da6b915eee55efac6e5b Author: Michał Górny gentoo org> AuthorDate: Fri Aug 11 16:19:16 2017 + Commit: Michał Górny gentoo org> CommitDate: Fri Aug 11 16:25:18 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46390e0b dev-games/ogre: Fix unreadable REQUIRED_USE, #620912 dev-games/ogre/ogre-1.9.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 499aef500a0..6e4e520a324 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) examples? ( ois ) poco? ( threads ) tbb? ( threads ) - ?? ( gl3plus ( || ( gles2 gles3 ) ) ) + gl3plus ( !gles2 !gles3 ) gles3? ( gles2 ) gl3plus? ( opengl )"
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/
commit: 72ff175342b7b6356d8c7fefacfd85496ecc8580 Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 29 17:33:00 2016 + Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 29 17:37:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ff1753 dev-games/ogre: Added sub-slot dependency for dev-libs/boost. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-games/ogre/ogre-1.9.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 7488f4b..7936ffd 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -38,7 +38,7 @@ RDEPEND=" x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt - boost? ( dev-libs/boost ) + boost? ( dev-libs/boost:= ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) gles2? ( >=media-libs/mesa-9.0.0[gles2] )
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 815056e5460579b8c5723257d53a1114430b9e66 Author: Michael Sterrett gentoo org> AuthorDate: Fri Jan 22 07:18:54 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Fri Jan 22 07:19:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815056e5 dev-games/ogre: fix building when OIS is not installed, with newer versions of cmake (bug #566126) Package-Manager: portage-2.2.26 dev-games/ogre/files/ogre-1.9.0-samples.patch | 13 + dev-games/ogre/ogre-1.9.0-r1.ebuild | 10 ++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dev-games/ogre/files/ogre-1.9.0-samples.patch b/dev-games/ogre/files/ogre-1.9.0-samples.patch new file mode 100644 index 000..d7573d7 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig CMakeLists.txt +@@ -519,7 +519,9 @@ + endif () + + # Setup samples +-add_subdirectory(Samples) ++if (OGRE_BUILD_SAMPLES) ++add_subdirectory(Samples) ++endif () + + #Add android JNI binding + if(ANDROID) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 9b79034..7488f4b 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 CMAKE_REMOVE_MODULES="yes" -CMAKE_REMOVE_MODULES_LIST="FindFreetype" +CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" inherit eutils cmake-utils vcs-snapshot @@ -21,6 +21,7 @@ KEYWORDS="amd64 ~arm x86" IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip" REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) + examples? ( ois ) poco? ( threads ) tbb? ( threads ) ?? ( gl3plus ( || ( gles2 gles3 ) ) ) @@ -71,7 +72,8 @@ src_prepare() { epatch \ "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \ "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" \ - "${FILESDIR}/${P}-gcc52.patch" + "${FILESDIR}/${P}-gcc52.patch" \ + "${FILESDIR}/${P}-samples.patch" } src_configure() { @@ -81,7 +83,6 @@ src_configure() { $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG) $(cmake-utils_use doc OGRE_INSTALL_DOCS) $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE) $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL) $(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS) @@ -90,9 +91,10 @@ src_configure() { $(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT) $(cmake-utils_use profile OGRE_PROFILING) $(cmake-utils_use examples OGRE_BUILD_SAMPLES) + $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) $(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE) -DOGRE_BUILD_TESTS=FALSE - $(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0") + -DOGRE_CONFIG_THREADS=$(usex threads 2 0) $(cmake-utils_use tools OGRE_BUILD_TOOLS) $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP) )
[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
commit: 7442516a9e82c154de48ff3812fa58d5f632217e Author: Michael Sterrett gentoo org> AuthorDate: Thu Sep 3 18:25:21 2015 + Commit: Michael Sterrett gentoo org> CommitDate: Thu Sep 3 18:25:35 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7442516a fix building with gcc52 with patch from Sven Eden via bug #559472 Package-Manager: portage-2.2.20.1 dev-games/ogre/files/ogre-1.9.0-gcc52.patch| 63 ++ .../ogre-1.9.0-remove_media_path_to_bindir.patch | 4 +- ...ogre-1.9.0-remove_resource_path_to_bindir.patch | 4 +- dev-games/ogre/ogre-1.9.0-r1.ebuild| 6 ++- 4 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dev-games/ogre/files/ogre-1.9.0-gcc52.patch b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch new file mode 100644 index 000..030368d --- /dev/null +++ b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch @@ -0,0 +1,63 @@ +--- a/OgreMain/include/OgreProgressiveMeshGenerator.h b/OgreMain/include/OgreProgressiveMeshGenerator.h +@@ -215,7 +215,40 @@ + void tuneContainerSize(); + void addVertexData(VertexData* vertexData, bool useSharedVertexLookup); + template +- void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, VertexLookupList& lookup, unsigned short submeshID); ++ void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, VertexLookupList& lookup, unsigned short submeshID) ++ { ++ ++ // Loop through all triangles and connect them to the vertices. ++ for (; iPos < iEnd; iPos += 3) { ++ // It should never reallocate or every pointer will be invalid. ++ OgreAssert(mTriangleList.capacity() > mTriangleList.size(), ""); ++ mTriangleList.push_back(PMTriangle()); ++ PMTriangle* tri = (); ++ tri->isRemoved = false; ++ tri->submeshID = submeshID; ++ for (int i = 0; i < 3; i++) { ++ // Invalid index: Index is bigger then vertex buffer size. ++ OgreAssert(iPos[i] < lookup.size(), ""); ++ tri->vertexID[i] = iPos[i]; ++ tri->vertex[i] = lookup[iPos[i]]; ++ } ++ if (tri->isMalformed()) { ++#if OGRE_DEBUG_MODE ++ stringstream str; ++ str << "In " << mMeshName << " malformed triangle found with ID: " << getTriangleID(tri) << ". " << ++ std::endl; ++ printTriangle(tri, str); ++ str << "It will be excluded from LOD level calculations."; ++ LogManager::getSingleton().stream() << str.str(); ++#endif ++ tri->isRemoved = true; ++ mIndexBufferInfoList[tri->submeshID].indexCount -= 3; ++ continue; ++ } ++ tri->computeNormal(); ++ addTriangleToEdges(tri); ++ } ++ } + void addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID); + + void computeCosts(); +--- a/OgreMain/src/OgreProgressiveMeshGenerator.cpp b/OgreMain/src/OgreProgressiveMeshGenerator.cpp +@@ -219,6 +219,8 @@ + } + vbuf->unlock(); + } ++/// Called from OgreQueuedProgressiveMeshGenerator.cpp, so it can not be defined in here. ++#if 0 + template + void ProgressiveMeshGenerator::addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, + VertexLookupList& lookup, +@@ -256,6 +258,7 @@ + addTriangleToEdges(tri); + } + } ++#endif // 0 + + void ProgressiveMeshGenerator::addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID) + { diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch index 9af7685..bb2ca55 100644 --- a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch +++ b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch @@ -1,5 +1,5 @@ a/CMake/InstallResources.cmake 2014-10-29 12:43:49.0 +0100 -+++ b/CMake/InstallResources.cmake 2014-10-29 12:46:10.017611431 +0100 +--- a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake @@ -178,10 +178,6 @@ # CREATE CONFIG FILES - BUILD DIR VERSIONS diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch index d737628..a26aa3f 100644 --- a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch +++ b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch @@