diff --git a/virtualbox/002-dri-driver-path.patch b/virtualbox/002-dri-driver-path.patch index 777e8e73b..26b7f3f65 100644 --- a/virtualbox/002-dri-driver-path.patch +++ b/virtualbox/002-dri-driver-path.patch @@ -1,18 +1,19 @@ -# 2013 © Sébastien Luttringer ---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-09-04 21:03:47.040743507 +0200 -+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-10-20 23:23:49.705371815 +0200 -@@ -58,23 +58,8 @@ +diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +index 92b4ffc..1a1c467 100644 +--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ++++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +@@ -56,24 +56,8 @@ typedef enum { + //#define DEBUG_DRI_CALLS - //@todo this could be different... +-/// @todo this could be different... -#ifdef RT_ARCH_AMD64 -# ifdef RT_OS_FREEBSD -# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri" -# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" -# else -# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" -# endif -#else -# ifdef RT_OS_FREEBSD @@ -20,7 +21,8 @@ -# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" -# else -# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" -# endif -#endif diff --git a/virtualbox/PKGBUILD b/virtualbox/PKGBUILD index 0aef4f8c4..bad16235a 100644 --- a/virtualbox/PKGBUILD +++ b/virtualbox/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('virtualbox' 'virtualbox-guest-iso' 'virtualbox-ext-vnc' 'virtualbox-ext-oracle') -pkgver=5.2.0 +pkgver=5.2.2 pkgrel=1 arch=('x86_64') url='http://virtualbox.org' @@ -77,9 +77,9 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'PUEL') noextract=(VBoxGuestAdditions_$pkgver.iso "Oracle_VM_VirtualBox_Extension_Pack-$pkgver.vbox-extpack") -sha256sums=('26fc73aee2df18142e4129beed1175fbd7eed69a9b6b150bcff7d9b92f4ade54' - '841678a04a1800de26e76bbb7a0f8f7f48fe903deede77a67394b93bf2f2cde4' - '005ba9211862643e2516d549e98b80942918047f1f6c55fcfe08c490dd1947bc' +sha256sums=('35ab0c307feedbd9191c14ed4056b46a85bea1918b0c0c40616f0470991bc017' + '8317a0479a94877829b20a19df8a7c09187b31eecb3f1ed9d2b8cb8681a81bb8' + '9328548ca8cbc526232c0631cb5a17618c771b07665b362c1e3d89a2425bf799' 'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec' '113f9b92141b85df01f1e74d22f01d1f1aa81650eb79b89ceefc3cae20afe2e2' '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' @@ -91,7 +91,7 @@ sha256sums=('26fc73aee2df18142e4129beed1175fbd7eed69a9b6b150bcff7d9b92f4ade54' '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac' - 'ee54fe188e27b6e80e2044ea9ba1874db2ca2c026ad04f393be1be69c18d440d' + 'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0' '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' '5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc' '6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f' diff --git a/virtualbox/virtualbox-host-dkms.install b/virtualbox/virtualbox-host-dkms.install index db563206c..dd94c412d 100644 --- a/virtualbox/virtualbox-host-dkms.install +++ b/virtualbox/virtualbox-host-dkms.install @@ -8,7 +8,7 @@ post_upgrade() { echo '==> Read modules-load.d man page to disable them.' fi echo 'Installing VirtualBox host DKMS modules' - vboxver=5.2.0 + vboxver=5.2.2 dkms autoinstall /usr/src/vboxhost-${vboxver}_OSE/dkms.conf || return 0 }