weston: 5.0.0 -> 6.0.0 #58522
Merged
weston: 5.0.0 -> 6.0.0 #58522
+28
−104
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
10.rebuild-darwin: 0
dtzWill
force-pushed
the
update/weston-6
branch
from
600481d to
3ee28b1
Compare
primeos
reviewed
Mar 30, 2019
probably can remove the legacy attribute now.
infinisil
added
the
8.has: package (update)
|
@dtzWill Is this still WIP? |
I suspect no, but don't remember O:). |
jtojnar
reviewed
Apr 17, 2019
|
@dtzWill also 2/4 of my review notes are still not marked as resolved, could you have a quick look at them? I could help testing this when it's finished. |
The GitHub GUI didn't let me do this...
|
Just recalled that there was this PR. I'll have a quick look. |
ofborg
bot
added
the
2.status: merge conflict
The default is true so only false makes a difference.
We build with -Dauto_features=disabled
primeos
reviewed
May 16, 2019
| mesonFlags= [ | ||
| "-Dbackend-rdp=${boolToString (freerdp != null)}" | ||
| "-Dremoting=false" # TODO | ||
| "-Dsimple-dmabuf-drm=" # Disables all drivers |
There was a problem hiding this comment.
Note: The default is [ 'intel', 'freedreno', 'etnaviv' ] and I didn't check whether disabling this makes sense or not...
|
Gave it a quick test and at least Testing is welcome :) I'm not sure how solid this actually is, but I'm in favor of merging it after some comments/reviews. @dtzWill Can you rebase to resolve the merge conflict? I didn't try but AFAIK I wouldn't have the permissions anyway. |
primeos
approved these changes
May 16, 2019
There was a problem hiding this comment.
File diff from diffoscope:
--- /nix/store/dfbdv03q88v28xh6vv8jz3r85aibdx10-weston-5.0.0
+++ /nix/store/2z706w77w9b8c28w335psal9wybci1r2-weston-6.0.0
├── file list
│ @@ -1,90 +1,108 @@
│ bin
│ bin/wcap-decode
│ bin/weston
│ +bin/weston-calibrator
│ +bin/weston-clickdot
│ +bin/weston-cliptest
│ +bin/weston-confine
│ +bin/weston-debug
│ +bin/weston-dnd
│ +bin/weston-editor
│ +bin/weston-eventdemo
│ +bin/weston-flower
│ +bin/weston-fullscreen
│ +bin/weston-image
│ bin/weston-info
│ bin/weston-launch
│ +bin/weston-multi-resource
│ +bin/weston-presentation-shm
│ +bin/weston-resizor
│ +bin/weston-scaler
│ +bin/weston-screenshooter
│ +bin/weston-simple-damage
│ +bin/weston-simple-dmabuf-drm
│ +bin/weston-simple-dmabuf-egl
│ +bin/weston-simple-dmabuf-v4l
│ +bin/weston-simple-egl
│ +bin/weston-simple-shm
│ +bin/weston-simple-touch
│ +bin/weston-smoke
│ +bin/weston-stacking
│ +bin/weston-subsurfaces
│ bin/weston-terminal
│ +bin/weston-touch-calibrator
│ +bin/weston-transformed
│ include
│ -include/libweston-5
│ -include/libweston-5/compositor-drm.h
│ -include/libweston-5/compositor-fbdev.h
│ -include/libweston-5/compositor-headless.h
│ -include/libweston-5/compositor-rdp.h
│ -include/libweston-5/compositor-wayland.h
│ -include/libweston-5/compositor-x11.h
│ -include/libweston-5/compositor.h
│ -include/libweston-5/config-parser.h
│ -include/libweston-5/libweston-desktop.h
│ -include/libweston-5/matrix.h
│ -include/libweston-5/plugin-registry.h
│ -include/libweston-5/timeline-object.h
│ -include/libweston-5/version.h
│ -include/libweston-5/windowed-output-api.h
│ -include/libweston-5/xwayland-api.h
│ -include/libweston-5/zalloc.h
│ +include/libweston-6
│ +include/libweston-6/compositor-drm.h
│ +include/libweston-6/compositor-fbdev.h
│ +include/libweston-6/compositor-headless.h
│ +include/libweston-6/compositor-rdp.h
│ +include/libweston-6/compositor-wayland.h
│ +include/libweston-6/compositor-x11.h
│ +include/libweston-6/compositor.h
│ +include/libweston-6/config-parser.h
│ +include/libweston-6/libweston-desktop.h
│ +include/libweston-6/matrix.h
│ +include/libweston-6/plugin-registry.h
│ +include/libweston-6/timeline-object.h
│ +include/libweston-6/version.h
│ +include/libweston-6/windowed-output-api.h
│ +include/libweston-6/xwayland-api.h
│ +include/libweston-6/zalloc.h
│ include/weston
│ include/weston/ivi-layout-export.h
│ include/weston/weston.h
│ lib
│ -lib/libweston-5
│ -lib/libweston-5.la
│ -lib/libweston-5.so
│ -lib/libweston-5.so.0
│ -lib/libweston-5.so.0.0.0
│ -lib/libweston-5/drm-backend.la
│ -lib/libweston-5/drm-backend.so
│ -lib/libweston-5/fbdev-backend.la
│ -lib/libweston-5/fbdev-backend.so
│ -lib/libweston-5/gl-renderer.la
│ -lib/libweston-5/gl-renderer.so
│ -lib/libweston-5/headless-backend.la
│ -lib/libweston-5/headless-backend.so
│ -lib/libweston-5/rdp-backend.la
│ -lib/libweston-5/rdp-backend.so
│ -lib/libweston-5/wayland-backend.la
│ -lib/libweston-5/wayland-backend.so
│ -lib/libweston-5/x11-backend.la
│ -lib/libweston-5/x11-backend.so
│ -lib/libweston-5/xwayland.la
│ -lib/libweston-5/xwayland.so
│ -lib/libweston-desktop-5.la
│ -lib/libweston-desktop-5.so
│ -lib/libweston-desktop-5.so.0
│ -lib/libweston-desktop-5.so.0.0.0
│ +lib/libweston-6
│ +lib/libweston-6.so
│ +lib/libweston-6.so.0
│ +lib/libweston-6.so.0.0.0
│ +lib/libweston-6/drm-backend.so
│ +lib/libweston-6/fbdev-backend.so
│ +lib/libweston-6/gl-renderer.so
│ +lib/libweston-6/headless-backend.so
│ +lib/libweston-6/rdp-backend.so
│ +lib/libweston-6/wayland-backend.so
│ +lib/libweston-6/x11-backend.so
│ +lib/libweston-6/xwayland.so
│ +lib/libweston-desktop-6.so
│ +lib/libweston-desktop-6.so.0
│ +lib/libweston-desktop-6.so.0.0.0
│ lib/pkgconfig
│ -lib/pkgconfig/libweston-5.pc
│ -lib/pkgconfig/libweston-desktop-5.pc
│ +lib/pkgconfig/libweston-6.pc
│ +lib/pkgconfig/libweston-desktop-6.pc
│ lib/pkgconfig/weston.pc
│ lib/weston
│ -lib/weston/desktop-shell.la
│ +lib/weston/cms-colord.so
│ +lib/weston/cms-static.so
│ lib/weston/desktop-shell.so
│ -lib/weston/fullscreen-shell.la
│ lib/weston/fullscreen-shell.so
│ -lib/weston/hmi-controller.la
│ lib/weston/hmi-controller.so
│ -lib/weston/ivi-shell.la
│ lib/weston/ivi-shell.so
│ -lib/weston/screen-share.la
│ lib/weston/screen-share.so
│ +lib/weston/systemd-notify.so
│ libexec
│ libexec/weston-desktop-shell
│ libexec/weston-ivi-shell-user-interface
│ libexec/weston-keyboard
│ -libexec/weston-screenshooter
│ libexec/weston-simple-im
│ share
│ share/man
│ share/man/man1
│ +share/man/man1/weston-debug.1.gz
│ share/man/man1/weston.1.gz
│ share/man/man5
│ share/man/man5/weston.ini.5.gz
│ share/man/man7
│ share/man/man7/weston-drm.7.gz
│ share/man/man7/weston-rdp.7.gz
│ +share/pkgconfig
│ +share/pkgconfig/libweston-6-protocols.pc
│ share/wayland-sessions
│ share/wayland-sessions/weston.desktop
│ share/weston
│ share/weston/background.png
│ share/weston/border.png
│ share/weston/fullscreen.png
│ share/weston/home.png
│ @@ -95,14 +113,16 @@
│ share/weston/icon_ivi_simple-egl.png
│ share/weston/icon_ivi_simple-shm.png
│ share/weston/icon_ivi_smoke.png
│ share/weston/icon_terminal.png
│ share/weston/icon_window.png
│ share/weston/panel.png
│ share/weston/pattern.png
│ +share/weston/protocols
│ +share/weston/protocols/weston-debug.xml
│ share/weston/random.png
│ share/weston/sidebyside.png
│ share/weston/sign_close.png
│ share/weston/sign_maximize.png
│ share/weston/sign_minimize.png
│ share/weston/terminal.png
│ share/weston/tiling.png
Seems like we now export additional binaries to /bin but that's strange since --enable-clients was provided before...
Overall it looks ok and should hopefully be fine.
| "-Dremoting=false" # TODO | ||
| "-Dsimple-dmabuf-drm=" # Disables all drivers | ||
| "-Dtest-junit-xml=false" | ||
| #"--enable-clients" |
There was a problem hiding this comment.
This was introduced here https://gitlab.freedesktop.org/wayland/weston/commit/60c15080ab24ae2f4347fb04e39f147c51656688 and the clients are defined here: https://gitlab.freedesktop.org/wayland/weston/blob/6.0.0/Makefile.am#L565
| "-Dsimple-dmabuf-drm=" # Disables all drivers | ||
| "-Dtest-junit-xml=false" | ||
| #"--enable-clients" | ||
| #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails |
There was a problem hiding this comment.
Should be fine to remove since the build doesn't fail.
ofborg
bot
removed
the
2.status: merge conflict
|
According to For the log: File differences with: westonLitefile listwestonfile list |
|
It still builds/runs, |
|
On Fri, 31 May 2019 14:00:02 -0700, Michael Weiss ***@***.***> wrote:
Merged #58522 into master.
Thank you for seeing this through, sorry for not assisting more.
\o/ this is finally merged :D.
…
--
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub:
#58522 (comment) part: text/html
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040356.html
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040334.html
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Tested a handful of the executables, not sure how to use all of them :3.