x11-drivers/xf86-video-virtualbox: fix bug #625690

Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5202

diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch
new file mode 100644 (file)
index 0000000..c5d3c3f
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch
@@ -0,0 +1,13 @@
+Fix bug #625690
+
+--- a/src/VBox/Additions/linux/drm/Makefile.module.kms
++++ b/src/VBox/Additions/linux/drm/Makefile.module.kms
+@@ -50,7 +50,7 @@ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie
+ ifneq ($(KERN_VERSION),24)
+ MOD_CFLAGS += -include $(MANGLING)
+ endif
+-MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
++MOD_INCL   = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ # What on earth is this?
+ MOD_INCL  += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
+ MOD_INCL  += -Iinclude/drm

diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild
index 31448eb0c1aa07d080dfdb2da72313a7fb5937ba..3eb7cfa80d312c91ad52d5f16b4ed5046bd4a2eb 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild
@@ -75,7 +75,7 @@ pkg_setup() {
 
 src_prepare() {
        # Prepare the vboxvideo_drm Makefiles and build dir
-       eapply "${FILESDIR}"/${PN}-5.1.4-Makefile.module.kms.patch
+       eapply "${FILESDIR}"/${PN}-5.1.24-Makefile.module.kms.patch
 
        # Remove shipped binaries (kBuild,yasm), see bug #232775
        rm -r kBuild/bin tools || die