Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6049 from Rmys/master

Browse Source 
Virtualbox:ver.bump
This commit is contained in:
Rmys
2018-11-23 11:34:17 +03:00
committed by GitHub
parent 8f026a106b 9b0d759f53
commit ff8e8e6d24
5 changed files with 89 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/virtualbox/files/001_virtualbox-5.0.16-mesa-check.patch
+36
View File
@@ -0,0 +1,36 @@
--- VirtualBox-5.0.16/configure
+++ VirtualBox-5.0.16/configure
@@ -1270,10 +1270,7 @@
XCloseDisplay(dpy);
}
EOF
- [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
- if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
- log_success "found"
- fi
+ test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs
}
@@ -1427,21 +1424,6 @@
#include <GL/glu.h>
extern "C" int main(void)
{
- Display *dpy;
- int major, minor;
-
- dpy = XOpenDisplay(NULL);
- if (dpy)
- {
- Bool glx_version = glXQueryVersion(dpy, &major, &minor);
- XCloseDisplay(dpy);
- if (glx_version)
- {
- printf("found version %u.%u, OK.\n", major, minor);
- return 0;
- }
- }
- printf("found (inactive), OK.\n");
return 0;
}
EOF
hardware/virtualization/virtualbox/files/009-virtualbox-5.1.0-add_missing_gl_header.patch
+12
View File
@@ -0,0 +1,12 @@
https://bugs.gentoo.org/588794
--- a/include/VBox/VBoxGL2D.h
+++ b/include/VBox/VBoxGL2D.h
@@ -28,6 +28,7 @@
#define __VBoxGLSupportInfo_h__
#include <iprt/types.h>
+#include <GL/gl.h>
typedef char GLchar;
hardware/virtualization/virtualbox/files/010-qt-5.patch
+15 -3
View File
@@ -1,6 +1,8 @@
diff -u -r VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
--- VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-05-09 18:38:05.000000000 +0200
+++ VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-06-05 21:51:18.401913367 +0200
https://bugs.gentoo.org/654872
Taken from pg_overlay. Thanks to Perfect Gentleman!
--- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-04-13 23:37:17.000000000 +0700
+++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-04-18 19:42:30.207128585 +0700
@@ -21,6 +21,7 @@
/* Qt includes: */
@@ -9,3 +11,13 @@ diff -u -r VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/U
/* GUI includes: */
# include "QIWidgetValidator.h"
--- a/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+++ b/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
@@ -83,6 +83,7 @@
#include <QtWidgets/qgraphicsitem.h>
#include <QtWidgets/qgraphicslayoutitem.h>
#include <QtWidgets/qgraphicswidget.h>
+#include <QtWidgets/qbuttongroup.h>
#include <QtCore/QMetaType>
#include <QtGui/qevent.h>
#include <QtGui/qtouchdevice.h>
hardware/virtualization/virtualbox/files/012-vboxsf-automount.patch
+20
View File
@@ -0,0 +1,20 @@
This ghetto patch attempts to fix shared folder automounting for guests running
Linux 4.16, and also suggests an alternative to mount.vboxsf.
diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
--- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-02-26 17:57:30.000000000 +0200
+++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-04-07 21:00:05.785735622 +0300
@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
"vboxsf",
fFlags,
&mntinf);
+ if (r == -1 && errno == EINVAL)
+ {
+ /* Mainline vboxsf accepts regular mount opts. */
+ char mount_opts[1024];
+ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", mntinf.gid);
+ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
+ }
if (r == 0)
{
VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
hardware/virtualization/virtualbox/pspec.xml
+6 -3
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A powerful virtualization program</Summary>
<Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
<Archive sha1sum="74a4626bc9f16a606f861341bdecc073756384d2" type="tarbz2">http://download.virtualbox.org/virtualbox/5.2.20/VirtualBox-5.2.20.tar.bz2</Archive>
<Archive sha1sum="3c2d3efa26e1ea41a4762ecd060c2aca269b5fc2" type="tarbz2">http://download.virtualbox.org/virtualbox/5.2.22/VirtualBox-5.2.22.tar.bz2</Archive>
<BuildDependencies>
<Dependency>dev86</Dependency>
<Dependency>cdrkit</Dependency>
@@ -64,6 +64,9 @@
<Patch level="1">python.patch</Patch>
<Patch level="1">008-no-vboxvideo.patch</Patch>
<Patch level="1">010-qt-5.patch</Patch>
<Patch level="1">012-vboxsf-automount.patch</Patch>
<Patch level="1">001_virtualbox-5.0.16-mesa-check.patch</Patch> -->
<Patch level="1">009-virtualbox-5.1.0-add_missing_gl_header.patch</Patch>
</Patches>
</Source>
@@ -154,8 +157,8 @@
<History>
<Update release="19">
<Date>2018-11-06</Date>
<Version>5.2.20</Version>
<Date>2018-11-23</Date>
<Version>5.2.22</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>