Differential D10762

Fix the build on armhf/aarch64
ClosedPublic
Actions

Authored by bshah on Feb 23 2018, 6:47 AM.

Details

Reviewers
graesslin
Group Reviewers
Plasma
Commits
R108:3fa287280b04: Fix the build on armhf/aarch64
R108:775ba8fc972b: Fix the build on armhf/aarch64
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

Diff Detail

Repository
R108 KWin
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
bshah created this revision.Feb 23 2018, 6:47 AM
Restricted Application added a project: KWin. · View Herald TranscriptFeb 23 2018, 6:47 AM
Restricted Application added subscribers: KWin, kwin, plasma-devel. · View Herald Transcript
bshah requested review of this revision.Feb 23 2018, 6:47 AM
Restricted Application edited projects, added Plasma; removed KWin. · View Herald TranscriptFeb 23 2018, 6:47 AM
bshah planned changes to this revision.Feb 23 2018, 6:57 AM

Appearantly this doesn't fix all the issues.

Restricted Application edited projects, added KWin; removed Plasma. · View Herald TranscriptFeb 23 2018, 6:57 AM
bshah updated this revision to Diff 27834.Feb 23 2018, 8:07 AM

cover all the cases of epoxy

I am not really sure if this is right approch, suggestions welcome

Restricted Application edited projects, added Plasma; removed KWin. · View Herald TranscriptFeb 23 2018, 8:07 AM
graesslin requested changes to this revision.Feb 23 2018, 4:33 PM
graesslin added inline comments.
libkwineffects/kwinglplatform.cpp
22

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–27

Instead of copy pasting this all over the place: let's add one header file which does the epoxy include and the ifdef mess.

This revision now requires changes to proceed.Feb 23 2018, 4:33 PM
Restricted Application edited projects, added KWin; removed Plasma. · View Herald TranscriptFeb 23 2018, 4:33 PM
bshah updated this revision to Diff 28375.Mar 2 2018, 6:41 AM
  • In QPA move duplicated code in the seperate header
  • Add comment on why kwinglutils_funcs.h is included
graesslin requested changes to this revision.Mar 2 2018, 5:00 PM
graesslin added inline comments.
platform.h
29

please also this one through the new header. Just move it into the main directory, then you can access it from everywhere.

This revision now requires changes to proceed.Mar 2 2018, 5:00 PM
bshah updated this revision to Diff 28659.Mar 5 2018, 5:49 AM

updated to use single header

graesslin accepted this revision.Mar 5 2018, 5:49 PM
This revision is now accepted and ready to land.Mar 5 2018, 5:49 PM
graesslin added a comment.Mar 5 2018, 6:51 PM

btw. please push to 5.12 branch

Closed by commit R108:3fa287280b04: Fix the build on armhf/aarch64 (authored by bshah). · Explain WhyMar 6 2018, 3:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28781

View Options

fixqopengl.h

Loading...
View Options

libkwineffects/kwinglplatform.cpp

Loading...
View Options

platform.h

Loading...
View Options

plugins/qpa/abstractplatformcontext.h

Loading...
View Options

plugins/qpa/integration.h

Loading...
View Options

plugins/qpa/window.h

Loading...