diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-07-06 08:20:31 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-07-06 08:21:11 +0700 |
| commit | 8ac8893a4d2851c6db0f966a252f2c8f4b3d94fa (patch) | |
| tree | aee88e4e430aee6883583da15bac2577ca11d2d4 /libraries/collada-dom | |
| parent | 2fdf317e1d9f6392c69bd6aad71ca42467bcada5 (diff) | |
libraries/collada-dom: Fix build on -current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/collada-dom')
| -rw-r--r-- | libraries/collada-dom/collada-dom.SlackBuild | 8 | ||||
| -rw-r--r-- | libraries/collada-dom/return-type.patch | 26 |
2 files changed, 31 insertions, 3 deletions
diff --git a/libraries/collada-dom/collada-dom.SlackBuild b/libraries/collada-dom/collada-dom.SlackBuild index 35bcef74358a..67035584500d 100644 --- a/libraries/collada-dom/collada-dom.SlackBuild +++ b/libraries/collada-dom/collada-dom.SlackBuild @@ -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 \ diff --git a/libraries/collada-dom/return-type.patch b/libraries/collada-dom/return-type.patch new file mode 100644 index 000000000000..7fe685ce5bfc --- /dev/null +++ b/libraries/collada-dom/return-type.patch @@ -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 + + |