[arch-commits] Commit in ogre/repos/community-x86_64 (6 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Tue Aug 17 01:21:45 UTC 2021
Date: Tuesday, August 17, 2021 @ 01:21:45
Author: svenstaro
Revision: 1001105
archrelease: copy trunk to community-x86_64
Added:
ogre/repos/community-x86_64/PKGBUILD
(from rev 1001104, ogre/trunk/PKGBUILD)
ogre/repos/community-x86_64/fix-includes.patch
(from rev 1001104, ogre/trunk/fix-includes.patch)
ogre/repos/community-x86_64/ogre.install
(from rev 1001104, ogre/trunk/ogre.install)
Deleted:
ogre/repos/community-x86_64/PKGBUILD
ogre/repos/community-x86_64/fix-includes.patch
ogre/repos/community-x86_64/ogre.install
--------------------+
PKGBUILD | 136 +++++++++++++++++++++++++--------------------------
fix-includes.patch | 74 +++++++++++++--------------
ogre.install | 6 +-
3 files changed, 108 insertions(+), 108 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-17 01:21:32 UTC (rev 1001104)
+++ PKGBUILD 2021-08-17 01:21:45 UTC (rev 1001105)
@@ -1,68 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-pkgname=ogre
-pkgver=2.2.4
-pkgrel=2
-pkgdesc='Scene-oriented, flexible 3D engine written in C++'
-arch=('x86_64')
-url='http://www.ogre3d.org'
-license=('custom:MIT')
-depends=('freeimage' 'freetype2' 'libxaw' 'libxrandr' 'rapidjson'
- 'nvidia-cg-toolkit' 'zziplib' 'sdl2' 'glu' 'tinyxml' 'zlib')
-makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'ninja' 'cppunit')
-install=ogre.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/v${pkgver}.tar.gz"
- fix-includes.patch)
-optdepends=('python: python bindings')
-sha512sums=('c16dac0c9e02efd45f6c3189e0600b739e551d78f4794160701377a9c1b4e24b4868a774a35c80d7f2cade44abe04128bc46949ca497a44867b55f378ede028b'
- 'a8c70b4ee692cded9c97a0101e59bede0f4c0c2445d075b15bb20e0a3cf1e0c9af3cedde2e3b8524d2430e7b338869eb9d41d5853e9cf1510688a9ddf4f4b19f')
-
-prepare() {
- cd ogre-next-${pkgver}
- patch -Np1 -i "${srcdir}"/fix-includes.patch
-}
-
-build() {
- cd ogre-next-${pkgver}
-
- cmake \
- -Bbuild \
- -GNinja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DOGRE_CONFIG_ENABLE_JSON=TRUE \
- -DOGRE_CONFIG_THREADS=1 \
- -DOGRE_CONFIG_THREAD_PROVIDER="std" \
- -DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=ON \
- -DOGRE_USE_BOOST=TRUE \
- -DOGRE_BUILD_TESTS=TRUE \
- -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE
-
- ninja -C build
- ninja -C build OgreDoc
- # All of these are broken
- # -DOGRE_BUILD_COMPONENT_TERRAIN=ON \
- # -DOGRE_BUILD_COMPONENT_VOLUME=ON \
- # -DOGRE_BUILD_COMPONENT_PAGING=ON \
- # -DOGRE_BUILD_COMPONENT_PROPERTY=ON \
- # -DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=ON \
- # -DOGRE_BUILD_COMPONENT_SCENE_FORMAT=ON \
-}
-
-check() {
- cd ogre-next-${pkgver}
-
- # Upstream pls
- # ninja -C build test
-}
-
-package() {
- cd ogre-next-${pkgver}
-
- DESTDIR="${pkgdir}" ninja -C build install
-
- mkdir -p "${pkgdir}"/opt/ogre/samples
- mv "${pkgdir}"/usr/bin/Sample_* "${pkgdir}"/opt/ogre/samples
- mv "${pkgdir}"/usr/bin/Test_* "${pkgdir}"/opt/ogre/samples
- install -Dm644 Docs/License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ogre/repos/community-x86_64/PKGBUILD (from rev 1001104, ogre/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-17 01:21:45 UTC (rev 1001105)
@@ -0,0 +1,68 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+pkgname=ogre
+pkgver=13.0.0
+pkgrel=1
+pkgdesc='Scene-oriented, flexible 3D engine written in C++'
+arch=('x86_64')
+url='http://www.ogre3d.org'
+license=('custom:MIT')
+depends=('freeimage' 'freetype2' 'libxaw' 'libxrandr' 'rapidjson'
+ 'zziplib' 'sdl2' 'glu' 'tinyxml' 'zlib')
+makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'ninja' 'cppunit')
+install=ogre.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz"
+ https://github.com/OGRECave/ogre/commit/74c5ce3da1054b88a19f8e9f79d4492ec271ea1f.patch)
+optdepends=('python: python bindings')
+sha512sums=('b137322251b6d4798b3b2bef8f2a1e81bbe7839fd085425f66ce55dea52f93562dab8ed32ea9f19a431c65783a00a202acea75c1ef207d30d0101ae05166c605'
+ '8b0b3edd71a9322ef62fa34b5d1362e3a5fa58dd2db4233ae26b299d2ddad2b872d59ba0f900fb8f43f757260988826b7ea9eb04f4fd50f603272e6aa89a768b')
+
+prepare() {
+ cd ogre-${pkgver}
+ patch -Np1 -i "${srcdir}"/74c5ce3da1054b88a19f8e9f79d4492ec271ea1f.patch
+}
+
+build() {
+ cd ogre-${pkgver}
+
+ cmake \
+ -Bbuild \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DOGRE_CONFIG_ENABLE_JSON=ON \
+ -DOGRE_CONFIG_THREADS=1 \
+ -DOGRE_CONFIG_THREAD_PROVIDER="std" \
+ -DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=ON \
+ -DOGRE_BUILD_COMPONENT_TERRAIN=ON \
+ -DOGRE_BUILD_COMPONENT_VOLUME=ON \
+ -DOGRE_BUILD_COMPONENT_PAGING=ON \
+ -DOGRE_BUILD_COMPONENT_PROPERTY=ON \
+ -DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=ON \
+ -DOGRE_BUILD_COMPONENT_SCENE_FORMAT=ON \
+ -DOGRE_USE_BOOST=ON \
+ -DOGRE_BUILD_TESTS=ON \
+ -DOGRE_INSTALL_SAMPLES_SOURCE=ON
+
+ ninja -C build
+ ninja -C build OgreDoc
+ # All of these are broken
+}
+
+check() {
+ cd ogre-${pkgver}
+
+ # Upstream pls
+ # ninja -C build test
+}
+
+package() {
+ cd ogre-${pkgver}
+
+ DESTDIR="${pkgdir}" ninja -C build install
+
+ mkdir -p "${pkgdir}"/opt/ogre/samples
+ mv "${pkgdir}"/usr/bin/SampleBrowser "${pkgdir}"/opt/ogre/samples
+ mv "${pkgdir}"/usr/bin/Test_* "${pkgdir}"/opt/ogre/samples
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: fix-includes.patch
===================================================================
--- fix-includes.patch 2021-08-17 01:21:32 UTC (rev 1001104)
+++ fix-includes.patch 2021-08-17 01:21:45 UTC (rev 1001105)
@@ -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
- {
Copied: ogre/repos/community-x86_64/fix-includes.patch (from rev 1001104, ogre/trunk/fix-includes.patch)
===================================================================
--- fix-includes.patch (rev 0)
+++ fix-includes.patch 2021-08-17 01:21:45 UTC (rev 1001105)
@@ -0,0 +1,37 @@
+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
+ {
Deleted: ogre.install
===================================================================
--- ogre.install 2021-08-17 01:21:32 UTC (rev 1001104)
+++ ogre.install 2021-08-17 01:21:45 UTC (rev 1001105)
@@ -1,3 +0,0 @@
-post_install() {
- echo "Ogre samples are in /opt/ogre/samples"
-}
Copied: ogre/repos/community-x86_64/ogre.install (from rev 1001104, ogre/trunk/ogre.install)
===================================================================
--- ogre.install (rev 0)
+++ ogre.install 2021-08-17 01:21:45 UTC (rev 1001105)
@@ -0,0 +1,3 @@
+post_install() {
+ echo "Ogre samples are in /opt/ogre/samples"
+}
More information about the arch-commits
mailing list