diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics')
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.16.0.bbappend (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.14.12.bbappend) | 2 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Merge-pull-request-10011-from-jviney-master.patch | 112 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb | 4 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb | 1 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0001-Allow-to-boot-without-input-device.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0001-Allow-to-boot-without-input-device.patch) | 8 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0002-Share-toytoolkit-lib.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0002-Share-toytoolkit-lib.patch) | 179 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0003-add-window_set_fullscreen_at_output.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0003-add-window-set-fullscreen-at-output.patch) | 24 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0004-Add-display_poll-function.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0004-Add-display_poll-function.patch) | 16 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0005-Add-wl-ivi-shell-surface-creating-support.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0005-Add-wl-ivi-shell-surface-creating-support.patch) | 12 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0006-Add-widget_set_surface_allocation-func.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0006-Add-widget_set_surface_allocation-func.patch) | 12 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch) | 14 | ||||
-rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_8.0.0.bbappend (renamed from bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_5.0.0.bbappend) | 2 |
12 files changed, 104 insertions, 282 deletions
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.14.12.bbappend b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.16.0.bbappend index fa555a8d..17c4e718 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.14.12.bbappend +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/cairo/cairo_1.16.0.bbappend @@ -1,4 +1,2 @@ -require include/gles-control.inc - PACKAGECONFIG_pn-cairo_append = "${@' egl glesv2' if '${USE_GLES_WAYLAND}' == '1' else ''}" PACKAGECONFIG_pn-cairo_append += "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Merge-pull-request-10011-from-jviney-master.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Merge-pull-request-10011-from-jviney-master.patch deleted file mode 100644 index b20183b3..00000000 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/0001-Merge-pull-request-10011-from-jviney-master.patch +++ /dev/null @@ -1,112 +0,0 @@ -From b1d208891b9f6ae3968730b120a5d0dcbba679d0 Mon Sep 17 00:00:00 2001 -From: Jonathan Viney <jonathan.viney@gmail.com> -Date: Sun, 19 Nov 2017 07:08:41 +1300 -Subject: [PATCH] Merge pull request #10011 from jviney:master - -Fix build with FFmpeg master. Some deprecated APIs have been removed. (#10011) - -* Fix build with FFmpeg master. - -* ffmpeg: update AVFMT_RAWPICTURE support removal ---- - modules/videoio/src/cap_ffmpeg_impl.hpp | 37 +++++++++++++++++++++++++-------- - 1 file changed, 28 insertions(+), 9 deletions(-) - -diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp -index 5f51e65..4646148 100644 ---- a/modules/videoio/src/cap_ffmpeg_impl.hpp -+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp -@@ -149,6 +149,10 @@ extern "C" { - #define AV_PIX_FMT_GRAY16BE PIX_FMT_GRAY16BE - #endif - -+#ifndef PKT_FLAG_KEY -+#define PKT_FLAG_KEY AV_PKT_FLAG_KEY -+#endif -+ - #if LIBAVUTIL_BUILD >= (LIBAVUTIL_VERSION_MICRO >= 100 \ - ? CALC_FFMPEG_VERSION(52, 38, 100) : CALC_FFMPEG_VERSION(52, 13, 0)) - #define USE_AV_FRAME_GET_BUFFER 1 -@@ -1570,7 +1574,11 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc, - // some formats want stream headers to be seperate - if(oc->oformat->flags & AVFMT_GLOBALHEADER) - { -+#if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION(56, 35, 0) -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; -+#else - c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+#endif - } - #endif - -@@ -1598,23 +1606,24 @@ static int icv_av_write_frame_FFMPEG( AVFormatContext * oc, AVStream * video_st, - #endif - int ret = OPENCV_NO_FRAMES_WRITTEN_CODE; - -- if (oc->oformat->flags & AVFMT_RAWPICTURE) { -+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0) -+ if (oc->oformat->flags & AVFMT_RAWPICTURE) -+ { - /* raw video case. The API will change slightly in the near - futur for that */ - AVPacket pkt; - av_init_packet(&pkt); - --#ifndef PKT_FLAG_KEY --#define PKT_FLAG_KEY AV_PKT_FLAG_KEY --#endif -- - pkt.flags |= PKT_FLAG_KEY; - pkt.stream_index= video_st->index; - pkt.data= (uint8_t *)picture; - pkt.size= sizeof(AVPicture); - - ret = av_write_frame(oc, &pkt); -- } else { -+ } -+ else -+#endif -+ { - /* encode the image */ - AVPacket pkt; - av_init_packet(&pkt); -@@ -1772,7 +1781,9 @@ void CvVideoWriter_FFMPEG::close() - /* write the trailer, if any */ - if(ok && oc) - { -- if( (oc->oformat->flags & AVFMT_RAWPICTURE) == 0 ) -+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0) -+ if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) -+#endif - { - for(;;) - { -@@ -2071,7 +2082,11 @@ bool CvVideoWriter_FFMPEG::open( const char * filename, int fourcc, - - outbuf = NULL; - -- if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) { -+ -+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(57, 0, 0) -+ if (!(oc->oformat->flags & AVFMT_RAWPICTURE)) -+#endif -+ { - /* allocate output buffer */ - /* assume we will never get codec output with more than 4 bytes per pixel... */ - outbuf_size = width*height*4; -@@ -2376,7 +2391,11 @@ AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVFormatContext *oc, CV_CODEC - // some formats want stream headers to be seperate - if (oc->oformat->flags & AVFMT_GLOBALHEADER) - { -- c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ #if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION(56, 35, 0) -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; -+ #else -+ c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ #endif - } - #endif - --- -2.7.4 - diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb index 602b1b45..4c63f961 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_2.4.bb @@ -44,7 +44,9 @@ PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1. PACKAGECONFIG[opengl] = "-DWITH_OPENGL=ON,-DWITH_OPENGL=OFF,," PACKAGECONFIG[qt5] = "-DWITH_QT=ON,-DWITH_QT=OFF,qtbase," -inherit distutils-base pkgconfig cmake ${@bb.utils.contains( 'DISTRO_FEATURES', 'qt5', 'cmake_qt5','', d)} +inherit pkgconfig cmake ${@bb.utils.contains( 'DISTRO_FEATURES', 'qt5', 'cmake_qt5','', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} export BUILD_SYS export HOST_SYS diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb index 01ed0210..682aebd4 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv_3.2.bb @@ -30,7 +30,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://uselocalxfeatures.patch;patchdir=../contrib/ \ file://useoeprotobuf.patch;patchdir=../contrib/ \ file://0001-Revert-cuda-fix-fp16-compilation.patch \ - file://0001-Merge-pull-request-10011-from-jviney-master.patch \ " # file://0002-Revert-check-FP16-build-condition-correctly.patch \ # diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0001-Allow-to-boot-without-input-device.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0001-Allow-to-boot-without-input-device.patch index d453103e..5636c23d 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0001-Allow-to-boot-without-input-device.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0001-Allow-to-boot-without-input-device.patch @@ -1,17 +1,17 @@ -From 980b48bc279d46559465665e94e546f661d1d427 Mon Sep 17 00:00:00 2001 +From d04c556bc8eac439cc87c7cdf9b4446d4a9cecaa Mon Sep 17 00:00:00 2001 From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> Date: Fri, 17 Feb 2017 03:06:27 +0300 -Subject: [PATCH 1/7] Allow to boot without input device +Subject: [PATCH] Allow to boot without input device --- libweston/libinput-seat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libweston/libinput-seat.c b/libweston/libinput-seat.c -index ac1e8e9..b7f601a 100644 +index 9801551..190acfd 100644 --- a/libweston/libinput-seat.c +++ b/libweston/libinput-seat.c -@@ -302,7 +302,6 @@ udev_input_enable(struct udev_input *input) +@@ -305,7 +305,6 @@ udev_input_enable(struct udev_input *input) "\t- seats misconfigured " "(Weston backend option 'seat', " "udev device property ID_SEAT)\n"); diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0002-Share-toytoolkit-lib.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0002-Share-toytoolkit-lib.patch index a641cb30..e799649a 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0002-Share-toytoolkit-lib.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0002-Share-toytoolkit-lib.patch @@ -1,96 +1,50 @@ -From 6e0aeaec800a9155a09c8b94c33705acc420ab1b Mon Sep 17 00:00:00 2001 +From 32bb2f9f31945fda4d3a530c7e48632f3249d3a6 Mon Sep 17 00:00:00 2001 From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> Date: Tue, 13 Jun 2017 23:51:22 +0300 -Subject: [PATCH 2/7] Share toytoolkit lib +Subject: [PATCH 1/4] Share toytoolkit lib --- - Makefile.am | 35 +++ - clients/toytoolkit.h | 741 +++++++++++++++++++++++++++++++++++++++++++++++++++ - clients/window.h | 714 +------------------------------------------------ - configure.ac | 2 +- - 4 files changed, 778 insertions(+), 714 deletions(-) + clients/meson.build | 11 + + clients/toytoolkit.h | 738 +++++++++++++++++++++++++++++++++++++++++++++++++++ + clients/window.h | 711 +------------------------------------------------ + 3 files changed, 750 insertions(+), 710 deletions(-) create mode 100644 clients/toytoolkit.h -diff --git a/Makefile.am b/Makefile.am -index 83bb253..9433362 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,7 @@ module_LTLIBRARIES = - libweston_moduledir = $(libdir)/libweston-$(LIBWESTON_MAJOR) - libweston_module_LTLIBRARIES = - noinst_LTLIBRARIES = -+lib_LTLIBRARIES = - BUILT_SOURCES = - - AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install -@@ -101,6 +102,7 @@ libweston_@LIBWESTON_MAJOR@_la_SOURCES = \ - shared/matrix.h \ - shared/timespec-util.h \ - shared/zalloc.h \ -+ clients/toytoolkit.h \ - shared/platform.h \ - shared/weston-egl-ext.h - -@@ -279,6 +281,7 @@ dist_wayland_session_DATA = compositor/weston.desktop - - libwestonincludedir = $(includedir)/libweston-${LIBWESTON_MAJOR} - libwestoninclude_HEADERS = \ -+ clients/toytoolkit.h \ - libweston/version.h \ - libweston/compositor.h \ - libweston/compositor-drm.h \ -@@ -655,6 +658,7 @@ noinst_LTLIBRARIES += libtoytoolkit.la - libtoytoolkit_la_SOURCES = \ - clients/window.c \ - clients/window.h \ -+ clients/toytoolkit.h \ - shared/helpers.h - - nodist_libtoytoolkit_la_SOURCES = \ -@@ -680,6 +684,37 @@ libtoytoolkit_la_LIBADD = \ - libshared-cairo.la $(CLOCK_GETTIME_LIBS) -lm - libtoytoolkit_la_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) $(CAIRO_EGL_CFLAGS) - -+lib_LTLIBRARIES += libweston-toytoolkit.la -+ -+libweston_toytoolkit_la_SOURCES = \ -+ clients/window.c \ -+ clients/window.h \ -+ clients/toytoolkit.h \ -+ protocol/text-cursor-position-protocol.c \ -+ protocol/text-cursor-position-client-protocol.h \ -+ protocol/viewporter-client-protocol.h \ -+ protocol/viewporter-protocol.c \ -+ protocol/xdg-shell-unstable-v6-protocol.c \ -+ protocol/xdg-shell-unstable-v6-client-protocol.h \ -+ \ -+ \ -+ protocol/ivi-application-protocol.c \ -+ protocol/ivi-application-client-protocol.h -+ -+BUILT_SOURCES += $(libweston_toytoolkit_la_SOURCES) -+ -+libweston_toytoolkit_la_CFLAGS = \ -+ $(AM_CFLAGS) $(CLIENT_CFLAGS) $(CAIRO_EGL_CFLAGS) \ -+ $(GCC_CFLAGS) -pthread -fvisibility=default -+libweston_toytoolkit_la_LIBADD = \ -+ $(CLIENT_LIBS) \ -+ $(CAIRO_EGL_LIBS) \ -+ libshared-cairo.la -lrt -lm -+libweston_toytoolkit_la_LDFLAGS = -version-info 1:0:1 -+ -+ -+ -+ - weston_flower_SOURCES = clients/flower.c - weston_flower_LDADD = libtoytoolkit.la - weston_flower_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) +diff --git a/clients/meson.build b/clients/meson.build +index bdc5d44..c48e522 100644 +--- a/clients/meson.build ++++ b/clients/meson.build +@@ -24,6 +24,7 @@ deps_toytoolkit = [ + dependency('wayland-cursor'), + cc.find_library('util'), + ] ++ + lib_toytoolkit = static_library( + 'toytoolkit', + srcs_toytoolkit, +@@ -31,6 +32,16 @@ lib_toytoolkit = static_library( + dependencies: deps_toytoolkit, + install: false, + ) ++ ++lib_toytoolkit_shared = shared_library( ++ 'weston-toytoolkit-@0@'.format(libweston_major), ++ srcs_toytoolkit, ++ include_directories: include_directories('..', '../shared'), ++ dependencies: deps_toytoolkit, ++ version: '0.0.@0@'.format(libweston_revision), ++ install: true, ++) ++ + dep_toytoolkit = declare_dependency( + link_with: lib_toytoolkit, + dependencies: deps_toytoolkit, diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h new file mode 100644 -index 0000000..1c0b77d +index 0000000..cd5455e --- /dev/null +++ b/clients/toytoolkit.h -@@ -0,0 +1,741 @@ +@@ -0,0 +1,738 @@ +/* + * Copyright © 2008 Kristian Høgsberg + * @@ -222,8 +176,6 @@ index 0000000..1c0b77d + +#define SURFACE_HINT_RESIZE 0x10 + -+#define SURFACE_HINT_RGB565 0x100 -+ +cairo_surface_t * +display_create_surface(struct display *display, + struct wl_surface *surface, @@ -595,15 +547,6 @@ index 0000000..1c0b77d +void +window_set_text_cursor_position(struct window *window, int32_t x, int32_t y); + -+enum preferred_format { -+ WINDOW_PREFERRED_FORMAT_NONE, -+ WINDOW_PREFERRED_FORMAT_RGB565 -+}; -+ -+void -+window_set_preferred_format(struct window *window, -+ enum preferred_format format); -+ +int +widget_set_tooltip(struct widget *parent, char *entry, float x, float y); + @@ -700,6 +643,14 @@ index 0000000..1c0b77d +void +widget_set_use_cairo(struct widget *widget, int use_cairo); + ++/* ++ * Sets the viewport destination for the widget's surface ++ * return 0 on success and -1 on failure. Set width and height to ++ * -1 to reset the viewport. ++ */ ++int ++widget_set_viewport_destination(struct widget *widget, int width, int height); ++ +struct widget * +window_frame_create(struct window *window, void *data); + @@ -833,10 +784,10 @@ index 0000000..1c0b77d + +#endif diff --git a/clients/window.h b/clients/window.h -index fde5c2f..fea173f 100644 +index c66dd06..f07d711 100644 --- a/clients/window.h +++ b/clients/window.h -@@ -27,721 +27,9 @@ +@@ -27,718 +27,9 @@ #include "config.h" #include <stdint.h> @@ -845,8 +796,8 @@ index fde5c2f..fea173f 100644 -#include <wayland-client.h> -#include <cairo.h> +#include "toytoolkit.h" - #include "shared/config-parser.h" - #include "shared/zalloc.h" + #include <libweston/config-parser.h> + #include <libweston/zalloc.h> #include "shared/platform.h" -struct window; @@ -949,8 +900,6 @@ index fde5c2f..fea173f 100644 - -#define SURFACE_HINT_RESIZE 0x10 - --#define SURFACE_HINT_RGB565 0x100 -- -cairo_surface_t * -display_create_surface(struct display *display, - struct wl_surface *surface, @@ -1322,15 +1271,6 @@ index fde5c2f..fea173f 100644 -void -window_set_text_cursor_position(struct window *window, int32_t x, int32_t y); - --enum preferred_format { -- WINDOW_PREFERRED_FORMAT_NONE, -- WINDOW_PREFERRED_FORMAT_RGB565 --}; -- --void --window_set_preferred_format(struct window *window, -- enum preferred_format format); -- -int -widget_set_tooltip(struct widget *parent, char *entry, float x, float y); - @@ -1427,6 +1367,14 @@ index fde5c2f..fea173f 100644 -void -widget_set_use_cairo(struct widget *widget, int use_cairo); - +-/* +- * Sets the viewport destination for the widget's surface +- * return 0 on success and -1 on failure. Set width and height to +- * -1 to reset the viewport. +- */ +-int +-widget_set_viewport_destination(struct widget *widget, int width, int height); +- -struct widget * -window_frame_create(struct window *window, void *data); - @@ -1559,19 +1507,6 @@ index fde5c2f..fea173f 100644 -toytimer_disarm(struct toytimer *tt); - #endif -diff --git a/configure.ac b/configure.ac -index 96acf75..d3fa5af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,7 +82,7 @@ AC_PROG_SED - - # Initialize libtool - LT_PREREQ([2.2]) --LT_INIT([disable-static]) -+LT_INIT([shared static]) - - AC_ARG_VAR([WESTON_NATIVE_BACKEND], - [Set the native backend to use, if Weston is not running under Wayland nor X11. @<:@default=drm-backend.so@:>@]) -- 2.7.4 diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0003-add-window-set-fullscreen-at-output.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0003-add-window_set_fullscreen_at_output.patch index bf3ef82c..478f7929 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0003-add-window-set-fullscreen-at-output.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0003-add-window_set_fullscreen_at_output.patch @@ -1,7 +1,7 @@ -From 91ccb8d7fa92a55fd3d14da8f7fa883e951ae49a Mon Sep 17 00:00:00 2001 -From: Valentine Barshak <valentine.barshak@cogentembedded.com> -Date: Wed, 6 Mar 2019 00:17:31 +0300 -Subject: [PATCH 3/7] add window_set_fullscreen_at_output +From 96bcbcc000541653e8937ff51b9ba945290d354d Mon Sep 17 00:00:00 2001 +From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> +Date: Tue, 13 Jun 2017 23:51:22 +0300 +Subject: [PATCH 2/4] add window_set_fullscreen_at_output --- clients/toytoolkit.h | 9 +++++++++ @@ -9,7 +9,7 @@ Subject: [PATCH 3/7] add window_set_fullscreen_at_output 2 files changed, 47 insertions(+) diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index 1c0b77d..2bcecc1 100644 +index cd5455e..b99b6f1 100644 --- a/clients/toytoolkit.h +++ b/clients/toytoolkit.h @@ -74,6 +74,12 @@ display_get_compositor(struct display *display); @@ -25,7 +25,7 @@ index 1c0b77d..2bcecc1 100644 uint32_t display_get_serial(struct display *display); -@@ -432,6 +438,9 @@ window_is_fullscreen(struct window *window); +@@ -430,6 +436,9 @@ window_is_fullscreen(struct window *window); void window_set_fullscreen(struct window *window, int fullscreen); @@ -36,11 +36,11 @@ index 1c0b77d..2bcecc1 100644 window_is_maximized(struct window *window); diff --git a/clients/window.c b/clients/window.c -index b64e96c..43f20e2 100644 +index 2bd303e..34645b2 100644 --- a/clients/window.c +++ b/clients/window.c -@@ -4597,6 +4597,21 @@ window_set_fullscreen(struct window *window, int fullscreen) - zxdg_toplevel_v6_unset_fullscreen(window->xdg_toplevel); +@@ -4672,6 +4672,21 @@ window_set_fullscreen(struct window *window, int fullscreen) + xdg_toplevel_unset_fullscreen(window->xdg_toplevel); } +void @@ -53,15 +53,15 @@ index b64e96c..43f20e2 100644 + return; + + if (fullscreen) -+ zxdg_toplevel_v6_set_fullscreen(window->xdg_toplevel, output ? output_get_wl_output(output) : NULL); ++ xdg_toplevel_set_fullscreen(window->xdg_toplevel, output ? output_get_wl_output(output) : NULL); + else -+ zxdg_toplevel_v6_unset_fullscreen(window->xdg_toplevel); ++ xdg_toplevel_unset_fullscreen(window->xdg_toplevel); +} + int window_is_maximized(struct window *window) { -@@ -6328,6 +6343,29 @@ display_get_output(struct display *display) +@@ -6397,6 +6412,29 @@ display_get_output(struct display *display) return container_of(display->output_list.next, struct output, link); } diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0004-Add-display_poll-function.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0004-Add-display_poll-function.patch index b171271a..e0ffa92a 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0004-Add-display_poll-function.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0004-Add-display_poll-function.patch @@ -1,7 +1,7 @@ -From 5dfdbc46524919521c9b3cc485100a54c0908016 Mon Sep 17 00:00:00 2001 -From: Valentine Barshak <valentine.barshak@cogentembedded.com> -Date: Wed, 6 Mar 2019 00:19:06 +0300 -Subject: [PATCH 4/7] Add display_poll function +From 1d64f24383749038ccc8c5f273a279698b2a9662 Mon Sep 17 00:00:00 2001 +From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> +Date: Tue, 13 Jun 2017 23:51:22 +0300 +Subject: [PATCH 3/4] Add display_poll function --- clients/toytoolkit.h | 3 +++ @@ -9,10 +9,10 @@ Subject: [PATCH 4/7] Add display_poll function 2 files changed, 55 insertions(+) diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index 2bcecc1..a77eda3 100644 +index b99b6f1..67c2720 100644 --- a/clients/toytoolkit.h +++ b/clients/toytoolkit.h -@@ -163,6 +163,9 @@ display_unwatch_fd(struct display *display, int fd); +@@ -161,6 +161,9 @@ display_unwatch_fd(struct display *display, int fd); void display_run(struct display *d); @@ -23,10 +23,10 @@ index 2bcecc1..a77eda3 100644 display_exit(struct display *d); diff --git a/clients/window.c b/clients/window.c -index 43f20e2..9cd0e8e 100644 +index 34645b2..3b7def3 100644 --- a/clients/window.c +++ b/clients/window.c -@@ -6490,6 +6490,58 @@ display_run(struct display *display) +@@ -6559,6 +6559,58 @@ display_run(struct display *display) } } diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0005-Add-wl-ivi-shell-surface-creating-support.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0005-Add-wl-ivi-shell-surface-creating-support.patch index 563f2a2a..7163cb36 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0005-Add-wl-ivi-shell-surface-creating-support.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0005-Add-wl-ivi-shell-surface-creating-support.patch @@ -1,7 +1,7 @@ -From 5009db4e22545def833be7e2946419d209026bd6 Mon Sep 17 00:00:00 2001 +From 626341e48f4159d91ff39af2d0dc7bc720521121 Mon Sep 17 00:00:00 2001 From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> Date: Tue, 13 Jun 2017 23:58:37 +0300 -Subject: [PATCH 5/7] Add wl ivi shell surface creating support +Subject: [PATCH 4/4] Add wl ivi shell sirface creating support --- ivi-shell/ivi-layout-export.h | 19 +++++++++++++++++++ @@ -9,10 +9,10 @@ Subject: [PATCH 5/7] Add wl ivi shell surface creating support 2 files changed, 21 insertions(+) diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h -index 016d8b5..29d84dc 100644 +index 740e1ac..bd97d4a 100644 --- a/ivi-shell/ivi-layout-export.h +++ b/ivi-shell/ivi-layout-export.h -@@ -154,6 +154,25 @@ struct ivi_layout_interface { +@@ -156,6 +156,25 @@ struct ivi_layout_interface { */ int32_t (*commit_changes)(void); @@ -39,10 +39,10 @@ index 016d8b5..29d84dc 100644 * surface controller interface */ diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c -index d9a0c2d..968819f 100644 +index 7cec79d..615c026 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c -@@ -1950,6 +1950,8 @@ static struct ivi_layout_interface ivi_layout_interface = { +@@ -2054,6 +2054,8 @@ static struct ivi_layout_interface ivi_layout_interface = { * commit all changes */ .commit_changes = ivi_layout_commit_changes, diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0006-Add-widget_set_surface_allocation-func.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0006-Add-widget_set_surface_allocation-func.patch index 21f68ce5..2992a37f 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0006-Add-widget_set_surface_allocation-func.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0006-Add-widget_set_surface_allocation-func.patch @@ -1,7 +1,7 @@ -From a74be0a8f1b71ae24e43e337d44f215d33fe012c Mon Sep 17 00:00:00 2001 +From e513edbcb6d870c9ce956f0a092d01540073b750 Mon Sep 17 00:00:00 2001 From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> Date: Tue, 13 Dec 2016 00:43:11 +0300 -Subject: [PATCH 6/7] Add widget_set_surface_allocation func +Subject: [PATCH] Add widget_set_surface_allocation func --- clients/toytoolkit.h | 3 +++ @@ -9,10 +9,10 @@ Subject: [PATCH 6/7] Add widget_set_surface_allocation func 2 files changed, 15 insertions(+) diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index a77eda3..0f6145d 100644 +index 67c2720..45d322a 100644 --- a/clients/toytoolkit.h +++ b/clients/toytoolkit.h -@@ -543,6 +543,9 @@ void +@@ -532,6 +532,9 @@ void widget_set_allocation(struct widget *widget, int32_t x, int32_t y, int32_t width, int32_t height); void @@ -23,10 +23,10 @@ index a77eda3..0f6145d 100644 void widget_set_transparent(struct widget *widget, int transparent); diff --git a/clients/window.c b/clients/window.c -index 9cd0e8e..d0e2ece 100644 +index 3b7def3..c0b25e8 100644 --- a/clients/window.c +++ b/clients/window.c -@@ -1744,6 +1744,18 @@ widget_set_allocation(struct widget *widget, +@@ -1761,6 +1761,18 @@ widget_set_allocation(struct widget *widget, } void diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch index 86daf5c4..90893cde 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-5.0.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-8.0.0/0007-Add-call-for-setting-fullscreen-with-IVI.patch @@ -1,7 +1,7 @@ -From 48c11b3d668383cb964fa41a73e6b666f30fea57 Mon Sep 17 00:00:00 2001 +From 9f1228fad3e549fd0ead4fd37573e02b874d1661 Mon Sep 17 00:00:00 2001 From: Grigory Kletsko <grigory.kletsko@cogentembedded.com> Date: Tue, 13 Dec 2016 18:20:11 +0300 -Subject: [PATCH 7/7] Add call for setting fullscreen with IVI +Subject: [PATCH] Add call for setting fullscreen with IVI --- clients/toytoolkit.h | 3 +++ @@ -9,10 +9,10 @@ Subject: [PATCH 7/7] Add call for setting fullscreen with IVI 2 files changed, 9 insertions(+) diff --git a/clients/toytoolkit.h b/clients/toytoolkit.h -index 0f6145d..7058c41 100644 +index 45d322a..481bfe1 100644 --- a/clients/toytoolkit.h +++ b/clients/toytoolkit.h -@@ -444,6 +444,9 @@ window_set_fullscreen(struct window *window, int fullscreen); +@@ -442,6 +442,9 @@ window_set_fullscreen(struct window *window, int fullscreen); void window_set_fullscreen_at_output(struct window *window, int fullscreen, struct output *output); @@ -23,11 +23,11 @@ index 0f6145d..7058c41 100644 window_is_maximized(struct window *window); diff --git a/clients/window.c b/clients/window.c -index d0e2ece..81fb674 100644 +index c0b25e8..0ba9307 100644 --- a/clients/window.c +++ b/clients/window.c -@@ -4624,6 +4624,12 @@ window_set_fullscreen_at_output(struct window *window, int fullscreen, struct ou - zxdg_toplevel_v6_unset_fullscreen(window->xdg_toplevel); +@@ -4699,6 +4699,12 @@ window_set_fullscreen_at_output(struct window *window, int fullscreen, struct ou + xdg_toplevel_unset_fullscreen(window->xdg_toplevel); } +void diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_5.0.0.bbappend b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_8.0.0.bbappend index 96e48aba..9521606c 100644 --- a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_5.0.0.bbappend +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-graphics/wayland/weston_8.0.0.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := '${THISDIR}/${PN}-${PV}:' SRC_URI_append = " \ file://0001-Allow-to-boot-without-input-device.patch \ file://0002-Share-toytoolkit-lib.patch \ - file://0003-add-window-set-fullscreen-at-output.patch \ + file://0003-add-window_set_fullscreen_at_output.patch \ file://0004-Add-display_poll-function.patch \ file://0005-Add-wl-ivi-shell-surface-creating-support.patch \ file://0006-Add-widget_set_surface_allocation-func.patch \ |