package/wayland-protocols: bump to version 1.25

Drop patch that is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
James Hilliard 2022-02-05 16:03:01 -07:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 39aa793c0f
commit bf152e55a3
3 changed files with 5 additions and 47 deletions

View File

@ -1,42 +0,0 @@
From 80e97bd00bf6263845aa98b411507baba28be67e Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 19 Sep 2021 11:01:00 +0200
Subject: [PATCH] meson.build: wayland-scanner is only needed for tests
wayland-scanner is only needed for tests so don't require it if tests
are disabled
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/80e97bd00bf6263845aa98b411507baba28be67e]
---
meson.build | 2 --
tests/meson.build | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 94b49e7..15dbc37 100644
--- a/meson.build
+++ b/meson.build
@@ -8,8 +8,6 @@ wayland_protocols_version = meson.project_version()
fs = import('fs')
-dep_scanner = dependency('wayland-scanner', native: true)
-
stable_protocols = [
'presentation-time',
'viewporter',
diff --git a/tests/meson.build b/tests/meson.build
index 66337e7..74824ae 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,4 +1,5 @@
prog_scan_sh = find_program('scan.sh')
+dep_scanner = dependency('wayland-scanner', native: true)
prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
libwayland = [
--
GitLab

View File

@ -1,5 +1,5 @@
# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041979.html
md5 31a6c469718db37d2688109e548506e4 wayland-protocols-1.23.tar.xz
sha1 8c4ebdce35953b1e2af458c139a432a308af6f50 wayland-protocols-1.23.tar.xz
sha256 6c0af1915f96f615927a6270d025bd973ff1c58e521e4ca1fc9abfc914633f76 wayland-protocols-1.23.tar.xz
# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html
md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz
sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz
sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz
sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING

View File

@ -4,7 +4,7 @@
#
################################################################################
WAYLAND_PROTOCOLS_VERSION = 1.23
WAYLAND_PROTOCOLS_VERSION = 1.25
WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases
WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz
WAYLAND_PROTOCOLS_LICENSE = MIT