* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/, x11-drivers/xf86-video-virtualbox/files/
@ 2016-05-03 20:28 Ian Stakenvicius
0 siblings, 0 replies; 3+ messages in thread
From: Ian Stakenvicius @ 2016-05-03 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 9670bfc86462af15a9d05b170b72ad68168b2580
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 20:03:45 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue May 3 20:27:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9670bfc8
x11-drivers/xf86-video-virtualbox-5.0.20: build kernel module with help of upstream Makefiles.
This commit builds on the prior work of Polynomial-C to compile vboxvideo.ko
using the upstream Makefile.module.kms. A small patch is necessary to add a missing
include path to the build, and the rest of the changes are the addition of necessary
symlinks to allow the build to proceed.
Package-Manager: portage-2.2.26
...deo-virtualbox-5.0.20-Makefile.module.kms.patch | 11 +++++
.../xf86-video-virtualbox-5.0.20.ebuild | 51 +++++++++++-----------
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.20-Makefile.module.kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.20-Makefile.module.kms.patch
new file mode 100644
index 0000000..dd05a4a
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.0.20-Makefile.module.kms.patch
@@ -0,0 +1,11 @@
+--- a/src/VBox/Additions/linux/drm/Makefile.module.kms 2016-04-28 09:08:06.000000000 -0400
++++ b/src/VBox/Additions/linux/drm/Makefile.module.kms 2016-05-03 15:11:22.134971872 -0400
+@@ -38,7 +38,7 @@
+ MANGLING := $(KBUILD_EXTMOD)/include/VBox/VBoxGuestMangling.h
+ endif
+ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -include $(MANGLING)
+-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.0.20.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.20.ebuild
index 24d85e9..5dbf6db 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.20.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.20.ebuild
@@ -73,14 +73,19 @@ pkg_setup() {
}
src_prepare() {
- # Prepare the vboxvideo_drm Makefiles
- #cp "${FILESDIR}/Makefile.inc" "${MODULES_SRC_DIR}" || die
- ln -s Makefile.module.kms "${MODULES_SRC_DIR}/Makefile" || die
- #sed '/^include.*header/ainclude $(obj)/Makefile.inc' \
- # -i "${MODULES_SRC_DIR}/Makefile.module.kms" || die
- for incfile in Makefile.include.{head,foot}er ; do
- ln -s "${S}/src/VBox/Installer/linux/${incfile}" \
- "${MODULES_SRC_DIR}/${incfile}" || die
+ # Prepare the vboxvideo_drm Makefiles and build dir
+ eapply "${FILESDIR}"/${P}-Makefile.module.kms.patch
+ ln -sf Makefile.module.kms "${MODULES_SRC_DIR}"/Makefile || die
+ # All of these are expected to be in $(KBUILD_EXTMOD)/ so symlink them into place
+ local incfile incfiles=(
+ include
+ src/VBox/Runtime/r0drv
+ src/VBox/Installer/linux/Makefile.include.{head,foot}er
+ out/linux.${ARCH}/release/{product,version,revision}-generated.h
+ )
+ for incfile in ${incfiles[@]} ; do
+ ln -sf "${S}"/${incfile} \
+ "${MODULES_SRC_DIR}"/${incfile##*/} || die
done
# Remove shipped binaries (kBuild,yasm), see bug #232775
@@ -118,18 +123,14 @@ src_configure() {
}
src_compile() {
- local targets=()
-
- targets=(
+ local each targets=(
Runtime
Additions/common/VBoxGuestLib
GuestHost/OpenGL
Additions/x11/x11stubs
Additions/common/crOpenGL
Additions/x11/vboxvideo
- #Additions/linux/drm
)
-
for each in ${targets[@]} ; do
pushd "${S}"/src/VBox/${each} $>/dev/null || die
MAKE="kmk" \
@@ -142,18 +143,18 @@ src_compile() {
if use dri ; then
local objdir="out/linux.${ARCH}/release/obj/vboxvideo_drv_system/src/VBox"
- ln -s "${S}"/${objdir}/Additions/common/VBoxVideo/HGSMIBase.o \
- ${MODULES_SRC_DIR} || die
- ln -s "${S}"/${objdir}/GuestHost/HGSMI/HGSMICommon.o \
- ${MODULES_SRC_DIR} || die
- ln -s "${S}"/${objdir}/GuestHost/HGSMI/HGSMIMemAlloc.o \
- ${MODULES_SRC_DIR} || die
- ln -s "${S}"/${objdir}/Runtime/common/alloc/heapoffset.o \
- ${MODULES_SRC_DIR} || die
- ln -s "${S}"/${objdir}/Additions/common/VBoxVideo/Modesetting.o \
- ${MODULES_SRC_DIR} || die
- ln -s "${S}"/${objdir}/Additions/common/VBoxVideo/VBVABase.o \
- ${MODULES_SRC_DIR} || die
+ # see the vboxvideo_drm_SOURCES list in Makefile.kmk for the below
+ targets=(
+ Additions/common/VBoxVideo/HGSMIBase.o
+ Additions/common/VBoxVideo/Modesetting.o
+ Additions/common/VBoxVideo/VBVABase.o
+ GuestHost/HGSMI/HGSMICommon.o
+ GuestHost/HGSMI/HGSMIMemAlloc.o
+ Runtime/common/alloc/heapoffset.o
+ )
+ for each in ${targets[@]} ; do
+ ln -sf "${S}"/${objdir}/${each} "${MODULES_SRC_DIR}"/${each##*/} || die
+ done
# Now creating the kernel modules. We must do this _after_
# we compiled the user-space tools as we need two of the
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/, x11-drivers/xf86-video-virtualbox/files/
@ 2017-01-25 1:18 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2017-01-25 1:18 UTC (permalink / raw
To: gentoo-commits
commit: c5fca1c68a374712eb2a6b2fde6807c63b6a5f63
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 01:16:56 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 01:17:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fca1c6
x11-drivers/xf86-video-virtualbox: Fixed build with >=x11-base/xorg-server-1.19
This closes Gentoo bug #602784.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../xf86-video-virtualbox-5.1.10-xorg119.patch | 82 ++++++++++++++++++++++
.../xf86-video-virtualbox-5.1.14.ebuild | 3 +
2 files changed, 85 insertions(+)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch
new file mode 100644
index 00000000..26958fe
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch
@@ -0,0 +1,82 @@
+Fix from opensuse:
+https://build.opensuse.org/package/view_file/Virtualization/virtualbox/Fix_for_server_1.19.patch
+
+https://bugs.gentoo.org/602784
+
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+===================================================================
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+@@ -52,6 +52,10 @@
+ #ifndef _VBOXVIDEO_H_
+ #define _VBOXVIDEO_H_
+
++#if XORG_VERSION_CURRENT >= 11900000
++#include <bits/sigset.h>
++typedef __sigset_t sigset_t;
++#endif
+ #include <VBox/VBoxVideoGuest.h>
+ #include <VBox/VBoxVideo.h>
+ #include "version-generated.h"
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
+===================================================================
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/helpers.c
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
+@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p
+
+ property_name = MakeAtom(pszName, strlen(pszName), TRUE);
+ VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
++#if XORG_VERSION_CURRENT >= 11900000
++ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
++#else
+ ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
++#endif
+ }
+
+ void vbvxReprobeCursor(ScrnInfoPtr pScrn)
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+===================================================================
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
+ updateGraphicsCapability(pScrn, TRUE);
+
+ /* Register block and wake-up handlers for getting new screen size hints. */
++#if XORG_VERSION_CURRENT >= 11900000
++ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
++#else
+ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
++#endif
+
+ /* software cursor */
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
+===================================================================
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
+@@ -15,6 +15,10 @@
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
++#if XORG_VERSION_CURRENT >= 11900000
++#include <bits/sigset.h>
++typedef __sigset_t sigset_t;
++#endif
+ #include <VBox/VBoxGuestLib.h>
+
+ #ifndef PCIACCESS
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
+===================================================================
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/edid.c
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
+@@ -44,6 +44,10 @@
+ * Dave Airlie <airlied@redhat.com>
+ */
+
++#if XORG_VERSION_CURRENT >= 11900000
++#include <bits/sigset.h>
++typedef __sigset_t sigset_t;
++#endif
+ #include <misc.h>
+ #include <xf86DDC.h>
+ #include <xf86Crtc.h>
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild
index 016ff4c..65beeec 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild
@@ -56,6 +56,9 @@ PATCHES=(
# unset useless/problematic checks in configure
"${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
+
+ # xorg-1.19 patch from opensuse (bug #602784)
+ "${FILESDIR}/${PN}-5.1.10-xorg119.patch"
)
QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/, x11-drivers/xf86-video-virtualbox/files/
@ 2017-06-25 20:02 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2017-06-25 20:02 UTC (permalink / raw
To: gentoo-commits
commit: fbb4e03fbd53bd42e46d0ce64e66dca3d8154f79
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Wed Jun 14 20:06:17 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 20:02:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb4e03f
x11-drivers/xf86-video-virtualbox: fix bug 579910
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4932
.../files/xf86-video-virtualbox-5.1.22-sysmacros.patch | 15 +++++++++++++++
.../xf86-video-virtualbox-5.1.22.ebuild | 3 +++
2 files changed, 18 insertions(+)
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 00000000000..673beef32de
--- /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/xf86-video-virtualbox-5.1.22.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.22.ebuild
index cb90ffc4122..31448eb0c1a 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.22.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.22.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"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-25 20:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-03 20:28 [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/, x11-drivers/xf86-video-virtualbox/files/ Ian Stakenvicius
-- strict thread matches above, loose matches on Subject: below --
2017-01-25 1:18 Lars Wendler
2017-06-25 20:02 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox