[arch-commits] Commit in openmw/trunk (PKGBUILD bullet-251.patch)
Date: Friday, December 23, 2016 @ 19:59:18
Author: svenstaro
Revision: 201279
upgpkg: openmw 0.41.0-1
upstream release 0.41
Modified:
openmw/trunk/PKGBUILD
Deleted:
openmw/trunk/bullet-251.patch
--+
PKGBUILD | 15 ++
bullet-251.patch | 76 -
2 files changed, 4 insertions(+), 87 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-12-23 19:25:21 UTC (rev 201278)
+++ PKGBUILD2016-12-23 19:59:18 UTC (rev 201279)
@@ -2,8 +2,8 @@
# Contributor: Sandy Carter
pkgname=openmw
-pkgver=0.40.0
-pkgrel=5
+pkgver=0.41.0
+pkgrel=1
pkgdesc="An open-source engine reimplementation for the role-playing game
Morrowind"
arch=('i686' 'x86_64')
url="http://www.openmw.org";
@@ -10,16 +10,9 @@
license=('GPL3' 'MIT' 'custom')
depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2'
'unshield' 'libxt')
makedepends=('cmake' 'boost' 'doxygen')
-source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz";
-"bullet-251.patch")
-sha1sums=('a69aa56374c4e991950fa1b7bfec92ef790cbbed'
- 'bef2eaf6135c58354395ef07b5ac07dbdd2387e3')
+source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz";)
+sha512sums=('a47a7af3c6d3252e22206eb776069ef87f698acbe133b0e0294db307486c28cb300085fcf45b436af541dbb22f6d45f2ee3998e50a1c711f667f8a738813255d')
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
- patch -Np1 < ${srcdir}/bullet-251.patch
-}
-
build() {
cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
cmake -DCMAKE_INSTALL_PREFIX=/usr \
Deleted: bullet-251.patch
===
--- bullet-251.patch2016-12-23 19:25:21 UTC (rev 201278)
+++ bullet-251.patch2016-12-23 19:59:18 UTC (rev 201279)
@@ -1,76 +0,0 @@
-From 5ccbabc27d7f1ec02447680e4bed28d12333fb77 Mon Sep 17 00:00:00 2001
-From: scrawl
-Date: Fri, 14 Oct 2016 20:59:55 +0200
-Subject: [PATCH] Fix build against bullet with profiler disabled (Fixes #3592)
-
- apps/openmw/mwgui/debugwindow.cpp | 7 +++
- apps/openmw/mwphysics/physicssystem.cpp | 3 +++
- 2 files changed, 10 insertions(+)
-
-diff --git a/apps/openmw/mwgui/debugwindow.cpp
b/apps/openmw/mwgui/debugwindow.cpp
-index 37ea347..a29910f 100644
a/apps/openmw/mwgui/debugwindow.cpp
-+++ b/apps/openmw/mwgui/debugwindow.cpp
-@@ -7,6 +7,8 @@
-
- #include
-
-+#ifndef BT_NO_PROFILE
-+
- namespace
- {
- void bulletDumpRecursive(CProfileIterator* pit, int spacing,
std::stringstream& os)
-@@ -71,6 +73,7 @@ namespace
- }
- }
-
-+#endif // BT_NO_PROFILE
-
- namespace MWGui
- {
-@@ -92,10 +95,13 @@ namespace MWGui
-
- MyGUI::IntSize viewSize =
MyGUI::RenderManager::getInstance().getViewSize();
- mMainWidget->setSize(viewSize);
-+
-+
- }
-
- void DebugWindow::onFrame(float dt)
- {
-+#ifndef BT_NO_PROFILE
- if (!isVisible())
- return;
-
-@@ -115,6 +121,7 @@ namespace MWGui
- size_t previousPos = mBulletProfilerEdit->getVScrollPosition();
- mBulletProfilerEdit->setCaption(stream.str());
- mBulletProfilerEdit->setVScrollPosition(std::min(previousPos,
mBulletProfilerEdit->getVScrollRange()-1));
-+#endif
- }
-
- }
-diff --git a/apps/openmw/mwphysics/physicssystem.cpp
b/apps/openmw/mwphysics/physicssystem.cpp
-index 954d195..e442fbd 100644
a/apps/openmw/mwphysics/physicssystem.cpp
-+++ b/apps/openmw/mwphysics/physicssystem.cpp
-@@ -14,6 +14,7 @@
- #include
- #include
- #include
-+
- #include
-
- #include
-@@ -1363,8 +1364,10 @@ namespace MWPhysics
- for (std::set::iterator it = mAnimatedObjects.begin(); it !=
mAnimatedObjects.end(); ++it)
- (*it)->animateCollisionShapes(mCollisionWorld);
-
-+#ifndef BT_NO_PROFILE
- CProfileManager::Reset();
- CProfileManager::Increment_Frame_Counter();
-+#endif
- }
-
- void PhysicsSystem::debugDraw()
[arch-commits] Commit in openmw/trunk (PKGBUILD bullet-251.patch)
Date: Sunday, October 16, 2016 @ 04:56:38
Author: svenstaro
Revision: 192345
upgpkg: openmw 0.40.0-4
rebuild
Added:
openmw/trunk/bullet-251.patch
Modified:
openmw/trunk/PKGBUILD
--+
PKGBUILD | 13 ++---
bullet-251.patch | 76 +
2 files changed, 86 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-10-16 03:03:06 UTC (rev 192344)
+++ PKGBUILD2016-10-16 04:56:38 UTC (rev 192345)
@@ -3,7 +3,7 @@
pkgname=openmw
pkgver=0.40.0
-pkgrel=3
+pkgrel=4
pkgdesc="An open-source engine reimplementation for the role-playing game
Morrowind"
arch=('i686' 'x86_64')
url="http://www.openmw.org";
@@ -10,9 +10,16 @@
license=('GPL3' 'MIT' 'custom')
depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2'
'unshield' 'libxt')
makedepends=('cmake' 'boost' 'doxygen')
-source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz";)
-sha1sums=('a69aa56374c4e991950fa1b7bfec92ef790cbbed')
+source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz";
+"bullet-251.patch")
+sha1sums=('a69aa56374c4e991950fa1b7bfec92ef790cbbed'
+ 'bef2eaf6135c58354395ef07b5ac07dbdd2387e3')
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+ patch -Np1 < ${srcdir}/bullet-251.patch
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
cmake -DCMAKE_INSTALL_PREFIX=/usr \
Added: bullet-251.patch
===
--- bullet-251.patch(rev 0)
+++ bullet-251.patch2016-10-16 04:56:38 UTC (rev 192345)
@@ -0,0 +1,76 @@
+From 5ccbabc27d7f1ec02447680e4bed28d12333fb77 Mon Sep 17 00:00:00 2001
+From: scrawl
+Date: Fri, 14 Oct 2016 20:59:55 +0200
+Subject: [PATCH] Fix build against bullet with profiler disabled (Fixes #3592)
+
+---
+ apps/openmw/mwgui/debugwindow.cpp | 7 +++
+ apps/openmw/mwphysics/physicssystem.cpp | 3 +++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/apps/openmw/mwgui/debugwindow.cpp
b/apps/openmw/mwgui/debugwindow.cpp
+index 37ea347..a29910f 100644
+--- a/apps/openmw/mwgui/debugwindow.cpp
b/apps/openmw/mwgui/debugwindow.cpp
+@@ -7,6 +7,8 @@
+
+ #include
+
++#ifndef BT_NO_PROFILE
++
+ namespace
+ {
+ void bulletDumpRecursive(CProfileIterator* pit, int spacing,
std::stringstream& os)
+@@ -71,6 +73,7 @@ namespace
+ }
+ }
+
++#endif // BT_NO_PROFILE
+
+ namespace MWGui
+ {
+@@ -92,10 +95,13 @@ namespace MWGui
+
+ MyGUI::IntSize viewSize =
MyGUI::RenderManager::getInstance().getViewSize();
+ mMainWidget->setSize(viewSize);
++
++
+ }
+
+ void DebugWindow::onFrame(float dt)
+ {
++#ifndef BT_NO_PROFILE
+ if (!isVisible())
+ return;
+
+@@ -115,6 +121,7 @@ namespace MWGui
+ size_t previousPos = mBulletProfilerEdit->getVScrollPosition();
+ mBulletProfilerEdit->setCaption(stream.str());
+ mBulletProfilerEdit->setVScrollPosition(std::min(previousPos,
mBulletProfilerEdit->getVScrollRange()-1));
++#endif
+ }
+
+ }
+diff --git a/apps/openmw/mwphysics/physicssystem.cpp
b/apps/openmw/mwphysics/physicssystem.cpp
+index 954d195..e442fbd 100644
+--- a/apps/openmw/mwphysics/physicssystem.cpp
b/apps/openmw/mwphysics/physicssystem.cpp
+@@ -14,6 +14,7 @@
+ #include
+ #include
+ #include
++
+ #include
+
+ #include
+@@ -1363,8 +1364,10 @@ namespace MWPhysics
+ for (std::set::iterator it = mAnimatedObjects.begin(); it !=
mAnimatedObjects.end(); ++it)
+ (*it)->animateCollisionShapes(mCollisionWorld);
+
++#ifndef BT_NO_PROFILE
+ CProfileManager::Reset();
+ CProfileManager::Increment_Frame_Counter();
++#endif
+ }
+
+ void PhysicsSystem::debugDraw()
