- disable libunwind usage on x32

[packages/weston.git] / weston.spec

diff --git a/weston.spec b/weston.spec
index dd92b10d761128bc20e6c17527716d359ecb449d..078ea43a59f8bef381c35814a0f5b0450012dfac 100644 (file)
--- a/weston.spec
+++ b/weston.spec
@@ -5,43 +5,50 @@
 %bcond_without wayland         # wayland (nested) compositor
 %bcond_without x11             # X11 compositor
 %bcond_without libinput        # libinput backend
+%bcond_without libunwind       # libunwind usage for backtraces
 %bcond_without vaapi           # vaapi recorder
 %bcond_without wlaunch         # weston launch
 %bcond_without xwayland        # X server launcher
 %bcond_without sclients        # simple clients
 %bcond_without clients         # non-simple + full GL clients
-#
+
+%ifarch x32
+%undefine      with_libunwind
+%endif
+
 Summary:       Weston - Wayland demos
 Summary(pl.UTF-8):     Weston - programy demonstracyjne dla protokołu Wayland
 Name:          weston
-Version:       1.6.1
-Release:       1
+Version:       1.7.0
+Release:       2
 License:       MIT
 Group:         Applications
 Source0:       http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 08e857668621c930cab239d11c12cf47
-Patch0:                libinput-0.9.patch
+# Source0-md5: 1fde8a44f48cd177438522850d6ba4be
 URL:           http://wayland.freedesktop.org/
 BuildRequires: Mesa-libEGL-devel >= 7.10
 # GLESv2
 BuildRequires: Mesa-libGLES-devel
 # for wayland and sclients, but also desktop-shell, which is always enabled
 BuildRequires: Mesa-libwayland-egl-devel >= 9.0-2
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.11
 BuildRequires: cairo-devel >= 1.10.0
 BuildRequires: colord-devel >= 0.1.27
 BuildRequires: dbus-devel >= 1.6
 %{?with_rdp:BuildRequires:     freerdp-devel >= 1.1.0}
 BuildRequires: lcms2-devel >= 2
-%{?with_libinput:BuildRequires:        libinput-devel >= 0.6.0}
+%{?with_libinput:BuildRequires:        libinput-devel >= 0.8.0}
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: libunwind-devel
+BuildRequires: libtool >= 2:2.2
+%{?with_libunwind:BuildRequires:       libunwind-devel}
 BuildRequires: libwebp-devel
 BuildRequires: pixman-devel >= 0.26
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
 # wayland-server always; wayland-client if with_wayland || with_sclients || with_clients; wayland-cursor if with_clients
-BuildRequires: wayland-devel >= 1.6.0
+BuildRequires: wayland-devel >= 1.7.0
 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.3.0
 BuildRequires: xz
 %if %{with drm}
@@ -85,7 +92,7 @@ Requires:     colord-libs >= 0.1.27
 Requires:      dbus-libs >= 1.6
 %{?with_rdp:Requires:  freerdp >= 1.1.0}
 %{?with_drm:Requires:  libdrm >= 2.4.30}
-%{?with_libinput:Requires:     libinput >= 0.6.0}
+%{?with_libinput:Requires:     libinput >= 0.8.0}
 %if %{with vaapi}
 Requires:      libva >= 1.2.0
 Requires:      libva-drm >= 1.2.0
@@ -94,7 +101,7 @@ Requires:    libva-drm >= 1.2.0
 Requires:      pixman >= 0.26
 %{?with_wlaunch:Requires:      systemd-libs >= 1:198}
 %{?with_drm:Requires:  udev-libs >= 1:136}
-Requires:      wayland >= 1.6.0
+Requires:      wayland >= 1.7.0
 Requires:      xorg-lib-libxkbcommon >= 0.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -118,7 +125,7 @@ Requires:   Mesa-libEGL-devel >= 7.10
 # GLESv2
 Requires:      Mesa-libGLES-devel
 Requires:      pixman-devel >= 0.26
-Requires:      wayland-devel >= 1.6.0
+Requires:      wayland-devel >= 1.7.0
 Requires:      xorg-lib-libxkbcommon-devel >= 0.3.0
 
 %description devel
@@ -129,14 +136,18 @@ Pliki nagłówkowe do tworzenia wtyczek dla Westona.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        %{!?with_clients:--disable-clients} \
        %{!?with_drm:--disable-drm-compositor} \
        %{?with_libinput:--enable-libinput-backend} \
+       %{!?with_libunwind:--disable-libunwind} \
        %{?with_rdp:--enable-rdp-compositor} \
        %{!?with_sclients:--disable-simple-clients} \
        --disable-setuid-install \
@@ -200,7 +211,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %attr(755,root,root) %{_libdir}/weston/desktop-shell.so
 %attr(755,root,root) %{_libdir}/weston/fullscreen-shell.so
+# ivi shell
+%attr(755,root,root) %{_libexecdir}/weston-ivi-shell-user-interface
+%attr(755,root,root) %{_libdir}/weston/hmi-controller.so
+%attr(755,root,root) %{_libdir}/weston/ivi-shell.so
 %{_datadir}/weston
+%dir %{_datadir}/wayland-sessions
+%{_datadir}/wayland-sessions/weston.desktop
 %{_mandir}/man1/weston.1*
 %{_mandir}/man5/weston.ini.5*
 %{_mandir}/man7/weston-drm.7*