Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chromebrew
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
chromebrew
Commits
f87680d9
Commit
f87680d9
authored
Nov 29, 2020
by
Ed Reel
Committed by
GitHub
Nov 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add xwayland pre-built binary for i686 (#4667)
parent
ad3539b6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
13 deletions
+17
-13
packages/xwayland.rb
packages/xwayland.rb
+17
-13
No files found.
packages/xwayland.rb
View file @
f87680d9
...
...
@@ -12,11 +12,13 @@ class Xwayland < Package
binary_url
({
aarch64:
'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.9-1-chromeos-armv7l.tar.xz'
,
armv7l:
'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.9-1-chromeos-armv7l.tar.xz'
,
i686:
'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.9-1-chromeos-i686.tar.xz'
,
x86_64:
'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.9-1-chromeos-x86_64.tar.xz'
,
})
binary_sha256
({
aarch64:
'09a2f25dadcdf4d04bd7939daccef4286540dc17da05f96dd27001d5e29e64bd'
,
armv7l:
'09a2f25dadcdf4d04bd7939daccef4286540dc17da05f96dd27001d5e29e64bd'
,
i686:
'3ad7dc7bc50cb4dbb9951b730fb1b12b1974a1942716110ceb66ed3a4607342a'
,
x86_64:
'5d88e6eead59c165464489aee67fa8a28005ec2e407d5d3e042bde27beeb1c9a'
,
})
...
...
@@ -73,7 +75,6 @@ class Xwayland < Package
system
'base64 --decode patch2_base64 > patch2'
system
'patch -p 1 < patch2'
url_patch3
=
"https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/067ac4b5060c16e6687a97cbb4bcdbaf5a0b5639/x11-base/xwayland/files/0001-xwayland-sysmacros.patch?format=TEXT"
uri_patch3
=
URI
.
parse
url_patch3
filename_patch3
=
'patch3_base64'
...
...
@@ -99,9 +100,12 @@ class Xwayland < Package
end
def
self
.
build
ENV
[
'CFLAGS'
]
=
"-fuse-ld=lld"
ENV
[
'CXXFLAGS'
]
=
"-fuse-ld=lld"
system
"meson setup build"
case
ARCH
when
'aarch64'
,
'armv7l'
,
'x86_64'
ENV
[
'CFLAGS'
]
=
'-fuse-ld=lld'
ENV
[
'CXXFLAGS'
]
=
'-fuse-ld=lld'
end
system
'meson setup build'
system
"meson configure
#{
CREW_MESON_OPTIONS
}
\
-Dipv6=true \
-Dxvfb=true \
...
...
@@ -119,8 +123,8 @@ class Xwayland < Package
-Dint10=false \
-Dlog_dir=
#{
CREW_PREFIX
}
/var/log \
build"
system
"meson configure build"
system
"ninja -C build"
system
'meson configure build'
system
'ninja -C build'
system
"cat <<'EOF'> Xwayland_sh
#!/bin/bash
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment