diff options
| author | Manuel Bachmann <manuel.bachmann@open.eurogiciel.org> | 2014-08-08 14:34:30 +0200 |
|---|---|---|
| committer | Manuel Bachmann <manuel.bachmann@open.eurogiciel.org> | 2014-08-08 14:34:30 +0200 |
| commit | 70f5e662b526ecd7ead46302a456138c5ecae121 (patch) | |
| tree | 5181127ea4bcb9baf876584ad55a051f420506e7 | |
| parent | b6d2ab405030b880d7057a966206aa6af97f9ca7 (diff) | |
| download | chromium-70f5e662b526ecd7ead46302a456138c5ecae121.tar.gz chromium-70f5e662b526ecd7ead46302a456138c5ecae121.tar.bz2 chromium-70f5e662b526ecd7ead46302a456138c5ecae121.zip | |
packaging: add "ozone-wayland" internal dep & fix build
If we are on a Wayland profile, let's pull "ozone-wayland" and
apply its specific patches.
Re-enable "input_speech", because Chromium needs to link with "flac"
and "speex" at the final step, good to know...
Add some needed binary files in the RPM.
Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
| -rw-r--r-- | packaging/chromium.spec | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/packaging/chromium.spec b/packaging/chromium.spec index 0c5c792b4352..9d0a3ec8b877 100644 --- a/packaging/chromium.spec +++ b/packaging/chromium.spec @@ -77,6 +77,7 @@ BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(pangocairo) BuildRequires: pkgconfig(pangoft2) %if %{with wayland} +BuildRequires: chromium-ozone-wayland BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-egl) @@ -137,12 +138,21 @@ ln -s %{_datadir}/chromium/testing/gmock testing/gmock ln -s %{_datadir}/chromium/testing/gtest testing/gtest ln -s %{_datadir}/chromium/breakpad/src breakpad/src ln -s %{_datadir}/chromium/third_party/lss third_party/lss +%if %{with wayland} +ln -s %{_datadir}/chromium/ozone ozone +%endif # input_speech pulls "speex" ; alsa uses "snd_seq_*" objects which are not compiled in in Tizen -GYP_DEFINES="use_ash=1 use_aura=1 chromeos=0 use_cups=0 use_gconf=0 use_gnome_keyring=0 disable_nacl=%{_disable_nacl} enable_webrtc=0 use_system_yasm=1 input_speech=0 use_alsa=0" +GYP_DEFINES="use_ash=1 use_aura=1 chromeos=0 use_cups=0 use_gconf=0 use_gnome_keyring=0 disable_nacl=%{_disable_nacl} enable_webrtc=0 use_system_yasm=1 use_alsa=0" %if %{with wayland} GYP_DEFINES="${GYP_DEFINES} use_ozone=1 enable_ozone_wayland_vkb=1 enable_xdg_shell=1" + +patch -p1 < ozone/patches/0001-browser-Support-Desktop-Aura-creation-on-Ozone.patch +patch -p1 < ozone/patches/0002-Temporary-patch-to-fix-linking-issue.patch +patch -p1 < ozone/patches/0003-Add-support-to-provide-external-ozone-files-in-views.patch +patch -p1 < ozone/patches/0005-Add-support-for-checking-DesktopWindow-with-Ozone-an.patch +patch -p1 < ozone/patches/0006-Temporarily-remove-ozone-dependency-for-gl.patch %endif export GYP_DEFINES @@ -164,9 +174,13 @@ ninja %{?_smp_mflags} -C out/Debug content_shell %install install -m 755 out/Debug/content_shell %{buildroot}%{_bindir}/content_shell +install -m 755 out/Debug/content_shell.pak %{buildroot}%{_bindir}/content_shell.pak +install -m 755 out/Debug/icudtl.dat %{buildroot}%{_bindir}/icudtl.dat %files %manifest %{name}.manifest %defattr(-,root,root) %license LICENSE %{_bindir}/content_shell +%{_bindir}/content_shell.pak +%{_bindir}/icudtl.dat |