fix build fail issue and merge old patch

3 files changed, 29 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 83bb2533..e200c739 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -924,7 +924,19 @@ dist_westondata_DATA =				\
 	data/icon_window.png			\
 	data/sign_close.png			\
 	data/sign_maximize.png			\
-	data/sign_minimize.png
+	data/sign_minimize.png                  \
+	data/background.png                     \
+	data/panel.png                          \
+	data/tiling.png                         \
+	data/sidebyside.png                     \
+	data/fullscreen.png                     \
+	data/random.png                         \
+	data/home.png                           \
+	data/icon_ivi_simple-egl.png            \
+	data/icon_ivi_simple-shm.png            \
+	data/icon_ivi_smoke.png                 \
+	data/icon_ivi_flower.png               \
+	data/icon_ivi_clickdot.png
 
 if ENABLE_IVI_SHELL
 dist_westondata_DATA +=				\
diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c
index 134e7298..42beca34 100755..100644
--- a/libweston/compositor-rdp.c
+++ b/libweston/compositor-rdp.c
@@ -1289,8 +1289,9 @@ rdp_peer_init(freerdp_peer *client, struct rdp_backend *b)
 	settings->RemoteFxCodec = TRUE;
 	settings->NSCodec = TRUE;
 	settings->FrameMarkerCommandEnabled = TRUE;
+#if 0
 	settings->SurfaceFrameMarkerEnabled = TRUE;
-
+#endif
 	client->Capabilities = xf_peer_capabilities;
 	client->PostConnect = xf_peer_post_connect;
 	client->Activate = xf_peer_activate;
diff --git a/packaging/weston.spec b/packaging/weston.spec
index dd7d4fb8..9ce46d51 100644
--- a/packaging/weston.spec
+++ b/packaging/weston.spec
@@ -14,7 +14,7 @@
 %define extra_config_options3 --enable-sys-uid --disable-ivi-shell
 
 Name:           weston
-Version:        1.8.0
+Version:        5.0.0
 Release:        0
 Summary:        Wayland Compositor Infrastructure
 License:        MIT
@@ -56,7 +56,8 @@ BuildRequires:  pkgconfig(libudev) >= 136
 BuildRequires:  pkgconfig(libva)
 %endif
 BuildRequires:  pkgconfig(mtdev) >= 1.1.0
-BuildRequires:  pkgconfig(pangocairo)
+#BuildRequires:  pkgconfig(pangocairo)
+BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(pixman-1)
 BuildRequires:  pkgconfig(poppler-glib)
 BuildRequires:  pkgconfig(wayland-client)
@@ -146,7 +147,7 @@ install -m 755 weston-flower %{buildroot}%{_bindir}
 install -m 755 weston-image %{buildroot}%{_bindir}
 install -m 755 weston-cliptest %{buildroot}%{_bindir}
 install -m 755 weston-dnd %{buildroot}%{_bindir}
-install -m 755 weston-editor %{buildroot}%{_bindir}
+#install -m 755 weston-editor %{buildroot}%{_bindir}
 install -m 755 weston-stacking %{buildroot}%{_bindir}
 install -m 755 weston-smoke %{buildroot}%{_bindir}
 install -m 755 weston-scaler %{buildroot}%{_bindir}
@@ -176,16 +177,18 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -r weston-launch
 %{_libexecdir}/weston-*
 %{_libdir}/weston/desktop-shell.so
 %if !%{with mobile}
-%{_libdir}/weston/drm-backend.so
+%{_libdir}/libweston-5/drm-backend.so
 %endif
-%{_libdir}/weston/fbdev-backend.so
+%{_libdir}/libweston-5/fbdev-backend.so
 %{_libdir}/weston/fullscreen-shell.so
-%{_libdir}/weston/headless-backend.so
-%{_libdir}/weston/wayland-backend.so
-%{_libdir}/weston/gl-renderer.so
+%{_libdir}/libweston-5/headless-backend.so
+%{_libdir}/libweston-5/wayland-backend.so
+%{_libdir}/libweston-5/gl-renderer.so
+%{_libdir}/libweston-5.*  
+%{_libdir}/libweston-desktop-5.*
 %{_datadir}/weston
 # exclude ivi-shell-specific files
-%exclude %{_libexecdir}/weston-ivi-shell-user-interface
+#%exclude %{_libexecdir}/weston-ivi-shell-user-interface
 %exclude %{_datadir}/weston/background.png
 %exclude %{_datadir}/weston/panel.png
 %exclude %{_datadir}/weston/tiling.png
@@ -203,6 +206,7 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -r weston-launch
 %manifest %{name}.manifest
 %{_includedir}/weston/*.h
 %{_libdir}/pkgconfig/*.pc
+%{_includedir}/libweston-5/*.h
 
 %files clients
 %manifest %{name}.manifest
@@ -218,7 +222,7 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -r weston-launch
 %{_bindir}/weston-image
 %{_bindir}/weston-cliptest
 %{_bindir}/weston-dnd
-%{_bindir}/weston-editor
+#%{_bindir}/weston-editor
 %{_bindir}/weston-stacking
 %{_bindir}/weston-smoke
 %{_bindir}/weston-scaler