[ports-gcc] Unbreak x11/qt5/qt3d

[Charlene Wendling]

Hi,

> http://build-failures.rhaalovely.net/powerpc/2019-08-09/x11/qt5/qt3d.log
> http://build-failures.rhaalovely.net/sparc64/2019-08-21/x11/qt5/qt3d.log

There used to have more issues with gcc-4.9, but with gcc-8.3, only the
bundled assimp is troublesome :)

Recent assimp versions have a fix for it [0], that allows qt3d to build
on macppc [1]. Amd64 is still fine and geo/qgis does not misbehave.

OK?

Charlène.


[0] https://github.com/assimp/assimp/pull/986
[1] https://bin.charlenew.xyz/qt3d.log.gz


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qt3d/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 24 Jun 2019 20:56:45 -0000 1.10
+++ Makefile 24 Aug 2019 12:15:31 -0000
@@ -5,7 +5,7 @@

QT5NAME = Qt3D
COMMENT-main = Qt5 components for 3D graphics
-REVISION-main = 1
+REVISION-main = 2

MULTI_PACKAGES = -main -examples

Index: patches/patch-src_3rdparty_assimp_code_glTFAsset_inl
===================================================================
RCS file: patches/patch-src_3rdparty_assimp_code_glTFAsset_inl
diff -N patches/patch-src_3rdparty_assimp_code_glTFAsset_inl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_3rdparty_assimp_code_glTFAsset_inl 24 Aug 2019 12:15:31 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix the build on big endian archs. From:
+https://github.com/assimp/assimp/pull/986/commits/c2c12c1db5c8d7610ad46b1970aabf4afde0eef4
+
+Index: src/3rdparty/assimp/code/glTFAsset.inl
+--- src/3rdparty/assimp/code/glTFAsset.inl.orig
++++ src/3rdparty/assimp/code/glTFAsset.inl
+@@ -40,6 +40,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
+
+ #include "StringUtils.h"
+
++using namespace Assimp;
++
+ namespace glTF {
+
+ namespace {

[Jeremie Courreges-Anglas]

On Sat, Aug 24 2019, Charlene Wendling <julia...@posteo.jp> wrote:
> Hi,
>
>> http://build-failures.rhaalovely.net/powerpc/2019-08-09/x11/qt5/qt3d.log
>> http://build-failures.rhaalovely.net/sparc64/2019-08-21/x11/qt5/qt3d.log
>
> There used to have more issues with gcc-4.9, but with gcc-8.3, only the
> bundled assimp is troublesome :)
>
> Recent assimp versions have a fix for it [0], that allows qt3d to build
> on macppc [1]. Amd64 is still fine and geo/qgis does not misbehave.
>
> OK?

ok jca@

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE