From bd80e0d0a32e78430e5f42abdc597e617f9e9b6b Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Sun, 15 Feb 2015 00:29:09 +0100 Subject: [PATCH] packaging: Bump to 1.7.0 Signed-off-by: Manuel Bachmann Droped conflicts : 31d9909... downstream: allow regular users to launch Weston b7c0823... logind: forward Active=true changes for non-DRM backends Change-Id: If344776827a8c6ab6d6d4a98ea5ce38e150b8082 Bug-Tizen: TC-2476 Signed-off-by: Philippe Coval --- packaging/weston.changes | 3 ++ packaging/weston.ini | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ packaging/weston.spec | 75 +++++++++++++++++++++++++++++++++---- 3 files changed, 167 insertions(+), 7 deletions(-) create mode 100644 packaging/weston.ini diff --git a/packaging/weston.changes b/packaging/weston.changes index a24fa00..0dd0339 100644 --- a/packaging/weston.changes +++ b/packaging/weston.changes @@ -1,3 +1,6 @@ +* Mon Feb 16 2014 Manuel Bachmann 1.7.0@dbd8606 +- Update to 1.7.0 + * Wed Feb 12 2014 Ossama Othman 1.4.0@d601bc0 - Update to 1.4.0 diff --git a/packaging/weston.ini b/packaging/weston.ini new file mode 100644 index 0000000..36243d4 --- /dev/null +++ b/packaging/weston.ini @@ -0,0 +1,96 @@ +[core] +shell=ivi-shell.so + +[ivi-shell] +ivi-module=hmi-controller.so +ivi-shell-user-interface=/usr/libexec/weston-ivi-shell-user-interface + +cursor-theme=default +cursor-size=32 + +base-layer-id=1000 +workspace-background-layer-id=2000 +workspace-layer-id=3000 +application-layer-id=4000 + +transition-duration=300 + +background-image=/usr/share/weston/background.png +background-id=1001 +panel-image=/usr/share/weston/panel.png +panel-id=1002 +tiling-image=/usr/share/weston/tiling.png +tiling-id=1003 +sidebyside-image=/usr/share/weston/sidebyside.png +sidebyside-id=1004 +fullscreen-image=/usr/share/weston/fullscreen.png +fullscreen-id=1005 +random-image=/usr/share/weston/random.png +random-id=1006 +home-image=/usr/share/weston/home.png +home-id=1007 +workspace-background-color=0x99000000 +workspace-background-id=2001 + +[input-method] +path=/usr/libexec/weston-keyboard + +[ivi-launcher] +workspace-id=0 +icon-id=4001 +icon=/usr/share/weston/icon_ivi_flower.png +path=/usr/bin/weston-flower + +[ivi-launcher] +workspace-id=0 +icon-id=4002 +icon=/usr/share/weston/icon_ivi_clickdot.png +path=/usr/bin/weston-clickdot + +[ivi-launcher] +workspace-id=1 +icon-id=4003 +icon=/usr/share/weston/icon_ivi_simple-egl.png +path=/usr/bin/weston-simple-egl + +[ivi-launcher] +workspace-id=1 +icon-id=4004 +icon=/usr/share/weston/icon_ivi_simple-shm.png +path=/usr/bin/weston-simple-shm + +[ivi-launcher] +workspace-id=2 +icon-id=4005 +icon=/usr/share/weston/icon_ivi_smoke.png +path=/usr/bin/weston-smoke + +[ivi-launcher] +workspace-id=3 +icon-id=4006 +icon=/usr/share/weston/icon_ivi_flower.png +path=/usr/bin/weston-flower + +[ivi-launcher] +workspace-id=3 +icon-id=4007 +icon=/usr/share/weston/icon_ivi_clickdot.png +path=/usr/bin/weston-clickdot + +[ivi-launcher] +workspace-id=3 +icon-id=4008 +icon=/usr/share/weston/icon_ivi_simple-egl.png +path=/usr/bin/weston-simple-egl + +[ivi-launcher] +workspace-id=3 +icon-id=4009 +icon=/usr/share/weston/icon_ivi_simple-shm.png +path=/usr/bin/weston-simple-shm + +[ivi-launcher] +workspace-id=3 +icon-id=4010 +icon=/usr/share/weston/icon_ivi_smoke.png +path=/usr/bin/weston-smoke diff --git a/packaging/weston.spec b/packaging/weston.spec index 90e2ee8..5b315ae 100644 --- a/packaging/weston.spec +++ b/packaging/weston.spec @@ -12,11 +12,11 @@ %endif %if "%{profile}" == "common" -%define extra_config_options3 --enable-sys-uid +%define extra_config_options3 --enable-sys-uid --disable-ivi-shell %endif Name: weston -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: Wayland Compositor Infrastructure License: MIT @@ -26,7 +26,7 @@ Url: http://weston.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/wayland/weston #Git-Web: http://cgit.freedesktop.org/wayland/weston/ Source0: %name-%version.tar.xz -Source1: %name.target +Source1: %name.ini Source1001: %name.manifest BuildRequires: autoconf >= 2.64, automake >= 1.11 BuildRequires: expat-devel @@ -51,7 +51,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libdrm) >= 2.4.30 %endif BuildRequires: pkgconfig(libffi) -BuildRequires: pkgconfig(libinput) >= 0.6.0 +BuildRequires: pkgconfig(libinput) >= 0.8.0 BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(libudev) >= 136 %if %{with libva} @@ -108,6 +108,22 @@ This package provides a RDP compositor allowing to do remote rendering through the network. %endif +%if "%{profile}" == "ivi" +%package ivi-shell +Summary: %{name} IVI Shell +Group: Graphics & UI Framework/Wayland Window System +%description ivi-shell +A reference Weston shell designed for use in IVI systems. + +%package ivi-shell-config +Summary: Tizen IVI %{name} configuration +Group: Automotive/Configuration +Conflicts: weston-ivi-config +Conflicts: ico-uxf-weston-plugin +%description ivi-shell-config +This package contains Tizen IVI-specific configuration. +%endif + %prep %setup -q cp %{SOURCE1001} . @@ -138,8 +154,10 @@ install -m 755 weston-simple-touch %{buildroot}%{_bindir} install -m 755 weston-simple-shm %{buildroot}%{_bindir} install -m 755 weston-simple-egl %{buildroot}%{_bindir} install -m 755 weston-simple-damage %{buildroot}%{_bindir} +install -m 755 weston-presentation-shm %{buildroot}%{_bindir} install -m 755 weston-nested-client %{buildroot}%{_bindir} install -m 755 weston-nested %{buildroot}%{_bindir} +install -m 755 weston-multi-resource %{buildroot}%{_bindir} install -m 755 weston-flower %{buildroot}%{_bindir} install -m 755 weston-image %{buildroot}%{_bindir} install -m 755 weston-cliptest %{buildroot}%{_bindir} @@ -155,9 +173,11 @@ install -m 755 weston-subsurfaces %{buildroot}%{_bindir} install -m 755 weston-transformed %{buildroot}%{_bindir} install -m 755 weston-fullscreen %{buildroot}%{_bindir} +%if "%{profile}" == "ivi" +mkdir -p %{buildroot}%{_sysconfdir}/xdg +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg +%endif -install -d %{buildroot}%{_unitdir_user} -install -m 644 %{SOURCE1} %{buildroot}%{_unitdir_user}/weston.target # The weston.service unit file must be provided by the weston-startup # virtual package, i.e. "Provide: weston-startup". The weston-startup # virtual package requirement is intended to force Tizen profile @@ -167,6 +187,8 @@ install -m 644 %{SOURCE1} %{buildroot}%{_unitdir_user}/weston.target # lead to confusion. This approach allows startup related files to be # maintained outside of this weston package. +rm -rf %{buildroot}%{_datadir}/wayland-sessions + %pre getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launch @@ -192,7 +214,20 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launc %{_libdir}/weston/wayland-backend.so %{_libdir}/weston/gl-renderer.so %{_datadir}/weston -%{_unitdir_user}/weston.target +# exclude ivi-shell-specific files +%exclude %{_libexecdir}/weston-ivi-shell-user-interface +%exclude %{_datadir}/weston/background.png +%exclude %{_datadir}/weston/panel.png +%exclude %{_datadir}/weston/tiling.png +%exclude %{_datadir}/weston/sidebyside.png +%exclude %{_datadir}/weston/fullscreen.png +%exclude %{_datadir}/weston/random.png +%exclude %{_datadir}/weston/home.png +%exclude %{_datadir}/weston/icon_ivi_simple-egl.png +%exclude %{_datadir}/weston/icon_ivi_simple-shm.png +%exclude %{_datadir}/weston/icon_ivi_smoke.png +%exclude %{_datadir}/weston/icon_ivi_flower.png +%exclude %{_datadir}/weston/icon_ivi_clickdot.png %files devel %manifest %{name}.manifest @@ -205,8 +240,10 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launc %{_bindir}/weston-simple-shm %{_bindir}/weston-simple-egl %{_bindir}/weston-simple-damage +%{_bindir}/weston-presentation-shm %{_bindir}/weston-nested-client %{_bindir}/weston-nested +%{_bindir}/weston-multi-resource %{_bindir}/weston-flower %{_bindir}/weston-image %{_bindir}/weston-cliptest @@ -230,4 +267,28 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launc %{_libdir}/weston/screen-share.so %endif +%if "%{profile}" == "ivi" +%files ivi-shell +%manifest %{name}.manifest +%{_libdir}/weston/hmi-controller.so +%{_libdir}/weston/ivi-shell.so +%{_libexecdir}/weston-ivi-shell-user-interface +%{_datadir}/weston/background.png +%{_datadir}/weston/panel.png +%{_datadir}/weston/tiling.png +%{_datadir}/weston/sidebyside.png +%{_datadir}/weston/fullscreen.png +%{_datadir}/weston/random.png +%{_datadir}/weston/home.png +%{_datadir}/weston/icon_ivi_simple-egl.png +%{_datadir}/weston/icon_ivi_simple-shm.png +%{_datadir}/weston/icon_ivi_smoke.png +%{_datadir}/weston/icon_ivi_flower.png +%{_datadir}/weston/icon_ivi_clickdot.png + +%files ivi-shell-config +%manifest %{name}.manifest +%config %{_sysconfdir}/xdg/weston.ini +%endif + %changelog -- 2.7.4