From 0e002c8ed877754e2d3cf82c8647462517349646 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Wed, 21 May 2014 11:38:03 +0200 Subject: [PATCH] meta-tizen: Add weston patches for tizen-common MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I30ce1c1671ec4be2c18fb7cc09e548bb0e66671e (From meta-tizen rev: 780afe0a0722c767c7dd5113aed261de38e9bba3) Signed-off-by: Kévin THIERRY Signed-off-by: Patrick Ohly --- .../wayland/weston/0001-Update-to-1.4.0.patch | 2 +- ...lets-us-read-out-a-rectangle-of-pixels-fr.patch | 2 +- ...sitor-implement-xdg_surface_set_minimized.patch | 2 +- ...use-Mod-Tab-to-show-raise-minimized-surfa.patch | 2 +- ...lkit-totally-switch-to-xdg-shell-protocol.patch | 2 +- ...dd-weston-editor-weston-subsurfaces-clien.patch | 2 +- ...ion-input-panel-layer-above-fullscreen-la.patch | 2 +- .../0008-packaging-add-the-RDP-backend.patch | 89 ++++++++++++++++++++++ .../0009-packaging-fix-the-RDP-backend-build.patch | 50 ++++++++++++ .../weston/0010-packaging-fix-obs-build.patch | 27 +++++++ ...panel-optional-panel-false-in-weston.ini.patch} | 4 +- ...Hack-to-allow-selecting-a-default-output.patch} | 4 +- ...3-allow-to-start-weston-with-system-user.patch} | 4 +- .../recipes-graphics/wayland/weston_1.4.0.bbappend | 9 ++- 14 files changed, 185 insertions(+), 16 deletions(-) create mode 100644 meta-tizen/recipes-graphics/wayland/weston/0008-packaging-add-the-RDP-backend.patch create mode 100644 meta-tizen/recipes-graphics/wayland/weston/0009-packaging-fix-the-RDP-backend-build.patch create mode 100644 meta-tizen/recipes-graphics/wayland/weston/0010-packaging-fix-obs-build.patch rename meta-tizen/recipes-graphics/wayland/weston/{0008-shell-make-panel-optional-panel-false-in-weston.ini.patch => 0011-shell-make-panel-optional-panel-false-in-weston.ini.patch} (95%) rename meta-tizen/recipes-graphics/wayland/weston/{0009-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch => 0012-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch} (98%) rename meta-tizen/recipes-graphics/wayland/weston/{0010-allow-to-start-weston-with-system-user.patch => 0013-allow-to-start-weston-with-system-user.patch} (90%) diff --git a/meta-tizen/recipes-graphics/wayland/weston/0001-Update-to-1.4.0.patch b/meta-tizen/recipes-graphics/wayland/weston/0001-Update-to-1.4.0.patch index b48e777..2ec5f41 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0001-Update-to-1.4.0.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0001-Update-to-1.4.0.patch @@ -1,7 +1,7 @@ From 804c40d5e1d0f4a42db1cbc7d6cf0666b82c1e7d Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Wed, 12 Feb 2014 14:17:21 -0800 -Subject: [PATCH 01/10] Update to 1.4.0 +Subject: [PATCH 01/13] Update to 1.4.0 Change-Id: I17dab833c810374f13cf79672690a09a92ef1fb7 Signed-off-by: Ossama Othman diff --git a/meta-tizen/recipes-graphics/wayland/weston/0002-This-vfunc-lets-us-read-out-a-rectangle-of-pixels-fr.patch b/meta-tizen/recipes-graphics/wayland/weston/0002-This-vfunc-lets-us-read-out-a-rectangle-of-pixels-fr.patch index 2601548..4275d3d 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0002-This-vfunc-lets-us-read-out-a-rectangle-of-pixels-fr.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0002-This-vfunc-lets-us-read-out-a-rectangle-of-pixels-fr.patch @@ -1,7 +1,7 @@ From 13640d5c849085fa2b099c2d54e656eec8a1318f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 29 Jan 2014 15:55:09 +0900 -Subject: [PATCH 02/10] This vfunc lets us read out a rectangle of pixels from +Subject: [PATCH 02/13] This vfunc lets us read out a rectangle of pixels from the currently attached surface buffer. Change-Id: Ia12d01fd0d157654602a2c46dd5874218252dd2f diff --git a/meta-tizen/recipes-graphics/wayland/weston/0003-compositor-implement-xdg_surface_set_minimized.patch b/meta-tizen/recipes-graphics/wayland/weston/0003-compositor-implement-xdg_surface_set_minimized.patch index 7590c6a..30741cd 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0003-compositor-implement-xdg_surface_set_minimized.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0003-compositor-implement-xdg_surface_set_minimized.patch @@ -1,7 +1,7 @@ From cb6dd95704b8dbf2344d0c5008e0739cf8740438 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Wed, 26 Feb 2014 16:43:59 +0100 -Subject: [PATCH 03/10] compositor: implement xdg_surface_set_minimized() +Subject: [PATCH 03/13] compositor: implement xdg_surface_set_minimized() We now handle the client-side xdg_surface_set_minimized() call, and eventually hide the target surface by moving it diff --git a/meta-tizen/recipes-graphics/wayland/weston/0004-compositor-use-Mod-Tab-to-show-raise-minimized-surfa.patch b/meta-tizen/recipes-graphics/wayland/weston/0004-compositor-use-Mod-Tab-to-show-raise-minimized-surfa.patch index 0537d47..e3a2776 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0004-compositor-use-Mod-Tab-to-show-raise-minimized-surfa.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0004-compositor-use-Mod-Tab-to-show-raise-minimized-surfa.patch @@ -1,7 +1,7 @@ From 8b5c42d8c95bf4b3f25ad767e0eb15b6b2c6710e Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Wed, 26 Feb 2014 17:11:22 +0100 -Subject: [PATCH 04/10] compositor: use Mod-Tab to show/raise minimized +Subject: [PATCH 04/13] compositor: use Mod-Tab to show/raise minimized surfaces Temporarily show minimized surfaces when switching between diff --git a/meta-tizen/recipes-graphics/wayland/weston/0005-toytoolkit-totally-switch-to-xdg-shell-protocol.patch b/meta-tizen/recipes-graphics/wayland/weston/0005-toytoolkit-totally-switch-to-xdg-shell-protocol.patch index 3305456..612d107 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0005-toytoolkit-totally-switch-to-xdg-shell-protocol.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0005-toytoolkit-totally-switch-to-xdg-shell-protocol.patch @@ -1,7 +1,7 @@ From 12578261ae9027f89ebfcfcc326e2757c253e4a2 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Wed, 26 Feb 2014 17:59:19 +0100 -Subject: [PATCH 05/10] toytoolkit: totally switch to xdg-shell protocol +Subject: [PATCH 05/13] toytoolkit: totally switch to xdg-shell protocol Totally switch toytoolkit to xdg-shell instead of wl_shell, so each state (maximization, minimization...) is correctly diff --git a/meta-tizen/recipes-graphics/wayland/weston/0006-packaging-add-weston-editor-weston-subsurfaces-clien.patch b/meta-tizen/recipes-graphics/wayland/weston/0006-packaging-add-weston-editor-weston-subsurfaces-clien.patch index c81f7fc..4c3e2c9 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0006-packaging-add-weston-editor-weston-subsurfaces-clien.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0006-packaging-add-weston-editor-weston-subsurfaces-clien.patch @@ -1,7 +1,7 @@ From c4be9bb5d281a7dad9fc409cde43cab349a369b0 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Thu, 6 Mar 2014 12:22:25 +0100 -Subject: [PATCH 06/10] packaging: add weston-editor & weston-subsurfaces +Subject: [PATCH 06/13] packaging: add weston-editor & weston-subsurfaces clients. The editor client has virtual keyboard API, and subsurfaces diff --git a/meta-tizen/recipes-graphics/wayland/weston/0007-shell-position-input-panel-layer-above-fullscreen-la.patch b/meta-tizen/recipes-graphics/wayland/weston/0007-shell-position-input-panel-layer-above-fullscreen-la.patch index 18e869f..fc71812 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0007-shell-position-input-panel-layer-above-fullscreen-la.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0007-shell-position-input-panel-layer-above-fullscreen-la.patch @@ -1,7 +1,7 @@ From d74310237df6e88f6978f5b57b3924e8b4514f37 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Fri, 7 Mar 2014 17:49:07 +0100 -Subject: [PATCH 07/10] shell: position input panel layer above fullscreen +Subject: [PATCH 07/13] shell: position input panel layer above fullscreen layer When a client calls the input panel (weston-keyboard e.g.) diff --git a/meta-tizen/recipes-graphics/wayland/weston/0008-packaging-add-the-RDP-backend.patch b/meta-tizen/recipes-graphics/wayland/weston/0008-packaging-add-the-RDP-backend.patch new file mode 100644 index 0000000..29b86f9 --- /dev/null +++ b/meta-tizen/recipes-graphics/wayland/weston/0008-packaging-add-the-RDP-backend.patch @@ -0,0 +1,89 @@ +From a6ac09dd1cc5b7547ff75fbe993f878aeb8920b4 Mon Sep 17 00:00:00 2001 +From: Manuel Bachmann +Date: Wed, 14 May 2014 13:32:38 +0200 +Subject: [PATCH 08/13] packaging: add the RDP backend + +As we now have FreeRDP (platform/upstream/freerdp), we are +able to ship the RDP backend -which provides a remote +display feature- in an additionnal package. + +Change-Id: Iaefb801ff4cf65060546fedebaff6aecf5263507 +Signed-off-by: Manuel Bachmann +--- + packaging/weston-rdp.spec | 64 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 64 insertions(+) + create mode 100644 packaging/weston-rdp.spec + +diff --git a/packaging/weston-rdp.spec b/packaging/weston-rdp.spec +new file mode 100644 +index 0000000..ad5993c +--- /dev/null ++++ b/packaging/weston-rdp.spec +@@ -0,0 +1,64 @@ ++%bcond_with wayland ++ ++Name: weston-rdp ++Version: 1.4.0 ++Release: 0 ++Summary: RDP compositor for Weston ++License: MIT ++Group: Graphics & UI Framework/Wayland Window System ++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: weston-rdp.manifest ++BuildRequires: autoconf >= 2.64, automake >= 1.11 ++BuildRequires: expat-devel ++BuildRequires: libjpeg-devel ++BuildRequires: libtool >= 2.2 ++BuildRequires: pkgconfig ++BuildRequires: xz ++BuildRequires: pkgconfig(cairo) ++BuildRequires: pkgconfig(freerdp) ++BuildRequires: pkgconfig(gio-2.0) ++BuildRequires: pkgconfig(glib-2.0) ++BuildRequires: pkgconfig(gobject-2.0) ++BuildRequires: pkgconfig(pixman-1) ++BuildRequires: pkgconfig(wayland-client) ++BuildRequires: pkgconfig(wayland-server) ++BuildRequires: pkgconfig(xkbcommon) >= 0.3.0 ++Requires: weston ++ ++%if !%{with wayland} ++ExclusiveArch: ++%endif ++ ++ ++%description ++This package provides a RDP compositor allowing to do remote rendering ++through the network. ++ ++%prep ++%setup -q ++cp %{SOURCE1} . ++ ++%build ++%autogen --disable-static --disable-setuid-install --disable-weston-launch --disable-simple-clients --with-cairo=image --disable-egl --disable-clients --disable-libunwind --disable-xwayland --disable-xwayland-test --disable-x11-compositor --disable-drm-compositor --disable-fbdev-compositor --disable-headless-compositor --disable-wayland-compositor --disable-rpi-compositor --enable-rdp-compositor %{?extra_config_options:%extra_config_options} ++make %{?_smp_mflags} ++ ++%install ++%make_install ++ ++%files ++%manifest %{name}.manifest ++%defattr(-,root,root) ++%license COPYING ++%_libdir/weston/rdp-backend.so ++%exclude %_bindir ++%exclude %_includedir ++%exclude %_prefix/lib/debug ++%exclude %_libdir/pkgconfig ++%exclude %_libdir/weston/desktop-shell.so ++%exclude %_datadir ++ ++%changelog +-- +1.8.1.4 + diff --git a/meta-tizen/recipes-graphics/wayland/weston/0009-packaging-fix-the-RDP-backend-build.patch b/meta-tizen/recipes-graphics/wayland/weston/0009-packaging-fix-the-RDP-backend-build.patch new file mode 100644 index 0000000..3dd4f81 --- /dev/null +++ b/meta-tizen/recipes-graphics/wayland/weston/0009-packaging-fix-the-RDP-backend-build.patch @@ -0,0 +1,50 @@ +From ea380956ee45d68bf1c13c73843f1f07e693960e Mon Sep 17 00:00:00 2001 +From: Manuel Bachmann +Date: Tue, 20 May 2014 13:49:34 +0200 +Subject: [PATCH 09/13] packaging: fix the RDP backend build + +Add manifest file, correct small typos. + +Change-Id: I3d1e088ed2aca9b64a9dd9b24d9e5296d38c0bdb +Signed-off-by: Manuel Bachmann +--- + packaging/weston-rdp.manifest | 5 +++++ + packaging/weston-rdp.spec | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + create mode 100644 packaging/weston-rdp.manifest + +diff --git a/packaging/weston-rdp.manifest b/packaging/weston-rdp.manifest +new file mode 100644 +index 0000000..017d22d +--- /dev/null ++++ b/packaging/weston-rdp.manifest +@@ -0,0 +1,5 @@ ++ ++ ++ ++ ++ +diff --git a/packaging/weston-rdp.spec b/packaging/weston-rdp.spec +index ad5993c..a3c2a32 100644 +--- a/packaging/weston-rdp.spec ++++ b/packaging/weston-rdp.spec +@@ -3,14 +3,14 @@ + Name: weston-rdp + Version: 1.4.0 + Release: 0 +-Summary: RDP compositor for Weston ++Summary: RDP compositor for Weston + License: MIT + Group: Graphics & UI Framework/Wayland Window System + 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 ++Source0: weston-%version.tar.xz + Source1: weston-rdp.manifest + BuildRequires: autoconf >= 2.64, automake >= 1.11 + BuildRequires: expat-devel +-- +1.8.1.4 + diff --git a/meta-tizen/recipes-graphics/wayland/weston/0010-packaging-fix-obs-build.patch b/meta-tizen/recipes-graphics/wayland/weston/0010-packaging-fix-obs-build.patch new file mode 100644 index 0000000..a6294f1 --- /dev/null +++ b/meta-tizen/recipes-graphics/wayland/weston/0010-packaging-fix-obs-build.patch @@ -0,0 +1,27 @@ +From 4b6ce5843ab0836d4f7b3300811cbc7c3afeff28 Mon Sep 17 00:00:00 2001 +From: Stephane Desneux +Date: Tue, 20 May 2014 16:03:48 +0200 +Subject: [PATCH 10/13] packaging: fix obs build + +Change-Id: Ie934cee0017e1251db9fe4cc73c9d82c070fb126 +Signed-off-by: Stephane Desneux +--- + packaging/weston-rdp.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packaging/weston-rdp.spec b/packaging/weston-rdp.spec +index a3c2a32..abe1801 100644 +--- a/packaging/weston-rdp.spec ++++ b/packaging/weston-rdp.spec +@@ -39,7 +39,7 @@ This package provides a RDP compositor allowing to do remote rendering + through the network. + + %prep +-%setup -q ++%setup -q -n weston-%{version} + cp %{SOURCE1} . + + %build +-- +1.8.1.4 + diff --git a/meta-tizen/recipes-graphics/wayland/weston/0008-shell-make-panel-optional-panel-false-in-weston.ini.patch b/meta-tizen/recipes-graphics/wayland/weston/0011-shell-make-panel-optional-panel-false-in-weston.ini.patch similarity index 95% rename from meta-tizen/recipes-graphics/wayland/weston/0008-shell-make-panel-optional-panel-false-in-weston.ini.patch rename to meta-tizen/recipes-graphics/wayland/weston/0011-shell-make-panel-optional-panel-false-in-weston.ini.patch index 4a78650..fef7ca1 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0008-shell-make-panel-optional-panel-false-in-weston.ini.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0011-shell-make-panel-optional-panel-false-in-weston.ini.patch @@ -1,7 +1,7 @@ -From 5bbfde4c9d19b17391a9a3e0d1dbc24a55bee496 Mon Sep 17 00:00:00 2001 +From 63fb11604751406fe80f75de5452009bf0d03772 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Mon, 7 Apr 2014 15:43:51 +0200 -Subject: [PATCH 08/10] shell: make panel optional ("panel=false" in +Subject: [PATCH 11/13] shell: make panel optional ("panel=false" in weston.ini) Change-Id: I6b2e9ee24f623c4b05f3cd675a90007bf708b09b diff --git a/meta-tizen/recipes-graphics/wayland/weston/0009-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch b/meta-tizen/recipes-graphics/wayland/weston/0012-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch similarity index 98% rename from meta-tizen/recipes-graphics/wayland/weston/0009-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch rename to meta-tizen/recipes-graphics/wayland/weston/0012-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch index 4bba1b6..cdee9f4 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0009-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0012-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch @@ -1,7 +1,7 @@ -From 9aab809f91fd839fda0a7b8999efdfeafdab793d Mon Sep 17 00:00:00 2001 +From bdb907107b377633a870b164e706a731a2279321 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 11 Apr 2014 22:09:19 +0200 -Subject: [PATCH 09/10] shell 1.4.0: Hack to allow selecting a default output +Subject: [PATCH 12/13] shell 1.4.0: Hack to allow selecting a default output Ported patch from Rafael Antognolli diff --git a/meta-tizen/recipes-graphics/wayland/weston/0010-allow-to-start-weston-with-system-user.patch b/meta-tizen/recipes-graphics/wayland/weston/0013-allow-to-start-weston-with-system-user.patch similarity index 90% rename from meta-tizen/recipes-graphics/wayland/weston/0010-allow-to-start-weston-with-system-user.patch rename to meta-tizen/recipes-graphics/wayland/weston/0013-allow-to-start-weston-with-system-user.patch index 4f355ca..2a45ed3 100644 --- a/meta-tizen/recipes-graphics/wayland/weston/0010-allow-to-start-weston-with-system-user.patch +++ b/meta-tizen/recipes-graphics/wayland/weston/0013-allow-to-start-weston-with-system-user.patch @@ -1,7 +1,7 @@ -From 5d81c84830847a7f9b6120329239720c35fd80e1 Mon Sep 17 00:00:00 2001 +From 5ac9c3048611cc8afcfc54c85f5618a562c8f0ec Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Mon, 14 Apr 2014 20:44:40 +0200 -Subject: [PATCH 10/10] allow to start weston with system user +Subject: [PATCH 13/13] allow to start weston with system user the check to allow only root user had been replaced by a check to see if effective uid is equal or less than 499 diff --git a/meta-tizen/recipes-graphics/wayland/weston_1.4.0.bbappend b/meta-tizen/recipes-graphics/wayland/weston_1.4.0.bbappend index a4e92ba..e495b9a 100644 --- a/meta-tizen/recipes-graphics/wayland/weston_1.4.0.bbappend +++ b/meta-tizen/recipes-graphics/wayland/weston_1.4.0.bbappend @@ -7,6 +7,9 @@ SRC_URI += "file://0001-Update-to-1.4.0.patch \ file://0005-toytoolkit-totally-switch-to-xdg-shell-protocol.patch \ file://0006-packaging-add-weston-editor-weston-subsurfaces-clien.patch \ file://0007-shell-position-input-panel-layer-above-fullscreen-la.patch \ - file://0008-shell-make-panel-optional-panel-false-in-weston.ini.patch \ - file://0009-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch \ - file://0010-allow-to-start-weston-with-system-user.patch" + file://0008-packaging-add-the-RDP-backend.patch \ + file://0009-packaging-fix-the-RDP-backend-build.patch \ + file://0010-packaging-fix-obs-build.patch \ + file://0011-shell-make-panel-optional-panel-false-in-weston.ini.patch \ + file://0012-shell-1.4.0-Hack-to-allow-selecting-a-default-output.patch \ + file://0013-allow-to-start-weston-with-system-user.patch" -- 2.7.4