Accepting request 250296 from X11:Wayland
- Update to new upstream release 1.6.0 OBS-URL: https://build.opensuse.org/request/show/250296 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/weston?expand=0&rev=8
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
4ea3b2cc00
@ -0,0 +1,28 @@
|
||||
From 901f05ab852a6f66cfae7d6081065e88e878a6eb Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 8 Sep 2014 14:55:42 +0200
|
||||
Subject: [PATCH] build: honor results obtained by pkg-config libinput
|
||||
|
||||
The error was:
|
||||
src/libinput-seat.c:30:22: fatal error: libinput.h: No such file or directory
|
||||
---
|
||||
Makefile.am | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index b2d6893..7f3e5d3 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -34,7 +34,8 @@ AM_CPPFLAGS = \
|
||||
-DDATADIR='"$(datadir)"' \
|
||||
-DMODULEDIR='"$(moduledir)"' \
|
||||
-DLIBEXECDIR='"$(libexecdir)"' \
|
||||
- -DBINDIR='"$(bindir)"'
|
||||
+ -DBINDIR='"$(bindir)"' \
|
||||
+ $(LIBINPUT_BACKEND_CFLAGS)
|
||||
|
||||
CLEANFILES = weston.ini $(BUILT_SOURCES)
|
||||
|
||||
--
|
||||
2.0.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64
|
||||
size 709808
|
||||
3
weston-1.6.0.tar.xz
Normal file
3
weston-1.6.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dc3ea5d13bbf025fabc006216c5ddc0d80d5f4ebe778912b8c4d1d4acaaa614d
|
||||
size 733112
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 19 20:38:34 UTC 2014 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 1.6.0
|
||||
* Xdg-shell protocol changes. [Changed again since 1.5.0.]
|
||||
* Add weston_layer masking mechanism.
|
||||
* keyboard repeat rate support, sent from compositor to clients,
|
||||
configurable.
|
||||
* Use wl_display_add_socket_auto(): no need to specify the socket
|
||||
anymore when running Weston under Weston, it just works now.
|
||||
* Exit Weston, if weston-desktop-shell dies too early. Should help with
|
||||
one class of "just black screen" problems.
|
||||
* Option to force numlock on at start on DRM and fbdev backends.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 12 11:14:34 UTC 2014 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 1.5.93
|
||||
* Weston is now more picky about incorrect command line arguments.
|
||||
* Weston's libinput backend, which is enabled by default, now
|
||||
requires libinput 0.6.0.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 8 12:58:51 UTC 2014 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 1.5.92
|
||||
* No changelog provided yet (comes with 1.6.0 later)
|
||||
- Add 0001-build-honor-results-obtained-by-pkg-config-libinput.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 22 08:07:12 UTC 2014 - sor.alexei@meowr.ru
|
||||
|
||||
- Update to new upstream release 1.5.0
|
||||
* More work on xdg-shell, still not complete. The minimize feature
|
||||
was added.
|
||||
* The weston input stack was split out as a new library, libinput.
|
||||
Weston can be configured to link to libinput for input but defaults
|
||||
to the built in input code for now.
|
||||
* Weston now uses the new Xwayland server. The Xwayland code was
|
||||
refactored to be its own X server in the Xorg tree, similar to how
|
||||
Xwin and Xquartz and Xnest work.
|
||||
* Animated window closing. A minor feature, but it validates the
|
||||
mechanism for keeping surfaces around after the client that created
|
||||
them goes away.
|
||||
* Fullscreen shell. The fullscreen shell provides a mechanism for a
|
||||
single client to provide a fullscreen surface, for kiosk-mode or
|
||||
appliance type use cases.
|
||||
* Weston now supports different color dephts on different outputs.
|
||||
* Weston now uses non-recursive Makefiles.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 24 12:08:08 UTC 2014 - jengelh@inai.de
|
||||
|
||||
|
||||
71
weston.spec
71
weston.spec
@ -18,7 +18,7 @@
|
||||
|
||||
Name: weston
|
||||
%define lname libweston0
|
||||
Version: 1.4.0
|
||||
Version: 1.6.0
|
||||
Release: 0
|
||||
Summary: Wayland Reference Compositor
|
||||
License: HPND and CC-BY-SA-3.0
|
||||
@ -28,15 +28,12 @@ Url: http://wayland.freedesktop.org/
|
||||
#Git-Clone: git://anongit.freedesktop.org/wayland/weston
|
||||
#Git-Web: http://cgit.freedesktop.org/wayland/weston/
|
||||
Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#git#BuildRequires: autoconf >= 2.64, automake >= 1.11
|
||||
Patch1: 0001-build-honor-results-obtained-by-pkg-config-libinput.patch
|
||||
BuildRequires: autoconf >= 2.64
|
||||
BuildRequires: automake >= 1.11
|
||||
BuildRequires: freerdp-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libtool >= 2.2
|
||||
#git#BuildRequires: libtool >= 2.2
|
||||
BuildRequires: libvpx-devel
|
||||
BuildRequires: libxml2-tools
|
||||
BuildRequires: pam-devel
|
||||
@ -44,12 +41,13 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: rsvg-view
|
||||
BuildRequires: xkeyboard-config
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
BuildRequires: pkgconfig(cairo) >= 1.10.0
|
||||
BuildRequires: pkgconfig(cairo-egl) >= 1.11.3
|
||||
BuildRequires: pkgconfig(cairo-xcb)
|
||||
BuildRequires: pkgconfig(colord) >= 0.1.27
|
||||
BuildRequires: pkgconfig(dbus-1) >= 1.6
|
||||
BuildRequires: pkgconfig(egl) >= 7.10
|
||||
BuildRequires: pkgconfig(freerdp)
|
||||
BuildRequires: pkgconfig(gbm)
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(glesv2)
|
||||
@ -59,17 +57,17 @@ BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(lcms2)
|
||||
BuildRequires: pkgconfig(libdrm) >= 2.4.30
|
||||
BuildRequires: pkgconfig(libffi)
|
||||
BuildRequires: pkgconfig(libinput) >= 0.6.0
|
||||
BuildRequires: pkgconfig(libsystemd-login) >= 198
|
||||
BuildRequires: pkgconfig(libudev) >= 136
|
||||
BuildRequires: pkgconfig(libunwind)
|
||||
BuildRequires: pkgconfig(libwebp)
|
||||
BuildRequires: pkgconfig(mtdev) >= 1.1.0
|
||||
BuildRequires: pkgconfig(pixman-1)
|
||||
BuildRequires: pkgconfig(pixman-1) >= 0.25.2
|
||||
BuildRequires: pkgconfig(poppler-glib)
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.0.0
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.5.91
|
||||
BuildRequires: pkgconfig(wayland-egl)
|
||||
BuildRequires: pkgconfig(wayland-scanner)
|
||||
BuildRequires: pkgconfig(wayland-server) >= 1.3.90
|
||||
BuildRequires: pkgconfig(wayland-server) >= 1.5.91
|
||||
BuildRequires: pkgconfig(xcb)
|
||||
BuildRequires: pkgconfig(xcb-xfixes)
|
||||
BuildRequires: pkgconfig(xcursor)
|
||||
@ -103,52 +101,45 @@ to develop plugins for Weston.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
if [ ! -e configure ]; then
|
||||
NOCONFIGURE=1 ./autogen.sh;
|
||||
fi;
|
||||
#if [ ! -e configure ]; then
|
||||
autoreconf -fi
|
||||
#fi
|
||||
# Ensure people will use pkgconfig to locate headers.
|
||||
%configure --disable-static --disable-setuid-install \
|
||||
--disable-rpi-compositor \
|
||||
--includedir="%_includedir/pkg/%name"
|
||||
# Implicit enable-libunwind would make the tests run endlessly on i586.
|
||||
%configure --disable-static --includedir="%_includedir/pkg/%name" \
|
||||
--disable-setuid-install --disable-libunwind
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR="%buildroot";
|
||||
rm -f "%buildroot/%_libdir"/*.la "%buildroot/%_libdir/weston"/*.la;
|
||||
%make_install
|
||||
find "%buildroot" -type f -name "*.la" -delete -print
|
||||
|
||||
%check
|
||||
ls -dl /proc/self || exit 0;
|
||||
# Ignore exit code, because """the headless backend is not even in the 1.0
|
||||
# stable series. It means it will be an option starting from 1.2 of stable
|
||||
# series."""
|
||||
# And the 1.4 tests don't use it :/
|
||||
export XDG_RUNTIME_DIR="$HOME/xdgrun"
|
||||
export XDG_CONFIG_HOME="$HOME"
|
||||
cat >"$XDG_CONFIG_HOME/weston.ini" <<-EOF
|
||||
[core]
|
||||
backend=headless-backend.so
|
||||
EOF
|
||||
%if !0%{?qemu_user_space_build}
|
||||
export XDG_RUNTIME_DIR="$PWD/xdg"
|
||||
mkdir -pm go-rwx "$XDG_RUNTIME_DIR"
|
||||
if ! make check; then
|
||||
cat tests/test-suite.log
|
||||
if ! make BACKEND=headless-backend.so check; then
|
||||
cat test-suite.log
|
||||
# make check can not pass completely without an actual screen.
|
||||
#exit 1
|
||||
fi
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_bindir/wcap-*
|
||||
%_bindir/weston*
|
||||
%_libexecdir/weston-*
|
||||
%_libdir/weston/
|
||||
%_datadir/weston/
|
||||
%_mandir/man1/weston.1*
|
||||
%_mandir/man5/weston*5*
|
||||
%_mandir/man7/weston*7*
|
||||
%doc COPYING README
|
||||
%_bindir/w*
|
||||
%_libexecdir/%name-*
|
||||
%_libdir/%name/
|
||||
%_datadir/%name/
|
||||
%_mandir/man?/*.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%_includedir/pkg/
|
||||
%_libdir/pkgconfig/weston.pc
|
||||
%_libdir/pkgconfig/%name.pc
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user