* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2015-09-03 18:25 Michael Sterrett
0 siblings, 0 replies; 9+ messages in thread
From: Michael Sterrett @ 2015-09-03 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 7442516a9e82c154de48ff3812fa58d5f632217e
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 18:25:21 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 18:25:35 2015 +0000
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 0000000..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<typename IndexType>
+- 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 = &mTriangleList.back();
++ 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<typename IndexType>
+ 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.000000000 +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
@@ -1,5 +1,5 @@
---- a/CMake/InstallResources.cmake 2013-12-01 18:28:12.000000000 +0100
-+++ b/CMake/InstallResources.cmake 2014-10-29 12:38:29.963602465 +0100
+--- a/CMake/InstallResources.cmake
++++ b/CMake/InstallResources.cmake
@@ -201,11 +201,6 @@
set(OGRE_PLUGIN_DIR_DBG "")
set(OGRE_SAMPLES_DIR_REL "")
diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild
index 059d63e..9b79034 100644
--- a/dev-games/ogre/ogre-1.9.0-r1.ebuild
+++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild
@@ -68,8 +68,10 @@ src_prepare() {
rm -f Tools/XMLConverter/{include,src}/tiny*.*
# Fix some path issues
- epatch "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
- "${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
+ epatch \
+ "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
+ "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" \
+ "${FILESDIR}/${P}-gcc52.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2016-01-22 7:20 Michael Sterrett
0 siblings, 0 replies; 9+ messages in thread
From: Michael Sterrett @ 2016-01-22 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 815056e5460579b8c5723257d53a1114430b9e66
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 07:18:54 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 07:19:14 2016 +0000
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 0000000..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)
)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2018-06-17 18:44 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-06-17 18:44 UTC (permalink / raw
To: gentoo-commits
commit: 56eb120ed955d25b33a0045145f55ca7ce8cab56
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed Apr 25 05:58:45 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 18:44:25 2018 +0000
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 <AT> 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 00000000000..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 <koliap@gmail.com>
+# 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 00000000000..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.000000000 +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 00000000000..9c39dfc0762
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-resource_path.patch
@@ -0,0 +1,18 @@
+--- a/CMake/InstallResources.cmake 2013-12-01 18:28:12.000000000 +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 "${OGRE_BINARY_DIR}/lib")
++# set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
++# set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+ endif ()
+
+ if (MSVC AND NOT NMAKE)
diff --git a/dev-games/ogre/files/ogre-1.10.11-samples.patch b/dev-games/ogre/files/ogre-1.10.11-samples.patch
new file mode 100644
index 00000000000..80b989e980c
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.10.11-samples.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -536,7 +536,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.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild
new file mode 100644
index 00000000000..950be9db539
--- /dev/null
+++ b/dev-games/ogre/ogre-1.10.11.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils vcs-snapshot
+
+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="
+ 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"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig
+ x11-base/xorg-proto"
+PATCHES=(
+ "${FILESDIR}/${P}-samples.patch"
+ "${FILESDIR}/${P}-resource_path.patch"
+ "${FILESDIR}/${P}-media_path.patch"
+ "${FILESDIR}/${P}-fix_double_precision-88f0d5b.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
+ # Update for 1.10.11: Unfortunately the build system does not
+ # search for a system wide tinyxml at this moment. However,
+ # TinyXML is meant to be built into and not linked to a using
+ # project anyway.
+ # rm -f Tools/XMLConverter/{include,src}/tiny*.*
+
+ # Fix some path issues
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DOGRE_BUILD_COMPONENT_JAVA=NO
+ -DOGRE_BUILD_COMPONENT_PYTHON=NO
+ -DOGRE_BUILD_DEPENDENCIES=NO
+ -DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+ -DOGRE_BUILD_SAMPLES=$(usex examples)
+ -DOGRE_BUILD_TESTS=FALSE
+ -DOGRE_BUILD_TOOLS=$(usex tools)
+ -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+ -DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
+ -DOGRE_CONFIG_THREADS=3
+ -DOGRE_CONFIG_THREAD_PROVIDER=std
+ -DOGRE_FULL_RPATH=NO
+ -DOGRE_INSTALL_DOCS=$(usex doc)
+ -DOGRE_INSTALL_SAMPLES=$(usex examples)
+ -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
+ -DOGRE_NODE_STORAGE_LEGACY=NO
+ -DOGRE_PROFILING=$(usex profile)
+ -DOGRE_RESOURCEMANAGER_STRICT=strict
+ -DOGRE_USE_STD11=YES
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ CONFIGDIR=/etc/OGRE
+ SHAREDIR=/usr/share/OGRE
+
+ # plugins and resources are the main configuration
+ insinto "${CONFIGDIR}"
+ doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
+ doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+ dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+ dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+ # These are only for the sample browser
+ insinto "${SHAREDIR}"
+ doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
+ doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2018-09-07 11:42 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-09-07 11:42 UTC (permalink / raw
To: gentoo-commits
commit: 220665f8a33f57b0c3c00301c120c5e248661e9a
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Mon Aug 6 06:13:01 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 7 11:22:50 2018 +0000
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..00000000000
--- 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 <koliap@gmail.com>
-# 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..00000000000
--- 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? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${P}-samples.patch"
- "${FILESDIR}/${P}-resource_path.patch"
- "${FILESDIR}/${P}-media_path.patch"
- "${FILESDIR}/${P}-fix_double_precision-88f0d5b.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
- # Update for 1.10.11: Unfortunately the build system does not
- # search for a system wide tinyxml at this moment. However,
- # TinyXML is meant to be built into and not linked to a using
- # project anyway.
- # rm -f Tools/XMLConverter/{include,src}/tiny*.*
-
- # Fix some path issues
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DOGRE_BUILD_COMPONENT_JAVA=NO
- -DOGRE_BUILD_COMPONENT_PYTHON=NO
- -DOGRE_BUILD_DEPENDENCIES=NO
- -DOGRE_BUILD_PLUGIN_CG=$(usex cg)
- -DOGRE_BUILD_SAMPLES=$(usex examples)
- -DOGRE_BUILD_TESTS=FALSE
- -DOGRE_BUILD_TOOLS=$(usex tools)
- -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
- -DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
- -DOGRE_CONFIG_THREADS=3
- -DOGRE_CONFIG_THREAD_PROVIDER=std
- -DOGRE_FULL_RPATH=NO
- -DOGRE_INSTALL_DOCS=$(usex doc)
- -DOGRE_INSTALL_SAMPLES=$(usex examples)
- -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
- -DOGRE_NODE_STORAGE_LEGACY=NO
- -DOGRE_PROFILING=$(usex profile)
- -DOGRE_RESOURCEMANAGER_STRICT=strict
- -DOGRE_USE_STD11=YES
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- CONFIGDIR=/etc/OGRE
- SHAREDIR=/usr/share/OGRE
-
- # plugins and resources are the main configuration
- insinto "${CONFIGDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
- dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
- dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
-
- # These are only for the sample browser
- insinto "${SHAREDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2020-01-07 22:58 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2020-01-07 22:58 UTC (permalink / raw
To: gentoo-commits
commit: f5337cdf544c153250ab4602f297a390a4b0ca29
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Sun Nov 10 15:43:00 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 22:58:02 2020 +0000
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 <sven.eden <AT> gmx.de>
Signed-off-by: James Le Cuirot <chewi <AT> 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 b/dev-games/ogre/ogre-2.1_pre20191212.ebuild
similarity index 70%
rename from dev-games/ogre/ogre-2.1_pre20180901.ebuild
rename to dev-games/ogre/ogre-2.1_pre20191212.ebuild
index f7805764e6e..4973a50d793 100644
--- a/dev-games/ogre/ogre-2.1_pre20180901.ebuild
+++ b/dev-games/ogre/ogre-2.1_pre20191212.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-inherit cmake-utils
-MY_COMMIT="35b083cba64a"
-MY_P="sinbad-${PN}-${MY_COMMIT}"
+inherit cmake flag-o-matic git-r3
DESCRIPTION="Object-oriented Graphics Rendering Engine"
HOMEPAGE="https://www.ogre3d.org/"
-SRC_URI="https://bitbucket.org/sinbad/ogre/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+
+EGIT_BRANCH="v2-1"
+EGIT_COMMIT="5b682fb90c9e8e660e2fbf92bbf7797a9246700d"
+EGIT_REPO_URI="https://github.com/OGRECave/ogre-next.git"
+EGIT_SUBMODULES=()
LICENSE="MIT public-domain"
SLOT="0/2.1"
KEYWORDS="~amd64"
-IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations
- mobile +opengl profile tools"
+IUSE="+cache debug doc egl examples +freeimage gles2 json
+ legacy-animations mobile +opengl profile tools"
# USE flags that do not work, as their options aren't ported, yet.
-# cg
-# double-precision
+# cg
+# double-precision
REQUIRED_USE="
|| ( gles2 opengl )
@@ -51,6 +52,7 @@ RDEPEND="
"
# Dependencies for USE flags that do not work, yet.
# cg? ( media-gfx/nvidia-cg-toolkit )
+
DEPEND="${RDEPEND}
virtual/pkgconfig
x11-base/xorg-proto
@@ -63,8 +65,6 @@ PATCHES=(
"${FILESDIR}/${PN}-2.1-enhance_config_loading.patch"
)
-S=${WORKDIR}/${MY_P}
-
src_prepare() {
sed -i \
-e "s:share/OGRE/docs:share/doc/${PF}:" \
@@ -75,7 +75,7 @@ src_prepare() {
CMake/Utils/OgreConfigTargets.cmake || die
# Fix some path issues
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -86,18 +86,22 @@ src_configure() {
-DOGRE_BUILD_COMPONENT_HLMS_UNLIT_MOBILE=$(usex mobile)
-DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=yes
-DOGRE_BUILD_COMPONENT_SCENE_FORMAT=yes
+ -DOGRE_BUILD_PLATFORM_NACL=no
-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
-DOGRE_BUILD_RENDERSYSTEM_GLES=no
-DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
-DOGRE_BUILD_SAMPLES2=$(usex examples)
-DOGRE_BUILD_TESTS=no
-DOGRE_BUILD_TOOLS=$(usex tools)
+ -DOGRE_CONFIG_ALLOCATOR=$(usex debug 5 1)
+ -DOGRE_CONFIG_ENABLE_FINE_LIGHT_MASK_GRANULARITY=yes
-DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
-DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
-DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(\
usex gles2 $(\
usex mobile no yes) no)
-DOGRE_CONFIG_ENABLE_JSON=$(usex json)
+ -DOGRE_CONFIG_MEMTRACK_DEBUG=$(usex debug)
-DOGRE_CONFIG_THREADS=2
-DOGRE_CONFIG_THREAD_PROVIDER=std
-DOGRE_FULL_RPATH=no
@@ -108,10 +112,16 @@ src_configure() {
-DOGRE_PROFILING_PROVIDER=$(usex profile none internal)
-DOGRE_USE_BOOST=no
)
- # Options that aren't ported, yet:
- # -DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+
+ # The double-precision mode can not be enabled, yet.
# -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+ # The CgFxScriptLoader doesn't seem to be completely ported, yet.
+ # USE flag disabled.
+ mycmakeargs+=(
+ -DOGRE_BUILD_PLUGIN_CG=no
+ )
+
# These components are off by default, as they might not be ported, yet.
# When advancing to a newer commit, try whether any of the disabled
# components can be activated now.
@@ -125,21 +135,32 @@ src_configure() {
-DOGRE_BUILD_COMPONENT_VOLUME=no
)
- cmake-utils_src_configure
+ # Take out the warning about deprecated copy, as Ogre emits thousands of
+ # those. But using a deprecated way of doing things isn't an error and
+ # mainly of interest for developers.
+ # (The warning is part of -Wextra and only effects C++ compilation.)
+ append-cxxflags $(test-flags-CXX -Wno-deprecated-copy)
+
+ # The same with the old ways of using memset(0...) on objects. It is
+ # no longer assumed to be a good idea, but a warning about it isn't
+ # of any value to the user. (And it happens many times in Ogre.)
+ append-cxxflags $(test-flags-CXX -Wno-class-memaccess)
+
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
CONFIGDIR=/etc/OGRE
SHAREDIR=/usr/share/OGRE
# plugins and resources are the main configuration
insinto "${CONFIGDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/plugins_tools.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/resources2.cfg
+ doins "${BUILD_DIR}"/bin/plugins.cfg
+ doins "${BUILD_DIR}"/bin/plugins_tools.cfg
+ doins "${BUILD_DIR}"/bin/resources.cfg
+ doins "${BUILD_DIR}"/bin/resources2.cfg
dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
dosym "${CONFIGDIR}"/plugins_tools.cfg "${SHAREDIR}"/plugins_tools.cfg
dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
@@ -148,6 +169,6 @@ src_install() {
# These are only for the Samples
if use examples ; then
insinto "${SHAREDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+ doins "${BUILD_DIR}"/bin/samples.cfg
fi
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2020-01-07 22:58 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2020-01-07 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 60fd22922ec02d9a74c22c6cb6dad58c79092dae
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed Nov 6 23:12:03 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 22:57:59 2020 +0000
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 <sven.eden <AT> gmx.de>
Signed-off-by: James Le Cuirot <chewi <AT> 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 00000000000..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 00000000000..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 2019-11-06 08:09:15.185821495 +0100
++++ b/CMake/InstallResources.cmake 2019-11-06 08:10:41.169819050 +0100
+@@ -145,9 +145,6 @@
+
+ # CREATE CONFIG FILES - BUILD DIR VERSIONS
+ if (NOT (APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
+- set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media")
+- set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media")
+- set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media")
+ else ()
+ # iOS needs to use relative paths in the config files
+ set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.12.4-resource_path.patch b/dev-games/ogre/files/ogre-1.12.4-resource_path.patch
new file mode 100644
index 00000000000..cf35e2f99e8
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.12.4-resource_path.patch
@@ -0,0 +1,13 @@
+These was already configured above, the BINARY paths are wrong!
+
+--- a/CMake/InstallResources.cmake 2019-11-06 08:12:01.271816772 +0100
++++ b/CMake/InstallResources.cmake 2019-11-06 08:13:15.623814658 +0100
+@@ -163,8 +163,6 @@
+ set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/")
+ set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/")
+ elseif (UNIX)
+- set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+- set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+ endif ()
+
+ if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 841aaefd7dc..4c31c236ea0 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>yamakuzure@gmx.net</email>
+ <name>Sven Eden</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<maintainer type="project">
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
@@ -109,7 +117,7 @@ Exporters
sensitive lookup. Some demos might not work with this setting.
(default: case-insensitive + sensitive lookup in all groups)
</flag>
- <flag name="resman-strict">
+ <flag name="resman-strict" restrict="<dev-games/ogre-1.12">
Resource Manager STRICT : search in default group if not specified otherwise.
Case sensitive lookup. Some demos might not work with this setting.
(default: case-insensitive + sensitive lookup in all groups)
@@ -119,5 +127,7 @@ Exporters
</use>
<upstream>
<remote-id type="bitbucket">sinbad/ogre</remote-id>
+ <remote-id type="github">OGRECave/ogre</remote-id>
+ <remote-id type="github">OGRECave/ogre-next</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-games/ogre/ogre-1.10.12.ebuild b/dev-games/ogre/ogre-1.10.12.ebuild
index 34a0952245b..91e3b9f49d5 100644
--- a/dev-games/ogre/ogre-1.10.12.ebuild
+++ b/dev-games/ogre/ogre-1.10.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
diff --git a/dev-games/ogre/ogre-1.11.2.ebuild b/dev-games/ogre/ogre-1.11.2.ebuild
index e3f452d99e9..0de0b6eb487 100644
--- a/dev-games/ogre/ogre-1.11.2.ebuild
+++ b/dev-games/ogre/ogre-1.11.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
LICENSE="MIT public-domain"
SLOT="0/1.11"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools"
diff --git a/dev-games/ogre/ogre-1.11.2.ebuild b/dev-games/ogre/ogre-1.12.4.ebuild
similarity index 56%
copy from dev-games/ogre/ogre-1.11.2.ebuild
copy to dev-games/ogre/ogre-1.12.4.ebuild
index e3f452d99e9..7d8c48cadd8 100644
--- a/dev-games/ogre/ogre-1.11.2.ebuild
+++ b/dev-games/ogre/ogre-1.12.4.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-inherit cmake-utils
+inherit cmake
+
+IMGUI_PN="imgui"
+IMGUI_PV="1.74"
+IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
DESCRIPTION="Object-oriented Graphics Rendering Engine"
HOMEPAGE="https://www.ogre3d.org/"
-SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/ocornut/${IMGUI_PN}/archive/v${IMGUI_PV}.tar.gz -> ${IMGUI_P}.tar.gz"
LICENSE="MIT public-domain"
-SLOT="0/1.11"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/1.12"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
- gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools"
+ gles2 json openexr +opengl pch profile resman-pedantic tools"
REQUIRED_USE="
|| ( gles2 opengl )
- ?? ( resman-pedantic resman-strict )
"
RESTRICT="test" #139905
RDEPEND="
dev-games/ois
+ dev-libs/pugixml
dev-libs/zziplib
media-libs/freetype:2
x11-libs/libX11
@@ -51,40 +55,82 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
PATCHES=(
- "${FILESDIR}/${P}-media_path.patch"
- "${FILESDIR}/${P}-resource_path.patch"
- "${FILESDIR}/${P}-fix_sample_source_install.patch"
- "${FILESDIR}/${PN}-1.10.12-use_system_tinyxml.patch"
+ "${FILESDIR}"/${P}-media_path.patch
+ "${FILESDIR}"/${P}-resource_path.patch
+ "${FILESDIR}"/${P}-fix_sample_source_install.patch
+ "${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch
)
+src_unpack() {
+ unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed"
+
+ # Ogre 1.12.3 includes imgui, but as a submodule, it is not included
+ # in the release.
+ cd "${S}"/Components/Overlay/src || die "Unpack incomplete"
+ unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed"
+
+ # Without this 'rm', mv puts imgui-1.73 *into* imgui/ instead of renaming.
+ rm -rf "${IMGUI_PN}" || die "Removing ${IMGUI_PN} failed"
+ mv "${IMGUI_P}" "${IMGUI_PN}" || die "Moving ${IMGUI_P} to ${IMGUI_PN} failed"
+}
+
src_prepare() {
+ local broken_png=(
+ Icon@2x-72.png
+ Default-Portrait~ipad.png
+ Default-Portrait@2x~ipad.png
+ Default-Landscape@2x~ipad.png
+ )
+
sed -i \
- -e "s:share/OGRE/docs:share/doc/${PF}:" \
+ -e "s:share/doc/OGRE:share/doc/${PF}:" \
Docs/CMakeLists.txt || die
# In this series, the CMAKE_BUILD_TARGET is hard-wired to the
# installation. And only Debug, MinSizeRel and RelWithDebInfo
# are supported.
if use debug; then
+ sed -i \
+ -e 's/Debug/Gentoo/g' \
+ CMake/InstallResources.cmake \
+ || die
sed -i \
-e 's/Debug/Gentoo/g' \
CMake/Utils/OgreConfigTargets.cmake \
|| die
else
+ sed -i \
+ -e 's/MinSizeRel/Gentoo/g' \
+ CMake/InstallResources.cmake \
+ || die
sed -i \
-e 's/MinSizeRel/Gentoo/g' \
CMake/Utils/OgreConfigTargets.cmake \
|| die
fi
+
+ # Fix broken png files
+ einfo "Fixing broken png files."
+ pushd "${S}"/Samples/Common/misc 1>/dev/null 2>&1
+ for png in "${broken_png[@]}"; do
+ pngfix -q --out=out.png ${png}
+ mv -f out.png "${png}" || die
+ done
+ popd 1>/dev/null 2>&1
+ einfo "done ..."
+
# Fix some path issues
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_INSTALL_RPATH=yes
-DOGRE_BUILD_COMPONENT_BITES=yes
+ -DOGRE_BUILD_COMPONENT_CSHARP=no
-DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
-DOGRE_BUILD_COMPONENT_JAVA=no
+ -DOGRE_BUILD_COMPONENT_OVERLAY=yes
+ -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes
-DOGRE_BUILD_COMPONENT_PAGING=yes
-DOGRE_BUILD_COMPONENT_PROPERTY=yes
-DOGRE_BUILD_COMPONENT_PYTHON=no
@@ -113,31 +159,44 @@ src_configure() {
-DOGRE_INSTALL_SAMPLES=$(usex examples)
-DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
-DOGRE_PROFILING=$(usex profile)
- -DOGRE_RESOURCEMANAGER_STRICT=$(\
- usex resman-pedantic 1 $(\
- usex resman-strict 2 0))
+ -DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2)
)
- cmake-utils_src_configure
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc ; then
+ eninja -C "${BUILD_DIR}" OgreDoc
+ fi
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
CONFIGDIR=/etc/OGRE
SHAREDIR=/usr/share/OGRE
# plugins and resources are the main configuration
insinto "${CONFIGDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
+ doins "${BUILD_DIR}"/bin/plugins.cfg
+ doins "${BUILD_DIR}"/bin/resources.cfg
dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
# These are only for the sample browser
if use examples ; then
insinto "${SHAREDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
+ doins "${BUILD_DIR}"/bin/quakemap.cfg
+ doins "${BUILD_DIR}"/bin/samples.cfg
fi
}
+
+pkg_postinst() {
+ elog "If you experience crashes when starting /usr/bin/SampleBrowser,"
+ elog "remove the cache directory at:"
+ elog " '~/.cache/OGRE Sample Browser'"
+ elog "first, before filling a bug report."
+}
diff --git a/dev-games/ogre/ogre-2.1_pre20180901.ebuild b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
index 9249788cc20..f7805764e6e 100644
--- a/dev-games/ogre/ogre-2.1_pre20180901.ebuild
+++ b/dev-games/ogre/ogre-2.1_pre20180901.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/sinbad/ogre/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.
LICENSE="MIT public-domain"
SLOT="0/2.1"
-KEYWORDS=""
+KEYWORDS="~amd64"
IUSE="+cache debug doc egl examples +freeimage gles2 json +legacy-animations
mobile +opengl profile tools"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2020-01-07 22:58 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2020-01-07 22:58 UTC (permalink / raw
To: gentoo-commits
commit: aa2d2531f94b42c1308b15e38052ecd1ed9471e2
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Sun Nov 10 18:09:34 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 22:58:06 2020 +0000
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 <sven.eden <AT> gmx.de>
Signed-off-by: James Le Cuirot <chewi <AT> 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..00000000000
--- 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.000000000 +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..00000000000
--- 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.000000000 +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 "${OGRE_BINARY_DIR}/lib")
-+# set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
-+# set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
- endif ()
-
- if (MSVC AND NOT NMAKE)
diff --git a/dev-games/ogre/files/ogre-1.10.11-samples.patch b/dev-games/ogre/files/ogre-1.10.11-samples.patch
deleted file mode 100644
index 80b989e980c..00000000000
--- a/dev-games/ogre/files/ogre-1.10.11-samples.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -536,7 +536,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/files/ogre-1.11.2-fix_sample_source_install.patch b/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
deleted file mode 100644
index 6e4a476fbb4..00000000000
--- a/dev-games/ogre/files/ogre-1.11.2-fix_sample_source_install.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index aea15218c17..00000000000
--- a/dev-games/ogre/files/ogre-1.11.2-media_path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
- set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-1.11.2-resource_path.patch b/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
deleted file mode 100644
index 8557d783ec4..00000000000
--- a/dev-games/ogre/files/ogre-1.11.2-resource_path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMake/InstallResources.cmake 2018-03-23 10:48:44.371486540 +0100
-+++ b/CMake/InstallResources.cmake 2018-03-23 10:49:08.333486363 +0100
-@@ -184,8 +184,9 @@
- set(OGRE_PLUGIN_DIR_REL "")
- set(OGRE_SAMPLES_DIR_REL "")
- elseif (UNIX)
-- set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
-- set(OGRE_SAMPLES_DIR_REL "${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_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
- endif ()
-
- if (WINDOWS_STORE OR WINDOWS_PHONE OR EMSCRIPTEN)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 4c31c236ea0..0821402dc0e 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -117,11 +117,6 @@ Exporters
sensitive lookup. Some demos might not work with this setting.
(default: case-insensitive + sensitive lookup in all groups)
</flag>
- <flag name="resman-strict" restrict="<dev-games/ogre-1.12">
- Resource Manager STRICT : search in default group if not specified otherwise.
- Case sensitive lookup. Some demos might not work with this setting.
- (default: case-insensitive + sensitive lookup in all groups)
- </flag>
<flag name="tbb">When USE=threads, use tbb for threading</flag>
<flag name="tools">Build and install helper tools</flag>
</use>
diff --git a/dev-games/ogre/ogre-1.10.12.ebuild b/dev-games/ogre/ogre-1.10.12.ebuild
deleted file mode 100644
index 91e3b9f49d5..00000000000
--- a/dev-games/ogre/ogre-1.10.12.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-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="+cache cg doc double-precision egl examples experimental +freeimage gles2
- +opengl profile resman-pedantic resman-strict tools"
-
-REQUIRED_USE="
- || ( gles2 opengl )
- ?? ( resman-pedantic resman-strict )
- examples? ( experimental )
-"
-RESTRICT="test" #139905
-
-RDEPEND="
- dev-games/ois
- dev-libs/boost:=
- dev-libs/zziplib
- media-libs/freetype:2
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXrandr
- x11-libs/libXt
- cg? ( media-gfx/nvidia-cg-toolkit )
- egl? ( media-libs/mesa[egl] )
- freeimage? ( media-libs/freeimage )
- gles2? ( media-libs/mesa[gles2] )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- tools? ( dev-libs/tinyxml[stl] )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.10.11-samples.patch"
- "${FILESDIR}/${PN}-1.10.11-resource_path.patch"
- "${FILESDIR}/${PN}-1.10.11-media_path.patch"
- "${FILESDIR}/${P}-use_system_tinyxml.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
-
- # Fix some path issues
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DOGRE_BUILD_COMPONENT_BITES=$(usex experimental)
- -DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
- -DOGRE_BUILD_COMPONENT_JAVA=no
- -DOGRE_BUILD_COMPONENT_PYTHON=no
- -DOGRE_BUILD_DEPENDENCIES=no
- -DOGRE_BUILD_PLUGIN_CG=$(usex cg)
- -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
- -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
- -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
- -DOGRE_BUILD_SAMPLES=$(usex examples)
- -DOGRE_BUILD_TESTS=no
- -DOGRE_BUILD_TOOLS=$(usex tools)
- -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
- -DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage)
- -DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
- -DOGRE_CONFIG_THREADS=3
- -DOGRE_CONFIG_THREAD_PROVIDER=std
- -DOGRE_FULL_RPATH=no
- -DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
- -DOGRE_INSTALL_DOCS=$(usex doc)
- -DOGRE_INSTALL_SAMPLES=$(usex examples)
- -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
- -DOGRE_NODE_STORAGE_LEGACY=no
- -DOGRE_PROFILING=$(usex profile)
- -DOGRE_RESOURCEMANAGER_STRICT=$(\
- usex resman-pedantic 1 $(\
- usex resman-strict 2 0))
- -DOGRE_USE_STD11=yes
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- CONFIGDIR=/etc/OGRE
- SHAREDIR=/usr/share/OGRE
-
- # plugins and resources are the main configuration
- insinto "${CONFIGDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
- dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
- dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
-
- # These are only for the sample browser
- insinto "${SHAREDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
-}
diff --git a/dev-games/ogre/ogre-1.11.2.ebuild b/dev-games/ogre/ogre-1.11.2.ebuild
deleted file mode 100644
index 0de0b6eb487..00000000000
--- a/dev-games/ogre/ogre-1.11.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
-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.11"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+cache cg debug doc double-precision egl examples experimental +freeimage
- gles2 json openexr +opengl pch profile resman-pedantic resman-strict tools"
-
-REQUIRED_USE="
- || ( gles2 opengl )
- ?? ( resman-pedantic resman-strict )
-"
-
-RESTRICT="test" #139905
-
-RDEPEND="
- dev-games/ois
- dev-libs/zziplib
- media-libs/freetype:2
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXrandr
- x11-libs/libXt
- cg? ( media-gfx/nvidia-cg-toolkit )
- egl? ( media-libs/mesa[egl] )
- freeimage? ( media-libs/freeimage )
- gles2? ( media-libs/mesa[gles2] )
- json? ( dev-libs/rapidjson )
- openexr? ( media-libs/openexr:= )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- tools? ( dev-libs/tinyxml[stl] )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}/${P}-media_path.patch"
- "${FILESDIR}/${P}-resource_path.patch"
- "${FILESDIR}/${P}-fix_sample_source_install.patch"
- "${FILESDIR}/${PN}-1.10.12-use_system_tinyxml.patch"
-)
-
-src_prepare() {
- sed -i \
- -e "s:share/OGRE/docs:share/doc/${PF}:" \
- Docs/CMakeLists.txt || die
- # In this series, the CMAKE_BUILD_TARGET is hard-wired to the
- # installation. And only Debug, MinSizeRel and RelWithDebInfo
- # are supported.
- if use debug; then
- sed -i \
- -e 's/Debug/Gentoo/g' \
- CMake/Utils/OgreConfigTargets.cmake \
- || die
- else
- sed -i \
- -e 's/MinSizeRel/Gentoo/g' \
- CMake/Utils/OgreConfigTargets.cmake \
- || die
- fi
- # Fix some path issues
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_INSTALL_RPATH=yes
- -DOGRE_BUILD_COMPONENT_BITES=yes
- -DOGRE_BUILD_COMPONENT_HLMS=$(usex experimental)
- -DOGRE_BUILD_COMPONENT_JAVA=no
- -DOGRE_BUILD_COMPONENT_PAGING=yes
- -DOGRE_BUILD_COMPONENT_PROPERTY=yes
- -DOGRE_BUILD_COMPONENT_PYTHON=no
- -DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=yes
- -DOGRE_BUILD_COMPONENT_TERRAIN=yes
- -DOGRE_BUILD_COMPONENT_VOLUME=yes
- -DOGRE_BUILD_DEPENDENCIES=no
- -DOGRE_BUILD_PLUGIN_CG=$(usex cg)
- -DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage)
- -DOGRE_BUILD_PLUGIN_EXRCODEC=$(usex openexr)
- -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
- -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
- -DOGRE_BUILD_RENDERSYSTEM_GLES2=$(usex gles2)
- -DOGRE_BUILD_SAMPLES=$(usex examples)
- -DOGRE_BUILD_TESTS=no
- -DOGRE_BUILD_TOOLS=$(usex tools)
- -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
- -DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
- -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=$(usex gles2 $(usex cg) no)
- -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=$(usex gles2)
- -DOGRE_CONFIG_THREADS=3
- -DOGRE_CONFIG_THREAD_PROVIDER=std
- -DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch)
- -DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
- -DOGRE_INSTALL_DOCS=$(usex doc)
- -DOGRE_INSTALL_SAMPLES=$(usex examples)
- -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples)
- -DOGRE_PROFILING=$(usex profile)
- -DOGRE_RESOURCEMANAGER_STRICT=$(\
- usex resman-pedantic 1 $(\
- usex resman-strict 2 0))
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- CONFIGDIR=/etc/OGRE
- SHAREDIR=/usr/share/OGRE
-
- # plugins and resources are the main configuration
- insinto "${CONFIGDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg
- dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
- dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
-
- # These are only for the sample browser
- if use examples ; then
- insinto "${SHAREDIR}"
- doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg
- doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2020-09-21 21:09 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2020-09-21 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 099e98fe1e981a2eb44477e53933fa768f2b3834
Author: Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Sun Sep 20 14:39:00 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 21:08:36 2020 +0000
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 <sven.eden <AT> prydeworx.com>
Closes: https://github.com/gentoo/gentoo/pull/17619
Signed-off-by: James Le Cuirot <chewi <AT> 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 c446c58b57874d3e2522f7e0315771b7a9f5ac8888449493a1dad6fc4d30454c57f4f145c2554de110607f3e5d586d6ec91859b8024e7d8bdb821fa6c6c3f2e2
+DIST imgui-1.77.tar.gz 1269147 BLAKE2B be0db9b77903664db0fadf1672ec23983dc89292fd261a1e89c1eab88b82e95de7c2af37eb7ef43cc994b889fdf7d7fb2dd1282b93c1f3b1166c7fe0d2dccaf5 SHA512 d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546
+DIST ogre-1.12.9.tar.gz 125955067 BLAKE2B 5676690d2d9db8c4c903b7bf3e7660ddf5c0675eb11e1b34f08a5a50739d6212e986c7b500173ad5edab4835d96c705f86cc0fd37e1ff1e64a161ab1ce8968df SHA512 a80525a4924a430ccac3f01f93a5f36b4b9d2f7671ef0629d7dd21d3651ea7a698d5cc520eb814c6ee4c0ee7efcd3f6a8f16688773300a25537636bb61eba286
DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde
DIST ogre-2.1.tar.gz 157457252 BLAKE2B 97e83cb93a07de5bd5f4fd778604e6146105e70045a6019f0fcdd7f96fe20f6ad495e19988dcd5e4c4073a0bcdeb5ce2afb06fae6945363c397a882672c80520 SHA512 9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5
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 00000000000..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 dev-games/ogre/files/ogre-1.12.9-gentoolize_imgui_inclusion.patch
index 4c7803a0a2f..765a53d4695 100644
--- 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
@@ -1,17 +1,16 @@
---- a/Components/Overlay/CMakeLists.txt 2020-08-16 17:45:59.605165822 +0200
-+++ b/Components/Overlay/CMakeLists.txt 2020-08-16 17:48:45.796175402 +0200
+--- a/Components/Overlay/CMakeLists.txt 2020-09-20 16:13:41.280993468 +0200
++++ b/Components/Overlay/CMakeLists.txt 2020-09-20 16:14:52.468997571 +0200
@@ -19,14 +19,14 @@
file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
-- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.73" CACHE PATH "")
-+ set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.76" CACHE PATH "")
+- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "")
++ set(IMGUI_DIR "${PROJECT_SOURCE_DIR}/imgui-1.77" CACHE PATH "")
if(NOT EXISTS ${IMGUI_DIR})
message(STATUS "Dowloading imgui")
file(DOWNLOAD
-- https://github.com/ocornut/imgui/archive/v1.73.tar.gz
+ https://github.com/ocornut/imgui/archive/v1.77.tar.gz
- ${PROJECT_BINARY_DIR}/imgui.tar.gz)
-+ https://github.com/ocornut/imgui/archive/v1.76.tar.gz
+ ${PROJECT_SOURCE_DIR}/imgui.tar.gz)
execute_process(COMMAND ${CMAKE_COMMAND}
- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -19,7 +18,7 @@
endif()
list(APPEND SOURCE_FILES
${IMGUI_DIR}/imgui.cpp
-@@ -84,4 +84,4 @@
+@@ -80,4 +80,4 @@
)
install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip"
DESTINATION "${OGRE_MEDIA_PATH}/packs/"
diff --git a/dev-games/ogre/files/ogre-1.12.8-media_path.patch b/dev-games/ogre/files/ogre-1.12.9-media_path.patch
similarity index 100%
rename from dev-games/ogre/files/ogre-1.12.8-media_path.patch
rename to dev-games/ogre/files/ogre-1.12.9-media_path.patch
diff --git a/dev-games/ogre/files/ogre-1.12.8-resource_path.patch b/dev-games/ogre/files/ogre-1.12.9-resource_path.patch
similarity index 100%
rename from dev-games/ogre/files/ogre-1.12.8-resource_path.patch
rename to dev-games/ogre/files/ogre-1.12.9-resource_path.patch
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 43330db8ca1..db70daa7736 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -77,12 +77,13 @@ Exporters
* Maya (meshes)
</longdescription>
<use>
+ <flag name="assimp" restrict="~dev-games/ogre-1.12.9">Use media-libs/assimp to import assets from 3D files</flag>
<flag name="boost">Enable boost support</flag>
<flag name="cache">Enable GL state cache support</flag>
<flag name="cg">NVIDIA toolkit plugin</flag>
<flag name="double-precision">More precise calculations at the expense of speed</flag>
<flag name="egl">Use egl instead of glx</flag>
- <flag name="deprecated" restrict="~dev-games/ogre-1.12.6">
+ <flag name="deprecated" restrict="~dev-games/ogre-1.12.9">
Build deprecated component 'HLMS' and nodeless positioning of Lights and Cameras.
</flag>
<flag name="fine-granularity" restrict="~dev-games/ogre-2.1">
@@ -112,7 +113,9 @@ Exporters
(default: case-insensitive + sensitive lookup in all groups)
</flag>
<flag name="tbb">When USE=threads, use tbb for threading</flag>
- <flag name="tools">Build and install MeshUpgrader, VRMLConverter and XMLConverter</flag>
+ <flag name="tools">
+ Build and install AssimpConverter (assimp USE flag is enabled), MeshUpgrader, VRMLConverter and XMLConverter
+ </flag>
</use>
<upstream>
<remote-id type="bitbucket">sinbad/ogre</remote-id>
diff --git a/dev-games/ogre/ogre-1.12.8.ebuild b/dev-games/ogre/ogre-1.12.9.ebuild
similarity index 94%
rename from dev-games/ogre/ogre-1.12.8.ebuild
rename to dev-games/ogre/ogre-1.12.9.ebuild
index d7a634ba0da..74d3cd557a6 100644
--- a/dev-games/ogre/ogre-1.12.8.ebuild
+++ b/dev-games/ogre/ogre-1.12.9.ebuild
@@ -7,7 +7,7 @@ CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB"
inherit cmake
IMGUI_PN="imgui"
-IMGUI_PV="1.76"
+IMGUI_PV="1.77"
IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
DESCRIPTION="Object-oriented Graphics Rendering Engine"
@@ -19,7 +19,7 @@ LICENSE="MIT public-domain"
SLOT="0/1.12"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cache cg debug deprecated doc double-precision egl examples +freeimage
+IUSE="assimp +cache cg debug deprecated doc double-precision egl examples +freeimage
json openexr +opengl pch profile resman-pedantic tools"
# Note: gles2 USE flag taken out for now. It seems like the Ogre Devs now rely
@@ -50,6 +50,7 @@ RDEPEND="
x11-libs/libXaw
x11-libs/libXrandr
x11-libs/libXt
+ assimp? ( media-libs/assimp )
cg? ( media-gfx/nvidia-cg-toolkit )
egl? ( media-libs/mesa[egl] )
freeimage? ( media-libs/freeimage )
@@ -75,18 +76,17 @@ PATCHES=(
"${FILESDIR}"/${P}-media_path.patch
"${FILESDIR}"/${P}-resource_path.patch
"${FILESDIR}"/${P}-fix_Simple_demo.patch
- "${FILESDIR}"/${P}-upgrade_imgui.patch
+ "${FILESDIR}"/${P}-gentoolize_imgui_inclusion.patch
+ "${FILESDIR}"/${P}-fix_config_window_height.patch
"${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch
)
src_unpack() {
unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed"
- # Ogre 1.12.8 includes imgui, but as a submodule, it is not included
+ # Ogre 1.12.9 includes imgui, but as a submodule, it is not included
# in the release. The build system tries to download it, that may
- # a) fail and
- # b) uses an old release 1.73
- # So we are doing it ourselves.
+ # fail and so we are doing it ourselves.
cd "${S}" || die "Unpack incomplete"
unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/
@ 2023-01-29 13:34 Joonas Niilola
0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2023-01-29 13:34 UTC (permalink / raw
To: gentoo-commits
commit: 7f9cae11a9f1f4ede5fba3603e2f4f48b4f01b1d
Author: Sven Eden <sven.eden <AT> prydeworx <DOT> com>
AuthorDate: Fri Jan 27 07:13:40 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 13:34:07 2023 +0000
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 <sven.eden <AT> prydeworx.com>
Signed-off-by: Joonas Niilola <juippis <AT> 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 000000000000..13e65963193a
--- /dev/null
+++ b/dev-games/ogre/files/ogre-13.5.3-gentoolize_imgui_inclusion.patch
@@ -0,0 +1,27 @@
+--- a/Components/Overlay/CMakeLists.txt 2022-12-13 08:16:21.006454596 +0100
++++ b/Components/Overlay/CMakeLists.txt 2022-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 000000000000..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))
+- set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media")
+- set(OGRE_CORE_MEDIA_DIR "${PROJECT_SOURCE_DIR}/Media")
+- set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media")
+ else ()
+ # iOS needs to use relative paths in the config files
+ set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
diff --git a/dev-games/ogre/files/ogre-13.5.3-resource_path.patch b/dev-games/ogre/files/ogre-13.5.3-resource_path.patch
new file mode 100644
index 000000000000..3d8bef1f7c64
--- /dev/null
+++ b/dev-games/ogre/files/ogre-13.5.3-resource_path.patch
@@ -0,0 +1,13 @@
+These was already configured above, the BINARY paths are wrong!
+
+--- a/CMake/InstallResources.cmake 2019-11-06 08:12:01.271816772 +0100
++++ b/CMake/InstallResources.cmake 2019-11-06 08:13:15.623814658 +0100
+@@ -188,8 +188,6 @@
+ set(OGRE_PLUGIN_DIR_REL "Contents/Frameworks/")
+ set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/")
+ elseif (UNIX)
+- set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+- set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+ endif ()
+
+ if(OGRE_BUILD_SAMPLES)
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index bc396b074590..9ffeae644f30 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -77,36 +77,23 @@ Exporters
* Maya (meshes)
</longdescription>
<use>
- <flag name="assimp" restrict="~dev-games/ogre-1.12.9">Use <pkg>media-libs/assimp</pkg> to import assets from 3D files</flag>
+ <flag name="assimp" restrict=">dev-games/ogre-13">Use <pkg>media-libs/assimp</pkg> to import assets from 3D files</flag>
<flag name="boost">Enable boost support</flag>
+ <flag name="bullet" restrict=">dev-games/ogre-13">Use <pkg>sci-physics/bullet</pkg> for physics plugin</flag>
<flag name="cache">Enable GL state cache support</flag>
<flag name="cg">NVIDIA toolkit plugin</flag>
<flag name="double-precision">More precise calculations at the expense of speed</flag>
<flag name="egl">Use egl instead of glx</flag>
- <flag name="deprecated" restrict="~dev-games/ogre-1.12.9">
- Build deprecated component 'HLMS' and nodeless positioning of Lights and Cameras.
- </flag>
- <flag name="fine-granularity" restrict="~dev-games/ogre-2.1">
- Enable fine light mask granularity. This impacts on performance and should
- not be enabled unless an application really needs it.
+ <flag name="deprecated" restrict=">dev-games/ogre-13">
+ Build deprecated nodeless positioning of Lights and Cameras.
</flag>
<flag name="freeimage">Support images via <pkg>media-libs/freeimage</pkg></flag>
- <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
- <flag name="gles2" restrict="~dev-games/ogre-1.9.0">Build OpenGL ES 2.x RenderSystem</flag>
- <flag name="gles3" restrict="~dev-games/ogre-1.9.0">Enable OpenGL ES 3.x Features</flag>
+ <flag name="gl3plus">Build OpenGL 3+ RenderSystem</flag>
+ <flag name="gles2" restrict="<dev-games/ogre-13">Build OpenGL ES 2.x RenderSystem</flag>
+ <flag name="gles3" restrict="<dev-games/ogre-13">Enable OpenGL ES 3.x Features</flag>
<flag name="json">Use <pkg>dev-libs/rapidjson</pkg> (needed by Hlms JSON materials)</flag>
- <flag name="legacy-animations">
- Use the skeletal animation from 1.x. It's much slower, but the new system
- is still experimental.
- </flag>
<flag name="ois">Pull in Object-oriented Input System library <pkg>dev-games/ois</pkg> for samples</flag>
<flag name="poco">When USE=threads, use poco for threading</flag>
- <!-- Not yet available? Needs testing! (Note: Shouldn't this be EGL instead of GLES2?)
- <flag name="mobile">
- Build for OpenGL ES 2.0 only and use the mobile variants of the PBS and
- unlit material systems.
- </flag>
- -->
<flag name="resman-pedantic">
Resource Manager PEDANTIC : require an explicit resource group. Case
sensitive lookup. Some demos might not work with this setting.
@@ -120,6 +107,5 @@ Exporters
<upstream>
<remote-id type="bitbucket">sinbad/ogre</remote-id>
<remote-id type="github">OGRECave/ogre</remote-id>
- <remote-id type="github">OGRECave/ogre-next</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-games/ogre/ogre-13.6.1.ebuild b/dev-games/ogre/ogre-13.6.1.ebuild
new file mode 100644
index 000000000000..0cfe093f3488
--- /dev/null
+++ b/dev-games/ogre/ogre-13.6.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype FindDoxygen FindZLIB )
+inherit cmake
+
+IMGUI_PN="imgui"
+IMGUI_PV="1.87"
+IMGUI_P="${IMGUI_PN}-${IMGUI_PV}"
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="https://www.ogre3d.org/"
+SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/ocornut/${IMGUI_PN}/archive/v${IMGUI_PV}.tar.gz -> ${IMGUI_P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0/13.6"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="assimp bullet +cache cg debug deprecated doc double-precision egl examples +freeimage
+ json +opengl pch profile resman-pedantic tools"
+
+# Note: gles2 USE flag taken out for now, as even the configuration seems to be broken
+# ~~sed 2022-12-13 (sven@eden-worx.com)
+#
+# Note: The following dependencies might be considered for new ebuilds
+# + Vulkan SDK: Vulkan RenderSystem, glslang Plugin. Alternatively use system packages <https://vulkan.lunarg.com/>
+#
+# Note: Without gles2 USE flag, the opengl USE flag is next to useless. But
+# there are packages which enforce it, so it has to stay.
+#
+REQUIRED_USE="
+ examples? ( opengl )
+"
+
+RESTRICT="test" #139905
+
+RDEPEND="
+ dev-games/ois
+ dev-libs/pugixml
+ dev-libs/zziplib
+ media-libs/freetype:2
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXrandr
+ x11-libs/libXt
+ assimp? ( media-libs/assimp:= )
+ bullet? ( sci-physics/bullet:= )
+ cg? ( media-gfx/nvidia-cg-toolkit )
+ egl? ( media-libs/mesa[egl(+)] )
+ freeimage? ( media-libs/freeimage )
+ json? ( dev-libs/rapidjson )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ tools? ( dev-libs/tinyxml[stl] )
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-13.5.3-media_path.patch
+ "${FILESDIR}"/${PN}-13.5.3-resource_path.patch
+ "${FILESDIR}"/${PN}-13.5.3-gentoolize_imgui_inclusion.patch
+ "${FILESDIR}"/${PN}-1.10.12-use_system_tinyxml.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz || die "Unpacking ${P}.zip failed"
+
+ # Ogre includes imgui, but as a manual download done by Components/Overlay/CMakeLists.txt
+ # That may fail and so we are doing it ourselves.
+ cd "${S}" || die "Unpack incomplete"
+ unpack ${IMGUI_P}.tar.gz || die "Unpacking ${IMGUI_P}.zip failed"
+}
+
+src_prepare() {
+ local broken_png=(
+ Icon@2x-72.png
+ Default-Portrait~ipad.png
+ Default-Portrait@2x~ipad.png
+ Default-Landscape@2x~ipad.png
+ )
+
+ sed -i \
+ -e "s:share/doc/OGRE:share/doc/${PF}:" \
+ Docs/CMakeLists.txt || die
+ # In this series, the CMAKE_BUILD_TARGET is hard-wired to the
+ # installation. And only Debug, MinSizeRel and RelWithDebInfo
+ # are supported.
+ sed -i \
+ -e "s/$(usex debug Debug Release)/Gentoo/g" \
+ CMake/InstallResources.cmake \
+ CMake/Utils/OgreConfigTargets.cmake \
+ || die
+
+ # Fix broken png files
+ einfo "Fixing broken png files."
+ pushd "${S}"/Samples/Common/misc 1>/dev/null 2>&1
+ for png in "${broken_png[@]}"; do
+ pngfix -q --out=out.png ${png}
+ mv -f out.png "${png}" || die
+ done
+ popd 1>/dev/null 2>&1
+ einfo "done ..."
+
+ # Fix some path issues
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_INSTALL_RPATH=yes
+ -DOGRE_ASSERT_MODE=1
+ -DOGRE_BUILD_COMPONENT_BITES=yes
+ -DOGRE_BUILD_COMPONENT_BULLET=$(usex bullet)
+ -DOGRE_BUILD_COMPONENT_CSHARP=no
+ -DOGRE_BUILD_COMPONENT_JAVA=no
+ -DOGRE_BUILD_COMPONENT_OVERLAY=yes
+ -DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=yes
+ -DOGRE_BUILD_COMPONENT_PAGING=yes
+ -DOGRE_BUILD_COMPONENT_PROPERTY=yes
+ -DOGRE_BUILD_COMPONENT_PYTHON=no
+ -DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=yes
+ -DOGRE_BUILD_COMPONENT_TERRAIN=yes
+ -DOGRE_BUILD_COMPONENT_VOLUME=yes
+ -DOGRE_BUILD_DEPENDENCIES=no
+ -DOGRE_BUILD_PLUGIN_ASSIMP=$(usex assimp)
+ -DOGRE_BUILD_PLUGIN_CG=$(usex cg)
+ -DOGRE_BUILD_PLUGIN_FREEIMAGE=$(usex freeimage)
+ -DOGRE_BUILD_PLUGIN_EXRCODEC=no
+ -DOGRE_BUILD_RENDERSYSTEM_GL=$(usex opengl)
+ -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=$(usex opengl)
+ -DOGRE_BUILD_RENDERSYSTEM_GLES2=no
+ -DOGRE_BUILD_SAMPLES=$(usex examples)
+ -DOGRE_BUILD_TESTS=no
+ -DOGRE_BUILD_TOOLS=$(usex tools)
+ -DOGRE_CONFIG_DOUBLE=$(usex double-precision)
+ -DOGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT=$(usex cache)
+ -DOGRE_CONFIG_ENABLE_GLES2_CG_SUPPORT=no
+ -DOGRE_CONFIG_ENABLE_GLES3_SUPPORT=no
+ -DOGRE_CONFIG_THREADS=3
+ -DOGRE_CONFIG_THREAD_PROVIDER=std
+ -DOGRE_ENABLE_PRECOMPILED_HEADERS=$(usex pch)
+ -DOGRE_GLSUPPORT_USE_EGL=$(usex egl)
+ -DOGRE_INSTALL_DOCS=$(usex doc)
+ -DOGRE_INSTALL_SAMPLES=$(usex examples)
+ -DOGRE_NODELESS_POSITIONING=$(usex deprecated)
+ -DOGRE_PROFILING=$(usex profile)
+ -DOGRE_RESOURCEMANAGER_STRICT=$(usex resman-pedantic 1 2)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc ; then
+ eninja -C "${BUILD_DIR}" OgreDoc
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ CONFIGDIR=/etc/OGRE
+ SHAREDIR=/usr/share/OGRE
+
+ # plugins and resources are the main configuration
+ insinto "${CONFIGDIR}"
+ doins "${BUILD_DIR}"/bin/plugins.cfg
+ doins "${BUILD_DIR}"/bin/resources.cfg
+ dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg
+ dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg
+
+ # These are only for the sample browser
+ if use examples ; then
+ insinto "${SHAREDIR}"
+ doins "${BUILD_DIR}"/bin/samples.cfg
+ fi
+}
+
+pkg_postinst() {
+ elog "If you experience crashes when starting /usr/bin/SampleBrowser,"
+ elog "remove the cache directory at:"
+ elog " '~/.cache/OGRE Sample Browser'"
+ elog "first, before filing a bug report."
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-01-29 13:34 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-07 22:58 [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2023-01-29 13:34 Joonas Niilola
2020-09-21 21:09 James Le Cuirot
2020-01-07 22:58 James Le Cuirot
2020-01-07 22:58 James Le Cuirot
2018-09-07 11:42 Andreas Sturmlechner
2018-06-17 18:44 Andreas Sturmlechner
2016-01-22 7:20 Michael Sterrett
2015-09-03 18:25 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox