diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-07-22 14:37:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-07-22 14:37:29 +0100 |
| commit | fb465e879075b8ae73954a3503b3e669f83a7158 (patch) | |
| tree | 31561c9cebbe1b6be4fb9656a36b046adafcab41 /x11-drivers/xf86-video-virtualbox | |
| parent | ec3a03fa0cb7eda1fec7fec2a5642be8472922aa (diff) | |
x11-drivers/xf86-video-virtualbox : adjust Gentoo's out-of-date kms patch
Diffstat (limited to 'x11-drivers/xf86-video-virtualbox')
4 files changed, 32 insertions, 2 deletions
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.22-sysmacros.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.22-sysmacros.patch new file mode 100644 index 00000000..673beef3 --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.22-sysmacros.patch @@ -0,0 +1,15 @@ +Fix bug #579910. Add sys/sysmacros.h header. + +https://bugs.gentoo.org/579910 + +index 20ae130..2f3fac0 100644 +--- a/src/VBox/Runtime/r3/linux/sysfs.cpp ++++ b/src/VBox/Runtime/r3/linux/sysfs.cpp +@@ -46,6 +46,7 @@ + #include <sys/sysctl.h> + #include <sys/stat.h> + #include <sys/fcntl.h> ++#include <sys/sysmacros.h> + #include <errno.h> + + diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch index f34ac667..3acd10cc 100644 --- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch +++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.4-Makefile.module.kms.patch @@ -1,6 +1,6 @@ --- a/src/VBox/Additions/linux/drm/Makefile.module.kms +++ b/src/VBox/Additions/linux/drm/Makefile.module.kms -@@ -43,7 +43,7 @@ else +@@ -50,7 +50,7 @@ else MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h endif MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING) -fno-pie diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-kms.patch new file mode 100644 index 00000000..56fdfd2a --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-kms.patch @@ -0,0 +1,12 @@ +diff -Nur a/src/VBox/Additions/linux/drm/Makefile.module.kms b/src/VBox/Additions/linux/drm/Makefile.module.kms +--- a/src/VBox/Additions/linux/drm/Makefile.module.kms 2017-07-17 16:58:30.000000000 +0100 ++++ b/src/VBox/Additions/linux/drm/Makefile.module.kms 2017-07-22 14:29:44.977047225 +0100 +@@ -50,7 +50,7 @@ + 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-r1706.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24-r1706.ebuild index 0b01d8ae..b2c94230 100644 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24-r1706.ebuild +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24-r1706.ebuild @@ -58,6 +58,9 @@ PATCHES=( # xorg-1.19 patch from opensuse (bug #602784) "${FILESDIR}/${PN}-5.1.10-xorg119.patch" + + # fix bug #579946 + "${FILESDIR}/${PN}-5.1.22-sysmacros.patch" ) QA_TEXTRELS_x86="usr/lib/VBoxOGL.so" @@ -72,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}-kms.patch # Remove shipped binaries (kBuild,yasm), see bug #232775 rm -r kBuild/bin tools || die |