aboutsummaryrefslogtreecommitdiff
path: root/srcpkgs/virtualbox-ose
diff options
context:
space:
mode:
authorJuan RP <xtraeme@voidlinux.eu>2017-12-07 10:51:22 +0000
committerJuan RP <xtraeme@voidlinux.eu>2017-12-07 10:51:22 +0000
commitdf406f32b97fe71f87bb5072314066795dab63f2 (patch)
treeeceda8f728ece99f239e71c7c51160c2bdc9482f /srcpkgs/virtualbox-ose
parentb3d1d5fdeb50d17c05a475beb77d2f64863feebd (diff)
downloadvoid-packages-df406f32b97fe71f87bb5072314066795dab63f2.tar
void-packages-df406f32b97fe71f87bb5072314066795dab63f2.tar.gz
void-packages-df406f32b97fe71f87bb5072314066795dab63f2.tar.bz2
void-packages-df406f32b97fe71f87bb5072314066795dab63f2.tar.lz
void-packages-df406f32b97fe71f87bb5072314066795dab63f2.tar.xz
void-packages-df406f32b97fe71f87bb5072314066795dab63f2.tar.zst
void-packages-df406f32b97fe71f87bb5072314066795dab63f2.zip
virtualbox-ose: update to 5.2.2.
Diffstat (limited to '')
-rw-r--r--srcpkgs/virtualbox-ose/patches/003-ogl-include-path.patch41
-rw-r--r--srcpkgs/virtualbox-ose/patches/009-glibc-2.26.patch11
-rw-r--r--srcpkgs/virtualbox-ose/patches/010-kernel-4.14.patch31
-rw-r--r--srcpkgs/virtualbox-ose/template7
4 files changed, 4 insertions, 86 deletions
diff --git a/srcpkgs/virtualbox-ose/patches/003-ogl-include-path.patch b/srcpkgs/virtualbox-ose/patches/003-ogl-include-path.patch
deleted file mode 100644
index 87d75bb0c5c..00000000000
--- a/srcpkgs/virtualbox-ose/patches/003-ogl-include-path.patch
+++ /dev/null
@@ -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 += \
diff --git a/srcpkgs/virtualbox-ose/patches/009-glibc-2.26.patch b/srcpkgs/virtualbox-ose/patches/009-glibc-2.26.patch
deleted file mode 100644
index 86e606671cb..00000000000
--- a/srcpkgs/virtualbox-ose/patches/009-glibc-2.26.patch
+++ /dev/null
@@ -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));
diff --git a/srcpkgs/virtualbox-ose/patches/010-kernel-4.14.patch b/srcpkgs/virtualbox-ose/patches/010-kernel-4.14.patch
deleted file mode 100644
index 58bd28db97b..00000000000
--- a/srcpkgs/virtualbox-ose/patches/010-kernel-4.14.patch
+++ /dev/null
@@ -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);
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 55de112df8d..b0b24a1476d 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -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() {