[arch-commits] Commit in ogre-next/trunk (PKGBUILD fix-includes.patch)

[Sven-Hendrik Haase]

    Date: Saturday, December 25, 2021 @ 21:28:30
  Author: svenstaro
Revision: 1083802

upgpkg: ogre-next 2.3.0-1

Modified:
  ogre-next/trunk/PKGBUILD
Deleted:
  ogre-next/trunk/fix-includes.patch

--------------------+
 PKGBUILD           |   15 ++++-----------
 fix-includes.patch |   37 -------------------------------------
 2 files changed, 4 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-25 21:22:27 UTC (rev 1083801)
+++ PKGBUILD	2021-12-25 21:28:30 UTC (rev 1083802)
@@ -1,6 +1,6 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
 pkgname=ogre-next
-pkgver=2.2.4
+pkgver=2.3.0
 pkgrel=1
 pkgdesc='Scene-oriented, flexible 3D engine written in C++'
 arch=('x86_64')
@@ -11,16 +11,9 @@
 makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'ninja' 'cppunit')
 conflicts=('ogre')
 install=ogre-next.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/v${pkgver}.tar.gz"
-        fix-includes.patch)
-sha512sums=('c16dac0c9e02efd45f6c3189e0600b739e551d78f4794160701377a9c1b4e24b4868a774a35c80d7f2cade44abe04128bc46949ca497a44867b55f378ede028b'
-            'a8c70b4ee692cded9c97a0101e59bede0f4c0c2445d075b15bb20e0a3cf1e0c9af3cedde2e3b8524d2430e7b338869eb9d41d5853e9cf1510688a9ddf4f4b19f')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/v${pkgver}.tar.gz")
+sha512sums=('90c502f8fdabb40069fc8347769f0ca110942d0291ba6b33678449bfef953a55c42e84c748e37ff74af7babf498d71a7c464e6a435ab11889345950b9d65632e')
 
-prepare() {
-  cd ogre-next-${pkgver}
-  patch -Np1 -i "${srcdir}"/fix-includes.patch
-}
-
 build() {
   cd ogre-next-${pkgver}
 

Deleted: fix-includes.patch
===================================================================
--- fix-includes.patch	2021-12-25 21:22:27 UTC (rev 1083801)
+++ fix-includes.patch	2021-12-25 21:28:30 UTC (rev 1083802)
@@ -1,37 +0,0 @@
-diff --git a/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h b/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h
-index 89184c450..9a606231d 100644
---- a/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h
-+++ b/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h
-@@ -27,6 +27,7 @@ THE SOFTWARE
- #define __OgreDefaultWorkQueueStandard_H__
- 
- #include "../OgreWorkQueue.h"
-+#include "ogrestd/vector.h"
- 
- namespace Ogre
- {
-diff --git a/OgreMain/src/OgrePlatformInformation.cpp b/OgreMain/src/OgrePlatformInformation.cpp
-index f4a8462d2..d6b00d120 100644
---- a/OgreMain/src/OgrePlatformInformation.cpp
-+++ b/OgreMain/src/OgrePlatformInformation.cpp
-@@ -44,7 +44,7 @@ THE SOFTWARE.
-     #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID
-         #include <linux/sysctl.h>
-     #else
--        #include <sys/sysctl.h>
-+        #include <linux/sysctl.h>
-     #endif
- #endif
- 
-diff --git a/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp b/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp
-index f39b4232e..9ae3039b0 100644
---- a/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp
-+++ b/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp
-@@ -17,6 +17,7 @@
- #include "OgreDescriptorSetTexture.h"
- #include "OgreHlmsManager.h"
- #include "OgreRoot.h"
-+#include "OgreHlmsDatablock.h"
- 
- namespace Ogre
- {