D10762: Fix the build on armhf/aarch64
This revision was automatically updated to reflect the committed changes. Closed by commit R108:3fa287280b04: Fix the build on armhf/aarch64 (authored by bshah). REPOSITORY R108 KWin CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10762?vs=28659&id=28781 REVISION DETAIL https://phabricator.kde.org/D10762 AFFECTED FILES fixqopengl.h libkwineffects/kwinglplatform.cpp platform.h plugins/qpa/abstractplatformcontext.h plugins/qpa/integration.h plugins/qpa/window.h To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
graesslin added a comment. btw. please push to 5.12 branch REPOSITORY R108 KWin BRANCH arcpatch-D10762 REVISION DETAIL https://phabricator.kde.org/D10762 To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
graesslin accepted this revision. This revision is now accepted and ready to land. REPOSITORY R108 KWin BRANCH arcpatch-D10762 REVISION DETAIL https://phabricator.kde.org/D10762 To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
bshah updated this revision to Diff 28659. bshah added a comment. updated to use single header REPOSITORY R108 KWin CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10762?vs=28375&id=28659 BRANCH arcpatch-D10762 REVISION DETAIL https://phabricator.kde.org/D10762 AFFECTED FILES fixqopengl.h libkwineffects/kwinglplatform.cpp platform.h plugins/qpa/abstractplatformcontext.h plugins/qpa/integration.h plugins/qpa/window.h To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
graesslin requested changes to this revision. graesslin added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > platform.h:29 > +// declaration, so we have to prevent the Qt header from being #included. > +#define QOPENGL_H > + please also this one through the new header. Just move it into the main directory, then you can access it from everywhere. REPOSITORY R108 KWin REVISION DETAIL https://phabricator.kde.org/D10762 To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
bshah updated this revision to Diff 28375. bshah added a comment. - In QPA move duplicated code in the seperate header - Add comment on why kwinglutils_funcs.h is included REPOSITORY R108 KWin CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10762?vs=27834&id=28375 BRANCH fix-arm-build REVISION DETAIL https://phabricator.kde.org/D10762 AFFECTED FILES libkwineffects/kwinglplatform.cpp platform.h plugins/qpa/abstractplatformcontext.h plugins/qpa/fixqopengl.h plugins/qpa/integration.h plugins/qpa/window.h To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
graesslin requested changes to this revision. graesslin added inline comments. This revision now requires changes to proceed. Restricted Application edited projects, added KWin; removed Plasma. INLINE COMMENTS > kwinglplatform.cpp:22 > #include "kwinglplatform.h" > +#include "kwinglutils_funcs.h" > #include why include kwinglutils_funcs.h? If it's truly needed, please add a comment so that it doesn't get removed with cleanup > platform.h:24-37 > #include > + > +// qopengl.h declares GLdouble as a typedef of float when Qt is built > +// with GLES support. This conflicts with the epoxy/gl_generated.h > +// declaration, so we have to prevent the Qt header from being #included. > +#define QOPENGL_H > + Instead of copy pasting this all over the place: let's add one header file which does the epoxy include and the ifdef mess. REPOSITORY R108 KWin REVISION DETAIL https://phabricator.kde.org/D10762 To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
bshah updated this revision to Diff 27834. bshah added a comment. Restricted Application edited projects, added Plasma; removed KWin. cover all the cases of epoxy I am not really sure if this is right approch, suggestions welcome REPOSITORY R108 KWin CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10762?vs=27831&id=27834 BRANCH fix-arm-build REVISION DETAIL https://phabricator.kde.org/D10762 AFFECTED FILES libkwineffects/kwinglplatform.cpp platform.h plugins/qpa/abstractplatformcontext.h plugins/qpa/integration.h plugins/qpa/window.h To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart, iodelay, bwowk, hardening
D10762: Fix the build on armhf/aarch64
bshah planned changes to this revision. bshah added a comment. Restricted Application edited projects, added KWin; removed Plasma. Appearantly this doesn't fix all the issues. REPOSITORY R108 KWin REVISION DETAIL https://phabricator.kde.org/D10762 To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, iodelay, bwowk, ZrenBot, lesliezhai, ali-mohamed, hardening, jensreuterberg, abetts, sebas, apol, mart
D10762: Fix the build on armhf/aarch64
bshah created this revision. bshah added reviewers: Plasma, graesslin. Restricted Application added a project: KWin. Restricted Application added subscribers: KWin, kwin, plasma-devel. bshah requested review of this revision. Restricted Application edited projects, added Plasma; removed KWin. REVISION SUMMARY qopengl.h redeclares the functions defined in the epoxy/gl.h and it results in the build error. this is similar to other .cpp files where epoxy/gl.h is used. See: https://build.neon.kde.org/job/xenial_unstable_plasma_kwin_bin_armhf/157 REPOSITORY R108 KWin BRANCH fix-arm-build REVISION DETAIL https://phabricator.kde.org/D10762 AFFECTED FILES libkwineffects/kwinglplatform.cpp To: bshah, #plasma, graesslin Cc: plasma-devel, kwin, #kwin, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
