p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

collada-dom: fix compilation with recent gcc 

Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
This commit is contained in:
Dmitry Rozhkov 2017-02-02 10:43:28 +02:00
parent 361aeb2a5f
commit dbc17a263d
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
recipes-extended/collada-dom/collada-dom/0001-Fix-return-value-to-be-of-expected-type.patch Normal file
View File

@ -0,0 +1,31 @@
From 83899b26ad9c0c565cd41ef296e758675dda003d Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Date: Thu, 2 Feb 2017 10:37:52 +0200
Subject: [PATCH] Fix return value to be of expected type
The expected type is a pointer, but the code returns a boolean
value. This makes compilation fail with recent gcc.
Upstream-Status: Submitted [https://sourceforge.net/p/collada-dom/patches/10/]
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
---
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 676141f..d51dd78 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.7.4

4
recipes-extended/collada-dom/collada-dom_2.4.0.bb
View File

@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://License_Folder/license_e.txt;md5=33ea5b7341abf67bd905
DEPENDS = "boost libxml2 libpcre"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tgz"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tgz \
file://0001-Fix-return-value-to-be-of-expected-type.patch \
"
SRC_URI[md5sum] = "20399de4206eab850c32e65c04e907cb"
SRC_URI[sha256sum] = "5ca2d12f744bdceff0066ed3067b3b23d6859581fb0d657f98ba4487d8fa3896"