Commit bd36318f authored by Sergey Volk's avatar Sergey Volk Committed by Commit Bot

Roll src/third_party/minigbm/ 7f79cb5..6eca368 (4 commits)

https://chromium.googlesource.com/chromiumos/platform/minigbm/+log/7f79cb5..6eca368

$ git log 7f79cb5..6eca368 --date=short --no-merges --format='%ad %ae %s'
2018-03-06 servolk@google.com Rename amlogic backend in minigbm into meson
2018-02-28 marcheu@chromium.org msm: Align buffer dimensions for llvmpipe
2018-02-20 Deepak.Sharma@amd.com minigbm: amdgpu: support DRM_FORMAT_YVU420_ANDROID
2018-02-07 hoegsberg@chromium.org i915: Always set the modifier when allocating BOs

Also made two changes in third_party/minigbm/BUILD.gn:
1. Updates for the "amlogic" backend being renamed into "meson"
2. Added "libminigbm" target for Chromecast builds, which expect the final lib
name to be <GN target name> + .so

Bug: internal b/70752885
Test: build and run ozone_demo
Change-Id: Ie358b925464745f27402a826ef256e3da5199ec6
Reviewed-on: https://chromium-review.googlesource.com/952165Reviewed-by: default avatarMichael Spang <spang@chromium.org>
Commit-Queue: Sergey Volk <servolk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542043}
parent 3af3bbb8
......@@ -524,7 +524,7 @@ deps = {
# Graphics buffer allocator for Chrome OS.
'src/third_party/minigbm/src': {
'url': Var('chromium_git') + '/chromiumos/platform/minigbm.git' + '@' + '7f79cb53e1b38e8284f365a22c5dc9223f6ad847',
'url': Var('chromium_git') + '/chromiumos/platform/minigbm.git' + '@' + '6eca36809e185337bfcca95310a1765c34c360e1',
'condition': 'checkout_linux',
},
......
......@@ -14,11 +14,11 @@ declare_args() {
use_system_minigbm = false
use_amdgpu_minigbm = false
use_amlogic_minigbm = false
use_exynos_minigbm = false
use_intel_minigbm = false
use_marvell_minigbm = false
use_mediatek_minigbm = false
use_meson_minigbm = false
use_msm_minigbm = false
use_radeon_minigbm = false
use_rockchip_minigbm = false
......@@ -33,9 +33,6 @@ if (!use_system_minigbm) {
if (use_amdgpu_minigbm) {
defines += [ "DRV_AMDGPU" ]
}
if (use_amlogic_minigbm) {
defines += [ "DRV_AMLOGIC" ]
}
if (use_exynos_minigbm) {
defines += [ "DRV_EXYNOS" ]
}
......@@ -48,8 +45,8 @@ if (!use_system_minigbm) {
if (use_mediatek_minigbm) {
defines += [ "DRV_MEDIATEK" ]
}
if (use_msm_minigbm) {
defines += [ "DRV_MSM" ]
if (use_meson_minigbm) {
defines += [ "DRV_MESON" ]
}
if (use_msm_minigbm) {
defines += [ "DRV_MSM" ]
......@@ -71,7 +68,6 @@ if (!use_system_minigbm) {
shared_library("minigbm") {
sources = [
"src/amdgpu.c",
"src/amlogic.c",
"src/drv.c",
"src/evdi.c",
"src/exynos.c",
......@@ -82,6 +78,7 @@ if (!use_system_minigbm) {
"src/i915.c",
"src/marvell.c",
"src/mediatek.c",
"src/meson.c",
"src/msm.c",
"src/nouveau.c",
"src/radeon.c",
......@@ -106,6 +103,14 @@ if (!use_system_minigbm) {
all_dependent_configs =
[ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
# This target is used for Chromecast build, which expects the resulting lib
# to have a name <GN target name> + .so
group("libminigbm") {
deps = [
":minigbm",
]
}
}
if (use_system_minigbm) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment