Date: Sunday, October 16, 2016 @ 04:56:46
  Author: svenstaro
Revision: 192346

archrelease: copy trunk to community-i686, community-x86_64

Added:
  openmw/repos/community-i686/PKGBUILD
    (from rev 192345, openmw/trunk/PKGBUILD)
  openmw/repos/community-i686/bullet-251.patch
    (from rev 192345, openmw/trunk/bullet-251.patch)
  openmw/repos/community-x86_64/PKGBUILD
    (from rev 192345, openmw/trunk/PKGBUILD)
  openmw/repos/community-x86_64/bullet-251.patch
    (from rev 192345, openmw/trunk/bullet-251.patch)
Deleted:
  openmw/repos/community-i686/PKGBUILD
  openmw/repos/community-x86_64/PKGBUILD

-----------------------------------+
 /PKGBUILD                         |   72 ++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD           |   29 -------------
 community-i686/bullet-251.patch   |   76 ++++++++++++++++++++++++++++++++++++
 community-x86_64/PKGBUILD         |   29 -------------
 community-x86_64/bullet-251.patch |   76 ++++++++++++++++++++++++++++++++++++
 5 files changed, 224 insertions(+), 58 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD     2016-10-16 04:56:38 UTC (rev 192345)
+++ community-i686/PKGBUILD     2016-10-16 04:56:46 UTC (rev 192346)
@@ -1,29 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Contributor: Sandy Carter <bwrsand...@gmail.com>
-
-pkgname=openmw
-pkgver=0.40.0
-pkgrel=2
-pkgdesc="An open-source engine reimplementation for the role-playing game 
Morrowind"
-arch=('i686' 'x86_64')
-url="http://www.openmw.org";
-license=('GPL3' 'MIT' 'custom')
-depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 
'unshield')
-makedepends=('cmake' 'boost' 'doxygen')
-source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz";)
-sha1sums=('a69aa56374c4e991950fa1b7bfec92ef790cbbed')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DDESIRED_QT_VERSION=5
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: openmw/repos/community-i686/PKGBUILD (from rev 192345, 
openmw/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD                             (rev 0)
+++ community-i686/PKGBUILD     2016-10-16 04:56:46 UTC (rev 192346)
@@ -0,0 +1,36 @@
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Sandy Carter <bwrsand...@gmail.com>
+
+pkgname=openmw
+pkgver=0.40.0
+pkgrel=4
+pkgdesc="An open-source engine reimplementation for the role-playing game 
Morrowind"
+arch=('i686' 'x86_64')
+url="http://www.openmw.org";
+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')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  patch -Np1 < ${srcdir}/bullet-251.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DDESIRED_QT_VERSION=5
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: openmw/repos/community-i686/bullet-251.patch (from rev 192345, 
openmw/trunk/bullet-251.patch)
===================================================================
--- community-i686/bullet-251.patch                             (rev 0)
+++ community-i686/bullet-251.patch     2016-10-16 04:56:46 UTC (rev 192346)
@@ -0,0 +1,76 @@
+From 5ccbabc27d7f1ec02447680e4bed28d12333fb77 Mon Sep 17 00:00:00 2001
+From: scrawl <scr...@baseoftrash.de>
+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 <LinearMath/btQuickprof.h>
+ 
++#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 <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
+ #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
+ #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
++
+ #include <LinearMath/btQuickprof.h>
+ 
+ #include <components/nifbullet/bulletnifloader.hpp>
+@@ -1363,8 +1364,10 @@ namespace MWPhysics
+         for (std::set<Object*>::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()

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD   2016-10-16 04:56:38 UTC (rev 192345)
+++ community-x86_64/PKGBUILD   2016-10-16 04:56:46 UTC (rev 192346)
@@ -1,29 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Contributor: Sandy Carter <bwrsand...@gmail.com>
-
-pkgname=openmw
-pkgver=0.40.0
-pkgrel=2
-pkgdesc="An open-source engine reimplementation for the role-playing game 
Morrowind"
-arch=('i686' 'x86_64')
-url="http://www.openmw.org";
-license=('GPL3' 'MIT' 'custom')
-depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 
'unshield')
-makedepends=('cmake' 'boost' 'doxygen')
-source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz";)
-sha1sums=('a69aa56374c4e991950fa1b7bfec92ef790cbbed')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DDESIRED_QT_VERSION=5
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: openmw/repos/community-x86_64/PKGBUILD (from rev 192345, 
openmw/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD                           (rev 0)
+++ community-x86_64/PKGBUILD   2016-10-16 04:56:46 UTC (rev 192346)
@@ -0,0 +1,36 @@
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Sandy Carter <bwrsand...@gmail.com>
+
+pkgname=openmw
+pkgver=0.40.0
+pkgrel=4
+pkgdesc="An open-source engine reimplementation for the role-playing game 
Morrowind"
+arch=('i686' 'x86_64')
+url="http://www.openmw.org";
+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')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  patch -Np1 < ${srcdir}/bullet-251.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DDESIRED_QT_VERSION=5
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: openmw/repos/community-x86_64/bullet-251.patch (from rev 192345, 
openmw/trunk/bullet-251.patch)
===================================================================
--- community-x86_64/bullet-251.patch                           (rev 0)
+++ community-x86_64/bullet-251.patch   2016-10-16 04:56:46 UTC (rev 192346)
@@ -0,0 +1,76 @@
+From 5ccbabc27d7f1ec02447680e4bed28d12333fb77 Mon Sep 17 00:00:00 2001
+From: scrawl <scr...@baseoftrash.de>
+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 <LinearMath/btQuickprof.h>
+ 
++#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 <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
+ #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
+ #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
++
+ #include <LinearMath/btQuickprof.h>
+ 
+ #include <components/nifbullet/bulletnifloader.hpp>
+@@ -1363,8 +1364,10 @@ namespace MWPhysics
+         for (std::set<Object*>::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()

Reply via email to