Import FindGLIB2 and FindPulseAudio from ECM
ClosedPublic

Authored by heikobecker on Nov 10 2017, 4:07 PM.

Details

Summary

This seems backwards considering that both are in ECM now, but they
are source incompatible to the ones from KDELibs4Support.
We can't just depend on ECM 5.41.0 to solve this because the current
master of kmix is supposed to be released with KDE Applications 17.12
and 5.41.0 is only due for release on December 9th. Doing different
checks depending on the ECM version is also not an option because
ECM's version isn't increased in git yet, i.e. it's the same as for
the release of 5.40.0, which doesn't have the new find modules.
So this seems to be the best option with the downside that somebody
needs to remember to remove them when it's safe to depend on ECM
5.41.0.
This also allows us to get rid of KDELibs4 now.

Test Plan

Successfully buildt with ECM 5.40.0 and current master

Diff Detail

Repository
R345 KMix
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
heikobecker created this revision.Nov 10 2017, 4:07 PM
marten requested changes to this revision.Nov 10 2017, 4:39 PM

+1 for this change to fit in with the release schedule and allow the immediate removal of KDELibs4Support.

But... these modules are straight copies from the new ones in ECM (otherwise it would just be reverting the earlier removal). Therefore the rest of KMix needs to be adapted for the new variable names, e.g. FindPulseAudio.cmake sets PulseAudio_FOUND etc. but CMakeLists.txt in this review is still using PULSEAUDIO_FOUND. These are the changes that the comment starting "PulseAudio is an optional dependency..." in CMakeLists.txt refers.to.

This revision now requires changes to proceed.Nov 10 2017, 4:39 PM

+1 for this change to fit in with the release schedule and allow the immediate removal of KDELibs4Support.

But... these modules are straight copies from the new ones in ECM (otherwise it would just be reverting the earlier removal). Therefore the rest of KMix needs to be adapted for the new variable names, e.g. FindPulseAudio.cmake sets PulseAudio_FOUND etc. but CMakeLists.txt in this review is still using PULSEAUDIO_FOUND. These are the changes that the comment starting "PulseAudio is an optional dependency..." in CMakeLists.txt refers.to.

That already has been done in 8f6a33567166d45d7ca62ddfe41f319e33fe8d6f and c195e04252be30e691e9b5a1454a62bed490004f. Which has been the motivation behind this change because it basically added a hard dep on ECM 5.41.0.

Sorry, I'd missed those two commit notifications. Review OK by me.

lbeltrame accepted this revision.Nov 10 2017, 9:40 PM
marten accepted this revision.Nov 11 2017, 9:02 AM

Think that I need to do this as well, to override my earlier request for changes.

This revision is now accepted and ready to land.Nov 11 2017, 9:02 AM
This revision was automatically updated to reflect the committed changes.