Mailinglist Archive: opensuse-commit (794 mails)
| < Previous | Next > |
commit virtualbox-ose for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 08 Sep 2009 22:35:18 +0200
- Message-id: <20090908203518.1B58661B0@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package virtualbox-ose for openSUSE:Factory
checked in at Tue Sep 8 22:35:17 CEST 2009.
--------
--- virtualbox-ose/virtualbox-ose.changes 2009-08-27 14:26:56.000000000
+0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes
2009-09-07 15:02:18.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Sep 7 14:53:23 CEST 2009 - mseben@xxxxxxxxxx
+
+- added pa-interface_change.diff to fix interface change in PulseAudio
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
vbox-2.6.25
New:
----
vbox-2.6.25.diff
vbox-pa-interface_change.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox-ose.spec ++++++
--- /var/tmp/diff_new_pack.ILWtWR/_old 2009-09-08 22:34:55.000000000 +0200
+++ /var/tmp/diff_new_pack.ILWtWR/_new 2009-09-08 22:34:55.000000000 +0200
@@ -27,9 +27,7 @@
%else
%define do_permissions 0
%endif
-%if %suse_version > 1020
BuildRequires: fdupes
-%endif
%if %suse_version > 1110
BuildRequires: acpica dmidecode
%else
@@ -49,9 +47,6 @@
BuildRequires: gcc-32bit hal-32bit
BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit
xorg-x11-libs-32bit
BuildRequires: libgcc-32bit xorg-x11-libXext-devel-32bit
xorg-x11-libXmu-devel-32bit
-%if %suse_version == 1020
-BuildRequires: libstdc++41-devel-32bit
-%endif
%if %suse_version == 1030
BuildRequires: libstdc++42-devel-32bit
%endif
@@ -67,7 +62,7 @@
#
ExclusiveArch: %ix86 x86_64
Version: 3.0.4
-Release: 4
+Release: 5
Summary: VirtualBox OSE is an Emulator
License: GPL v2 or later
Group: System/Emulators/PC
@@ -90,11 +85,15 @@
Patch4: %{name}-init-scripts.diff
Patch6: virtualbox-gcc43-fixes.diff
Patch9: virtualbox-system-yasm.diff
-Patch10: vbox-2.6.25
+Patch10: vbox-2.6.25.diff
Patch14: vbox-kbuild_unit_paths.diff
Patch16: virtualbox-ose-disable-updates.diff
Patch17: virtualbox-ose-sudo-tmpdir.diff
Patch18: vbox-swab_2.6.29_header.diff
+%if %suse_version > 1110
+#PATCH-FIX-UPSTREAM fix interface change in pulseaudio lib, fix is already in
vbox's svn
+Patch19: vbox-pa-interface_change.diff
+%endif
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions
@@ -136,9 +135,7 @@
Summary: VirtualBox X11 drivers for mouse and video
Group: System/X11/Servers/XF86_4
Requires: virtualbox-ose-kmp
-%if %suse_version > 1010
Supplements: modalias(pci:v000080EEd0000BEEFsv*sd*bc*sc*i*)
-%endif
Provides: xorg-x11-driver-virtualbox <= %version
Obsoletes: xorg-x11-driver-virtualbox < %version
@@ -156,9 +153,7 @@
Summary: VirtualBox guest tools
Group: System/Emulators/PC
Requires: virtualbox-ose-kmp
-%if %suse_version > 1010
Supplements: modalias(pci:v000080EEd0000BEEFsv*sd*bc*sc*i*)
-%endif
%description guest-tools
VirtualBox guest addition tools.
@@ -188,6 +183,9 @@
%if %suse_version >= 1110
%patch18
%endif
+%if %suse_version > 1110
+%patch19
+%endif
%__cp %{SOURCE7} .
%build
@@ -202,17 +200,11 @@
# %__sed 's/#define CONFIG_XEN 1//g' > linux/autoconf.h
%__sed -i 's|@vboxinstdir@|%{_vbox_instdir}|' LocalConfig.kmk
./configure \
-%if %suse_version > 1020
--with-linux=/usr/src/linux-obj/%{_target_cpu}/default \
-%endif
$EXTRA_OPTS
/usr/bin/kmk \
KBUILD_VERBOSE=2 \
-%if %suse_version > 1020
VBOX_LINUX_SRC=/usr/src/linux-obj/%{_target_cpu}/default \
-%else
- VBOX_LINUX_SRC=/usr/src/linux-%{kernel_version}-obj/%{_target_cpu}/default
\
-%endif
all
for mod in out/linux.*/release/bin/src/vboxdrv \
out/linux.*/release/bin/src/vboxnetflt \
@@ -405,10 +397,8 @@
+device.name ${DEVICE}
+driver.xfree 4|${SERVER}
EOF
-%if %suse_version > 1020
%fdupes %{buildroot}/%{_datadir}/virtualbox/nls
%fdupes %{buildroot}/%{_bindir}
-%endif
%pre
echo "creating group vboxusers..."
++++++ vbox-2.6.25.diff ++++++
--- VirtualBox-2.0.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ VirtualBox-2.0.4/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -286,11 +286,21 @@
#undef bool
/*
- * There are post-2.6.24 kernels (confusingly with unchanged version number)
- * which eliminate macros which were marked as deprecated.
+ * The 2.6.25 kernel eliminates macros that were marked as deprecated and
eliminates
+ * routine change_page_attr() in favor of the set_pages_* API.
*/
-#ifndef __attribute_used__
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
#define __attribute_used__ __used
+
+static inline int my_change_page_attr(struct page *page, int numpages,
pgprot_t prot)
+{
+ /* use the set_pages_* API */
+ if (pgprot_val(prot) & _PAGE_NX)
+ set_pages_nx(page, numpages);
+ set_pages_uc(page, numpages);
+ return 0;
+}
+#define change_page_attr(a,b,c) my_change_page_attr((a), (b), (c))
#endif
/**
++++++ vbox-pa-interface_change.diff ++++++
--- src/VBox/Devices/Audio/pulse_stubs.c 2009-08-04 19:18:09.000000000
+0200
+++ src/VBox/Devices/Audio/pulse_stubs.c 2009-09-01 18:24:08.000000000
+0200
@@ -41,10 +41,17 @@
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),
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |