rpms/nvidia-173xx-kmod/devel nvidia-173xx-kmod.spec,1.29,NONE
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23893
Removed Files:
nvidia-173xx-kmod.spec
Log Message:
Remove kmod on rawhide
--- nvidia-173xx-kmod.spec DELETED ---
15 years, 3 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.0.2-dri.patch, NONE, 1.1 VirtualBox-OSE-3.0.2-libcxx.patch, NONE, 1.1 VirtualBox-OSE-3.0.2-pulse12.patch, NONE, 1.1 VirtualBox-OSE-3.0.2-video17.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.spec, 1.14, 1.15
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30469
Modified Files:
VirtualBox-OSE.spec
Added Files:
VirtualBox-OSE-3.0.2-dri.patch
VirtualBox-OSE-3.0.2-libcxx.patch
VirtualBox-OSE-3.0.2-pulse12.patch
VirtualBox-OSE-3.0.2-video17.patch
VirtualBox-OSE-3.0.2-xinput2.patch
VirtualBox-OSE-3.0.2-xorg17.patch
Log Message:
* Tue Aug 04 2009 Lubomir Rintel <lkundrak(a)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
VirtualBox-OSE-3.0.2-dri.patch:
--- NEW FILE VirtualBox-OSE-3.0.2-dri.patch ---
Disable DRI for Rawhide kernel.
diff -up VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.dri VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
--- VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.dri 2009-08-04 18:24:00.033239741 -0400
+++ VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2009-08-04 18:59:37.438284750 -0400
@@ -203,7 +203,7 @@ vboxvideo_drv_14_SOURCES = \
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS \
- VBOX_NO_LOW_COLOUR VBOX_DRI
+ VBOX_NO_LOW_COLOUR
vboxvideo_drv_15_INCS = \
$(VBOX_PATH_X11_XORG_1_5) \
$(VBOX_PATH_X11_XORG_1_5)/X11 \
@@ -270,8 +270,8 @@ vboxvideo_drv_17_INCS = \
/usr/share/xorg-x11-server-source/hw/xfree86/parser
vboxvideo_drv_17_SOURCES = \
vboxvideo_15.c \
- vboxutils.c \
- vboxvideo_dri.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.
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(a)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-pulse12.patch:
--- NEW FILE VirtualBox-OSE-3.0.2-pulse12.patch ---
Adjust for newer PulseAudio API.
Lubomir Rintel <lkundrak(a)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_API_VERSION >= 12
+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.2-video17.patch:
--- NEW FILE VirtualBox-OSE-3.0.2-video17.patch ---
diff -urp VirtualBox-3.0.2_OSE.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c
--- VirtualBox-3.0.2_OSE.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c 2009-07-10 11:40:23.000000000 -0400
+++ VirtualBox-3.0.2_OSE/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c 2009-08-04 15:54:37.137015652 -0400
@@ -475,6 +475,7 @@ static const xf86OutputFuncsRec VBOXOutp
.destroy = vbox_output_stub
};
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
/*
* 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
@@ -544,6 +545,7 @@ static const char *driSymbols[] = {
NULL
};
#endif
+#endif
#ifdef XFree86LOADER
/* Module loader interface */
@@ -584,6 +586,7 @@ vboxSetup(pointer Module, pointer Option
#else
xf86AddDriver(&VBOXDRV, Module, 0);
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
LoaderRefSymLists(fbSymbols,
shadowfbSymbols,
vbeSymbols,
@@ -592,6 +595,7 @@ vboxSetup(pointer Module, pointer Option
drmSymbols, driSymbols,
#endif
NULL);
+#endif
return (pointer)TRUE;
}
@@ -767,7 +771,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_XINPUT_VERSION) < 7
xf86LoaderReqSymLists(vbeSymbols, NULL);
+#endif
if ((pVBox->pVbe = VBEExtendedInit(NULL, pVBox->pEnt->index,
SET_BIOS_SCRATCH
@@ -787,16 +793,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_XINPUT_VERSION) < 7
xf86LoaderReqSymLists(ramdacSymbols, NULL);
+#endif
/* The framebuffer module. */
if (xf86LoadSubModule(pScrn, "fb") == NULL)
return (FALSE);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
xf86LoaderReqSymLists(fbSymbols, NULL);
+#endif
if (!xf86LoadSubModule(pScrn, "shadowfb"))
return FALSE;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
xf86LoaderReqSymLists(shadowfbSymbols, NULL);
+#endif
/* Set up our ScrnInfoRec structure to describe our virtual
capabilities to X. */
@@ -906,7 +918,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);
VirtualBox-OSE-3.0.2-xinput2.patch:
--- NEW FILE VirtualBox-OSE-3.0.2-xinput2.patch ---
Port to XInput 2.
Lubomir Rintel <lkundrak(a)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(a)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
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- VirtualBox-OSE.spec 3 Aug 2009 22:36:00 -0000 1.14
+++ VirtualBox-OSE.spec 5 Aug 2009 06:09:44 -0000 1.15
@@ -10,7 +10,7 @@
Name: VirtualBox-OSE
Version: 3.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -25,6 +25,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.2-pulse12.patch
+Patch5: VirtualBox-OSE-3.0.2-xinput2.patch
+Patch6: VirtualBox-OSE-3.0.2-xorg17.patch
+Patch7: VirtualBox-OSE-3.0.2-video17.patch
+Patch8: VirtualBox-OSE-3.0.2-dri.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,8 +49,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
@@ -100,6 +116,12 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
+%patch3 -p1 -b .libcxx
+%patch4 -p1 -b .pulse12
+%patch5 -p1 -b .xinput2
+%patch6 -p1 -b .xorg17
+%patch7 -p1 -b .video17
+%patch8 -p1 -b .dri
%patch10 -p1 -b .32bit
# Remove prebuilt binary tools
@@ -197,9 +219,10 @@
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
@@ -348,6 +371,14 @@
%changelog
+* Tue Aug 04 2009 Lubomir Rintel <lkundrak(a)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(a)v3.sk> - 3.0.2-3
- Add netadp bmodule (Vlastimil Holer, #744)
15 years, 3 months
rpms/buildsys-build-rpmfusion/F-10 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.28, 1.29 buildsys-build-rpmfusion.spec, 1.32, 1.33
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26080
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Wed Aug 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.32
- rebuild for kernel 2.6.29.6-93.fc10
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-10/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- buildsys-build-rpmfusion-kerneldevpkgs-current 4 Aug 2009 18:11:02 -0000 1.28
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 5 Aug 2009 04:48:09 -0000 1.29
@@ -1,3 +1,3 @@
-2.6.27.29-170.2.78.fc10
-2.6.27.29-170.2.78.fc10smp
-2.6.27.29-170.2.78.fc10PAE
+2.6.29.6-93.fc10
+2.6.29.6-93.fc10smp
+2.6.29.6-93.fc10PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-10/buildsys-build-rpmfusion.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- buildsys-build-rpmfusion.spec 4 Aug 2009 18:11:02 -0000 1.32
+++ buildsys-build-rpmfusion.spec 5 Aug 2009 04:48:09 -0000 1.33
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 10
-Release: 0.31
+Release: 0.32
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -100,6 +100,9 @@
%changelog
+* Wed Aug 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.32
+- rebuild for kernel 2.6.29.6-93.fc10
+
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:10-0.31
- rebuild for kernel 2.6.27.29-170.2.78.fc10
15 years, 3 months
rpms/wl-kmod/F-10 wl-kmod.spec,1.32,1.33
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/wl-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2549
Modified Files:
wl-kmod.spec
Log Message:
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9-2.4
- rebuild for new kernels
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/wl-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wl-kmod.spec 14 Jul 2009 17:52:39 -0000 1.32
+++ wl-kmod.spec 4 Aug 2009 18:38:47 -0000 1.33
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.10.91.9
-Release: 2%{?dist}.3
+Release: 2%{?dist}.4
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -84,6 +84,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9-2.4
+- rebuild for new kernels
+
* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9-2.3
- rebuild for new kernels
15 years, 3 months
rpms/VirtualBox-OSE-kmod/F-10 VirtualBox-OSE-kmod.spec,1.9,1.10
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2351
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.4-2.8
- rebuild for new kernels
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-10/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VirtualBox-OSE-kmod.spec 14 Jul 2009 17:58:19 -0000 1.9
+++ VirtualBox-OSE-kmod.spec 4 Aug 2009 18:38:31 -0000 1.10
@@ -7,7 +7,7 @@
Name: VirtualBox-OSE-kmod
Version: 2.1.4
-Release: 2%{?dist}.7
+Release: 2%{?dist}.8
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -78,6 +78,9 @@
%changelog
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.4-2.8
+- rebuild for new kernels
+
* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.4-2.7
- rebuild for new kernels
15 years, 3 months
rpms/slmodem-kmod/F-10 slmodem-kmod.spec,1.26,1.27
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/slmodem-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2324
Modified Files:
slmodem-kmod.spec
Log Message:
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.26
- rebuild for new kernels
Index: slmodem-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/F-10/slmodem-kmod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- slmodem-kmod.spec 14 Jul 2009 17:52:20 -0000 1.26
+++ slmodem-kmod.spec 4 Aug 2009 18:38:30 -0000 1.27
@@ -12,7 +12,7 @@
Name: slmodem-kmod
Version: 2.9.11
-Release: 26%{?dist}.25
+Release: 26%{?dist}.26
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.26
+- rebuild for new kernels
+
* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.25
- rebuild for new kernels
15 years, 3 months
rpms/sysprof-kmod/F-10 sysprof-kmod.spec,1.11,1.12
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/sysprof-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1997
Modified Files:
sysprof-kmod.spec
Log Message:
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-1.11
- rebuild for new kernels
Index: sysprof-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/sysprof-kmod/F-10/sysprof-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sysprof-kmod.spec 14 Jul 2009 17:58:02 -0000 1.11
+++ sysprof-kmod.spec 4 Aug 2009 18:38:14 -0000 1.12
@@ -8,7 +8,7 @@
Name: sysprof-kmod
Summary: Kernel module for sysprof
Version: 1.0.12
-Release: 1%{?dist}.10
+Release: 1%{?dist}.11
Group: System Environment/Kernel
License: GPLv2+
@@ -73,6 +73,9 @@
%changelog
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-1.11
+- rebuild for new kernels
+
* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.12-1.10
- rebuild for new kernels
15 years, 3 months
rpms/nvidia-kmod/F-10 nvidia-kmod.spec,1.41,1.42
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1970
Modified Files:
nvidia-kmod.spec
Log Message:
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.60-1.1
- rebuild for new kernels
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-10/nvidia-kmod.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- nvidia-kmod.spec 15 Jul 2009 20:18:45 -0000 1.41
+++ nvidia-kmod.spec 4 Aug 2009 18:38:13 -0000 1.42
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: nvidia-kmod
Version: 180.60
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -93,6 +93,9 @@
%changelog
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.60-1.1
+- rebuild for new kernels
+
* Thu Jul 15 2009 kwizart < kwizart at gmail.com > - 180.60-1
- Update to 180.60
15 years, 3 months
rpms/rt3070-kmod/F-10 rt3070-kmod.spec,1.14,1.15
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt3070-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1752
Modified Files:
rt3070-kmod.spec
Log Message:
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.6
- rebuild for new kernels
Index: rt3070-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/F-10/rt3070-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rt3070-kmod.spec 14 Jul 2009 17:57:46 -0000 1.14
+++ rt3070-kmod.spec 4 Aug 2009 18:37:57 -0000 1.15
@@ -7,7 +7,7 @@
Name: rt3070-kmod
Version: 2.1.1.0
-Release: 1%{?dist}.5
+Release: 1%{?dist}.6
Summary: Kernel module for wireless devices with Ralink's rt307x chipsets
Group: System Environment/Kernel
@@ -93,6 +93,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.6
+- rebuild for new kernels
+
* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.1.0-1.5
- rebuild for new kernels
15 years, 3 months
rpms/nvidia-beta-kmod/F-10 nvidia-beta-kmod.spec,1.22,1.23
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-beta-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1725
Modified Files:
nvidia-beta-kmod.spec
Log Message:
* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.12
- rebuild for new kernels
Index: nvidia-beta-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-beta-kmod/F-10/nvidia-beta-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia-beta-kmod.spec 14 Jul 2009 17:51:46 -0000 1.22
+++ nvidia-beta-kmod.spec 4 Aug 2009 18:37:56 -0000 1.23
@@ -8,7 +8,7 @@
Name: nvidia-beta-kmod
Version: 180.11.02
# Taken over by kmodtool
-Release: 1%{?dist}.11
+Release: 1%{?dist}.12
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -99,6 +99,9 @@
%changelog
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.12
+- rebuild for new kernels
+
* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.11
- rebuild for new kernels
15 years, 3 months
