virtualbox-ose: update to 5.2.2.
This commit is contained in:
parent
b3d1d5fdeb
commit
df406f32b9
4 changed files with 4 additions and 86 deletions
|
@ -1,41 +0,0 @@
|
|||
--- src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
|
||||
+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
|
||||
@@ -67,18 +67,12 @@
|
||||
VBoxOGL_INCS = .
|
||||
if1of ($(KBUILD_TARGET), linux solaris freebsd)
|
||||
VBoxOGL_INCS += \
|
||||
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
|
||||
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
|
||||
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
|
||||
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
|
||||
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
|
||||
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
|
||||
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
|
||||
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
|
||||
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
|
||||
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
|
||||
+ /usr/include/x11 \
|
||||
+ /usr/include/xorg \
|
||||
+ /usr/include/pixman-1 \
|
||||
$(VBOX_MESA_INCS) \
|
||||
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
|
||||
+ /usr/include/drm \
|
||||
+ /usr/include/libdrm
|
||||
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
|
||||
endif
|
||||
|
||||
@@ -213,10 +207,10 @@
|
||||
|
||||
if1of ($(KBUILD_TARGET), linux solaris freebsd)
|
||||
VBoxOGL_LIBS += \
|
||||
- $(PATH_STAGE_LIB)/libXcomposite.so \
|
||||
- $(PATH_STAGE_LIB)/libXdamage.so \
|
||||
- $(PATH_STAGE_LIB)/libXfixes.so \
|
||||
- $(PATH_STAGE_LIB)/libXext.so
|
||||
+ Xcomposite \
|
||||
+ Xdamage \
|
||||
+ Xfixes \
|
||||
+ Xext
|
||||
ifdef VBoxOGL_FAKEDRI
|
||||
ifeq ($(KBUILD_TARGET), freebsd)
|
||||
VBoxOGL_LIBS += \
|
|
@ -1,11 +0,0 @@
|
|||
--- src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h.orig
|
||||
+++ src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h
|
||||
@@ -55,7 +55,7 @@
|
||||
typedef uint32_t id_t;
|
||||
typedef uint32_t zoneid_t;
|
||||
#endif
|
||||
-#if !defined(NGREG) || !defined(RT_OS_LINUX)
|
||||
+#if !defined(__NGREG) || !defined(RT_OS_LINUX)
|
||||
typedef RTCCINTREG greg_t;
|
||||
#else
|
||||
AssertCompileSize(greg_t, sizeof(RTCCINTREG));
|
|
@ -1,31 +0,0 @@
|
|||
--- src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
+++ src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
@@ -126,6 +126,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
|
||||
+#define SKB_GSO_UDP 0
|
||||
+#endif
|
||||
+
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
|
||||
# define VBOX_HAVE_SKB_VLAN
|
||||
#else
|
||||
--- src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
|
||||
+++ src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
|
||||
@@ -353,12 +353,16 @@ static void vboxPciFileClose(struct file* file)
|
||||
static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size)
|
||||
{
|
||||
int ret;
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
|
||||
+ ret = kernel_write(file, data, size, &offset);
|
||||
+#else
|
||||
mm_segment_t fs_save;
|
||||
|
||||
fs_save = get_fs();
|
||||
set_fs(get_ds());
|
||||
ret = vfs_write(file, data, size, &offset);
|
||||
set_fs(fs_save);
|
||||
+#endif
|
||||
if (ret < 0)
|
||||
printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
|
|
@ -1,14 +1,14 @@
|
|||
# Template file for 'virtualbox-ose'
|
||||
pkgname=virtualbox-ose
|
||||
version=5.1.28
|
||||
revision=2
|
||||
version=5.2.2
|
||||
revision=1
|
||||
wrksrc="VirtualBox-${version%*a}"
|
||||
short_desc="General-purpose full virtualizer for x86 hardware"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://virtualbox.org"
|
||||
license="GPL-2, CDDL"
|
||||
distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2"
|
||||
checksum=ce7d4bf6535f70e3214abeb4866f7a8634aa3c7b6dedf8825e6ad80bd821398d
|
||||
checksum=35ab0c307feedbd9191c14ed4056b46a85bea1918b0c0c40616f0470991bc017
|
||||
|
||||
nopie=yes
|
||||
lib32disabled=yes
|
||||
|
@ -36,6 +36,7 @@ pre_configure() {
|
|||
cp ${FILESDIR}/LocalConfig.kmk .
|
||||
ln -s /bin/echo makeself
|
||||
|
||||
echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
|
||||
sed -i 's/^check_gcc$/#check_gcc/' configure
|
||||
}
|
||||
do_configure() {
|
||||
|
|
Loading…
Reference in a new issue