diff options
| author |   Christoph Willing <chris.willing@linux.com> | 2023-07-22 18:13:31 +1000 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-07-22 15:52:44 +0700 |
| commit | aee3114cd74d800faf679337044b8d604a40df1e (patch) | |
| tree | 91044542dd070dff6a81360a40b7940d94766a76 | |
| parent | 9f8cb4084495984310bcf41b539a9166c23e54f8 (diff) | |
| download | slackbuilds-aee3114cd74d800faf679337044b8d604a40df1e.tar.gz slackbuilds-aee3114cd74d800faf679337044b8d604a40df1e.tar.xz | |
graphics/opencollada: Accommodate updated compiler
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | graphics/opencollada/no_werror.diff | 11 | ||||
| -rw-r--r-- | graphics/opencollada/opencollada.SlackBuild | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/graphics/opencollada/no_werror.diff b/graphics/opencollada/no_werror.diff new file mode 100644 index 0000000000..c76a7a8ffe --- /dev/null +++ b/graphics/opencollada/no_werror.diff @@ -0,0 +1,11 @@ +--- DAEValidator/CMakeLists.txt.orig 2018-11-27 08:43:10.000000000 +1000 ++++ DAEValidator/CMakeLists.txt 2023-07-22 10:17:56.130000000 +1000 +@@ -100,7 +100,7 @@ + # C4820: 'bytes' bytes padding added after construct 'member_name' + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820") + else () +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall") + endif () + + add_custom_command( diff --git a/graphics/opencollada/opencollada.SlackBuild b/graphics/opencollada/opencollada.SlackBuild index 47330cdb90..a1f0efc246 100644 --- a/graphics/opencollada/opencollada.SlackBuild +++ b/graphics/opencollada/opencollada.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for opencollada -# Copyright 2015-2019 Christoph Willing, Brisbane Australia +# Copyright 2015-2023 Christoph Willing, Brisbane Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=opencollada SRCNAM=OpenCOLLADA VERSION=${VERSION:-1.6.68} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,6 +82,9 @@ find -L . \ # https://github.com/KhronosGroup/OpenCOLLADA/issues/570 patch -p1 < $CWD/pcre.patch +patch -p0 < $CWD/no_werror.diff +sed -i -e '/#include "Macros.h"/i #include <cstdint>' DAEValidator/library/src/DaeValidator.cpp +sed -i -e '/#include "Macros.h"/i #include <cstdint>' DAEValidator/library/src/XmlDoc.cpp mkdir -p build cd build |