Merge pull request #2169 from pullmoll/libogre

libogre: unbreak armv7-musl
This commit is contained in:
Jürgen Buchmüller 2015-08-04 02:03:31 +02:00
commit 3372afbfae
2 changed files with 14 additions and 2 deletions

View file

@ -0,0 +1,12 @@
--- OgreMain/src/OgrePlatformInformation.cpp 2015-08-03 22:41:03.964820685 +0200
+++ OgreMain/src/OgrePlatformInformation.cpp 2015-08-03 22:54:13.043818347 +0200
@@ -43,7 +43,9 @@
#if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID
#include <cpu-features.h>
#elif OGRE_CPU == OGRE_CPU_ARM
+ #if defined(__GLIBC__)
#include <sys/sysctl.h>
+ #endif
#if __MACH__
#if defined(__GLIBC__)
#include <mach/machine.h>

View file

@ -1,7 +1,7 @@
# Template file for 'ogre'
pkgname=libogre
version=1.9.0
revision=3
revision=4
build_style=cmake
_hgrev=dd30349ea6670e3cd962d9d41a8039de3a3482d3
configure_args="-DCMAKE_INSTALL_PREFIX=/usr \
@ -14,7 +14,7 @@ configure_args="-DCMAKE_INSTALL_PREFIX=/usr \
hostmakedepends="cmake pkg-config graphviz doxygen dejavu-fonts-ttf"
makedepends="boost-devel freetype-devel libXaw-devel libXrandr-devel
MesaLib-devel zziplib-devel libcppunit-devel glu-devel libatomic-devel"
short_desc="scene-oriented, flexible 3D engine"
short_desc="Scene-oriented, flexible 3D engine"
maintainer="Enno Boland <eb@s01.de>"
homepage="http://www.ogre3d.org"
license="MIT"