aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-03-03 05:43:11 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-03-03 05:43:11 +0000
commit19a52b429c3b94f81497191c09870b0978d0a3dc (patch)
treec135aeba3c97d38c2d9ef936562a3e195f4a7b25 /emulators
parenta255050b72698983e4022eab82ff025fc8dab7c2 (diff)
downloadports-19a52b429c3b94f81497191c09870b0978d0a3dc.tar.gz
ports-19a52b429c3b94f81497191c09870b0978d0a3dc.zip
Notes
Diffstat (limited to 'emulators')
-rw-r--r--emulators/virtualbox-ose-additions/Makefile2
-rw-r--r--emulators/virtualbox-ose-additions/distinfo4
-rw-r--r--emulators/virtualbox-ose-kmod/Makefile2
-rw-r--r--emulators/virtualbox-ose-kmod/distinfo4
-rw-r--r--emulators/virtualbox-ose/Makefile3
-rw-r--r--emulators/virtualbox-ose/distinfo8
-rw-r--r--emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk30
-rw-r--r--emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c6
-rw-r--r--emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h12
-rw-r--r--emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h11
-rw-r--r--emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h19
11 files changed, 71 insertions, 30 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 6f6eaeb0d22e..09ddd9e987c2 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -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/ \
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 92bb96af3094..c21d9c31e479 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -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
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index b383c2a6fc9a..c1aee1a6e57b 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -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/ \
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 92bb96af3094..c21d9c31e479 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -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
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 8348e2cba8bf..6773db05403c 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -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/ \
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 17e5820db66a..6c46a34c923a 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -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
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
index 9d14002f9fd2..9f7ba391e71c 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
@@ -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
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c
index 92290c06798a..d2f8c2be6ab8 100644
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c
@@ -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;
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h
new file mode 100644
index 000000000000..4cee66f4aea2
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-bsd-sys-mbuf.h
@@ -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 */
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h b/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h
new file mode 100644
index 000000000000..64432f6787bc
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h
@@ -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"
+
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h b/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h
new file mode 100644
index 000000000000..b8570a56acef
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h
@@ -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 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 05:25:43 +0000