Date: Friday, June 26, 2015 @ 05:49:47 Author: foutrelis Revision: 135885
Fix build with GCC 5.1 and revert switch to clang https://bugzilla.redhat.com/show_bug.cgi?id=1223612 Modified: ogre/trunk/PKGBUILD ----------+ PKGBUILD | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-26 03:04:24 UTC (rev 135884) +++ PKGBUILD 2015-06-26 03:49:47 UTC (rev 135885) @@ -8,19 +8,22 @@ arch=('i686' 'x86_64') url='http://www.ogre3d.org' license=('custom:MIT') -depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' +depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' 'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu' 'tinyxml') -makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial' 'clang') +makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial') install=ogre.install source=("hg+http://bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}"; - cmake30.patch::https://bitbucket.org/sinbad/ogre/commits/d84bce645d3dd439188d3d29d8da51c51765a085/raw/) + ogre-template-fix.patch::https://bitbucket.org/sinbad/ogre/commits/a24ac4afbbb9dc5ff49a61634af50da11ba8fb97/raw/ + ogre-cmake30.patch::https://bitbucket.org/sinbad/ogre/commits/d84bce645d3dd439188d3d29d8da51c51765a085/raw/) md5sums=('SKIP' + '3debee4514a33a0a642370aecdc41975' '116fb8009c8d4b499f9a885052cc0ea6') prepare() { cd ogre - patch -Np1 < $srcdir/cmake30.patch + patch -Np1 < $srcdir/ogre-template-fix.patch + patch -Np1 < $srcdir/ogre-cmake30.patch } build() { @@ -29,9 +32,9 @@ [[ -d build ]] && rm -rf build mkdir build && cd build - export CC="clang" - export CXX="clang++" - export CXXFLAGS="-msse4" + # Silence warnings about deprecated declarations + CXXFLAGS+=' -Wno-deprecated-declarations' + cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DOGRE_INSTALL_SAMPLES=TRUE \
