Changeset 96841 in vbox

Timestamp:

Sep 23, 2022 9:39:14 AM (2 years ago)

Author:

vboxsync

Message:

Linux packaging: add dependency on packages containing libvulkan.so.1.

Across different Linux distributions that we support, libvulkan.so.1 is
provided by packages of different names. Here is the list:

Oracle Linux 7: vulkan (rpm)
Oracle Linux 8 and 9, Fedora 35-36: vulkan-loader (rpm)
openSUSE 15.3: libvulkan1 (rpm)

Ubuntu 18.04 - 22.04, Debian 10-11: libvulkan1 (deb)

Location:

trunk

Files:

• debian/control (modified) (2 diffs)
• src/VBox/Installer/linux/debian/control (modified) (2 diffs)
• src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• src/VBox/Installer/linux/rpm/rules (modified) (1 diff)

trunk/debian/control

@@ -11 +11 @@
   libpulse-dev, libxml2-dev, python-dev, gsoap,
   libcap2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libxmu-dev,
-  libxext-dev, libcurl-dev, libxrandr-dev, openjdk-6-jdk | sun-java6-jdk
+  libxext-dev, libcurl-dev, libxrandr-dev, openjdk-6-jdk | sun-java6-jdk,
+  libvulkan-dev
 XS-Python-Version: >= 2.4
 
@@ -17 +18 @@
 Architecture: i386 amd64
 Pre-Depends: debconf (>= 1.1) | debconf-2.0
-Depends: debconf (>= 0.5) | debconf-2.0, psmisc, adduser,
+Depends: debconf (>= 0.5) | debconf-2.0, psmisc, adduser, libvulkan1,
   ${shlibs:Depends},
   ${misc:Depends}

trunk/src/VBox/Installer/linux/debian/control

@@ -11 +11 @@
   libpulse-dev, libxml2-dev, python-dev, gsoap,
   libcap2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libxmu-dev,
-  libxext-dev, libcurl-dev, libxrandr-dev, openjdk-6-jdk | sun-java6-jdk
+  libxext-dev, libcurl-dev, libxrandr-dev, openjdk-6-jdk | sun-java6-jdk,
+  libvulkan-dev
 XS-Python-Version: >= 2.4
 
@@ -17 +18 @@
 Architecture: i386 amd64
 Pre-Depends: debconf (>= 1.1) | debconf-2.0
-Depends: debconf (>= 0.5) | debconf-2.0, psmisc, adduser,
+Depends: debconf (>= 0.5) | debconf-2.0, psmisc, adduser, libvulkan1,
   ${shlibs:Depends},
   ${misc:Depends}

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -44 +44 @@
 Vendor:    Oracle Corporation
 BuildRoot: %BUILDROOT%
-Requires:  %INITSCRIPTS% %LIBASOUND% %NETTOOLS%
+Requires:  %INITSCRIPTS% %LIBASOUND% %NETTOOLS% %LIBVULKAN%
 
 %if %{?rpm_suse:1}%{!?rpm_suse:0}

trunk/src/VBox/Installer/linux/rpm/rules

@@ -261 +261 @@
             -e 's|%INITSCRIPTS%|$(if $(filter fedora,$(rpmspec)),initscripts,)|g' \
             -e 's|%NETTOOLS%|$(if $(filter fedora18 fedora19 fedora20 fedora21 el5 openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114,$(rpmrel)),net-tools,iproute)|g' \
+            -e 's|%LIBVULKAN%|$(if $(filter el7,$(rpmrel)),vulkan,%LIBVULKAN%)|g' \
+            -e 's|%LIBVULKAN%|$(if $(findstring el,$(rpmrel)),vulkan-loader,%LIBVULKAN%)|g' \
+            -e 's|%LIBVULKAN%|$(if $(findstring fedora,$(rpmrel)),vulkan-loader,%LIBVULKAN%)|g' \
+            -e 's|%LIBVULKAN%|$(if $(filter openSUSE153,$(rpmrel)),libvulkan1,)|g' \
             $(instlin)/rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
         mv $(bldbase)/VirtualBox-$(ver) $(bldbase)/$(rpmname)