%bcond_with x
%bcond_with wayland
-%ifarch x86_64
+%ifarch x86_64 %{arm}
+### x86_64
# NaCl build on 64bit system require libc 32bit to build the 32 IRT.
# While Tizen 64bit image does not offer 32bit packages at all,
# check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
# So disable nacl for 64bit now.
+### ARM
+# Due to OBS build for ARM some files needed by NaCl to be build
+# are not present.
%define _disable_nacl 1
%else
%define _disable_nacl 0
%endif
Name: crosswalk
-Version: 7.35.144.0
+Version: 8.36.161.0
Release: 0
Summary: Crosswalk is an app runtime based on Chromium
License: (BSD-3-Clause and LGPL-2.1+)
Source1001: crosswalk.manifest
Source1002: %{name}.xml.in
Source1003: %{name}.png
-Patch1: %{name}-do-not-look-for-gtk2-when-using-aura.patch
Patch9: Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
+Patch10: crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
BuildRequires: bison
BuildRequires: bzip2-devel
BuildRequires: pkgconfig(libexif)
BuildRequires: pkgconfig(libpci)
BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libtzplatform-config)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
cp -a src/LICENSE LICENSE.chromium
cp -a src/xwalk/LICENSE LICENSE.xwalk
-%patch1
%patch9
+# The profiles using Wayland (and thus Ozone) do not need this patch.
+%if !%{with wayland}
+%patch10
+%endif
+
%build
# For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
fi
%if %{with wayland}
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=0"
%endif
GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}"