SHA256
1
0
forked from pool/weston

- Update to new upstream release 1.5.92

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=35
This commit is contained in:
Jan Engelhardt 2014-09-08 13:05:23 +00:00 committed by Git OBS Bridge
parent 3dbd4d6d90
commit 42db612a33
5 changed files with 47 additions and 9 deletions

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684
size 722616

3
weston-1.5.92.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5e2a8d79e02d3c2770dd591fa6afe3306305024673105ae1c54da894bfd7b49
size 731976

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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

View File

@ -18,7 +18,7 @@
Name: weston
%define lname libweston0
Version: 1.5.0
Version: 1.5.92
Release: 0
Summary: Wayland Reference Compositor
License: HPND and CC-BY-SA-3.0
@ -28,12 +28,13 @@ 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
#git#BuildRequires: autoconf >= 2.64
#git#BuildRequires: automake >= 1.11
#git#BuildRequires: libtool >= 2.2
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
BuildRequires: libvpx-devel
BuildRequires: libxml2-tools
BuildRequires: pam-devel
@ -56,6 +57,7 @@ BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libdrm) >= 2.4.30
BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(libinput) >= 0.5.0
BuildRequires: pkgconfig(libsystemd-login) >= 198
BuildRequires: pkgconfig(libudev) >= 136
BuildRequires: pkgconfig(libwebp)
@ -99,11 +101,12 @@ to develop plugins for Weston.
%prep
%setup -q
%patch -P 1 -p1
%build
if [ ! -e configure ]; then
#if [ ! -e configure ]; then
autoreconf -fi
fi
#fi
# Ensure people will use pkgconfig to locate headers.
# Implicit enable-libunwind would make the tests run endlessly on i586.
%configure --disable-static --includedir="%_includedir/pkg/%name" \