package/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch

   1 From b6c602e4264021f98ec2c72316e2a2000bf35e82 Mon Sep 17 00:00:00 2001
   2 From: Peter Seiderer <ps.report@gmx.net>
   3 Date: Mon, 14 Nov 2016 23:42:25 +0100
   4 Subject: [PATCH] eglfs: fix eglfs_mali compile for odroid-mali
   5
   6 Avoid duplicated struct fbdev_window definition (introduced by [1]) by
   7 renaming struct fbdev_window to shadow_fbdev_window.
   8
   9 Fixes the following buildroot compile failure ([2]):
  10
  11 qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window'
  12  struct fbdev_window {
  13         ^
  14 In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0,
  15                  from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36,
  16                  from ../../../eglfs/qeglfsglobal.h:45,
  17                  from ../../../eglfs/qeglfsdeviceintegration.h:48,
  18                  from qeglfsmaliintegration.h:37,
  19                  from qeglfsmaliintegration.cpp:34:
  20
  21 [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc
  22 [2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a
  23
  24 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  25 ---
  26  .../eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp      | 4 ++--
  27  1 file changed, 2 insertions(+), 2 deletions(-)
  28
  29 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
  30 index 43decdf..aeba83f 100644
  31 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
  32 +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp
  33 @@ -42,7 +42,7 @@
  34
  35  QT_BEGIN_NAMESPACE
  36
  37 -struct fbdev_window {
  38 +struct shadow_fbdev_window {
  39      unsigned short width;
  40      unsigned short height;
  41  };
  42 @@ -85,7 +85,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w
  43      Q_UNUSED(window);
  44      Q_UNUSED(format);
  45
  46 -    fbdev_window *fbwin = reinterpret_cast<fbdev_window *>(malloc(sizeof(fbdev_window)));
  47 +    shadow_fbdev_window *fbwin = reinterpret_cast<shadow_fbdev_window *>(malloc(sizeof(shadow_fbdev_window)));
  48      if (NULL == fbwin)
  49          return 0;
  50
  51 --
  52 2.8.1
  53