[Orxonox-commit 7421] r152 - in linux/flatpak: . res
bucyril at orxonox.net
bucyril at orxonox.net
Thu Oct 11 19:46:57 CEST 2018
Author: bucyril
Date: 2018-10-11 19:46:57 +0200 (Thu, 11 Oct 2018)
New Revision: 152
Added:
linux/flatpak/res/
linux/flatpak/res/boost-configure
linux/flatpak/res/ogre1.9-gcc5.2.patch
Modified:
linux/flatpak/net.orxonox.Orxonox.json
Log:
flatpak image now working
Modified: linux/flatpak/net.orxonox.Orxonox.json
===================================================================
--- linux/flatpak/net.orxonox.Orxonox.json 2018-10-10 08:12:04 UTC (rev 151)
+++ linux/flatpak/net.orxonox.Orxonox.json 2018-10-11 17:46:57 UTC (rev 152)
@@ -3,7 +3,8 @@
"runtime": "org.freedesktop.Platform",
"runtime-version": "18.08",
"sdk": "org.freedesktop.Sdk",
- "command": "run",
+ "command": "/app/games/orxonox",
+ "cleanup": [ "/lib/*.a" ],
"modules": [
{
"name": "enet",
@@ -29,7 +30,6 @@
},
{
"name": "boost",
- "cleanup": [ "/lib/libboost_*.a" ],
"sources": [
{
"type": "archive",
@@ -38,7 +38,7 @@
},
{
"type": "file",
- "path": "boost-configure",
+ "path": "res/boost-configure",
"dest-filename": "configure"
}
]
@@ -49,7 +49,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/libXmu-1.1.1.tar.gz"
+ "path": "deps/libXmu-1.1.1.tar.gz",
+ "sha256": "e7f7f227c8f430de81984d9725113ecd8994d07de372abf334b1c3dec31ceaf1"
}
]
},
@@ -59,7 +60,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/libXaw-1.0.11.tar.gz"
+ "path": "deps/libXaw-1.0.11.tar.gz",
+ "sha256": "ef4dd840b2896401c75d68cf0296a7243b5953f22261f8e8c4a92b53e771fc90"
}
]
},
@@ -70,7 +72,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/freetype-2.4.0.tar.gz"
+ "path": "deps/freetype-2.4.0.tar.gz",
+ "sha256": "7d7cce582e83a9b35edf14a39bddb5303d0c3796865466e3302b6d85663c79a7"
}
]
},
@@ -84,7 +87,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/FreeImage3180-modified.tar.xz"
+ "path": "deps/FreeImage3180-modified.tar.xz",
+ "sha256": "2784dd06129f7d56b4d49ea5694d03edee0fdc2432e6d08c671f5b55127d31fa"
}
]
},
@@ -94,7 +98,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/glu.tar.xz"
+ "path": "deps/glu.tar.xz",
+ "sha256": "6d9bfdddf21d873f0ae460375f0904aad2f84197b259ea070ca56d9e796713f8"
}
]
},
@@ -104,11 +109,12 @@
"sources": [
{
"type": "archive",
- "path": "deps/ogre-1.9.tar.xz"
+ "path": "deps/ogre-1.9.tar.xz",
+ "sha256": "2fede124550fe3cb996e1e3efb46392d22f4346b826c1e76e6a1f2ecb476d485"
},
{
"type": "patch",
- "path": "ogre1.9-gcc5.2.patch"
+ "path": "res/ogre1.9-gcc5.2.patch"
}
]
},
@@ -115,11 +121,11 @@
{
"name": "lua",
"buildsystem": "cmake",
- "config-opts": [],
"sources": [
{
"type": "archive",
- "path": "deps/lua-5.1.5.tar.gz"
+ "path": "deps/lua-5.1.5.tar.gz",
+ "sha256": "612b024b1678cbb39a880a8b2c611b40fb267ba19c7d7073953289d046f1e99f"
}
]
},
@@ -129,7 +135,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/toluapp-1.0.93.tar.gz"
+ "path": "deps/toluapp-1.0.93.tar.gz",
+ "sha256": "0a1ff87cb74e7531aec57e2a7cfdf282116647dea3b46223e3cc7c362b55b5bb"
}
]
},
@@ -150,7 +157,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/tinyxml_2_6_2-cmake.tar.xz"
+ "path": "deps/tinyxml_2_6_2-cmake.tar.xz",
+ "sha256": "ec877dfc2d9b27a60b10b3686d894d6a14018de870b651dee0f08485231582f4"
}
]
},
@@ -168,7 +176,8 @@
"sources": [
{
"type": "archive",
- "path": "deps/tcl8.6.8-src.tar.gz"
+ "path": "deps/tcl8.6.8-src.tar.gz",
+ "sha256": "c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a"
}
]
},
@@ -177,6 +186,11 @@
"buildsystem": "cmake",
"builddir": true,
"subdir": "code",
+ "build-options" : {
+ "env": {
+ "LIBRARY_PATH":"/app/lib"
+ }
+ },
"sources": [
{
"type": "dir",
Added: linux/flatpak/res/boost-configure
===================================================================
--- linux/flatpak/res/boost-configure (rev 0)
+++ linux/flatpak/res/boost-configure 2018-10-11 17:46:57 UTC (rev 152)
@@ -0,0 +1,10 @@
+./bootstrap.sh "$@"
+
+
+cat <<EOF >Makefile
+all:
+ ./b2 -j `nproc` -mt --with-date_time --with-filesystem --with-thread
+
+install:
+ ./b2 install
+EOF
Property changes on: linux/flatpak/res/boost-configure
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: linux/flatpak/res/ogre1.9-gcc5.2.patch
===================================================================
--- linux/flatpak/res/ogre1.9-gcc5.2.patch (rev 0)
+++ linux/flatpak/res/ogre1.9-gcc5.2.patch 2018-10-11 17:46:57 UTC (rev 152)
@@ -0,0 +1,63 @@
+--- a/OgreMain/include/OgreProgressiveMeshGenerator.h 2015-09-03 04:58:34.119585218 +0200
++++ b/OgreMain/include/OgreProgressiveMeshGenerator.h 2015-09-03 04:58:39.342585320 +0200
+@@ -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 2015-09-03 04:58:34.879585233 +0200
++++ b/OgreMain/src/OgreProgressiveMeshGenerator.cpp 2015-09-03 04:58:43.944585409 +0200
+@@ -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)
+ {
More information about the Orxonox-commit
mailing list