Commit e9d28271 authored by Luca Giambonini's avatar Luca Giambonini

rebuild against boost

parent 9bfea265
pkgname=freecad
_pkgname=FreeCAD
pkgver=0.16
pkgrel=6
pkgrel=7
pkgdesc='A general purpose 3D CAD modeler'
arch=('x86_64')
url='http://www.freecadweb.org/wiki'
......
pkgname=frogatto
pkgver=1.3.1
pkgrel=4
pkgrel=5
pkgdesc="An old-school 2D platformer game, starring a certain quixotic frog."
arch=('x86_64')
url="http://www.frogatto.com"
......
pkgname=kmymoney
pkgver=4.8.1
pkgrel=1
pkgrel=2
pkgdesc="A finance manager for KDE4 with HBCI support"
arch=('x86_64')
url="http://kmymoney2.sourceforge.net"
......
pkgname=libkolabxml
pkgver=1.1.6
pkgrel=2
pkgrel=3
pkgdesc="Kolab XML format schema definitions library"
url='http://git.kolab.org/libkolabxml/'
arch=('x86_64')
......
pkgname=librevenge
pkgver=0.0.4
pkgrel=2
pkgrel=3
pkgdesc="library for REVerses ENGineered formats filters"
arch=('x86_64')
url="http://sf.net/p/libwpd/librevenge/"
......
......@@ -6,7 +6,7 @@ pkgname=librime
_pkgname=rime
pkgver=1.2.9
epoch=2 # 1.2.20160314 → 1.2.9
pkgrel=2
pkgrel=3
pkgdesc="Rime input method engine"
arch=('x86_64')
url="http://code.google.com/p/rimeime/"
......
pkgname=libtorrent-rasterbar
pkgver=1.1.4
pkgver=1.1.5
_pkgver=${pkgver//./_}
pkgrel=1
pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
......@@ -10,7 +10,7 @@ depends=('boost-libs' 'python2' 'python3' 'geoip' 'websocketpp')
makedepends=('boost' 'cmake')
options=('!emptydirs')
source=(https://github.com/arvidn/libtorrent/archive/libtorrent-${_pkgver}/$pkgname-$pkgver.tar.gz)
sha256sums=('9acbb24b47fa91fc1f10bda5853bd1e11b9873c9298baeb6b40e7cf7cf2237e7')
sha256sums=('b8cbf2f8f9f7b3d9d0fde4973d4e91e3d543d6dd82413ac4e44dc85a3866d7c5')
prepare() {
mkdir py2 py3
......
pkgname=lipsofsuna
pkgver=0.8.0
pkgrel=7
pkgrel=8
pkgdesc="Tongue-in-cheek dungeon crawl game that takes place in the chaotic dungeons of Suna."
arch=('x86_64')
url="http://lipsofsuna.org/"
......
pkgname=lyx
pkgver=2.2.3
pkgrel=1
pkgrel=2
pkgdesc="An advanced open-source document processor"
arch=('x86_64')
url="http://www.lyx.org"
......
pkgbase=mkvtoolnix
pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gui')
pkgver=17.0.0
pkgrel=1
pkgrel=2
pkgdesc="Set of tools to create, edit and inspect Matroska files."
arch=('x86_64')
license=('GPL')
......
pkgbase=ogre
pkgname=('ogre' 'ogre-docs')
pkgver=1.9.0
pkgrel=4
pkgver=1.10.8
pkgrel=1
pkgdesc="A scene-oriented, flexible 3D engine written in C++"
arch=('x86_64')
url='http://www.ogre3d.org'
......@@ -15,17 +15,10 @@ optdepends=('cppunit: unit testing'
'boost: for developing using ogre')
categories=('graphics')
install=ogre.install
source=("hg+https://bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}"
"gcc_gentoo.patch")
md5sums=('SKIP'
'ff86c68ce440b66431cc2d1d4bed1fec')
source=("hg+https://bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}")
md5sums=('SKIP')
#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2")
prepare() {
cd ${srcdir}/${pkgbase}
patch -Np1 -i ${srcdir}/gcc_gentoo.patch
}
build() {
cd ${srcdir}/${pkgbase}
......@@ -73,8 +66,8 @@ package_ogre() {
chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
# install license
install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
# move docs out of this package
mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
}
......
--- 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)
{
......@@ -3,7 +3,7 @@
pkgname=python3-pyelftools
_pypiname=pyelftools
pkgver=0.24
pkgrel=1
pkgrel=2
pkgdesc="Python library for analyzing ELF files and DWARF debugging information"
arch=('any')
url="https://github.com/eliben/pyelftools"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment