snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

virtualbox-ose: update to 4.3.22.

This commit is contained in:
Juan RP 2015-02-18 08:38:48 +01:00
parent 2640647d02
commit 958de109f3
6 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
srcpkgs/virtualbox-ose/patches/003-ogl-include-path.patch Normal file
View File

@ -0,0 +1,26 @@
--- 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)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif

35
srcpkgs/virtualbox-ose/patches/004-system-xorg.patch → srcpkgs/virtualbox-ose/patches/004-xorg.patch
View File

@ -1,31 +1,5 @@
--- 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)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
--- 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
--- src/VBox/Additions/common/VBoxGuestLib/Makefile.km 2013-09-04 21:03:47.334749420 +0200
+++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-10-21 00:06:36.418245968 +0200
@@ -40,8 +40,8 @@
VBoxGuestR3LibShared
ifndef VBOX_ONLY_TESTSUITE
@ -33,10 +7,11 @@
- LIBRARIES += \
- VBoxGuestR3LibXFree86
+# LIBRARIES += \
+# VBoxGuestR3LibXFree86
+# VBoxGuestR3LibXFree86
endif
endif
LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
--- 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 @@
@ -50,6 +25,7 @@
# Include sub-makefiles.
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
--- 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 @@
@ -108,6 +84,7 @@
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \
--- 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 @@

11
srcpkgs/virtualbox-ose/patches/006-rdesktop-vrdp-keymap-path.patch Normal file
View File

@ -0,0 +1,11 @@
--- src/VBox/RDP/client/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
+++ src/VBox/RDP/client/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
@@ -41,7 +41,7 @@
EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
- KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(DEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
+ KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(DEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
RDESKTOP=1
ifdef WITH_BIRD_VD_HACKS
rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS

15
srcpkgs/virtualbox-ose/patches/008-root-window.patch Normal file
View File

@ -0,0 +1,15 @@
--- src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-02-17 02:16:03.290231117 +0100
+++ src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-02-17 02:15:45.074322113 +0100
@@ -133,12 +133,7 @@
/** Helper to work round different ways of getting the root window in different
* server versions. */
-#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 700000000 \
- && XORG_VERSION_CURRENT >= 100900000
# define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
-#else
-# define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex]
-#endif
/** Structure containing all virtual monitor-specific information. */
struct VBoxScreen

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

@ -1,30 +0,0 @@
--- 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

8
srcpkgs/virtualbox-ose/template
View File

@ -1,19 +1,19 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
version=4.3.20
revision=6
version=4.3.22
revision=1
wrksrc="VirtualBox-${version}"
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://virtualbox.org"
license="GPL-2, MPL-1.1, CDDL"
distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
checksum=1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
checksum=0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba
lib32disabled=yes
only_for_archs="i686 x86_64"
hostmakedepends="perl pkg-config dev86 yasm acpica-utils gsoap"
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