Skip to content

Commit

Permalink
bump Wayland version (#3189)
Browse files Browse the repository at this point in the history
* 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.

* add back version constraints

* [Wayland] Build for experimental platforms

Co-authored-by: Mosè Giordano <[email protected]>
  • Loading branch information
simeonschaub and giordano authored Jun 19, 2021
1 parent 5fafb94 commit 903ed25
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 19 deletions.
14 changes: 6 additions & 8 deletions W/Wayland/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,15 +18,14 @@ 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
"""

# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
platforms = [p for p in supported_platforms() if Sys.islinux(p)]
platforms = filter!(Sys.islinux, supported_platforms(; experimental=true))

# The products that we will ensure are always built
products = [
Expand All @@ -40,10 +38,10 @@ products = [

# Dependencies that must be installed before this package can be built
dependencies = [
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"; compat="~2.2.10"),
Dependency("Libffi_jll"; compat="~3.2.2"),
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.

0 comments on commit 903ed25

Please sign in to comment.