[arch-commits] Commit in ogre-next/repos/community-x86_64 (5 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Sat Dec 25 21:28:38 UTC 2021
Date: Saturday, December 25, 2021 @ 21:28:37
Author: svenstaro
Revision: 1083803
archrelease: copy trunk to community-x86_64
Added:
ogre-next/repos/community-x86_64/PKGBUILD
(from rev 1083802, ogre-next/trunk/PKGBUILD)
ogre-next/repos/community-x86_64/ogre-next.install
(from rev 1083802, ogre-next/trunk/ogre-next.install)
Deleted:
ogre-next/repos/community-x86_64/PKGBUILD
ogre-next/repos/community-x86_64/fix-includes.patch
ogre-next/repos/community-x86_64/ogre-next.install
--------------------+
PKGBUILD | 117 +++++++++++++++++++++++----------------------------
fix-includes.patch | 37 ----------------
ogre-next.install | 6 +-
3 files changed, 58 insertions(+), 102 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-25 21:28:30 UTC (rev 1083802)
+++ PKGBUILD 2021-12-25 21:28:37 UTC (rev 1083803)
@@ -1,62 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-pkgname=ogre-next
-pkgver=2.2.4
-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' 'openvr')
-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')
-
-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=ON \
- -DOGRE_CONFIG_THREADS=1 \
- -DOGRE_CONFIG_THREAD_PROVIDER="std" \
- -DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=ON \
- -DOGRE_BUILD_COMPONENT_PROPERTY=ON \
- -DOGRE_BUILD_COMPONENT_SCENE_FORMAT=ON \
- -DOGRE_BUILD_TESTS=ON \
- -DOGRE_INSTALL_SAMPLES_SOURCE=ON
-
- ninja -C build
- ninja -C build OgreDoc
-}
-
-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-next/repos/community-x86_64/PKGBUILD (from rev 1083802, ogre-next/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-25 21:28:37 UTC (rev 1083803)
@@ -0,0 +1,55 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
+pkgname=ogre-next
+pkgver=2.3.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' 'openvr')
+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")
+sha512sums=('90c502f8fdabb40069fc8347769f0ca110942d0291ba6b33678449bfef953a55c42e84c748e37ff74af7babf498d71a7c464e6a435ab11889345950b9d65632e')
+
+build() {
+ cd ogre-next-${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_PROPERTY=ON \
+ -DOGRE_BUILD_COMPONENT_SCENE_FORMAT=ON \
+ -DOGRE_BUILD_TESTS=ON \
+ -DOGRE_INSTALL_SAMPLES_SOURCE=ON
+
+ ninja -C build
+ ninja -C build OgreDoc
+}
+
+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:
Deleted: fix-includes.patch
===================================================================
--- fix-includes.patch 2021-12-25 21:28:30 UTC (rev 1083802)
+++ fix-includes.patch 2021-12-25 21:28:37 UTC (rev 1083803)
@@ -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
- {
Deleted: ogre-next.install
===================================================================
--- ogre-next.install 2021-12-25 21:28:30 UTC (rev 1083802)
+++ ogre-next.install 2021-12-25 21:28:37 UTC (rev 1083803)
@@ -1,3 +0,0 @@
-post_install() {
- echo "Ogre samples are in /opt/ogre/samples"
-}
Copied: ogre-next/repos/community-x86_64/ogre-next.install (from rev 1083802, ogre-next/trunk/ogre-next.install)
===================================================================
--- ogre-next.install (rev 0)
+++ ogre-next.install 2021-12-25 21:28:37 UTC (rev 1083803)
@@ -0,0 +1,3 @@
+post_install() {
+ echo "Ogre samples are in /opt/ogre/samples"
+}
More information about the arch-commits
mailing list