rpms/smplayer/devel .cvsignore, 1.8, 1.9 smplayer.spec, 1.10, 1.11 sources, 1.8, 1.9
by Sebastian Vahl
Author: svahl
Update of /cvs/free/rpms/smplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8056
Modified Files:
.cvsignore smplayer.spec sources
Log Message:
* Sun Jul 28 2009 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.8-1
- new upstream version: 0.6.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 29 Mar 2009 14:47:07 -0000 1.8
+++ .cvsignore 11 Aug 2009 07:48:58 -0000 1.9
@@ -1 +1 @@
-smplayer-0.6.7.tar.bz2
+smplayer-0.6.8.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smplayer.spec 29 Mar 2009 14:47:07 -0000 1.10
+++ smplayer.spec 11 Aug 2009 07:48:58 -0000 1.11
@@ -8,7 +8,7 @@
%endif
Name: smplayer
-Version: 0.6.7
+Version: 0.6.8
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
@@ -22,7 +22,6 @@
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
Source2: smplayer_enqueue_kde3.desktop
-Patch0: smplayer-0.6.7-fix-translations.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -40,7 +39,6 @@
%prep
%setup -qn %{name}-%{version}
-%patch0 -p1 -b .fix-translations
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -123,6 +121,9 @@
%endif
%changelog
+* Sun Jul 28 2009 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.8-1
+- new upstream version: 0.6.8
+
* Sun Mar 29 2009 Sebastian Vahl <fedora(a)deadbabylon.de> - 0.6.7-1
- new upstream version: 0.6.7
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 29 Mar 2009 14:47:07 -0000 1.8
+++ sources 11 Aug 2009 07:48:58 -0000 1.9
@@ -1 +1 @@
-306b99374ad89cee93f1ad6fa94dea71 smplayer-0.6.7.tar.bz2
+4465e060e6c1a254dcd9c8c4608e69eb smplayer-0.6.8.tar.bz2
14 years, 9 months
- 1
- 0
rpms/VirtualBox-OSE-kmod/F-11 VirtualBox-OSE-kmod.spec,1.20,1.21
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17124
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
Merge from devel
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-11/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- VirtualBox-OSE-kmod.spec 3 Aug 2009 22:29:20 -0000 1.20
+++ VirtualBox-OSE-kmod.spec 9 Aug 2009 18:10:08 -0000 1.21
@@ -3,10 +3,10 @@
# "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: VirtualBox-OSE-kmod
-Version: 3.0.2
+Version: 3.0.4
Release: 2%{?dist}
Summary: Kernel module for VirtualBox-OSE
@@ -73,11 +73,22 @@
%{?akmod_install}
+%check
+# If we built modules, check if it was everything the kmodsrc package provided
+MODS=$(find $RPM_BUILD_ROOT -name '*.ko' -exec basename '{}' \; |wc -l)
+DIRS=$(ls %{name}-%{version} |wc -l)
+[ $MODS = $DIRS ] || [ $MODS = 0 ]
+
+
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 09 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
+- New release
+- Check that we build all modules present
+
* Tue Aug 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-2
- Add netadp bmodule (Vlastimil Holer, #744)
14 years, 9 months
- 1
- 0
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
by Lubomir Rintel
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(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-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
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(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_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(a)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(a)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(a)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(a)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(a)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(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)
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
14 years, 9 months
- 1
- 0
rpms/VirtualBox-OSE/devel VirtualBox-OSE-vboxresize.desktop, 1.2, 1.3 VirtualBox-OSE.spec, 1.19, 1.20
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15701
Modified Files:
VirtualBox-OSE.spec
Added Files:
VirtualBox-OSE-vboxresize.desktop
Log Message:
Minor fixups
Index: VirtualBox-OSE-vboxresize.desktop
===================================================================
RCS file: VirtualBox-OSE-vboxresize.desktop
diff -N VirtualBox-OSE-vboxresize.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ VirtualBox-OSE-vboxresize.desktop 9 Aug 2009 17:57:32 -0000 1.3
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=vbox-autoresize
+Exec=/usr/bin/VBoxClient --autoresize
+X-GNOME-Autostart-enabled=true
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- VirtualBox-OSE.spec 9 Aug 2009 17:07:53 -0000 1.19
+++ VirtualBox-OSE.spec 9 Aug 2009 17:57:32 -0000 1.20
@@ -24,6 +24,7 @@
Source5: VirtualBox-OSE-60-vboxadd.rules
Source6: VirtualBox-OSE.modules
Source7: VirtualBox-OSE-guest.modules
+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
@@ -246,10 +247,10 @@
$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 \
@@ -259,15 +260,19 @@
$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
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
@@ -328,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
@@ -388,7 +394,9 @@
%{_libdir}/VBoxOGL*.so
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-%{_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
@@ -404,6 +412,7 @@
- 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(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
14 years, 9 months
- 1
- 0
rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec, 1.18, 1.19 VirtualBox-OSE-vboxresize.desktop, 1.1, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12668
Modified Files:
VirtualBox-OSE.spec
Removed Files:
VirtualBox-OSE-vboxresize.desktop
Log Message:
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
- Include VBoxRandR
- Add dri module to guest
- Resize attempts in GDM make SELinux unhappy
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- VirtualBox-OSE.spec 9 Aug 2009 15:58:56 -0000 1.18
+++ VirtualBox-OSE.spec 9 Aug 2009 17:07:53 -0000 1.19
@@ -12,7 +12,7 @@
Name: VirtualBox-OSE
Version: 3.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -24,7 +24,6 @@
Source5: VirtualBox-OSE-60-vboxadd.rules
Source6: VirtualBox-OSE.modules
Source7: VirtualBox-OSE-guest.modules
-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
@@ -174,6 +173,7 @@
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}
@@ -255,21 +255,22 @@
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
install -m 0755 -D src/VBox/Additions/x11/Installer/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
-
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} \
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
@@ -381,11 +382,12 @@
%{_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
%config %{_sysconfdir}/udev/rules.d/60-vboxadd.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
@@ -398,6 +400,11 @@
%changelog
+* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
+- Include VBoxRandR
+- Add dri module to guest
+- Resize attempts in GDM make SELinux unhappy
+
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
- Add python- subpackage
--- VirtualBox-OSE-vboxresize.desktop DELETED ---
14 years, 9 months
- 1
- 0
rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.17,1.18
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8639
Modified Files:
VirtualBox-OSE.spec
Log Message:
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)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)
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- VirtualBox-OSE.spec 9 Aug 2009 14:25:32 -0000 1.17
+++ VirtualBox-OSE.spec 9 Aug 2009 15:58:56 -0000 1.18
@@ -1,8 +1,10 @@
+%{!?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
@@ -10,7 +12,7 @@
Name: VirtualBox-OSE
Version: 3.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -77,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
@@ -166,6 +177,7 @@
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
@@ -213,6 +225,10 @@
# 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 \
@@ -257,7 +273,7 @@
# 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
@@ -319,6 +335,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
@@ -343,9 +366,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
@@ -371,6 +398,11 @@
%changelog
+* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)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(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash
14 years, 9 months
- 1
- 0
rpms/VirtualBox-OSE/devel 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.spec, 1.16, 1.17 sources, 1.6, 1.7 VirtualBox-OSE-3.0.2-pulse12.patch, 1.1, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3541
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.0.4-pulse0916.patch
VirtualBox-OSE-3.0.4-vblank.patch
VirtualBox-OSE-3.0.4-videodrv6.patch
Removed Files:
VirtualBox-OSE-3.0.2-pulse12.patch
Log Message:
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash
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(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_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(a)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(a)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/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 12 Jul 2009 03:08:43 -0000 1.6
+++ .cvsignore 9 Aug 2009 14:25:32 -0000 1.7
@@ -1,2 +1,2 @@
-VirtualBox-3.0.2-OSE.tar.bz2
+VirtualBox-3.0.4-OSE.tar.bz2
UserManual.pdf
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VirtualBox-OSE.spec 8 Aug 2009 15:36:38 -0000 1.16
+++ VirtualBox-OSE.spec 9 Aug 2009 14:25:32 -0000 1.17
@@ -9,8 +9,8 @@
%bcond_without hardening
Name: VirtualBox-OSE
-Version: 3.0.2
-Release: 4%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -26,11 +26,11 @@
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
+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.2-videodrv6.patch
-Patch8: VirtualBox-OSE-3.0.2-dri.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)
@@ -117,11 +117,11 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
-%patch4 -p1 -b .pulse12
+%patch4 -p1 -b .pulse0916
%patch5 -p1 -b .xorg17
%patch6 -p1 -b .xinput2
%patch7 -p1 -b .videodrv6
-%patch8 -p1 -b .dri
+%patch8 -p1 -b .vblank
%patch10 -p1 -b .32bit
# Remove prebuilt binary tools
@@ -371,6 +371,10 @@
%changelog
+* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)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(a)v3.sk> - 3.0.2-4
- Build for i686
- Fix build with newer PulseAudio
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 12 Jul 2009 03:08:43 -0000 1.6
+++ sources 9 Aug 2009 14:25:32 -0000 1.7
@@ -1,2 +1,2 @@
-68e6658b8b11a509d7dec57835cba267 VirtualBox-3.0.2-OSE.tar.bz2
-4d0b51c0c4759dc34c124083bae73436 UserManual.pdf
+70d4c7b1f271120723a16c9d2b3ba46f VirtualBox-3.0.4-OSE.tar.bz2
+e37a6625c9048269112e96cc286aade0 UserManual.pdf
--- VirtualBox-OSE-3.0.2-pulse12.patch DELETED ---
14 years, 9 months
- 1
- 0
rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.18,1.19
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3508
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Sun Aug 09 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- New release
- Check that we build all modules present
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- VirtualBox-OSE-kmod.spec 3 Aug 2009 22:27:53 -0000 1.18
+++ VirtualBox-OSE-kmod.spec 9 Aug 2009 14:25:29 -0000 1.19
@@ -6,7 +6,7 @@
#define buildforkernels newest
Name: VirtualBox-OSE-kmod
-Version: 3.0.2
+Version: 3.0.4
Release: 2%{?dist}
Summary: Kernel module for VirtualBox-OSE
@@ -73,11 +73,22 @@
%{?akmod_install}
+%check
+# If we built modules, check if it was everything the kmodsrc package provided
+MODS=$(find $RPM_BUILD_ROOT -name '*.ko' -exec basename '{}' \; |wc -l)
+DIRS=$(ls %{name}-%{version} |wc -l)
+[ $MODS = $DIRS ] || [ $MODS = 0 ]
+
+
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Aug 09 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
+- New release
+- Check that we build all modules present
+
* Tue Aug 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-2
- Add netadp bmodule (Vlastimil Holer, #744)
14 years, 9 months
- 1
- 0
rpms/roadfighter/F-10 roadfighter-1.0.1269-Makefile.patch, NONE, 1.1 roadfighter.sh, NONE, 1.1 roadfighter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/roadfighter/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17002/F-10
Modified Files:
.cvsignore sources
Added Files:
roadfighter-1.0.1269-Makefile.patch roadfighter.sh
roadfighter.spec
Log Message:
First release
roadfighter-1.0.1269-Makefile.patch:
--- NEW FILE roadfighter-1.0.1269-Makefile.patch ---
--- roadfighter-1.0.1269.orig/build/linux/Makefile 2008-03-19 21:58:51.000000000 +0100
+++ roadfighter-1.0.1269/build/linux/Makefile 2009-06-22 17:39:28.000000000 +0200
@@ -37,14 +38,14 @@
$(SRC)/main.o
CC = g++
-CFLAGS = -g3 -O3 `sdl-config --cflags` -I/usr/X11R6/include
-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
+CFLAGS += `sdl-config --cflags` -I/usr/X11R6/include
+LIBS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
+LDFLAGS += -L/usr/X11R6/lib/
RM = rm -f
CP = cp -r
MD = mkdir -p
ECHO = echo
CHMOD = chmod
-STRIP = strip
all: $(EXE)
@@ -52,8 +53,7 @@
$(CC) $(CFLAGS) -c $< -o $@
$(EXE): $(OBJS)
- $(CC) $(LDFLAGS) $^ -o $@
- @$(STRIP) $@
+ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
@$(ECHO) " o If there are no errors, the game compiled succesfully"
clean:
--- NEW FILE roadfighter.sh ---
#!/bin/sh
GAME=roadfighter
GAME_LOCAL_DIR=$HOME/.$GAME
GAME_DATA_DIR=/usr/share/$GAME
GAME_EXECUTABLE=/usr/libexec/$GAME/$GAME
mkdir -p $GAME_LOCAL_DIR
cd $GAME_LOCAL_DIR
for dir in fonts graphics maps sound; do
ln -snf $GAME_DATA_DIR/$dir $dir
done
exec $GAME_EXECUTABLE "$@"
--- NEW FILE roadfighter.spec ---
Name: roadfighter
Version: 1.0.1269
Release: 2%{?dist}
Summary: Konami's Road Fighter remake
Group: Amusements/Games
# http://www.braingames.getput.com/forum/forum_posts.asp?TID=678&PN=1
License: Distributable
URL: http://roadfighter.jorito.net/
Source0: http://braingames.jorito.net/roadfighter/downloads/%{name}.src_%{version}...
Source1: roadfighter.sh
Patch0: %{name}-1.0.1269-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: SDL_sound-devel
BuildRequires: SDL_ttf-devel
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
This is a remake of a car-based arcade game developed by Konami and released
in 1984. The goal is to reach the finish line within the stages without
running out of time, hitting other cars or running out of fuel.
%prep
%setup -q
%patch0 -p1
# Fix char encondig
iconv --from=ISO-8859-1 --to=UTF-8 readme.txt > readme.txt.utf8
touch -r readme.txt readme.txt.utf8
mv readme.txt.utf8 readme.txt
%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
# Install wrapper script
install -d %{buildroot}%{_bindir}
install -m 755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
# Install game and data
install -d %{buildroot}%{_libexecdir}/%{name}
install -m 755 -p %{name} %{buildroot}%{_libexecdir}/%{name}
install -d %{buildroot}%{_datadir}/%{name}
cp -pr fonts graphics maps sound %{buildroot}%{_datadir}/%{name}
# Install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
convert -resize 32x32 \
-frame 0x3 \
-mattecolor '#dfdfdf' \
-transparent '#dfdfdf' \
build/linux/roadfighter.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
# Install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
build/linux/%{name}.desktop
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libexecdir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%doc readme.txt
%changelog
* Fri Aug 07 2009 Andrea Musuruane <musuruan(a)gmail.com> 1.0.1269-2
- Preserved timestamps
* Thu Jul 23 2009 Andrea Musuruane <musuruan(a)gmail.com> 1.0.1269-1
- First release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/roadfighter/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Aug 2009 17:12:26 -0000 1.1
+++ .cvsignore 9 Aug 2009 08:23:01 -0000 1.2
@@ -0,0 +1 @@
+roadfighter.src_1.0.1269.tgz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/roadfighter/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 8 Aug 2009 17:12:26 -0000 1.1
+++ sources 9 Aug 2009 08:23:01 -0000 1.2
@@ -0,0 +1 @@
+a1626dda4d17ae30bbdd9c1ede2cd555 roadfighter.src_1.0.1269.tgz
14 years, 9 months
- 1
- 0
rpms/roadfighter/F-11 roadfighter-1.0.1269-Makefile.patch, NONE, 1.1 roadfighter.sh, NONE, 1.1 roadfighter.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/roadfighter/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16523/F-11
Modified Files:
.cvsignore sources
Added Files:
roadfighter-1.0.1269-Makefile.patch roadfighter.sh
roadfighter.spec
Log Message:
First release
roadfighter-1.0.1269-Makefile.patch:
--- NEW FILE roadfighter-1.0.1269-Makefile.patch ---
--- roadfighter-1.0.1269.orig/build/linux/Makefile 2008-03-19 21:58:51.000000000 +0100
+++ roadfighter-1.0.1269/build/linux/Makefile 2009-06-22 17:39:28.000000000 +0200
@@ -37,14 +38,14 @@
$(SRC)/main.o
CC = g++
-CFLAGS = -g3 -O3 `sdl-config --cflags` -I/usr/X11R6/include
-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
+CFLAGS += `sdl-config --cflags` -I/usr/X11R6/include
+LIBS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
+LDFLAGS += -L/usr/X11R6/lib/
RM = rm -f
CP = cp -r
MD = mkdir -p
ECHO = echo
CHMOD = chmod
-STRIP = strip
all: $(EXE)
@@ -52,8 +53,7 @@
$(CC) $(CFLAGS) -c $< -o $@
$(EXE): $(OBJS)
- $(CC) $(LDFLAGS) $^ -o $@
- @$(STRIP) $@
+ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
@$(ECHO) " o If there are no errors, the game compiled succesfully"
clean:
--- NEW FILE roadfighter.sh ---
#!/bin/sh
GAME=roadfighter
GAME_LOCAL_DIR=$HOME/.$GAME
GAME_DATA_DIR=/usr/share/$GAME
GAME_EXECUTABLE=/usr/libexec/$GAME/$GAME
mkdir -p $GAME_LOCAL_DIR
cd $GAME_LOCAL_DIR
for dir in fonts graphics maps sound; do
ln -snf $GAME_DATA_DIR/$dir $dir
done
exec $GAME_EXECUTABLE "$@"
--- NEW FILE roadfighter.spec ---
Name: roadfighter
Version: 1.0.1269
Release: 2%{?dist}
Summary: Konami's Road Fighter remake
Group: Amusements/Games
# http://www.braingames.getput.com/forum/forum_posts.asp?TID=678&PN=1
License: Distributable
URL: http://roadfighter.jorito.net/
Source0: http://braingames.jorito.net/roadfighter/downloads/%{name}.src_%{version}...
Source1: roadfighter.sh
Patch0: %{name}-1.0.1269-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
BuildRequires: SDL_sound-devel
BuildRequires: SDL_ttf-devel
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
This is a remake of a car-based arcade game developed by Konami and released
in 1984. The goal is to reach the finish line within the stages without
running out of time, hitting other cars or running out of fuel.
%prep
%setup -q
%patch0 -p1
# Fix char encondig
iconv --from=ISO-8859-1 --to=UTF-8 readme.txt > readme.txt.utf8
touch -r readme.txt readme.txt.utf8
mv readme.txt.utf8 readme.txt
%build
export CFLAGS="%{optflags}"
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
# Install wrapper script
install -d %{buildroot}%{_bindir}
install -m 755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
# Install game and data
install -d %{buildroot}%{_libexecdir}/%{name}
install -m 755 -p %{name} %{buildroot}%{_libexecdir}/%{name}
install -d %{buildroot}%{_datadir}/%{name}
cp -pr fonts graphics maps sound %{buildroot}%{_datadir}/%{name}
# Install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
convert -resize 32x32 \
-frame 0x3 \
-mattecolor '#dfdfdf' \
-transparent '#dfdfdf' \
build/linux/roadfighter.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
# Install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
build/linux/%{name}.desktop
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libexecdir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%doc readme.txt
%changelog
* Fri Aug 07 2009 Andrea Musuruane <musuruan(a)gmail.com> 1.0.1269-2
- Preserved timestamps
* Thu Jul 23 2009 Andrea Musuruane <musuruan(a)gmail.com> 1.0.1269-1
- First release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/roadfighter/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Aug 2009 17:12:26 -0000 1.1
+++ .cvsignore 9 Aug 2009 08:20:04 -0000 1.2
@@ -0,0 +1 @@
+roadfighter.src_1.0.1269.tgz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/roadfighter/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 8 Aug 2009 17:12:26 -0000 1.1
+++ sources 9 Aug 2009 08:20:04 -0000 1.2
@@ -0,0 +1 @@
+a1626dda4d17ae30bbdd9c1ede2cd555 roadfighter.src_1.0.1269.tgz
14 years, 9 months
- 1
- 0