forked from pool/weston
- Update to release 12
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=111
This commit is contained in:
Git OBS Bridge
parent
ca3aa23751
commit
62474187dd
64
build.patch
Normal file
64
build.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2023-05-17 23:14:05.601257733 +0200
|
||||
References: https://lists.freedesktop.org/archives/wayland-devel/2023-May/042721.html
|
||||
|
||||
[ 5s] FAILED: libweston/libgl-borders.a.p/gl-borders.c.o
|
||||
[ 5s] cc -Ilibweston/libgl-borders.a.p -Ilibweston -I../libweston -I. -I.. -Iinclude -I../include -I/usr/include/wayland -I/usr/include/pixman-1 -I/usr/include/cairo -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/webp -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD -MQ libweston/libgl-borders.a.p/gl-borders.c.o -MF libweston/libgl-borders.a.p/gl-borders.c.o.d -o libweston/libgl-borders.a.p/gl-borders.c.o -c ../libweston/gl-borders.c
|
||||
[ 5s] In file included from ../libweston/renderer-gl/gl-renderer.h:32,
|
||||
[ 5s] from ../libweston/gl-borders.h:28,
|
||||
[ 5s] from ../libweston/gl-borders.c:31:
|
||||
[ 5s] ../include/libweston/libweston.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory
|
||||
|
||||
[ 4s] FAILED: shared/libshared.a.p/config-parser.c.o
|
||||
[ 4s] cc -Ishared/libshared.a.p -Ishared -I../shared -I. -I.. -Iinclude -I../include -I/usr/include/wayland -I/usr/include/pixman-1 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD -MQ shared/libshared.a.p/config-parser.c.o -MF shared/libshared.a.p/config-parser.c.o.d -o shared/libshared.a.p/config-parser.c.o -c ../shared/config-parser.c
|
||||
[ 4s] In file included from ../shared/config-parser.c:44:
|
||||
[ 4s] ../include/libweston/libweston.h:39:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory
|
||||
|
||||
[ 6s] FAILED: tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o
|
||||
[ 6s] cc -Itests/libtest-xwayland-client.a.p -Itests -I../tests -I. -I.. -Iinclude -I../include -Iprotocol -I/usr/include/pixman-1 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -fPIC -MD -MQ tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o -MF tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o.d -o tests/libtest-xwayland-client.a.p/xcb-client-helper.c.o -c ../tests/xcb-client-helper.c
|
||||
[ 6s] ../tests/xcb-client-helper.c:39:10: fatal error: wayland-client.h: No such file or directory
|
||||
|
||||
---
|
||||
libweston/meson.build | 1 +
|
||||
shared/meson.build | 2 +-
|
||||
tests/meson.build | 2 +-
|
||||
3 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: weston/libweston/meson.build
|
||||
===================================================================
|
||||
--- weston.orig/libweston/meson.build
|
||||
+++ weston/libweston/meson.build
|
||||
@@ -255,6 +255,7 @@ lib_gl_borders = static_library(
|
||||
dependencies: [
|
||||
dep_lib_cairo_shared,
|
||||
dep_egl, # for gl-renderer.h
|
||||
+ dep_xkbcommon,
|
||||
],
|
||||
build_by_default: false,
|
||||
install: false
|
||||
Index: weston/shared/meson.build
|
||||
===================================================================
|
||||
--- weston.orig/shared/meson.build
|
||||
+++ weston/shared/meson.build
|
||||
@@ -7,7 +7,7 @@ srcs_libshared = [
|
||||
'process-util.c',
|
||||
'hash.c',
|
||||
]
|
||||
-deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman]
|
||||
+deps_libshared = [dep_wayland_client, dep_wayland_server, dep_pixman, dep_xkbcommon]
|
||||
|
||||
lib_libshared = static_library(
|
||||
'shared',
|
||||
Index: weston/tests/meson.build
|
||||
===================================================================
|
||||
--- weston.orig/tests/meson.build
|
||||
+++ weston/tests/meson.build
|
||||
@@ -322,7 +322,7 @@ if get_option('xwayland')
|
||||
[ 'xcb-client-helper.c', weston_test_client_protocol_h ],
|
||||
include_directories: common_inc,
|
||||
dependencies: [
|
||||
- dep_pixman, dep_xcb_xwayland,
|
||||
+ dep_pixman, dep_wayland_client, dep_xcb_xwayland,
|
||||
xcb_dep, xcb_cursor_dep
|
||||
],
|
||||
install: false,
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7240752cef0b7de622baf8bd5348e63fc6b19f02ef824961b2add177d9652952
|
||||
size 1901480
|
||||
Binary file not shown.
3
weston-12.0.0.tar.xz
Normal file
3
weston-12.0.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:91853c86472cc1311465d29cda5abbe987aff01af53a4406c4513b7a023aba8b
|
||||
size 1969648
|
||||
BIN
weston-12.0.0.tar.xz.sig
Normal file
BIN
weston-12.0.0.tar.xz.sig
Normal file
Binary file not shown.
@ -1,8 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 17 10:26:49 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
Wed May 17 20:54:48 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 11.0.2
|
||||
* No curated changelog available
|
||||
- Update to release 12
|
||||
* backend-drm: multiple GPU support, by using
|
||||
`--additional-devices` to specify secondary DRM devices, in
|
||||
the form of a comma-separated list of devices.
|
||||
* backend-drm: use libdisplay-info as a better alternative for
|
||||
parsing EDID.
|
||||
* protocol: new screenshooter protocol: weston-output-capture.
|
||||
This new protocol is as a Weston public extension. The older
|
||||
weston-screenshooter protocol has been removed.
|
||||
* compositor: added a short-form for loading backends -- this
|
||||
allows the use of `--backend=headless` instead of
|
||||
`--backend=headless-backend.so`. Short-form for shells was
|
||||
also added: pass `--shell=foo`, rather than
|
||||
`--shell=foo-shell.so`. Renderers can be specified the same,
|
||||
by using `--renderer=gl|pixman`.
|
||||
* libweston-desktop DSO has been incorporated into libweston.
|
||||
Linking now with libweston would provide access to the former
|
||||
libweston-desktop library. Users of libweston-desktop would
|
||||
need to adjust their headers to <libweston/desktop.h> rather
|
||||
than using <libweston-desktop/libweston-desktop.h>. The API
|
||||
itself remains the same.
|
||||
- Add build.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 24 20:57:29 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
Name: weston
|
||||
%define lname libweston0
|
||||
%define major 11
|
||||
Version: 11.0.2
|
||||
%define major 12
|
||||
Version: 12.0.0
|
||||
Release: 0
|
||||
Summary: Wayland Reference Compositor
|
||||
License: CC-BY-SA-3.0 AND MIT
|
||||
@ -29,6 +29,7 @@ URL: https://wayland.freedesktop.org/
|
||||
#Git-Web: https://cgit.freedesktop.org/wayland/weston/
|
||||
Source: https://gitlab.freedesktop.org/wayland/weston/-/releases/%version/downloads/weston-%version.tar.xz
|
||||
Source2: https://gitlab.freedesktop.org/wayland/weston/-/releases/%version/downloads/weston-%version.tar.xz.sig
|
||||
Patch1: build.patch
|
||||
BuildRequires: Mesa-libGLESv3-devel
|
||||
BuildRequires: autoconf >= 2.64
|
||||
BuildRequires: automake >= 1.11
|
||||
@ -54,6 +55,7 @@ BuildRequires: pkgconfig(lcms2)
|
||||
BuildRequires: pkgconfig(libdrm) >= 2.4.108
|
||||
BuildRequires: pkgconfig(libevdev)
|
||||
BuildRequires: pkgconfig(libinput) >= 0.8.0
|
||||
BuildRequires: pkgconfig(libpipewire-0.3)
|
||||
BuildRequires: pkgconfig(libseat)
|
||||
BuildRequires: pkgconfig(libsystemd) >= 209
|
||||
BuildRequires: pkgconfig(libudev) >= 136
|
||||
@ -67,6 +69,7 @@ BuildRequires: pkgconfig(wayland-scanner)
|
||||
BuildRequires: pkgconfig(wayland-server) >= 1.18.0
|
||||
BuildRequires: pkgconfig(xcb) >= 1.8
|
||||
BuildRequires: pkgconfig(xcb-composite)
|
||||
BuildRequires: pkgconfig(xcb-cursor)
|
||||
BuildRequires: pkgconfig(xcb-shm)
|
||||
BuildRequires: pkgconfig(xcb-xfixes)
|
||||
BuildRequires: pkgconfig(xcb-xkb) >= 1.9
|
||||
@ -127,7 +130,7 @@ to develop plugins for Weston.
|
||||
echo "Workaround broken weston that fails to cope with -Wl,--no-undefined injected by meson/ninja"
|
||||
export LDFLAGS="%{?build_ldflags} -Wl,-z,undefs"
|
||||
%meson -Ddemo-clients=false -Dremoting=false -Dsimple-clients= \
|
||||
-Dtest-junit-xml=false -Dpipewire=false \
|
||||
-Dtest-junit-xml=false -Dpipewire=false -Dbackend-vnc=false \
|
||||
--includedir="%_includedir/%name"
|
||||
%meson_build
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user