Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtualbox-5.2.2:ver.bump

Browse Source
This commit is contained in:
sss
2017-11-25 20:55:27 +03:00
parent 56f949ae1e
commit 34cea29ca5
3 changed files with 64 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/virtualbox/files/002-dri-driver-path.patch
+10 -8
View File
@@ -1,18 +1,19 @@
# 2013 © Sébastien Luttringer
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-09-04 21:03:47.040743507 +0200
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-10-20 23:23:49.705371815 +0200
@@ -58,23 +58,8 @@
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
index 92b4ffc..1a1c467 100644
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
@@ -56,24 +56,8 @@ typedef enum {
//#define DEBUG_DRI_CALLS
//@todo this could be different...
-/// @todo this could be different...
-#ifdef RT_ARCH_AMD64
-# ifdef RT_OS_FREEBSD
-# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
-# else
-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#else
-# ifdef RT_OS_FREEBSD
@@ -20,7 +21,8 @@
-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
-# else
-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#endif
hardware/virtualization/virtualbox/files/003-ogl-include-new.patch
+42
View File
@@ -0,0 +1,42 @@
diff -Nuar a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2017-10-18 10:06:45.000000000 +0300
+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2017-11-20 12:49:55.626419756 +0300
@@ -69,17 +69,12 @@
if1of ($(KBUILD_TARGET), linux solaris freebsd)
ifndef VBOX_USE_SYSTEM_GL_HEADERS
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 \
- $(VBOX_GL_INCS)
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
+ $(VBOX_GL_INCS) \
+ /usr/include/drm \
+ /usr/include/libdrm
endif
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
@@ -219,10 +214,10 @@
VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
else
VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
+ Xcomposite \
+ Xdamage \
+ Xfixes \
+ Xext
endif
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
hardware/virtualization/virtualbox/pspec.xml
+12 -4
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A powerful virtualization program</Summary>
<Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
<Archive sha1sum="9f5c4880b6a94bf57a6c6e64166753147ccee5e1" type="tarbz2">http://download.virtualbox.org/virtualbox/5.1.14/VirtualBox-5.1.14.tar.bz2</Archive>
<Archive sha1sum="d523d30d36cc4a4456eb7ab50f33a58a3f87c022" type="tarbz2">http://download.virtualbox.org/virtualbox/5.2.2/VirtualBox-5.2.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>dev86</Dependency>
<Dependency>cdrkit</Dependency>
@@ -57,12 +57,12 @@
<Patches>
<Patch level="1">wrapper.patch</Patch>
<Patch level="1">002-dri-driver-path.patch</Patch>
<Patch level="1">003-ogl-include-path.patch</Patch>
<Patch level="1">003-ogl-include-new.patch</Patch>
<Patch level="1">008-root-window.patch</Patch>
<!-- <Patch level="1">004-xorg.patch</Patch> -->
<Patch level="1">python.patch</Patch>
<Patch level="1">new-xorg-1.19.patch</Patch>
<Patch level="1">VirtualBox-5.1.14-linux-4.9-buildfix.patch</Patch>
<!-- <Patch level="1">new-xorg-1.19.patch</Patch> -->
<!-- <Patch level="1">VirtualBox-5.1.14-linux-4.9-buildfix.patch</Patch> -->
</Patches>
</Source>
@@ -121,6 +121,7 @@
<PartOf>x11.driver</PartOf>
<Summary>VirtualBox guest utilities and drivers</Summary>
<RuntimeDependencies>
<Dependency>pam</Dependency>
<Dependency>libXt</Dependency>
<Dependency>libXmu</Dependency>
<Dependency>libXext</Dependency>
@@ -150,6 +151,13 @@
</Package>
<History>
<Update release="12">
<Date>2017-11-25</Date>
<Version>5.2.2</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2017-03-11</Date>
<Version>5.1.14</Version>