mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

Update to 4.3.24.

Browse Source
This commit is contained in:
Jung-uk Kim 2015-03-03 05:43:11 +00:00
parent a255050b72
commit 19a52b429c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=380340
11 changed files with 71 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulators/virtualbox-ose-additions/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.22
DISTVERSION= 4.3.24
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

4
emulators/virtualbox-ose-additions/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (VirtualBox-4.3.22.tar.bz2) = 0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba
SIZE (VirtualBox-4.3.22.tar.bz2) = 102659290
SHA256 (VirtualBox-4.3.24.tar.bz2) = e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc
SIZE (VirtualBox-4.3.24.tar.bz2) = 102647661

2
emulators/virtualbox-ose-kmod/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.22
DISTVERSION= 4.3.24
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

4
emulators/virtualbox-ose-kmod/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (VirtualBox-4.3.22.tar.bz2) = 0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba
SIZE (VirtualBox-4.3.22.tar.bz2) = 102659290
SHA256 (VirtualBox-4.3.24.tar.bz2) = e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc
SIZE (VirtualBox-4.3.24.tar.bz2) = 102647661

3
emulators/virtualbox-ose/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.22
PORTREVISION= 2
DISTVERSION= 4.3.24
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
http://tmp.chruetertee.ch/ \

8
emulators/virtualbox-ose/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (VirtualBox-4.3.22.tar.bz2) = 0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba
SIZE (VirtualBox-4.3.22.tar.bz2) = 102659290
SHA256 (VBoxGuestAdditions_4.3.22.iso) = d415bdf5c1a37281e77243241acbb9576307379c66d368d7d0aba233fdb1435e
SIZE (VBoxGuestAdditions_4.3.22.iso) = 58116096
SHA256 (VirtualBox-4.3.24.tar.bz2) = e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc
SIZE (VirtualBox-4.3.24.tar.bz2) = 102647661
SHA256 (VBoxGuestAdditions_4.3.24.iso) = df4385aaa80f322ee2acda0657a53d9ca5c489e695ee5f9776574b67c649c960
SIZE (VBoxGuestAdditions_4.3.24.iso) = 58109952

30
emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
View File

@ -1,5 +1,5 @@
--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-02-12 11:08:13.000000000 -0500
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-02-12 14:44:47.575613000 -0500
--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-02 10:06:58.000000000 -0500
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-02 18:25:17.273964000 -0500
@@ -26,7 +26,7 @@
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
vboxvideo_15_DEFS := \
@ -12,7 +12,7 @@
@@ -190,7 +190,7 @@
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
vboxvideo_drv_15_DEFS += \
@ -30,7 +30,7 @@
@@ -212,7 +212,7 @@
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
vboxvideo_drv_16_DEFS += \
@ -39,7 +39,7 @@
@@ -230,11 +230,19 @@
vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10699000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_17_DEFS += \
+ VBOX_DRI_OLD
@ -59,7 +59,7 @@
@@ -248,6 +256,10 @@
vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10800000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_18_DEFS += \
+ VBOX_DRI_OLD
@ -70,7 +70,7 @@
@@ -262,6 +274,10 @@
vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10900000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_19_DEFS += \
+ VBOX_DRI_OLD
@ -81,7 +81,7 @@
@@ -276,6 +292,10 @@
vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11000000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_110_DEFS += \
+ VBOX_DRI_OLD
@ -92,7 +92,7 @@
@@ -290,6 +310,10 @@
vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11100000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_111_DEFS += \
+ VBOX_DRI_OLD
@ -103,7 +103,7 @@
@@ -304,6 +328,10 @@
vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11200000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_112_DEFS += \
+ VBOX_DRI_OLD
@ -114,7 +114,7 @@
@@ -318,6 +346,10 @@
vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11300000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_113_DEFS += \
+ VBOX_DRI_OLD
@ -125,7 +125,7 @@
@@ -332,6 +364,10 @@
vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11400000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_114_DEFS += \
+ VBOX_DRI_OLD
@ -136,7 +136,7 @@
@@ -346,6 +382,10 @@
vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000
vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11500000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_115_DEFS += \
+ VBOX_DRI_OLD
@ -147,7 +147,7 @@
@@ -360,6 +400,10 @@
vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000
vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11600000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_116_DEFS += \
+ VBOX_DRI_OLD
@ -158,7 +158,7 @@
@@ -374,6 +418,10 @@
vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101700000
vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11700000
+if1of ($(KBUILD_TARGET), freebsd)
+ vboxvideo_drv_117_DEFS += \
+ VBOX_DRI_OLD

6
emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c
View File

@ -1,10 +1,10 @@
--- src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c.orig 2015-02-12 15:25:55.061952000 -0500
+++ src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c 2015-02-12 15:26:57.245403000 -0500
--- src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c.orig 2015-03-02 10:06:59.000000000 -0500
+++ src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c 2015-03-02 18:33:59.041474000 -0500
@@ -238,9 +238,11 @@
pDRIInfo->TransitionTo2d = VBOXDRITransitionTo2d;
pDRIInfo->TransitionTo3d = VBOXDRITransitionTo3d;
+#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 101700000
+#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 11700000
/* These two are set in DRICreateInfoRec(). */
pDRIInfo->wrap.ValidateTree = NULL;
pDRIInfo->wrap.PostValidateTree = NULL;

12
emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h Normal file
View File

@ -0,0 +1,12 @@
--- src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h.orig 2015-03-02 10:09:19.000000000 -0500
+++ src/VBox/Devices/Network/slirp/bsd/sys/mbuf.h 2015-03-02 19:42:56.808020000 -0500
@@ -241,6 +241,9 @@
#define M_FRAG 0x00000800 /* packet is a fragment of a larger packet */
#define M_FIRSTFRAG 0x00001000 /* packet is first fragment */
#define M_LASTFRAG 0x00002000 /* packet is last fragment */
+#ifdef M_SKIP_FIREWALL
+#undef M_SKIP_FIREWALL
+#endif
#define M_SKIP_FIREWALL 0x00004000 /* skip firewall processing */
#define M_FREELIST 0x00008000 /* mbuf is on the free list */
#define M_VLANTAG 0x00010000 /* ether_vtag is valid */

11
emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h Normal file
View File

@ -0,0 +1,11 @@
--- src/VBox/GuestHost/OpenGL/include/state/cr_line.h.orig 2015-03-02 10:09:45.000000000 -0500
+++ src/VBox/GuestHost/OpenGL/include/state/cr_line.h 2015-03-02 19:26:01.576169000 -0500
@@ -5,7 +5,7 @@
*/
#ifndef CR_STATE_LINE_H
-#define SR_STATE_LINE_H
+#define CR_STATE_LINE_H
#include "state/cr_statetypes.h"

19
emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h Normal file
View File

@ -0,0 +1,19 @@
--- src/VBox/GuestHost/OpenGL/include/state/cr_point.h.orig 2015-03-02 10:09:45.000000000 -0500
+++ src/VBox/GuestHost/OpenGL/include/state/cr_point.h 2015-03-02 19:21:08.518525000 -0500
@@ -4,8 +4,8 @@
* See the file LICENSE.txt for information on redistributing this software.
*/
-#ifndef CR_STATE_LINE_H
-#define SR_STATE_LINE_H
+#ifndef CR_STATE_POINT_H
+#define CR_STATE_POINT_H
#include "state/cr_statetypes.h"
@@ -59,4 +59,4 @@
}
#endif
-#endif /* CR_STATE_LINE_H */
+#endif /* CR_STATE_POINT_H */