rpms/nvidia-settings/F-12 .cvsignore, 1.3, 1.4 nvidia-settings.spec, 1.4, 1.5 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6055/F-12
Modified Files:
.cvsignore nvidia-settings.spec sources
Log Message:
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Feb 2010 19:49:46 -0000 1.3
+++ .cvsignore 28 Apr 2010 21:44:52 -0000 1.4
@@ -1 +1 @@
-nvidia-settings-195.36.08.tar.gz
+nvidia-settings-195.36.24.tar.gz
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/nvidia-settings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-settings.spec 28 Feb 2010 21:11:24 -0000 1.4
+++ nvidia-settings.spec 28 Apr 2010 21:44:52 -0000 1.5
@@ -1,13 +1,13 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 195.36.08
+%global nversion 195.36.24
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 3.4%{?dist}
+Release: 4%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -17,6 +17,7 @@
Source1: nvidia-settings.desktop
Patch0: nvidia-settings-1.0-default.patch
Patch1: nvidia-settings-1.0-lm.patch
+Patch2: 03_do_not_exit_on_no_scanout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -52,6 +53,7 @@
%setup -q
%patch0 -p1 -b .default
%patch1 -p1 -b .lm
+%patch2 -p1 -b .noscanout
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
@@ -87,8 +89,13 @@
%changelog
+* Wed Apr 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-4
+- Update internal to 195.36.24
+- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
+
* Sun Feb 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-3.4
- Update internal version to 195.36.08
+- Add patch for -lm
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Feb 2010 19:49:46 -0000 1.3
+++ sources 28 Apr 2010 21:44:52 -0000 1.4
@@ -1 +1 @@
-1d3c4e64169abc8f77442f9a2c1305a9 nvidia-settings-195.36.08.tar.gz
+43008cf2cec84fa27ee6f315845d50f7 nvidia-settings-195.36.24.tar.gz
14 years
rpms/nvidia-settings/F-11 .cvsignore, 1.2, 1.3 nvidia-settings.spec, 1.1, 1.2 sources, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6055/F-11
Modified Files:
.cvsignore nvidia-settings.spec sources
Log Message:
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Nov 2009 14:48:13 -0000 1.2
+++ .cvsignore 28 Apr 2010 21:44:52 -0000 1.3
@@ -1 +1 @@
-nvidia-settings-190.42.tar.gz
+nvidia-settings-195.36.24.tar.gz
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/nvidia-settings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-settings.spec 22 Nov 2009 14:48:13 -0000 1.1
+++ nvidia-settings.spec 28 Apr 2010 21:44:52 -0000 1.2
@@ -1,13 +1,13 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 190.42
+%global nversion 195.36.24
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 3.2%{?dist}
+Release: 4%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -16,6 +16,8 @@
Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
Source1: nvidia-settings.desktop
Patch0: nvidia-settings-1.0-default.patch
+Patch1: nvidia-settings-1.0-lm.patch
+Patch2: 03_do_not_exit_on_no_scanout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -50,6 +52,8 @@
%prep
%setup -q
%patch0 -p1 -b .default
+%patch1 -p1 -b .lm
+%patch2 -p1 -b .noscanout
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
@@ -85,6 +89,14 @@
%changelog
+* Wed Apr 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-4
+- Update internal to 195.36.24
+- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
+
+* Sun Feb 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-3.4
+- Update internal version to 195.36.08
+- Add patch for -lm
+
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Nov 2009 14:48:13 -0000 1.2
+++ sources 28 Apr 2010 21:44:52 -0000 1.3
@@ -1 +1 @@
-eb0cbb9f57ecf0d5a4a4804b7e257b10 nvidia-settings-190.42.tar.gz
+43008cf2cec84fa27ee6f315845d50f7 nvidia-settings-195.36.24.tar.gz
14 years
rpms/nvidia-settings/devel 03_do_not_exit_on_no_scanout.patch, NONE, 1.1 nvidia-settings.spec, 1.3, 1.4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5650
Modified Files:
nvidia-settings.spec .cvsignore sources
Added Files:
03_do_not_exit_on_no_scanout.patch
Log Message:
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
03_do_not_exit_on_no_scanout.patch:
ctkdisplayconfig-utils.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE 03_do_not_exit_on_no_scanout.patch ---
diff -Nurp nvidia-settings-195.36.08.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-195.36.08/src/gtk+-2.x/ctkdisplayconfig-utils.c
--- nvidia-settings-195.36.08.orig/src/gtk+-2.x/ctkdisplayconfig-utils.c 2010-02-25 14:44:28.000000000 +0100
+++ nvidia-settings-195.36.08/src/gtk+-2.x/ctkdisplayconfig-utils.c 2010-04-06 19:47:14.335936746 +0200
@@ -2112,11 +2112,14 @@ static int gpu_add_screen_from_server(nv
/* See if the screen is set to not scanout */
ret = NvCtrlGetAttribute(screen->handle, NV_CTRL_NO_SCANOUT, &val);
if (ret != NvCtrlSuccess) {
+ /*
*err_str = g_strdup_printf("Failed to query NoScanout for "
"screen %d.",
screen_id);
nv_warning_msg(*err_str);
goto fail;
+ */
+ val = NV_CTRL_NO_SCANOUT_DISABLED;
}
screen->no_scanout = (val == NV_CTRL_NO_SCANOUT_ENABLED) ? TRUE : FALSE;
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-settings.spec 28 Feb 2010 20:55:18 -0000 1.3
+++ nvidia-settings.spec 28 Apr 2010 21:41:49 -0000 1.4
@@ -1,13 +1,13 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 195.36.08
+%global nversion 195.36.24
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 3.4%{?dist}
+Release: 4%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
@@ -17,6 +17,7 @@
Source1: nvidia-settings.desktop
Patch0: nvidia-settings-1.0-default.patch
Patch1: nvidia-settings-1.0-lm.patch
+Patch2: 03_do_not_exit_on_no_scanout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -52,6 +53,7 @@
%setup -q
%patch0 -p1 -b .default
%patch1 -p1 -b .lm
+%patch2 -p1 -b .noscanout
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
@@ -87,6 +89,10 @@
%changelog
+* Wed Apr 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-4
+- Update internal to 195.36.24
+- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
+
* Sun Feb 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-3.4
- Update internal version to 195.36.08
- Add patch for -lm
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Feb 2010 19:39:24 -0000 1.3
+++ .cvsignore 28 Apr 2010 21:41:49 -0000 1.4
@@ -1 +1 @@
-nvidia-settings-195.36.08.tar.gz
+nvidia-settings-195.36.24.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Feb 2010 19:39:24 -0000 1.3
+++ sources 28 Apr 2010 21:41:49 -0000 1.4
@@ -1 +1 @@
-1d3c4e64169abc8f77442f9a2c1305a9 nvidia-settings-195.36.08.tar.gz
+43008cf2cec84fa27ee6f315845d50f7 nvidia-settings-195.36.24.tar.gz
14 years
rpms/nvidia-kmod/F-12 nvidia-kmod.spec, 1.85, 1.86 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29189
Modified Files:
nvidia-kmod.spec .cvsignore sources
Log Message:
- Update to 195.36.24
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/nvidia-kmod.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- nvidia-kmod.spec 22 Apr 2010 09:26:31 -0000 1.85
+++ nvidia-kmod.spec 28 Apr 2010 19:54:26 -0000 1.86
@@ -3,13 +3,13 @@
# "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
Epoch: 1
-Version: 195.36.15
+Version: 195.36.24
# Taken over by kmodtool
-Release: 1%{?dist}.5
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
%changelog
+* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
+- Update to 195.36.24
+
* Thu Apr 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:195.36.15-1.5
- rebuild for new kernel
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 27 Mar 2010 10:29:34 -0000 1.19
+++ .cvsignore 28 Apr 2010 19:54:26 -0000 1.20
@@ -1 +1 @@
-nvidia-kmod-data-195.36.15.tar.bz2
+nvidia-kmod-data-195.36.24.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 27 Mar 2010 10:29:34 -0000 1.19
+++ sources 28 Apr 2010 19:54:26 -0000 1.20
@@ -1 +1 @@
-0f7faf28b2f224b57bf7d09296330f39 nvidia-kmod-data-195.36.15.tar.bz2
+f6743503f98dd95f44ddb9b6f87117a5 nvidia-kmod-data-195.36.24.tar.bz2
14 years
rpms/xorg-x11-drv-nvidia/F-12 sources, 1.19, 1.20 .cvsignore, 1.19, 1.20 xorg-x11-drv-nvidia.spec, 1.42, 1.43
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29027
Modified Files:
sources .cvsignore xorg-x11-drv-nvidia.spec
Log Message:
Update to 195.36.24
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 27 Mar 2010 10:08:51 -0000 1.19
+++ sources 28 Apr 2010 19:51:50 -0000 1.20
@@ -1,2 +1,2 @@
-b09b45113585524b08b3b2acfdf4a290 NVIDIA-Linux-x86-195.36.15-pkg0.run
-82ff23e6d02b9f208c618ec17c60ca29 NVIDIA-Linux-x86_64-195.36.15-pkg0.run
+97d3e5f69707092aa643fb901bb94003 NVIDIA-Linux-x86-195.36.24-pkg0.run
+9d58114ed8c89cd66fbaccad0c997ee8 NVIDIA-Linux-x86_64-195.36.24-pkg0.run
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 27 Mar 2010 10:08:51 -0000 1.19
+++ .cvsignore 28 Apr 2010 19:51:50 -0000 1.20
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-195.36.15-pkg0.run
-NVIDIA-Linux-x86_64-195.36.15-pkg0.run
+NVIDIA-Linux-x86-195.36.24-pkg0.run
+NVIDIA-Linux-x86_64-195.36.24-pkg0.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xorg-x11-drv-nvidia.spec 27 Mar 2010 10:08:51 -0000 1.42
+++ xorg-x11-drv-nvidia.spec 28 Apr 2010 19:51:50 -0000 1.43
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 195.36.15
+Version: 195.36.24
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -351,6 +351,9 @@
%changelog
+* Sat Apr 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.24-1
+- Update to 195.36.24
+
* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1:195.36.15-1
- Update to 195.36.15
- Use macro for Epoch
14 years
rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.2.0-32bit.patch, NONE, 1.1 VirtualBox-OSE-3.2.0-noansi.patch, NONE, 1.1 VirtualBox-OSE-3.2.0-noupdate.patch, NONE, 1.1 VirtualBox-OSE-3.2.0-xorg17.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 VirtualBox-OSE.spec, 1.46, 1.47 sources, 1.16, 1.17 VirtualBox-OSE-3.0.4-noansi.patch, 1.1, NONE VirtualBox-OSE-3.1.0-noupdate.patch, 1.1, NONE VirtualBox-OSE-3.1.0-xorg17.patch, 1.1, NONE VirtualBox-OSE-3.1.6-32bit.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-serv11510
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.2.0-32bit.patch
VirtualBox-OSE-3.2.0-noansi.patch
VirtualBox-OSE-3.2.0-noupdate.patch
VirtualBox-OSE-3.2.0-xorg17.patch
Removed Files:
VirtualBox-OSE-3.0.4-noansi.patch
VirtualBox-OSE-3.1.0-noupdate.patch
VirtualBox-OSE-3.1.0-xorg17.patch
VirtualBox-OSE-3.1.6-32bit.patch
Log Message:
* Wed Apr 28 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.1.beta1
- 3.2.0 beta
- Build i686 on el6
VirtualBox-OSE-3.2.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 18 ++++++++++++++----
3 files changed, 23 insertions(+), 5 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-32bit.patch ---
>From 6ea579d79b86cff1a80899b5dcc22f4aa5a47b2b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 26 Mar 2010 04:44:55 +0100
Subject: [PATCH 3/4] Build on x86_64 without 32bit toolchain.
This disables the check for 32bit toolchain and tests that need it
(boo).
---
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 17 ++++++++++++++---
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 59f4e4c..5ef90de 100755
--- a/configure
+++ b/configure
@@ -2491,7 +2491,7 @@ if [ "$OS" = "linux" ]; then
fi
check_libcap
check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
fi
[ -n "$SETUP_WINE" ] && setup_wine
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 5b46a7e..b2d34ff 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -29,23 +29,29 @@ BLDDIRS += $(VBOX_DEVICES_TEST_OUT_DIR)
# We setup one 'other' target for executing the structure & alignment
# validation testcases. Perhaps a bit hackish, but extremely useful.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
OTHERS += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
endif
endif
+endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+endif
ifdef VBOX_WITH_RAW_MODE
#
# The testcase generator.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSizeRC
+endif
tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe
tstDeviceStructSizeRC_DEFS = VBOX_WITH_RAW_MODE
ifdef VBOX_WITH_USB
@@ -88,7 +94,9 @@ endif # VBOX_WITH_RAW_MODE
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS =
ifdef VBOX_WITH_USB
diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk
index eb051ca..3b8beb8 100644
--- a/src/VBox/VMM/testcase/Makefile.kmk
+++ b/src/VBox/VMM/testcase/Makefile.kmk
@@ -21,9 +21,15 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstAsmStructs tstGlobalConfig tstInstrEmul
+PROGRAMS += tstGlobalConfig tstInstrEmul
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
+endif
ifdef VBOX_WITH_RAW_MODE
- PROGRAMS += tstVMStructRC tstAsmStructsRC tstVMM tstVMM-HwAccm
+ PROGRAMS += tstVMM tstVMM-HwAccm
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
ifneq ($(KBUILD_TARGET),win)
PROGRAMS += tstVMMFork
endif
@@ -61,16 +67,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
#
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
OTHERS += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+ endif
endif
endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
- $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+endif
+TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
OTHER_CLEAN += \
--
1.7.0.1
VirtualBox-OSE-3.2.0-noansi.patch:
Config.kmk | 4 ++--
src/libs/xpcom18a4/Makefile.kmk | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-noansi.patch ---
>From d1bc4c5b0e1dd57f798efaf04b0430e22ba27a73 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 12:11:49 +0200
Subject: [PATCH 4/4] Build as c99
On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h
contains a non-iso/ansi c inline assembly construct.
---
Config.kmk | 4 ++--
src/libs/xpcom18a4/Makefile.kmk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index 28c076c..f1d6651 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3791,7 +3791,7 @@ if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) # the gnu ld gu
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64
endif
-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=c99
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=gnu99
TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants
TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \
@@ -3807,7 +3807,7 @@ TEMPLATE_VBOXGUESTR3XORGMOD = VBox X.org Guest Module
TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
+TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=gnu99
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
ifeq ($(KBUILD_TARGET_ARCH),amd64)
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
diff --git a/src/libs/xpcom18a4/Makefile.kmk b/src/libs/xpcom18a4/Makefile.kmk
index 5f5b27e..7ad05c4 100644
--- a/src/libs/xpcom18a4/Makefile.kmk
+++ b/src/libs/xpcom18a4/Makefile.kmk
@@ -76,7 +76,7 @@ TEMPLATE_XPCOM_CFLAGS.release = -O
TEMPLATE_XPCOM_CFLAGS.profile = -O
TEMPLATE_XPCOM_CFLAGS.freebsd = -pthread
TEMPLATE_XPCOM_CFLAGS.l4 = -nostdinc
-TEMPLATE_XPCOM_CFLAGS.linux = -pthread -ansi
+TEMPLATE_XPCOM_CFLAGS.linux = -pthread
TEMPLATE_XPCOM_CFLAGS.solaris = -fno-omit-frame-pointer # for now anyway.
TEMPLATE_XPCOM_DEFS = MOZILLA_CLIENT=1 NDEBUG=1 _IMPL_NS_COM \
XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \
--
1.7.0.1
VirtualBox-OSE-3.2.0-noupdate.patch:
VBoxUpdateDlg.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-noupdate.patch ---
>From 631f2a6aa525f51fa38a3b59550d80e452181e5f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 11:53:40 +0200
Subject: [PATCH 1/4] Disable automatic check for updates
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
---
.../Frontends/VirtualBox/src/VBoxUpdateDlg.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
index c23e908..78b536d 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
@@ -183,7 +183,11 @@ void VBoxUpdateData::decode()
if (parser.size() > 1)
{
QDate date = QDate::fromString (parser [1], Qt::ISODate);
- mDate = date.isValid() ? date : QDate::currentDate();
+ if (date.isValid()) {
+ mDate = date;
+ } else {
+ mPeriodIndex = PeriodNever;
+ }
}
/* Parse 'branch' value */
--
1.7.0.1
VirtualBox-OSE-3.2.0-xorg17.patch:
vboxmouse/Makefile.kmk | 26 ++++++++++-------------
vboxvideo/Makefile.kmk | 55 +++++++++++++++++++++++++++++--------------------
2 files changed, 45 insertions(+), 36 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-xorg17.patch ---
>From 074b5d40bed06b697f6c99f4a14d258c24a1b51c Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 12:04:23 +0200
Subject: [PATCH 2/4] Build drivers for XOrg 1.7 ABI
And only them.
---
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 26 +++++------
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 54 +++++++++++++++----------
2 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index da2033c..83a0b76 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -59,7 +59,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
@@ -80,7 +80,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 := \
@@ -112,7 +112,7 @@ vboxmouse_drv_13_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 := \
@@ -133,7 +133,7 @@ endif
#
# 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 := \
@@ -148,7 +148,7 @@ vboxmouse_drv_15_SOURCES = \
#
# 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 := \
@@ -167,15 +167,13 @@ vboxmouse_drv_16_SOURCES = \
DLLS += vboxmouse_drv_17
vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxmouse_drv_17_INCS := \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \
+ /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
@@ -203,7 +201,7 @@ vboxmouse_drv_18_SOURCES = \
# 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
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 41d5f80..118fc83 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -83,7 +83,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 += \
@@ -106,7 +106,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)
@@ -122,7 +122,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) VBOXVIDEO_13
@@ -145,7 +145,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_13_DEFS)
@@ -165,7 +165,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_13_DEFS) NO_ANSIC PCIACCESS \
@@ -193,7 +193,7 @@ endif
#
# 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)
@@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15
+ /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_drv_15_SOURCES)
@@ -263,7 +275,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
# 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
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--
1.7.0.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 26 Mar 2010 13:14:23 -0000 1.16
+++ .cvsignore 28 Apr 2010 16:24:48 -0000 1.17
@@ -1,2 +1,2 @@
-VirtualBox-3.1.6-OSE.tar.bz2
+VirtualBox-3.2.0_BETA1-OSE.tar.bz2
UserManual.pdf
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- VirtualBox-OSE.spec 26 Mar 2010 13:14:23 -0000 1.46
+++ VirtualBox-OSE.spec 28 Apr 2010 16:24:49 -0000 1.47
@@ -7,29 +7,35 @@
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
Name: VirtualBox-OSE
-Version: 3.1.6
-Release: 1%{?dist}
+Version: 3.2.0
+Release: 0.1.beta1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
License: GPLv2 or (GPLv2 and CDDL)
URL: http://www.virtualbox.org/wiki/VirtualBox
-Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version...
-Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+# You can download the binaries here:
+# http://213.239.192.22/download/3.2.0_BETA1/
+# (don't worry about the IP address, this is a temporary Oracle server)
+# -- From: Frank Mehnert
+Source0: http://213.239.192.22/download/%{version}_BETA1/VirtualBox-%{version}_BET...
+Source1: http://213.239.192.22/download/%{version}_BETA1/UserManual.pdf
+#Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version...
+#Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
Source3: VirtualBox-OSE-90-vboxdrv.rules
Source5: VirtualBox-OSE-60-vboxguest.rules
Source6: VirtualBox-OSE.modules
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE.blacklist-kvm
-Patch1: VirtualBox-OSE-3.1.0-noupdate.patch
+Patch1: VirtualBox-OSE-3.2.0-noupdate.patch
Patch2: VirtualBox-OSE-3.1.0-strings.patch
Patch3: VirtualBox-OSE-3.1.0-libcxx.patch
-Patch5: VirtualBox-OSE-3.1.0-xorg17.patch
+Patch5: VirtualBox-OSE-3.2.0-xorg17.patch
Patch9: VirtualBox-OSE-3.0.4-optflags.patch
-Patch10: VirtualBox-OSE-3.1.6-32bit.patch
+Patch10: VirtualBox-OSE-3.2.0-32bit.patch
Patch11: VirtualBox-OSE-3.1.0-visibility.patch
-Patch12: VirtualBox-OSE-3.0.4-noansi.patch
+Patch12: VirtualBox-OSE-3.2.0-noansi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,17 +54,19 @@
BuildRequires: qt4-devel
BuildRequires: gsoap-devel
BuildRequires: xz
+BuildRequires: pam-devel
# For the X11 module
BuildRequires: libdrm-devel
BuildRequires: libpciaccess-devel
BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libOSMesa-devel
BuildRequires: pixman-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-server-source
# Plague-specific weirdness
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
ExclusiveArch: i586 x86_64
@@ -165,6 +173,7 @@
# the commercially supported version to minimize confusion
# Directory structure
+install -d $RPM_BUILD_ROOT/%{_lib}/security
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
@@ -253,9 +262,6 @@
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
@@ -273,6 +279,9 @@
obj/bin/additions/VBoxOGL*.so
ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
+install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \
+ obj/bin/additions/pam_vbox.so
+
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
@@ -316,12 +325,14 @@
diff -u <((find obj/bin/additions/* -maxdepth 0 -type f \
-not -name 'autorun.sh' \
-not -name '*_drv*' \
+ -not -name 'pam_vbox.so' \
-exec basename '{}' \;
find obj/bin/* -maxdepth 0 -type f \
-not -name 'tst*' \
-not -name 'SUP*' \
-not -name 'VBox.sh' \
-not -name 'xpidl' \
+ -not -name 'scm' \
-not -name 'vboxkeyboard.tar.gz' \
-exec basename '{}' \;) |sort) \
<(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \
@@ -330,7 +341,6 @@
$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
@@ -398,11 +408,11 @@
%files guest
%defattr(-,root,root,-)
+/%{_lib}/security/pam_vbox.so
%{_bindir}/mount.vboxsf
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
%{_bindir}/VBoxService
-%{_bindir}/VBoxRandR
%{_libdir}/xorg/modules/drivers/*
%{_libdir}/dri/*
%{_libdir}/VBoxOGL*.so
@@ -421,6 +431,10 @@
%changelog
+* Wed Apr 28 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.1.beta1
+- 3.2.0 beta
+- Build i686 on el6
+
* Fri Mar 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.6-1
- New upstream release
- Workaround trouble linking with new linker
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 26 Mar 2010 13:14:23 -0000 1.16
+++ sources 28 Apr 2010 16:24:49 -0000 1.17
@@ -1,2 +1,2 @@
-6cb3c8161ad878c2a2732137c1621dc4 VirtualBox-3.1.6-OSE.tar.bz2
-8561a2b883fbede1e93b7dfb2238e7cc UserManual.pdf
+8d5da7e2115346cac837edc7804d9a82 VirtualBox-3.2.0_BETA1-OSE.tar.bz2
+1c48122ac2aa89fb9b9e69ac74889ce8 UserManual.pdf
--- VirtualBox-OSE-3.0.4-noansi.patch DELETED ---
--- VirtualBox-OSE-3.1.0-noupdate.patch DELETED ---
--- VirtualBox-OSE-3.1.0-xorg17.patch DELETED ---
--- VirtualBox-OSE-3.1.6-32bit.patch DELETED ---
14 years
rpms/get_iplayer/F-12 get_iplayer.spec, NONE, 1.1 options, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29843
Modified Files:
.cvsignore sources
Added Files:
get_iplayer.spec options
Log Message:
importF
--- NEW FILE get_iplayer.spec ---
Name: get_iplayer
Version: 2.76
Release: 1%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
License: GPLv3+
URL: http://github.com/jjl/get_iplayer
# Commit 8f6d751ff6ec689213c4c7f98d660dd273c8fb7c
Source0: http://download.github.com/jjl-get_iplayer-8f6d751.tar.gz
Source1: options
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
BuildArch: noarch
%description
get_iplayer is a tool for listing, recording and streaming BBC iPlayer TV
programmes, and other programmes via 3rd-party plugins.
%prep
%setup -q -n jjl-get_iplayer-8f6d751
sed /PROMETHEUS/Q -i README
%build
%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m0755 get_iplayer $RPM_BUILD_ROOT%{_bindir}/get_iplayer
install -p -D -m0644 man/get_iplayer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/get_iplayer.1.gz
install -p -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/get_iplayer/options
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/get_iplayer
%{_mandir}/man1/get_iplayer.1.*
%dir %{_sysconfdir}/get_iplayer
%config(noreplace) %{_sysconfdir}/get_iplayer/options
%doc LICENSE.txt
%doc README
%changelog
* Tue Apr 20 2010 David Woodhouse <dwmw2(a)infradead.org> 2.76-1
- Initial package
--- NEW FILE options ---
flvstreamer /usr/bin/rtmpdump
rtmptvopts --swfVfy http://www.bbc.co.uk/emp/10player.swf
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 28 Apr 2010 12:54:13 -0000 1.1
+++ .cvsignore 28 Apr 2010 12:59:49 -0000 1.2
@@ -0,0 +1 @@
+jjl-get_iplayer-8f6d751.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 28 Apr 2010 12:54:13 -0000 1.1
+++ sources 28 Apr 2010 12:59:49 -0000 1.2
@@ -0,0 +1 @@
+53fe2b4d0e643453bde670991abbb82b jjl-get_iplayer-8f6d751.tar.gz
14 years
rpms/get_iplayer/F-13 get_iplayer.spec, NONE, 1.1 options, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29800
Modified Files:
.cvsignore sources
Added Files:
get_iplayer.spec options
Log Message:
import
--- NEW FILE get_iplayer.spec ---
Name: get_iplayer
Version: 2.76
Release: 1%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
License: GPLv3+
URL: http://github.com/jjl/get_iplayer
# Commit 8f6d751ff6ec689213c4c7f98d660dd273c8fb7c
Source0: http://download.github.com/jjl-get_iplayer-8f6d751.tar.gz
Source1: options
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
BuildArch: noarch
%description
get_iplayer is a tool for listing, recording and streaming BBC iPlayer TV
programmes, and other programmes via 3rd-party plugins.
%prep
%setup -q -n jjl-get_iplayer-8f6d751
sed /PROMETHEUS/Q -i README
%build
%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m0755 get_iplayer $RPM_BUILD_ROOT%{_bindir}/get_iplayer
install -p -D -m0644 man/get_iplayer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/get_iplayer.1.gz
install -p -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/get_iplayer/options
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/get_iplayer
%{_mandir}/man1/get_iplayer.1.*
%dir %{_sysconfdir}/get_iplayer
%config(noreplace) %{_sysconfdir}/get_iplayer/options
%doc LICENSE.txt
%doc README
%changelog
* Tue Apr 20 2010 David Woodhouse <dwmw2(a)infradead.org> 2.76-1
- Initial package
--- NEW FILE options ---
flvstreamer /usr/bin/rtmpdump
rtmptvopts --swfVfy http://www.bbc.co.uk/emp/10player.swf
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 28 Apr 2010 12:54:13 -0000 1.1
+++ .cvsignore 28 Apr 2010 12:59:38 -0000 1.2
@@ -0,0 +1 @@
+jjl-get_iplayer-8f6d751.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 28 Apr 2010 12:54:13 -0000 1.1
+++ sources 28 Apr 2010 12:59:38 -0000 1.2
@@ -0,0 +1 @@
+53fe2b4d0e643453bde670991abbb82b jjl-get_iplayer-8f6d751.tar.gz
14 years
rpms/get_iplayer/devel get_iplayer.spec, NONE, 1.1 options, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by David Woodhouse
Author: dwmw2
Update of /cvs/free/rpms/get_iplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29686
Modified Files:
.cvsignore sources
Added Files:
get_iplayer.spec options
Log Message:
import
--- NEW FILE get_iplayer.spec ---
Name: get_iplayer
Version: 2.76
Release: 1%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
Group: Applications/Internet
License: GPLv3+
URL: http://github.com/jjl/get_iplayer
# Commit 8f6d751ff6ec689213c4c7f98d660dd273c8fb7c
Source0: http://download.github.com/jjl-get_iplayer-8f6d751.tar.gz
Source1: options
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed
Requires: rtmpdump ffmpeg id3v2 lame mplayer vlc
BuildArch: noarch
%description
get_iplayer is a tool for listing, recording and streaming BBC iPlayer TV
programmes, and other programmes via 3rd-party plugins.
%prep
%setup -q -n jjl-get_iplayer-8f6d751
sed /PROMETHEUS/Q -i README
%build
%install
rm -rf $RPM_BUILD_ROOT
install -p -D -m0755 get_iplayer $RPM_BUILD_ROOT%{_bindir}/get_iplayer
install -p -D -m0644 man/get_iplayer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/get_iplayer.1.gz
install -p -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/get_iplayer/options
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/get_iplayer
%{_mandir}/man1/get_iplayer.1.*
%dir %{_sysconfdir}/get_iplayer
%config(noreplace) %{_sysconfdir}/get_iplayer/options
%doc LICENSE.txt
%doc README
%changelog
* Tue Apr 20 2010 David Woodhouse <dwmw2(a)infradead.org> 2.76-1
- Initial package
--- NEW FILE options ---
flvstreamer /usr/bin/rtmpdump
rtmptvopts --swfVfy http://www.bbc.co.uk/emp/10player.swf
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 28 Apr 2010 12:54:13 -0000 1.1
+++ .cvsignore 28 Apr 2010 12:59:05 -0000 1.2
@@ -0,0 +1 @@
+jjl-get_iplayer-8f6d751.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 28 Apr 2010 12:54:13 -0000 1.1
+++ sources 28 Apr 2010 12:59:05 -0000 1.2
@@ -0,0 +1 @@
+53fe2b4d0e643453bde670991abbb82b jjl-get_iplayer-8f6d751.tar.gz
14 years
rpms/get_iplayer/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/get_iplayer/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsD29085/rpms/get_iplayer/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module get_iplayer
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: get_iplayer
# $Id: Makefile,v 1.1 2010/04/28 12:54:13 kwizart Exp $
NAME := get_iplayer
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
14 years