jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

virtualbox-ose: rebuild against xorg-server-1.17.

Browse source
This commit is contained in:
Juan RP 2015-02-05 07:56:00 +01:00
parent 1f28134124
commit 59b795c7a0
3 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
srcpkgs/virtualbox-ose/patches/004-system-xorg.patch
View file

@ -1,6 +1,5 @@
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000
--- src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000
+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000
@@ -63,18 +63,12 @@
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
@ -25,9 +24,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:55:28.778284533 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
--- src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:55:28.778284533 +0000
+++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -40,8 +40,8 @@
VBoxGuestR3LibShared
ifndef VBOX_ONLY_TESTSUITE
@ -39,9 +37,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile
endif
endif
LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
--- src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
+++ src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -17,6 +17,10 @@
SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
@ -53,9 +50,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-
# Include sub-makefiles.
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000
+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -29,7 +29,6 @@
# vboxmouse_drv
#
@ -112,9 +108,8 @@ diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk V
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \
diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
@@ -53,7 +53,6 @@
# vboxvideo_drv
#

30
srcpkgs/virtualbox-ose/patches/xorg-server-1.17.patch Normal file
View file

@ -0,0 +1,30 @@
--- src/VBox/Additions/x11/vboxvideo/edid.c 2014-11-21 16:16:53.000000000 +0100
+++ src/VBox/Additions/x11/vboxvideo/edid.c 2015-02-05 07:37:15.213061546 +0100
@@ -44,6 +44,7 @@
* Dave Airlie <airlied@redhat.com>
*/
+#include <xorg/xorg-server.h>
#include <misc.h>
#include <xf86DDC.h>
#include <xf86Crtc.h>
--- src/VBox/Additions/x11/vboxvideo/pointer.c 2014-11-21 16:16:53.000000000 +0100
+++ src/VBox/Additions/x11/vboxvideo/pointer.c 2015-02-05 07:48:43.910512564 +0100
@@ -22,6 +22,7 @@
# include <Pci.h>
#endif
+#include <xorg/xorg-server.h>
#include "xf86.h"
#define NEED_XF86_TYPES
#include <iprt/string.h>
--- src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2014-11-21 16:16:53.000000000 +0100
+++ src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2015-02-05 07:38:16.019638643 +0100
@@ -59,6 +59,7 @@
# include <string.h>
#endif
+#include <xorg/xorg-server.h>
#include "xf86.h"
#include "xf86_OSproc.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6

9
srcpkgs/virtualbox-ose/template
View file

@ -1,9 +1,8 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
version=4.3.20
revision=4
revision=5
wrksrc="VirtualBox-${version}"
patch_args="-Np1"
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://virtualbox.org"
@ -18,7 +17,7 @@ hostmakedepends="perl pkg-config dev86 yasm acpica-utils"
makedepends="libressl-devel>=2.1.3 libcurl-devel libpng-devel>=1.6 libvpx-devel
alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.16<1.17
pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.17<1.18
device-mapper-devel docbook-xsl"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
@ -44,6 +43,7 @@ do_configure() {
--disable-python --disable-kmods --nofatal
}
do_build() {
export USERNAME="$(whoami)"
source ./env.sh
kmk ${makejobs} all
}
@ -134,8 +134,7 @@ virtualbox-ose-dkms_package() {
}
virtualbox-ose-guest_package() {
lib32disabled=yes
replaces="runit-void<20141013_2"
depends="xserver-abi-video-18_1 virtualbox-ose-guest-dkms-${version}_${revision}"
depends="xserver-abi-video-19_1 virtualbox-ose-guest-dkms-${version}_${revision}"
short_desc+=" - guest utilities"
pkg_install() {