Commit 0a880b68 authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Add manual dependency on Vulkan

libvulkan is dlopen()'ed, so a manual dependency is necessary. It's
available on all RPM-based distros, so a basic dependency is added. But
it isn't available everywhere on Debian-based systems, so it's added as
a recommended dependency instead. If the system doesn't have libvulkan,
OpenGL will be used as a fallback.

R=thestig
BUG=1034606
CC=penghuang

Change-Id: Ibb0a1a94cc163c93a6428b1b408f6b364f9b6bb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1973042
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726036}
parent a4ba5d63
...@@ -264,6 +264,7 @@ copy("deb_packaging_files") { ...@@ -264,6 +264,7 @@ copy("deb_packaging_files") {
"debian/changelog.template", "debian/changelog.template",
"debian/control.template", "debian/control.template",
"debian/debian.menu", "debian/debian.menu",
"debian/manual_recommends",
"debian/postinst", "debian/postinst",
"debian/postrm", "debian/postrm",
"debian/prerm", "debian/prerm",
......
...@@ -268,8 +268,9 @@ export DEBEMAIL="${MAINTMAIL}" ...@@ -268,8 +268,9 @@ export DEBEMAIL="${MAINTMAIL}"
DEB_COMMON_DEPS="${BUILDDIR}/deb_common.deps" DEB_COMMON_DEPS="${BUILDDIR}/deb_common.deps"
COMMON_DEPS=$(sed ':a;N;$!ba;s/\n/, /g' "${DEB_COMMON_DEPS}") COMMON_DEPS=$(sed ':a;N;$!ba;s/\n/, /g' "${DEB_COMMON_DEPS}")
COMMON_PREDEPS="dpkg (>= 1.14.0)" COMMON_PREDEPS="dpkg (>= 1.14.0)"
COMMON_RECOMMENDS="libu2f-udev" MANUAL_RECOMMENDS="${SCRIPTDIR}/manual_recommends"
COMMON_RECOMMENDS=$(grep -v ^$ "${MANUAL_RECOMMENDS}" | grep -v ^# |
sed ':a;N;$!ba;s/\n/, /g')
# Make everything happen in the OUTPUTDIR. # Make everything happen in the OUTPUTDIR.
cd "${OUTPUTDIR}" cd "${OUTPUTDIR}"
......
# Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# Recommended dependencies not in the dpkg-shlibdeps output.
# u2f udev rules have moved from being installed by default by systemd on Debian
# systems to a separate package called libu2f-udev. Pull it in manually so that
# u2f keys will work. TODO(https://crbug.com/784010): Move this to "Depends"
# once support for Jessie, Stretch, Trusty, and Xenial are dropped.
libu2f-udev
# Try to use Vulkan when possible. libvulkan1 is not available on Ubuntu Trusty
# or Debian Jessie, so it is added to "Recommends" instead of "Depends".
# TODO(https://crbug.com/784010): Move this to "Depends" once support for
# Trusty and Jessie are dropped. Note that the dependency must still be manually
# added since the library is dlopen()'ed.
libvulkan1
...@@ -25,6 +25,9 @@ libssl3.so(NSS_3.28)(64bit) ...@@ -25,6 +25,9 @@ libssl3.so(NSS_3.28)(64bit)
# as a manual dependency. # as a manual dependency.
rpmlib(FileDigests) <= 4.6.0-1 rpmlib(FileDigests) <= 4.6.0-1
# libvulkan is dlopen()'ed, so must be added as a manual dependency.
libvulkan.so.1()(64bit)
# For uploading crash reports with Breakpad. # For uploading crash reports with Breakpad.
wget wget
......
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