[arch-commits] Commit in virtualbox/trunk (010-linux-4-15.patch PKGBUILD)
Christian Hesse
eworm at archlinux.org
Wed Feb 28 08:27:36 UTC 2018
Date: Wednesday, February 28, 2018 @ 08:27:35
Author: eworm
Revision: 299890
upgpkg: virtualbox 5.2.8-1
new upstream release
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/010-linux-4-15.patch
----------------------+
010-linux-4-15.patch | 116 -------------------------------------------------
PKGBUILD | 8 +--
2 files changed, 3 insertions(+), 121 deletions(-)
Deleted: 010-linux-4-15.patch
===================================================================
--- 010-linux-4-15.patch 2018-02-28 08:21:29 UTC (rev 299889)
+++ 010-linux-4-15.patch 2018-02-28 08:27:35 UTC (rev 299890)
@@ -1,116 +0,0 @@
-diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-index 9141ed3..d5acad2 100644
---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-@@ -1058,7 +1058,11 @@ void VGDrvNativeISRMousePollEvent(PVBOXGUESTDEVEXT pDevExt)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-
- /** log and dbg_log parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if (g_fLoggerCreated)
- {
-@@ -1073,7 +1077,11 @@ static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *p
- }
-
- /** log and dbg_log parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1084,7 +1092,11 @@ static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
-
-
- /** log and dbg_log_flags parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if (g_fLoggerCreated)
- {
-@@ -1098,7 +1110,11 @@ static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param
- }
-
- /** log and dbg_log_flags parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1109,7 +1125,11 @@ static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
-
-
- /** log and dbg_log_dest parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if (g_fLoggerCreated)
- {
-@@ -1123,7 +1143,11 @@ static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *p
- }
-
- /** log and dbg_log_dest parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1134,7 +1158,11 @@ static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
-
-
- /** r3_log_to_host parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if ( pszValue == NULL
- || *pszValue == '\0'
-@@ -1152,7 +1180,11 @@ static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_par
- }
-
- /** r3_log_to_host parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
- return strlen(pszBuf);
-diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c
-index 018a386..8e33a11 100644
---- a/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -401,7 +401,11 @@ static struct drm_encoder *vbox_best_single_encoder(struct drm_connector
-
- /* pick the encoder ids */
- if (enc_id)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+ return drm_encoder_find(connector->dev, NULL, enc_id);
-+#else
- return drm_encoder_find(connector->dev, enc_id);
-+#endif
-
- return NULL;
- }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-28 08:21:29 UTC (rev 299889)
+++ PKGBUILD 2018-02-28 08:27:35 UTC (rev 299890)
@@ -10,8 +10,8 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=5.2.6
-pkgrel=2
+pkgver=5.2.8
+pkgrel=1
arch=('x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -69,9 +69,8 @@
'007-python2-path.patch'
'008-no-vboxvideo.patch'
'009-include-path.patch'
- '010-linux-4-15.patch'
)
-sha256sums=('fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7'
+sha256sums=('ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8'
'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
'113f9b92141b85df01f1e74d22f01d1f1aa81650eb79b89ceefc3cae20afe2e2'
'2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
@@ -89,7 +88,6 @@
'6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f'
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
'1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
- 'e402dd9a102746d6ac1a2eb7f66fe5f6c5ad18f8b07dce5d0856f443e5202e5a'
)
prepare() {
More information about the arch-commits
mailing list