Skip to content
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

bump Wayland version #3189

Merged
merged 3 commits into from
Jun 19, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bump Wayland version
`Makefile.in` changed a lot, so not quite sure whether the patch might
still be needed, but let's try without first.
  • Loading branch information
simeonschaub committed Jun 19, 2021
commit b2597e18d232d6e5bfe6dfc6ddb64117137994e8
12 changes: 5 additions & 7 deletions W/Wayland/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -3,13 +3,12 @@
using BinaryBuilder

name = "Wayland"
version = v"1.17.0"
version = v"1.19.0"

# Collection of sources required to build Wayland
sources = [
ArchiveSource("https://wayland.freedesktop.org/releases/wayland-$(version).tar.xz",
"72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4"),
DirectorySource("./bundled"),
"baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15"),
]

# Bash recipe for building across all platforms
@@ -19,7 +18,6 @@ cd $WORKSPACE/srcdir/wayland-*/
# We need to run `wayland-scanner` on the host system
apk add wayland-dev

atomic_patch -p1 ../patches/Makefile_in.patch
./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-documentation --with-host-scanner
make -j${nproc}
make install
@@ -40,10 +38,10 @@ products = [

# Dependencies that must be installed before this package can be built
dependencies = [
simeonschaub marked this conversation as resolved.
Show resolved Hide resolved
Dependency("Expat_jll", v"2.2.7"; compat="~2.2.7"),
Dependency("Libffi_jll", v"3.2.1"; compat="~3.2.1"),
Dependency("Expat_jll"),
Dependency("Libffi_jll"),
Dependency("XML2_jll"),
]

# Build the tarballs.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"8")
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"8", julia_compat="1.6")
11 changes: 0 additions & 11 deletions W/Wayland/bundled/patches/Makefile_in.patch

This file was deleted.