summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2021-08-09 18:12:22 -0700
committerDylan Baker <dylan.c.baker@intel.com>2021-08-13 10:28:38 -0700
commit8c26804eea40372d1b4e9d5c1f7492c400694861 (patch)
treeee8ee6288397845dcf6d750c4210970f5cc84c7b
parentf7e77b7708c0c747fafdef8c116dbc9a43ba48e4 (diff)
meson: Remove duplicate xvmc in build summary.
Fixes: d30ce03bc07 ("meson: add build-summary") Signed-off-by: Vinson Lee <vlee@freedesktop.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12296> (cherry picked from commit c0fc745b78bc84b07f43b0114e2fac54938eca63)
-rw-r--r--.pick_status.json2
-rw-r--r--meson.build3
2 files changed, 1 insertions, 4 deletions
diff --git a/.pick_status.json b/.pick_status.json
index f1d54efbcc5..ce468d20360 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
"description": "meson: Remove duplicate xvmc in build summary.",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "d30ce03bc07562d2f694dbe94cbf9c1875a25c4d"
},
diff --git a/meson.build b/meson.build
index 45c5a9a6d6b..155db287796 100644
--- a/meson.build
+++ b/meson.build
@@ -2224,9 +2224,6 @@ if with_gallium
if with_gallium_xvmc
gallium_st += 'xvmc'
endif
- if with_gallium_xvmc
- gallium_st += 'xvmc'
- endif
if with_gallium_vdpau
gallium_st += 'vdpau'
endif