From: gc-user <gc-user@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] virtualbox-ose: update to 7.0.4.
Date: Thu, 15 Dec 2022 14:36:42 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41109@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
There is a new pull request by gc-user against master on the void-packages repository
https://github.com/gc-user/void-packages master
https://github.com/void-linux/void-packages/pull/41109
virtualbox-ose: update to 7.0.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: The packages xbps files for host installation were tested, the ones for installation on a guest not.
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/41109.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41109.patch --]
[-- Type: text/x-diff, Size: 10304 bytes --]
From 113d2a6a64d732364b45e6f8650bea06cadcf6cd Mon Sep 17 00:00:00 2001
From: gc-user <37037831+gc-user@users.noreply.github.com>
Date: Thu, 15 Dec 2022 13:29:33 +0100
Subject: [PATCH 1/7] virtualbox-ose: update to 7.0.4.
My first commit / PR ever.
This update was done by modifying the respective files of v6.1.36 until the build process went through all the way. Resulting xbps files installed fine and seem to run fine, as well. The "guest" packages were not tested!
VBoxSDL has been removed from line 77 because it caused the "install" section of the build process to fail. Comparing v6.1.36 with a v7.0.4 package from the virtualbox website showed that, apparently, there is no VBoxSDL.so file anymore in v7.0.4. So, I deleted that entry and the build process went through. As stated, the program, installed using the xbps files resulting from these changes to the files from v6.1.36, seem to work as expected.
---
srcpkgs/virtualbox-ose/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index f04ac2b800b7..d70eff447a29 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=6.1.36
+version=7.0.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,7 +8,7 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047
+checksum=58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17
nopie=yes
lib32disabled=yes
@@ -71,7 +71,7 @@ do_install() {
install -m0644 *.r0 *.fd ${DESTDIR}/usr/lib/virtualbox
# setuid
- install -m4755 VBoxSDL VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl \
+ install -m4755 VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl \
VBoxNetNAT -t ${DESTDIR}/usr/lib/virtualbox
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
From a080e1f9cf9e711db5802fa4c09ad300f07a4eac Mon Sep 17 00:00:00 2001
From: gc-user <37037831+gc-user@users.noreply.github.com>
Date: Thu, 15 Dec 2022 13:34:24 +0100
Subject: [PATCH 2/7] Update 017-libvdeplug-soname for VB v7.0.4.
---
srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch b/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch
index a3c1e34a057e..192dd6757680 100644
--- a/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch
+++ b/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch
@@ -11,7 +11,7 @@ Author: Felix Geyer <fgeyer@debian.org>
*/
/*
-@@ -24,7 +24,7 @@
+@@ -34,7 +34,7 @@
*/
/** The file name of the DBus library */
From 931e52fdb5646694ca4eaedf9c29432226bf6390 Mon Sep 17 00:00:00 2001
From: gc-user <37037831+gc-user@users.noreply.github.com>
Date: Thu, 15 Dec 2022 13:35:59 +0100
Subject: [PATCH 3/7] Update 016-disable-cloud.patch for VB v7.0.4.
---
.../patches/016-disable-cloud.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch b/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch
index e92e52306d1d..8810c77a25ad 100644
--- a/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch
+++ b/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch
@@ -1,11 +1,11 @@
--- a/Config.kmk
+++ b/Config.kmk
-@@ -802,7 +802,7 @@ endif
- # Use new VBoxNetDhcpd instead of old VBoxNetDHCP
+@@ -974,7 +974,7 @@
VBOX_WITH_DHCPD = 1
- # Experimental suport for cloud network integration
--VBOX_WITH_CLOUD_NET = 1
-+VBOX_WITH_CLOUD_NET =
- ## @}
-
-
+ # Experimental suport for cloud network integration (depends on libssh)
+ ifdef VBOX_WITH_LIBSSH
+- VBOX_WITH_CLOUD_NET = 1
++ VBOX_WITH_CLOUD_NET =
+ endif
+ # Use Mac OS X VMNET API instead of network kernel extensions
+ VBOX_WITH_VMNET = 1
From 71b7e56b6100224e765d295967b5774b6c66ca66 Mon Sep 17 00:00:00 2001
From: gc-user <37037831+gc-user@users.noreply.github.com>
Date: Thu, 15 Dec 2022 13:38:12 +0100
Subject: [PATCH 4/7] Update 013-Makefile.patch for VB v7.0.4.
---
.../virtualbox-ose/patches/013-Makefile.patch | 35 +++++++++----------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/patches/013-Makefile.patch b/srcpkgs/virtualbox-ose/patches/013-Makefile.patch
index d1b5a8dcf874..ac585a5c4267 100644
--- a/srcpkgs/virtualbox-ose/patches/013-Makefile.patch
+++ b/srcpkgs/virtualbox-ose/patches/013-Makefile.patch
@@ -1,7 +1,7 @@
--- a/src/VBox/HostDrivers/linux/Makefile
+++ b/src/VBox/HostDrivers/linux/Makefile
-@@ -23,25 +23,25 @@
- # terms and conditions of either the GPL or the CDDL or both.
+@@ -33,23 +33,23 @@
+ # SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
#
-ifneq ($(KERNELRELEASE),)
@@ -13,28 +13,25 @@
+# KBUILD_EXTMOD is set to $(M) in this case.
obj-m = vboxdrv/
--ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
-+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
- obj-m += vboxnetflt/
- endif
--ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
-+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
- obj-m += vboxnetadp/
- endif
--ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
-+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
- obj-m += vboxpci/
- endif
+- ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
++ ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
+ obj-m += vboxnetflt/
+ endif
+- ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
++ ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
+ obj-m += vboxnetadp/
+ endif
+- ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
++ ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
+ obj-m += vboxpci/
+ endif
-else # ! KERNELRELEASE
+else # ! KBUILD_EXTMOD
--# convenience Makefile without KERNELRELEASE
-+# convenience Makefile without KBUILD_EXTMOD
+ # convenience Makefile without KERNELRELEASE
- KBUILD_VERBOSE ?=
- KERN_VER ?= $(shell uname -r)
-@@ -167,4 +167,4 @@ load: unload
+@@ -244,5 +244,5 @@
fi; \
done
From 7a01eb8d088ec430e1612b94d187691ec0bf01e4 Mon Sep 17 00:00:00 2001
From: gc-user <37037831+gc-user@users.noreply.github.com>
Date: Thu, 15 Dec 2022 13:39:12 +0100
Subject: [PATCH 5/7] Update 008-no-vboxvideo.patch for VB v7.0.4.
---
srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
index 6f646ac02eeb..3409f3bdf0de 100644
--- a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
+++ b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
@@ -1,6 +1,6 @@
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -397,7 +397,7 @@ vboxvideo_drv_118_LIBS += $(vboxvideo_dr
+@@ -405,7 +405,7 @@ vboxvideo_drv_118_LIBS += $(vboxvideo_dr
ifdef VBOX_USE_SYSTEM_XORG_HEADERS
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
From d8f342bc3da3181f3c6f5b9dd25fea19f278fabf Mon Sep 17 00:00:00 2001
From: gc-user <37037831+gc-user@users.noreply.github.com>
Date: Thu, 15 Dec 2022 13:40:17 +0100
Subject: [PATCH 6/7] Update 005-gsoap-build.patch for VB v7.0.4.
---
srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
index a2855354f5e2..a0eef048ad3c 100644
--- a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
+++ b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
@@ -1,6 +1,6 @@
--- a/src/VBox/Main/webservice/Makefile.kmk
+++ b/src/VBox/Main/webservice/Makefile.kmk
-@@ -771,7 +771,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
+@@ -843,7 +843,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
From 5e53a52fff7e41f45adca9ed646259e39f5d92f5 Mon Sep 17 00:00:00 2001
From: gc-user <37037831+gc-user@users.noreply.github.com>
Date: Thu, 15 Dec 2022 14:21:02 +0100
Subject: [PATCH 7/7] virtualbox-ose: update to 7.0.4.
virtualbox-ose: update to 7.0.4.
My first commit / PR ever.
This update was done by modifying the respective files of v6.1.36 until the build process went through all the way. Resulting xbps files installed fine and seem to run fine, as well. The "guest" packages were not tested!
VBoxSDL has been removed from line 77 because it caused the "install" section of the build process to fail. Comparing v6.1.36 with a v7.0.4 package from the virtualbox website showed that, apparently, there is no VBoxSDL.so file anymore in v7.0.4. So, I deleted that entry and the build process went through. As stated, the program, installed using the xbps files resulting from these changes to the files from v6.1.36, seem to work as expected.
---
srcpkgs/virtualbox-ose/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d70eff447a29..7e8185a8dba4 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -15,9 +15,9 @@ lib32disabled=yes
archs="x86_64"
hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which"
-makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
+makedepends="device-mapper-devel docbook-xsl glslang-devel gsoap-devel libcap-devel libcurl-devel
libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-tools-devel qt5-x11extras-devel
SDL-devel xorg-server-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
next reply other threads:[~2022-12-15 13:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 13:36 gc-user [this message]
2022-12-15 15:05 ` [PR PATCH] [Updated] " gc-user
2022-12-15 15:43 ` sgn
2022-12-15 15:50 ` gc-user
2022-12-15 16:02 ` paper42
2022-12-15 16:36 ` gc-user
2022-12-15 16:36 ` [PR PATCH] [Closed]: " gc-user
2022-12-15 16:38 ` gc-user
-- strict thread matches above, loose matches on Subject: below --
2022-12-15 15:43 [PR PATCH] " sgn
2022-12-15 13:02 gc-user
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41109@inbox.vuxu.org \
--to=gc-user@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).