libraries/collada-dom: Fix build on -current.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo 2017-07-06 08:20:31 +07:00
parent 2fdf317e1d
commit 8ac8893a4d
2 changed files with 31 additions and 3 deletions

View File

@ -15,7 +15,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@ -26,8 +26,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@ -55,6 +55,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p1 < $CWD/return-type.patch
mkdir -p build
cd build
cmake \

View File

@ -0,0 +1,26 @@
From 8e65676c1cbecde1c0c4d8c2e1cfb20fc49c410b Mon Sep 17 00:00:00 2001
From: rosen <rosen.diankov@mujin.co.jp>
Date: Wed, 24 Feb 2016 12:49:14 +0900
Subject: [PATCH] fix return type thanks to #22
---
dom/src/dae/daeMetaGroup.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dom/src/dae/daeMetaGroup.cpp b/dom/src/dae/daeMetaGroup.cpp
index 25fd9cc..c34ac4c 100644
--- a/dom/src/dae/daeMetaGroup.cpp
+++ b/dom/src/dae/daeMetaGroup.cpp
@@ -26,7 +26,7 @@ daeElement *daeMetaGroup::placeElement( daeElement *parent, daeElement *child, d
(void)offset;
daeString nm = child->getElementName();
if ( findChild( nm ) == NULL ) {
- return false;
+ return NULL;
}
daeElementRef el;
--
2.8.2