Date: Monday, November 21, 2016 @ 22:29:34
Author: eworm
Revision: 196483
upgpkg: virtualbox 5.1.10-1
new upstream release
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/008-no-legacy-xorg.patch
virtualbox/trunk/009-linux-4-9.patch
--------------------------+
008-no-legacy-xorg.patch | 52 ---------------------------------------------
009-linux-4-9.patch | 37 --------------------------------
PKGBUILD | 10 ++------
3 files changed, 3 insertions(+), 96 deletions(-)
Deleted: 008-no-legacy-xorg.patch
===================================================================
--- 008-no-legacy-xorg.patch 2016-11-21 22:14:38 UTC (rev 196482)
+++ 008-no-legacy-xorg.patch 2016-11-21 22:29:34 UTC (rev 196483)
@@ -1,52 +0,0 @@
-diff --git a/Config.kmk b/Config.kmk
-index 94b1dc8..1062da7 100644
---- a/Config.kmk
-+++ b/Config.kmk
-@@ -2365,15 +2365,15 @@ ifdef VBOX_WITH_CROGL
- endif
-
- if1of ($(KBUILD_TARGET), freebsd linux solaris)
-- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
-- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
-- VBOX_MESA_INCS = \
-+ ifndef VBOX_USE_SYSTEM_GL_HEADERS
-+ VBOX_GL_INCS = \
- $(VBOX_PATH_MESA_SOURCE) \
- $(VBOX_PATH_MESA_SOURCE)/include \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
-+ endif
- endif
-
- VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
-diff --git a/src/VBox/Additions/x11/Makefile.kmk
b/src/VBox/Additions/x11/Makefile.kmk
-index 75197f9..5d2167e 100644
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -20,12 +20,18 @@ include $(KBUILD_PATH)/subheader.kmk
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
-- ifneq ($(KBUILD_TARGET), solaris)
-- include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
-- endif
-- ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-- include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
-+ ifndef VBOX_NO_LEGACY_XORG_X11
-+ include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
-+ ifneq ($(KBUILD_TARGET), solaris)
-+ include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
-+ endif
-+ # This should logically only be controlled by VBOX_NO_LEGACY_XORG_X11,
-+ # as it is not used for drivers at all, but rather to build X11 clients
-+ # on systems missing needed libraries.
-+ ## @todo fix at some later point when it will not break people's workflows.
-+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-+ include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
-+ endif
- endif
- endif
-
Deleted: 009-linux-4-9.patch
===================================================================
--- 009-linux-4-9.patch 2016-11-21 22:14:38 UTC (rev 196482)
+++ 009-linux-4-9.patch 2016-11-21 22:29:34 UTC (rev 196483)
@@ -1,37 +0,0 @@
-diff --git a/src/VBox/HostDrivers/Support/SUPDrvInternal.h
b/src/VBox/HostDrivers/Support/SUPDrvInternal.h
-index aadaa71..d45cdef 100644
---- a/src/VBox/HostDrivers/Support/SUPDrvInternal.h
-+++ b/src/VBox/HostDrivers/Support/SUPDrvInternal.h
-@@ -65,7 +65,7 @@
- # include <linux/modversions.h>
- # endif
- # endif
--# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
-+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0) && LINUX_VERSION_CODE <
KERNEL_VERSION(4, 9, 0)
- # undef ALIGN
- # endif
- # ifndef KBUILD_STR
-diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-index 4cf93c6..c7f932f 100644
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -1050,7 +1050,9 @@ DECLHIDDEN(int)
rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
- rc = get_user_pages(R3Ptr, /* Where from. */
- cPages, /* How many pages. */
- fWrite, /* Write to memory. */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
- fWrite, /* force write
access. */
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs); /* vmas */
- /*
-@@ -1064,7 +1066,9 @@ DECLHIDDEN(int)
rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
- R3Ptr, /* Where from. */
- cPages, /* How many pages. */
- fWrite, /* Write to memory. */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
- fWrite, /* force write
access. */
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs); /* vmas */
- #else /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) */
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-21 22:14:38 UTC (rev 196482)
+++ PKGBUILD 2016-11-21 22:29:34 UTC (rev 196483)
@@ -10,8 +10,8 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=5.1.8
-pkgrel=2
+pkgver=5.1.10
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -69,10 +69,8 @@
'005-gsoap-build.patch'
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch'
- '008-no-legacy-xorg.patch'
- '009-linux-4-9.patch'
)
-md5sums=('6a294ccb318cd605ca99df5dc2c20477'
+md5sums=('889d90a7d8119a6bcc699be258ca4a96'
'a19774e8c56f2c4d12c528992525c444'
'331f69783ea9d4e762f7103954c500a3'
'984412a63aa9c07ddc3cfd970381d5df'
@@ -89,8 +87,6 @@
'e8a0b47e61ddcffdeed71086585a1ef3'
'd82a6f19be739341ed7f1cf4ee8070ca'
'188ea65918309f737ce28216c2b07c3b'
- 'f028345dd4b4c9f9f5eda0084eb2acee'
- '5cfe16b62cf685423c56927ac61b329d'
)
prepare() {
