Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions build/config/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,19 @@ config("system_cxx") {
}

include_dirs = []
if (api_version == "10.0") {
include_dirs += [
"${lib_path}/gcc/${gcc_target_triple}/14.2.0/include",
"${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++",
"${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++/${gcc_target_triple}",
]
} else {
if (api_version == "6.0" || api_version == "6.5" || api_version == "7.0" ||
api_version == "8.0" || api_version == "9.0") {
include_dirs += [
"${lib_path}/gcc/${gcc_target_triple}/9.2.0/include",
"${lib_path}/gcc/${gcc_target_triple}/9.2.0/include/c++",
"${lib_path}/gcc/${gcc_target_triple}/9.2.0/include/c++/${gcc_target_triple}",
]
} else {
include_dirs += [
"${lib_path}/gcc/${gcc_target_triple}/14.2.0/include",
"${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++",
"${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++/${gcc_target_triple}",
]
}

libs = [ "stdc++" ]
Expand Down
17 changes: 8 additions & 9 deletions flutter/shell/platform/tizen/tizen_renderer_egl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,21 @@ bool TizenRendererEgl::CreateSurface(void* render_target,
const EGLint attribs[] = {EGL_NONE};

if (render_target_display) {
auto* egl_window =
static_cast<EGLNativeWindowType*>(ecore_wl2_egl_window_native_get(
static_cast<Ecore_Wl2_Egl_Window*>(render_target)));
egl_surface_ = eglCreateWindowSurface(egl_display_, egl_config_,
egl_window, attribs);
const auto egl_window = ecore_wl2_egl_window_native_get(
static_cast<Ecore_Wl2_Egl_Window*>(render_target));
egl_surface_ = eglCreateWindowSurface(
egl_display_, egl_config_,
reinterpret_cast<EGLNativeWindowType>(egl_window), attribs);
} else {
#ifdef NUI_SUPPORT
Dali::NativeImageSourceQueuePtr dali_native_image_queue =
static_cast<Dali::NativeImageSourceQueue*>(render_target);
tbm_surface_queue_h tbm_surface_queue_ =
Dali::AnyCast<tbm_surface_queue_h>(
dali_native_image_queue->GetNativeImageSourceQueue());
auto* egl_window =
reinterpret_cast<EGLNativeWindowType*>(tbm_surface_queue_);
egl_surface_ = eglCreateWindowSurface(egl_display_, egl_config_,
egl_window, attribs);
egl_surface_ = eglCreateWindowSurface(
egl_display_, egl_config_,
reinterpret_cast<EGLNativeWindowType>(tbm_surface_queue_), attribs);
#endif
}

Expand Down
9 changes: 8 additions & 1 deletion tools/generate_sysroot.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@
'dali2-toolkit-devel',
]

dali_integration_devel_packages = [
'dali2-integration-devel',
'dali2-adaptor-integration-devel',
'dali2-toolkit-integration-devel',
]

def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
target = 'standard'
Expand All @@ -122,7 +127,7 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
else:
sys.exit('Unknown arch: ' + arch)

if api_version >= 10.0:
if api_version > 10.0:
base_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen/Tizen-Base/reference/repos/standard/packages'
unified_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen/Tizen-Unified/reference/repos/{}/packages'.format(
target)
Expand Down Expand Up @@ -150,6 +155,8 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
packages = base_packages + unified_packages
if api_version >= 6.5:
packages += dali_packages
if api_version > 10.0:
packages += dali_integration_devel_packages

for package in packages:
quoted = urllib.parse.quote(package)
Expand Down
Loading