rpms/VirtualBox-OSE/F-11 VirtualBox-OSE-3.0.2-libcxx.patch, NONE,
1.1 VirtualBox-OSE-3.0.2-xinput2.patch, NONE,
1.1 VirtualBox-OSE-3.0.2-xorg17.patch, NONE,
1.1 VirtualBox-OSE-3.0.4-pulse0916.patch, NONE,
1.1 VirtualBox-OSE-3.0.4-vblank.patch, NONE,
1.1 VirtualBox-OSE-3.0.4-videodrv6.patch, NONE, 1.1 .cvsignore,
1.6, 1.7 VirtualBox-OSE.modules, 1.2, 1.3 VirtualBox-OSE.spec,
1.10, 1.11 sources, 1.6, 1.7
Lubomir Rintel
lkundrak at rpmfusion.org
Sun Aug 9 20:05:40 CEST 2009
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16334/F-11
Modified Files:
.cvsignore VirtualBox-OSE.modules VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.0.2-libcxx.patch
VirtualBox-OSE-3.0.2-xinput2.patch
VirtualBox-OSE-3.0.2-xorg17.patch
VirtualBox-OSE-3.0.4-pulse0916.patch
VirtualBox-OSE-3.0.4-vblank.patch
VirtualBox-OSE-3.0.4-videodrv6.patch
Log Message:
Merge from devel
VirtualBox-OSE-3.0.2-libcxx.patch:
--- NEW FILE VirtualBox-OSE-3.0.2-libcxx.patch ---
Do not include statically linked libstdc++. Not a good idea if we don't need
to be binary-compatible across exotic distribution. Doesn't work with trunk
glibc heading towards 2.11 anyways. Static linking is not really supported
anyways.
Lubomir Rintel <lkundrak at v3.sk>
diff -urp VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/VBoxClient/Makefile.kmk VirtualBox-3.0.2_OSE.fixed/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
--- VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-07-10 11:40:22.000000000 -0400
+++ VirtualBox-3.0.2_OSE.fixed/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2009-08-04 13:54:09.707926383 -0400
@@ -62,20 +62,20 @@ ifdef VBOX_X11_SEAMLESS_GUEST
Xext Xmu
endif
-#
-# Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
-# (It would've been preferred to avoid features depending on libstdc++, of course...)
-#
-# Actually, this is darn annoying and will *NOT* be tolerated for any new code!
-#
-VBoxClient_LIBPATH += $(PATH_VBoxClient)
-VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
-VBoxClient_CLEAN = $(PATH_VBoxClient)/libstdc++.a
-$$(PATH_VBoxClient)/libstdc++.a:
- $(call MSG_L1,Forcing static libstdc++)
- $(QUIET)$(MKDIR) -p $(@D)
- $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
- || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
+##
+## Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
+## (It would've been preferred to avoid features depending on libstdc++, of course...)
+##
+## Actually, this is darn annoying and will *NOT* be tolerated for any new code!
+##
+#VBoxClient_LIBPATH += $(PATH_VBoxClient)
+#VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
+#VBoxClient_CLEAN = $(PATH_VBoxClient)/libstdc++.a
+#$$(PATH_VBoxClient)/libstdc++.a:
+# $(call MSG_L1,Forcing static libstdc++)
+# $(QUIET)$(MKDIR) -p $(@D)
+# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
+# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
ifdef VBOX_X11_SEAMLESS_GUEST
if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
VirtualBox-OSE-3.0.2-xinput2.patch:
--- NEW FILE VirtualBox-OSE-3.0.2-xinput2.patch ---
Port to XInput 2.
Lubomir Rintel <lkundrak at v3.sk>
diff -urp VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c VirtualBox-3.0.2_OSE.fixed/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c
--- VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c 2009-07-10 11:40:23.000000000 -0400
+++ VirtualBox-3.0.2_OSE.fixed/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c 2009-08-04 14:58:36.353922261 -0400
@@ -75,10 +75,15 @@ VBoxInit(DeviceIntPtr device)
{
CARD8 map[2] = { 0, 1 };
InputInfoPtr pInfo;
+ Atom axis_labels[2] = { 0, 0 };
+ Atom button_labels[2] = { 0, 0 };
pInfo = device->public.devicePrivate;
if (!InitValuatorClassDeviceStruct(device, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axis_labels,
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
GetMotionHistory,
#endif
@@ -86,15 +91,27 @@ VBoxInit(DeviceIntPtr device)
return !Success;
/* Pretend we have buttons so the server accepts us as a pointing device. */
- if (!InitButtonClassDeviceStruct(device, 2 /* number of buttons */, map))
+ if (!InitButtonClassDeviceStruct(device, 2, /* number of buttons */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ button_labels,
+#endif
+ map))
return !Success;
/* Tell the server about the range of axis values we report */
- xf86InitValuatorAxisStruct(device, 0, 0 /* min X */, 65536 /* max X */,
+ xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axis_labels[0],
+#endif
+ 0 /* min X */, 65536 /* max X */,
10000, 0, 10000);
xf86InitValuatorDefaults(device, 0);
- xf86InitValuatorAxisStruct(device, 1, 0 /* min Y */, 65536 /* max Y */,
+ xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axis_labels[1],
+#endif
+ 0 /* min Y */, 65536 /* max Y */,
10000, 0, 10000);
xf86InitValuatorDefaults(device, 1);
xf86MotionHistoryAllocate(pInfo);
VirtualBox-OSE-3.0.2-xorg17.patch:
--- NEW FILE VirtualBox-OSE-3.0.2-xorg17.patch ---
Build drivers for XOrg 1.7 ABI.
And only them.
Lubomir Rintel <lkundrak at v3.sk>
diff -urp VirtualBox-3.0.2_OSE.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- VirtualBox-3.0.2_OSE.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2009-07-10 11:40:23.000000000 -0400
+++ VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2009-08-04 15:19:27.878921289 -0400
@@ -61,7 +61,7 @@ endif
#
# vboxmouse_drv_70
#
-DLLS += vboxmouse_drv_70
+#DLLS += vboxmouse_drv_70
vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_70_DEFS = \
XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
@@ -82,7 +82,7 @@ vboxmouse_drv_70_SOURCES = \
#
# vboxmouse_drv_71
#
-DLLS += vboxmouse_drv_71
+#DLLS += vboxmouse_drv_71
vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
vboxmouse_drv_71_INCS := \
@@ -99,7 +99,7 @@ vboxmouse_drv_71_SOURCES = \
#
# vboxmouse_drv_14
#
-DLLS += vboxmouse_drv_14
+#DLLS += vboxmouse_drv_14
vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_14_INCS := \
@@ -116,7 +116,7 @@ vboxmouse_drv_14_SOURCES = \
#
# vboxmouse_drv_15
#
-DLLS += vboxmouse_drv_15
+#DLLS += vboxmouse_drv_15
vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_15_INCS := \
@@ -129,9 +129,9 @@ vboxmouse_drv_15_SOURCES = \
#
-# vboxmouse_drv_16
+# vboxmouse_drv_16 \
#
-DLLS += vboxmouse_drv_16
+#DLLS += vboxmouse_drv_16
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \
@@ -143,64 +143,90 @@ vboxmouse_drv_16_INCS := \
vboxmouse_drv_16_SOURCES = \
vboxmouse_15.c
-# Check the undefined symbols in the X.Org modules against lists of allowed
-# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
-# ifndef VBOX_ONLY_ADDITIONS
- if1of ($(KBUILD_TARGET),linux solaris)
- ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
- ifndef VBOX_ONLY_SDK
- OUR_PATH_VBOXMOUSE=$(PATH_ROOT)/src/VBox/Additions/x11/vboxmouse
-
- ifeq ($(KBUILD_TARGET),linux)
- TESTING += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
- OTHERS += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
-$$(PATH_vboxmouse_drv)/tstvboxmouse68.run: $$(INSTARGET_vboxmouse_drv)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- "$(INSTARGET_vboxmouse_drv)" "$(OUR_PATH_VBOXMOUSE)/undefined_68" --static
- $(QUIET)$(APPEND) -t "$@" "done"
- endif
-
- TESTING += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
- OTHERS += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
-$$(PATH_vboxmouse_drv_70)/tstvboxmouse70.run: $$(INSTARGET_vboxmouse_drv_70)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxmouse_drv_70) $(OUR_PATH_VBOXMOUSE)/undefined_70
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
- OTHERS += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
-$$(PATH_vboxmouse_drv_71)/tstvboxmouse71.run: $$(INSTARGET_vboxmouse_drv_71)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxmouse_drv_71) $(OUR_PATH_VBOXMOUSE)/undefined_71
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
- OTHERS += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
-$$(PATH_vboxmouse_drv_14)/tstvboxmouse14.run: $$(INSTARGET_vboxmouse_drv_14)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxmouse_drv_14) $(OUR_PATH_VBOXMOUSE)/undefined_14
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
- OTHERS += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
-$$(PATH_vboxmouse_drv_15)/tstvboxmouse15.run: $$(INSTARGET_vboxmouse_drv_15)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxmouse_drv_15) $(OUR_PATH_VBOXMOUSE)/undefined_15
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
- OTHERS += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
-$$(PATH_vboxmouse_drv_16)/tstvboxmouse16.run: $$(INSTARGET_vboxmouse_drv_16)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxmouse_drv_16) $(OUR_PATH_VBOXMOUSE)/undefined_16
- $(QUIET)$(APPEND) -t "$@" "done"
-
- endif # ! VBOX_ONLY_SDK
- endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
- endif # eq ($(KBUILD_TARGET),linux)
-# endif # ! VBOX_ONLY_ADDITIONS
-endif # VBOX_WITH_TESTCASES
+DLLS += vboxmouse_drv_17
+vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+vboxmouse_drv_17_INCS := \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/Xext \
+ $(PATH_SUB_CURRENT)
+vboxmouse_drv_17_SOURCES = \
+ vboxmouse_15.c
+
+# $(VBOX_PATH_X11_XORG_1_6) \
+# $(VBOX_PATH_X11_XORG_1_6)/X11 \
+# $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0 \
+# $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
+
+## Check the undefined symbols in the X.Org modules against lists of allowed
+## symbols. Not very elegant, but it will catch problems early.
+#ifdef VBOX_WITH_TESTCASES
+## ifndef VBOX_ONLY_ADDITIONS
+# if1of ($(KBUILD_TARGET),linux solaris)
+# ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
+# ifndef VBOX_ONLY_SDK
+# OUR_PATH_VBOXMOUSE=$(PATH_ROOT)/src/VBox/Additions/x11/vboxmouse
+#
+# ifeq ($(KBUILD_TARGET),linux)
+# TESTING += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
+# OTHERS += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
+#$$(PATH_vboxmouse_drv)/tstvboxmouse68.run: $$(INSTARGET_vboxmouse_drv)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# "$(INSTARGET_vboxmouse_drv)" "$(OUR_PATH_VBOXMOUSE)/undefined_68" --static
+# $(QUIET)$(APPEND) -t "$@" "done"
+# endif
+#
+# TESTING += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
+# OTHERS += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
+#$$(PATH_vboxmouse_drv_70)/tstvboxmouse70.run: $$(INSTARGET_vboxmouse_drv_70)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxmouse_drv_70) $(OUR_PATH_VBOXMOUSE)/undefined_70
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
+# OTHERS += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
+#$$(PATH_vboxmouse_drv_71)/tstvboxmouse71.run: $$(INSTARGET_vboxmouse_drv_71)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxmouse_drv_71) $(OUR_PATH_VBOXMOUSE)/undefined_71
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
+# OTHERS += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
+#$$(PATH_vboxmouse_drv_14)/tstvboxmouse14.run: $$(INSTARGET_vboxmouse_drv_14)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxmouse_drv_14) $(OUR_PATH_VBOXMOUSE)/undefined_14
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
+# OTHERS += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
+#$$(PATH_vboxmouse_drv_15)/tstvboxmouse15.run: $$(INSTARGET_vboxmouse_drv_15)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxmouse_drv_15) $(OUR_PATH_VBOXMOUSE)/undefined_15
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
+# OTHERS += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
+#$$(PATH_vboxmouse_drv_16)/tstvboxmouse16.run: $$(INSTARGET_vboxmouse_drv_16)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxmouse_drv_16) $(OUR_PATH_VBOXMOUSE)/undefined_16
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+## TESTING += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
+## OTHERS += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
+##$$(PATH_vboxmouse_drv_17)/tstvboxmouse17.run: $$(INSTARGET_vboxmouse_drv_17)
+## $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+## $(INSTARGET_vboxmouse_drv_17) $(OUR_PATH_VBOXMOUSE)/undefined_17
+### $(QUIET)$(APPEND) -t "$@" "done"
+#
+# endif # ! VBOX_ONLY_SDK
+# endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
+# endif # eq ($(KBUILD_TARGET),linux)
+## endif # ! VBOX_ONLY_ADDITIONS
+#endif # VBOX_WITH_TESTCASES
include $(KBUILD_PATH)/subfooter.kmk
diff -urp VirtualBox-3.0.2_OSE.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
--- VirtualBox-3.0.2_OSE.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2009-07-10 11:40:23.000000000 -0400
+++ VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2009-08-04 15:20:09.279925752 -0400
@@ -113,7 +113,7 @@ endif # target linux
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a properity.
#
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -139,7 +139,7 @@ vboxvideo_drv_70_SOURCES = \
#
# vboxvideo_drv_71
#
-DLLS += vboxvideo_drv_71
+#DLLS += vboxvideo_drv_71
vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -158,7 +158,7 @@ vboxvideo_drv_71_SOURCES = \
#
# vboxvideo_drv_13
#
-DLLS += vboxvideo_drv_13
+#DLLS += vboxvideo_drv_13
vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -180,7 +180,7 @@ vboxvideo_drv_13_SOURCES = \
# This uses the same code (vboxvideo_13.c) as 1.3, but is built
# for 1.4 as well in case there should be any relevant header changes.
#
-DLLS += vboxvideo_drv_14
+#DLLS += vboxvideo_drv_14
vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_14_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -199,7 +199,7 @@ vboxvideo_drv_14_SOURCES = \
#
# vboxvideo_drv_15
#
-DLLS += vboxvideo_drv_15
+#DLLS += vboxvideo_drv_15
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS \
@@ -220,7 +220,7 @@ vboxvideo_drv_15_SOURCES = \
#
# vboxvideo_drv_16
#
-DLLS += vboxvideo_drv_16
+#DLLS += vboxvideo_drv_16
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -237,71 +237,114 @@ vboxvideo_drv_16_SOURCES = \
vboxutils.c \
vboxvideo_dri.c
-# Check the undefined symbols in the X.Org modules against lists of allowed
-# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
-# ifndef VBOX_ONLY_ADDITIONS
- if1of ($(KBUILD_TARGET),linux solaris)
- ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
- ifndef VBOX_ONLY_SDK
- OUR_PATH_VBOXVIDEO=$(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo
-
- ifeq ($(KBUILD_TARGET),linux)
- TESTING += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
- OTHERS += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
-$$(PATH_vboxvideo_drv)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_68 --static
- $(QUIET)$(APPEND) -t "$@" "done"
- endif
-
- TESTING += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
- OTHERS += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
-$$(PATH_vboxvideo_drv_70)/tstvboxvideo70.run: $$(INSTARGET_vboxvideo_drv_70)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxvideo_drv_70) $(OUR_PATH_VBOXVIDEO)/undefined_70
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
- OTHERS += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
-$$(PATH_vboxvideo_drv_71)/tstvboxvideo71.run: $$(INSTARGET_vboxvideo_drv_71)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxvideo_drv_71) $(OUR_PATH_VBOXVIDEO)/undefined_71
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
- OTHERS += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
-$$(PATH_vboxvideo_drv_13)/tstvboxvideo13.run: $$(INSTARGET_vboxvideo_drv_13)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxvideo_drv_13) $(OUR_PATH_VBOXVIDEO)/undefined_13
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
- OTHERS += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
-$$(PATH_vboxvideo_drv_14)/tstvboxvideo14.run: $$(INSTARGET_vboxvideo_drv_14)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxvideo_drv_14) $(OUR_PATH_VBOXVIDEO)/undefined_14
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
- OTHERS += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
-$$(PATH_vboxvideo_drv_15)/tstvboxvideo15.run: $$(INSTARGET_vboxvideo_drv_15)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxvideo_drv_15) $(OUR_PATH_VBOXVIDEO)/undefined_15
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
- OTHERS += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
-$$(PATH_vboxvideo_drv_16)/tstvboxvideo16.run: $$(INSTARGET_vboxvideo_drv_16)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
- $(INSTARGET_vboxvideo_drv_16) $(OUR_PATH_VBOXVIDEO)/undefined_16
- $(QUIET)$(APPEND) -t "$@" "done"
-
- endif # ! VBOX_ONLY_SDK
- endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
- endif # eq ($(KBUILD_TARGET),linux)
-# endif # ! VBOX_ONLY_ADDITIONS
-endif # VBOX_WITH_TESTCASES
+DLLS += vboxvideo_drv_17
+vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
+vboxvideo_drv_17_INCS = \
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source \
+ /usr/share/xorg-x11-server-source/fb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dri \
+ /usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+ /usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/modes \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+ /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+ /usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/miext/damage \
+ /usr/share/xorg-x11-server-source/randr \
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
+vboxvideo_drv_17_SOURCES = \
+ vboxvideo_15.c \
+ vboxutils.c \
+ vboxvideo_dri.c
+
+## Check the undefined symbols in the X.Org modules against lists of allowed
+## symbols. Not very elegant, but it will catch problems early.
+#ifdef VBOX_WITH_TESTCASES
+## ifndef VBOX_ONLY_ADDITIONS
+# if1of ($(KBUILD_TARGET),linux solaris)
+# ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
+# ifndef VBOX_ONLY_SDK
+# OUR_PATH_VBOXVIDEO=$(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo
+#
+# ifeq ($(KBUILD_TARGET),linux)
+# TESTING += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
+# OTHERS += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
+#$$(PATH_vboxvideo_drv)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_68 --static
+# $(QUIET)$(APPEND) -t "$@" "done"
+# endif
+#
+# TESTING += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
+# OTHERS += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
+#$$(PATH_vboxvideo_drv_70)/tstvboxvideo70.run: $$(INSTARGET_vboxvideo_drv_70)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxvideo_drv_70) $(OUR_PATH_VBOXVIDEO)/undefined_70
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
+# OTHERS += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
+#$$(PATH_vboxvideo_drv_71)/tstvboxvideo71.run: $$(INSTARGET_vboxvideo_drv_71)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxvideo_drv_71) $(OUR_PATH_VBOXVIDEO)/undefined_71
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
+# OTHERS += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
+#$$(PATH_vboxvideo_drv_13)/tstvboxvideo13.run: $$(INSTARGET_vboxvideo_drv_13)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxvideo_drv_13) $(OUR_PATH_VBOXVIDEO)/undefined_13
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
+# OTHERS += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
+#$$(PATH_vboxvideo_drv_14)/tstvboxvideo14.run: $$(INSTARGET_vboxvideo_drv_14)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxvideo_drv_14) $(OUR_PATH_VBOXVIDEO)/undefined_14
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
+# OTHERS += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
+#$$(PATH_vboxvideo_drv_15)/tstvboxvideo15.run: $$(INSTARGET_vboxvideo_drv_15)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxvideo_drv_15) $(OUR_PATH_VBOXVIDEO)/undefined_15
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+# TESTING += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
+# OTHERS += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
+#$$(PATH_vboxvideo_drv_16)/tstvboxvideo16.run: $$(INSTARGET_vboxvideo_drv_16)
+# $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+# $(INSTARGET_vboxvideo_drv_16) $(OUR_PATH_VBOXVIDEO)/undefined_16
+# $(QUIET)$(APPEND) -t "$@" "done"
+#
+## TESTING += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
+## OTHERS += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
+##$$(PATH_vboxvideo_drv_17)/tstvboxvideo17.run: $$(INSTARGET_vboxvideo_drv_17)
+## $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
+## $(INSTARGET_vboxvideo_drv_17) $(OUR_PATH_VBOXVIDEO)/undefined_17
+## $(QUIET)$(APPEND) -t "$@" "done"
+#
+# endif # ! VBOX_ONLY_SDK
+# endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
+# endif # eq ($(KBUILD_TARGET),linux)
+## endif # ! VBOX_ONLY_ADDITIONS
+#endif # VBOX_WITH_TESTCASES
include $(KBUILD_PATH)/subfooter.kmk
VirtualBox-OSE-3.0.4-pulse0916.patch:
--- NEW FILE VirtualBox-OSE-3.0.4-pulse0916.patch ---
Adjust for newer PulseAudio API.
We can not use PA_API_VERSION here, since it did not change (== 12).
Lubomir Rintel <lkundrak at v3.sk>
diff -urp VirtualBox-3.0.2_OSE/src/VBox/Devices/Audio/pulse_stubs.c VirtualBox-3.0.2_OSE.fixed/src/VBox/Devices/Audio/pulse_stubs.c
--- VirtualBox-3.0.2_OSE/src/VBox/Devices/Audio/pulse_stubs.c 2009-07-10 11:41:12.000000000 -0400
+++ VirtualBox-3.0.2_OSE.fixed/src/VBox/Devices/Audio/pulse_stubs.c 2009-08-04 11:35:03.036925820 -0400
@@ -41,10 +41,17 @@ void (*function ## _fn)(void); \
void function signature \
{ ( (void (*) signature) function ## _fn ) shortsig; }
+#if PA_PROTOCOL_VERSION >= 16
+PROXY_STUB (pa_stream_connect_playback, int,
+ (pa_stream *s, const char *dev, const pa_buffer_attr *attr,
+ pa_stream_flags_t flags, const pa_cvolume *volume, pa_stream *sync_stream),
+ (s, dev, attr, flags, volume, sync_stream))
+#else
PROXY_STUB (pa_stream_connect_playback, int,
(pa_stream *s, const char *dev, const pa_buffer_attr *attr,
pa_stream_flags_t flags, pa_cvolume *volume, pa_stream *sync_stream),
(s, dev, attr, flags, volume, sync_stream))
+#endif
PROXY_STUB (pa_stream_connect_record, int,
(pa_stream *s, const char *dev, const pa_buffer_attr *attr,
pa_stream_flags_t flags),
VirtualBox-OSE-3.0.4-vblank.patch:
--- NEW FILE VirtualBox-OSE-3.0.4-vblank.patch ---
Call drm_vblank_init() upon initialization, so that we initialize
flip list and don't crash on NULL dereference upon drm_release().
Lubomir Rintel <lkundrak at v3.sk>
diff -up VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c.vblank VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c
--- VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c.vblank 2009-08-09 15:13:14.000000000 +0200
+++ VirtualBox-3.0.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c 2009-08-09 15:13:20.000000000 +0200
@@ -66,8 +66,14 @@ static struct pci_device_id pciidlist[]
vboxvideo_PCI_IDS
};
+int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags)
+{
+ return drm_vblank_init(dev, 1);
+}
+
static struct drm_driver driver = {
/* .driver_features = DRIVER_USE_MTRR, */
+ .load = vboxvideo_driver_load,
.reclaim_buffers = drm_core_reclaim_buffers,
.get_map_ofs = drm_core_get_map_ofs,
.get_reg_ofs = drm_core_get_reg_ofs,
VirtualBox-OSE-3.0.4-videodrv6.patch:
--- NEW FILE VirtualBox-OSE-3.0.4-videodrv6.patch ---
Update the vboxvideo driver for Fedora 12's X.Org snapshot ABI.
Lubomir Rintel <lkundrak at v3.sk>
diff -up VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c.videodrv6 VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c
--- VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c.videodrv6 2009-08-04 19:17:01.000000000 +0200
+++ VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c 2009-08-09 15:33:40.007923255 +0200
@@ -469,6 +469,7 @@ static const xf86OutputFuncsRec VBOXOutp
.destroy = vbox_output_stub
};
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
/*
* List of symbols from other modules that this module references. This
* list is used to tell the loader that it is OK for symbols here to be
@@ -538,6 +539,7 @@ static const char *driSymbols[] = {
NULL
};
#endif
+#endif
#ifdef XFree86LOADER
/* Module loader interface */
@@ -580,6 +582,7 @@ vboxSetup(pointer Module, pointer Option
#endif
xf86Msg(X_CONFIG, "Load address of symbol \"VBOXVIDEO\" is %p\n",
(void *)&VBOXVIDEO);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
LoaderRefSymLists(fbSymbols,
shadowfbSymbols,
vbeSymbols,
@@ -588,6 +591,7 @@ vboxSetup(pointer Module, pointer Option
drmSymbols, driSymbols,
#endif
NULL);
+#endif
return (pointer)TRUE;
}
@@ -763,7 +767,9 @@ VBOXPreInit(ScrnInfoPtr pScrn, int flags
text mode, in order to keep our code simple. */
if (!xf86LoadSubModule(pScrn, "vbe"))
return (FALSE);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
xf86LoaderReqSymLists(vbeSymbols, NULL);
+#endif
if ((pVBox->pVbe = VBEExtendedInit(NULL, pVBox->pEnt->index,
SET_BIOS_SCRATCH
@@ -783,16 +789,22 @@ VBOXPreInit(ScrnInfoPtr pScrn, int flags
/* The ramdac module is needed for the hardware cursor. */
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
xf86LoaderReqSymLists(ramdacSymbols, NULL);
+#endif
/* The framebuffer module. */
if (xf86LoadSubModule(pScrn, "fb") == NULL)
return (FALSE);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
xf86LoaderReqSymLists(fbSymbols, NULL);
+#endif
if (!xf86LoadSubModule(pScrn, "shadowfb"))
return FALSE;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
xf86LoaderReqSymLists(shadowfbSymbols, NULL);
+#endif
/* Set up our ScrnInfoRec structure to describe our virtual
capabilities to X. */
@@ -880,7 +892,7 @@ VBOXPreInit(ScrnInfoPtr pScrn, int flags
/* Framebuffer-related setup */
pScrn->bitmapBitOrder = BITMAP_BIT_ORDER;
-#ifdef VBOX_DRI
+#if defined(VBOX_DRI) && GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
/* Load the dri module. */
if (xf86LoadSubModule(pScrn, "dri")) {
xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
diff -up VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h.videodrv6 VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
--- VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h.videodrv6 2009-08-04 19:17:02.000000000 +0200
+++ VirtualBox-3.0.4_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2009-08-09 15:24:27.393923506 +0200
@@ -97,7 +97,9 @@ do { \
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
+#endif
#ifndef NO_ANSIC
/* All drivers need this */
@@ -140,7 +142,9 @@ do { \
/* Dga definitions */
#include "dgaproc.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
+#endif
#include "fb.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 12 Jul 2009 03:07:37 -0000 1.6
+++ .cvsignore 9 Aug 2009 18:05:39 -0000 1.7
@@ -1,2 +1,2 @@
-VirtualBox-3.0.2-OSE.tar.bz2
UserManual.pdf
+VirtualBox-3.0.4-OSE.tar.bz2
Index: VirtualBox-OSE.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/VirtualBox-OSE.modules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-OSE.modules 3 May 2009 14:24:14 -0000 1.2
+++ VirtualBox-OSE.modules 9 Aug 2009 18:05:39 -0000 1.3
@@ -3,6 +3,8 @@
# User is advised to run this on upgrades
/sbin/rmmod vboxnetflt &>/dev/null ||:
/sbin/rmmod vboxdrv &>/dev/null ||:
+/sbin/rmmod vboxnetadp &>/dev/null ||:
/sbin/modprobe vboxdrv
/sbin/modprobe vboxnetflt
+/sbin/modprobe vboxnetadp
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/VirtualBox-OSE.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VirtualBox-OSE.spec 3 Aug 2009 22:37:12 -0000 1.10
+++ VirtualBox-OSE.spec 9 Aug 2009 18:05:39 -0000 1.11
@@ -1,15 +1,17 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
# This is to prevent certain object files from being stripped.
# FIXME: We would not probably get useful information
# without utilizing optflags (see below)
# TODO: Remove executable bit temporarily to prevent stripping
-%define debug_package %{nil}
+%global debug_package %{nil}
# Lots of useless checks
# This will be enabled by default once RPM is built with caps enabled
%bcond_without hardening
Name: VirtualBox-OSE
-Version: 3.0.2
+Version: 3.0.4
Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -25,6 +27,12 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
Patch2: VirtualBox-OSE-3.0.0-strings.patch
+Patch3: VirtualBox-OSE-3.0.2-libcxx.patch
+Patch4: VirtualBox-OSE-3.0.4-pulse0916.patch
+Patch5: VirtualBox-OSE-3.0.2-xorg17.patch
+Patch6: VirtualBox-OSE-3.0.2-xinput2.patch
+Patch7: VirtualBox-OSE-3.0.4-videodrv6.patch
+Patch8: VirtualBox-OSE-3.0.4-vblank.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,8 +51,18 @@
BuildRequires: libcap-devel
BuildRequires: qt4-devel
+# For the X11 module
+BuildRequires: libdrm-devel
+BuildRequires: libpciaccess-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: pixman-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-server-source
+
# Plague-specific weirdness
-%if 0%{?fedora} > 10
+%if 0%{?fedora} > 11
+ExclusiveArch: i686 x86_64
+%else %if 0%{?fedora} > 10
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
@@ -61,13 +79,22 @@
%package devel
Summary: %{name} SDK
Group: Development/Libraries
-Requires: pyxpcom
Requires: VirtualBox-OSE = %{version}-%{release}
+Requires: python-VirtualBox-OSE = %{version}-%{release}
%description devel
%{name} Software Development Kit.
+%package -n python-%{name}
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: VirtualBox-OSE = %{version}-%{release}
+
+%description -n python-%{name}
+Python XPCOM bindings to %{name}.
+
+
%package guest
Summary: %{name} Guest Additions
Group: System Environment/Base
@@ -100,6 +127,12 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
+%patch3 -p1 -b .libcxx
+%patch4 -p1 -b .pulse0916
+%patch5 -p1 -b .xorg17
+%patch6 -p1 -b .xinput2
+%patch7 -p1 -b .videodrv6
+%patch8 -p1 -b .vblank
%patch10 -p1 -b .32bit
# Remove prebuilt binary tools
@@ -141,9 +174,11 @@
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls
+install -d $RPM_BUILD_ROOT%{_libdir}/dri
install -d $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
+install -d $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
# Binaries and Wrapper with Launchers
install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
@@ -191,15 +226,20 @@
# SDK
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
+mv $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom \
+ $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
+ln -sf ../../../../../../..%{python_sitelib}/virtualbox/xpcom \
+ $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
# Icon
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
# Guest X.Org drivers
-%if 0%{?fedora} >= 10
-%global x11_api 16
-%endif
+# With the xorg17 patch, the _17 driver builds against what's
+# actually available for the system, so would probably be a 1.6
+# driver when compiled on Fedora 10, despite its name
+%global x11_api 17
install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
@@ -207,34 +247,39 @@
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
install -m 0755 -D src/VBox/Additions/linux/installer/90-vboxguest.fdi \
- $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi
+ $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
# Guest tools
-install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/additions/mountvboxsf \
obj/bin/additions/VBoxService \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
+install -m 0755 src/VBox/Additions/x11/Installer/VBoxRandR.sh \
+ $RPM_BUILD_ROOT%{_bindir}/VBoxRandR
+
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+ $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
install -m 0755 -D %{SOURCE8} \
- $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+ $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
-install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
+install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
obj/bin/additions/VBoxOGL*.so
+ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
+
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
-echo 'INSTALL_DIR="%{_libdir}/virtualbox"' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
+echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
# Install udev rules
install -p -m 0644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
@@ -288,6 +333,7 @@
$RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
-maxdepth 0 -type f \
-not -name '*.py[co]' \
+ -not -name VBoxRandR \
-not -name VBox -exec basename '{}' \; |sort)
set -o posix
@@ -296,6 +342,13 @@
rm -rf $RPM_BUILD_ROOT
+%pre devel
+# This changed to a symlink from directory, which would cause
+# the new package's CPIO payload to fail to unpack unless removed
+PYXP=%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
+[ -d "$PYXP" ] && rm -rf "$PYXP"
+
+
# Guest additions install the OGL libraries
%post guest -p /sbin/ldconfig
%postun guest -p /sbin/ldconfig
@@ -320,9 +373,13 @@
%files devel
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
%{_datadir}/virtualbox
-%doc COPYING
+
+
+%files -n python-%{name}
+%defattr(0644,root,root,0755)
+%{python_sitelib}/virtualbox
%files guest
@@ -331,12 +388,15 @@
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
%{_bindir}/VBoxService
+%{_bindir}/VBoxRandR
%{_libdir}/xorg/modules/drivers/*
+%{_libdir}/dri/*
+%{_libdir}/VBoxOGL*.so
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-%{_datadir}/gdm/autostart/LoginWindow
-%{_libdir}/VBoxOGL*.so
-%{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi
+# %{_datadir}/gdm/autostart/LoginWindow
+%exclude %{_datadir}/gdm
+%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%config %{_sysconfdir}/udev/rules.d/60-vboxadd.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
@@ -348,6 +408,29 @@
%changelog
+* Sun Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-3
+- Include VBoxRandR
+- Add dri module to guest
+- Resize attempts in GDM make SELinux unhappy
+- Fix HAL policy file location
+
+* Sun Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-2
+- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
+- Add python- subpackage
+- Correct permissions on SDK directories (#754)
+
+* Sun Aug 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.4-1
+- Update to later upstream release
+- Re-enable DRI again, fix drm_release crash
+
+* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.2-4
+- Build for i686
+- Fix build with newer PulseAudio
+- Don't bundle static libc++, fix build with newer one
+- Build Xorg 1.7 drivers, and only them
+- Adjust Mouse driver for XInput 2
+- Temporarily disable DRI
+
* Tue Aug 04 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.2-3
- Add netadp bmodule (Vlastimil Holer, #744)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 12 Jul 2009 03:07:37 -0000 1.6
+++ sources 9 Aug 2009 18:05:39 -0000 1.7
@@ -1,2 +1,2 @@
-68e6658b8b11a509d7dec57835cba267 VirtualBox-3.0.2-OSE.tar.bz2
-4d0b51c0c4759dc34c124083bae73436 UserManual.pdf
+e37a6625c9048269112e96cc286aade0 UserManual.pdf
+70d4c7b1f271120723a16c9d2b3ba46f VirtualBox-3.0.4-OSE.tar.bz2
More information about the rpmfusion-commits
mailing list