New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
T23208: Drop libwobbly dependency, switch to libwobbly-glib-0.3 #270
Conversation
Jenkins: retest this please. |
Ah, we'll need to include libwobbly-glib-0.3 in the distro . I'll chat to @cosimoc about that, the easiest way is probably to migrate it to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Let's see if the tests pass later (I called for a retest but maybe the libwobbly hadn't finished building).
Update: I created the repository now in endlessm as a fork of the original smspillaz one, and added the libwobbly job to the eos-build template. I can't run the jenkins-jobs command to update it at the moment. I will try again in a bit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The last commit basically undoes the first two. Please squash them all together.
@@ -102,6 +102,10 @@ if enable_recorder | |||
recorder_deps += [gst_dep, gst_base_dep, gtk_dep, x11_dep] | |||
endif | |||
|
|||
cc = meson.get_compiler('c') | |||
|
|||
m_dep = cc.find_library('m', required: false) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this required? I'd avoid diverging from the upstream build file if possible.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Its required since EndlesShellFX depends on libm
. I can probably get rid of EndlessShellFX now that we dont need to compile it separately but would rather do that in another story since it's a lot of churn.
src/wobbly-effect.c
Outdated
@@ -298,12 +297,11 @@ endless_shell_fx_wobbly_ungrab (EndlessShellFXWobbly *effect) | |||
* of the animation */ | |||
if (priv->timeout_id) | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove curly braces here and below, now that they only have one line
b74206a
to
e064048
Compare
e7acaa9
to
49529cc
Compare
This removes some of the messiness involved in compiling the only C++ library in gnome-shell. https://phabricator.endlessm.com/T23208
This PR drops the dependency on libwobbly's C++ API and moves to using libwobbly-glib (the C API). Amongst other things, using this API means that we no longer have a single C++ file cluttering up the build.
https://phabricator.endlessm.com/T23208