rpmfusion-commits
September 2012
rpmfusion-commits@lists.rpmfusion.org
- 17 participants
- 284 discussions
rpms/VirtualBox/F-17 VirtualBox-4.2.0-xorg111.patch, NONE, 1.1 VirtualBox.spec, 1.9, 1.10 VirtualBox-4.1.20-libcxx.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19174
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.2.0-xorg111.patch
Removed Files:
VirtualBox-4.1.20-libcxx.patch
Log Message:
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
- On F16, need add one xorg header for xorg-x11-server 1.11.x
VirtualBox-4.2.0-xorg111.patch:
fakedri_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE VirtualBox-4.2.0-xorg111.patch ---
On F16, need add one xorg header for xorg-x11-server 1.11.x
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-23 01:17:29.985646512 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-30 18:37:16.956945495 +0100
@@ -32,7 +32,7 @@ _glapi_get_dispatch(void);
extern void
_glapi_set_dispatch(struct _glapi_table *dispatch);
-//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VirtualBox.spec 30 Sep 2012 16:44:19 -0000 1.9
+++ VirtualBox.spec 30 Sep 2012 21:16:07 -0000 1.10
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.0
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -43,6 +43,7 @@
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
+Patch25: VirtualBox-4.2.0-xorg111.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -192,6 +193,9 @@
%endif
%patch23 -p1 -b .mesa
%patch24 -p1 -b .guestlib
+%if 0%{?fedora} < 17
+%patch25 -p1 -b .xorg111
+%endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
@@ -559,6 +563,9 @@
%changelog
+* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
+- On F16, need add one xorg header for xorg-x11-server 1.11.x
+
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
--- VirtualBox-4.1.20-libcxx.patch DELETED ---
11 years, 6 months
- 1
- 0
rpms/VirtualBox/F-18 VirtualBox-4.2.0-xorg111.patch, NONE, 1.1 VirtualBox.spec, 1.22, 1.23
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19134
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.2.0-xorg111.patch
Log Message:
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
- On F16, need add one xorg header for xorg-x11-server 1.11.x
VirtualBox-4.2.0-xorg111.patch:
fakedri_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE VirtualBox-4.2.0-xorg111.patch ---
On F16, need add one xorg header for xorg-x11-server 1.11.x
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-23 01:17:29.985646512 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-30 18:37:16.956945495 +0100
@@ -32,7 +32,7 @@ _glapi_get_dispatch(void);
extern void
_glapi_set_dispatch(struct _glapi_table *dispatch);
-//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- VirtualBox.spec 23 Sep 2012 14:33:25 -0000 1.22
+++ VirtualBox.spec 30 Sep 2012 21:15:52 -0000 1.23
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.0
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -43,6 +43,7 @@
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
+Patch25: VirtualBox-4.2.0-xorg111.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -192,6 +193,9 @@
%endif
%patch23 -p1 -b .mesa
%patch24 -p1 -b .guestlib
+%if 0%{?fedora} < 17
+%patch25 -p1 -b .xorg111
+%endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
@@ -559,6 +563,9 @@
%changelog
+* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
+- On F16, need add one xorg header for xorg-x11-server 1.11.x
+
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
11 years, 6 months
- 1
- 0
rpms/VirtualBox-kmod/F-16 VirtualBox-kmod.spec,1.16,1.17
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18513
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-16/VirtualBox-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VirtualBox-kmod.spec 17 Sep 2012 21:45:39 -0000 1.16
+++ VirtualBox-kmod.spec 30 Sep 2012 21:00:17 -0000 1.17
@@ -3,22 +3,24 @@
# "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
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel beta3
+#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+%global vboxrel 4
+%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.1.20
-Release: 1%{?dist}.1
+Version: 4.2.0
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -27,7 +29,7 @@
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt
-%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc = %{version}%{?prereltag}, xz, time
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
# needed for plague to make sure it builds for i586 and i686
@@ -96,6 +98,9 @@
%changelog
+* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
+- New upstream release.
+
* Mon Sep 17 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.20-1.1
- Rebuilt for updated kernel
11 years, 6 months
- 1
- 0
rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.21,1.22
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18034
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-17/VirtualBox-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- VirtualBox-kmod.spec 27 Sep 2012 19:09:02 -0000 1.21
+++ VirtualBox-kmod.spec 30 Sep 2012 20:50:30 -0000 1.22
@@ -3,22 +3,24 @@
# "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
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel beta3
+#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+%global vboxrel 3
+%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.1.20
-Release: 2%{?dist}.2
+Version: 4.2.0
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -27,7 +29,7 @@
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt
-%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc = %{version}%{?prereltag}, xz, time
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
# needed for plague to make sure it builds for i586 and i686
@@ -96,6 +98,9 @@
%changelog
+* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
+- New upstream release.
+
* Thu Sep 27 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.20-2.2
- Rebuilt for updated kernel
11 years, 6 months
- 1
- 0
rpms/VirtualBox/F-16 VirtualBox-4.2.0-xorg111.patch, NONE, 1.1 VirtualBox.spec, 1.8, 1.9
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15160
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.2.0-xorg111.patch
Log Message:
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
- On F16, need add one xorg header for xorg-x11-server 1.11.x
VirtualBox-4.2.0-xorg111.patch:
fakedri_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE VirtualBox-4.2.0-xorg111.patch ---
On F16, need add one xorg header for xorg-x11-server 1.11.x
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-23 01:17:29.985646512 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-30 18:37:16.956945495 +0100
@@ -32,7 +32,7 @@ _glapi_get_dispatch(void);
extern void
_glapi_set_dispatch(struct _glapi_table *dispatch);
-//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VirtualBox.spec 30 Sep 2012 19:37:20 -0000 1.8
+++ VirtualBox.spec 30 Sep 2012 19:41:48 -0000 1.9
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.0
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -43,6 +43,7 @@
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
+Patch25: VirtualBox-4.2.0-xorg111.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -192,6 +193,9 @@
%endif
%patch23 -p1 -b .mesa
%patch24 -p1 -b .guestlib
+%if 0%{?fedora} < 17
+%patch25 -p1 -b .xorg111
+%endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
@@ -559,6 +563,9 @@
%changelog
+* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
+- On F16, need add one xorg header for xorg-x11-server 1.11.x
+
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
11 years, 6 months
- 1
- 0
rpms/VirtualBox/devel VirtualBox-4.2.0-xorg111.patch, NONE, 1.1 VirtualBox.spec, 1.28, 1.29
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15048
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.2.0-xorg111.patch
Log Message:
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
- On F16, need add one xorg header for xorg-x11-server 1.11.x
VirtualBox-4.2.0-xorg111.patch:
fakedri_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE VirtualBox-4.2.0-xorg111.patch ---
On F16, need add one xorg header for xorg-x11-server 1.11.x
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-23 01:17:29.985646512 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-09-30 18:37:16.956945495 +0100
@@ -32,7 +32,7 @@ _glapi_get_dispatch(void);
extern void
_glapi_set_dispatch(struct _glapi_table *dispatch);
-//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- VirtualBox.spec 23 Sep 2012 13:49:23 -0000 1.28
+++ VirtualBox.spec 30 Sep 2012 19:40:30 -0000 1.29
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.0
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -43,6 +43,7 @@
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
+Patch25: VirtualBox-4.2.0-xorg111.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -192,6 +193,9 @@
%endif
%patch23 -p1 -b .mesa
%patch24 -p1 -b .guestlib
+%if 0%{?fedora} < 17
+%patch25 -p1 -b .xorg111
+%endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
@@ -559,6 +563,9 @@
%changelog
+* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
+- On F16, need add one xorg header for xorg-x11-server 1.11.x
+
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
11 years, 6 months
- 1
- 0
rpms/VirtualBox/F-16 VirtualBox-4.2.0-32bit.patch, NONE, 1.1 VirtualBox-4.2.0-VBoxGuestLib.patch, NONE, 1.1 VirtualBox-4.2.0-libcxx.patch, NONE, 1.1 VirtualBox-4.2.0-mesa.patch, NONE, 1.1 VirtualBox-4.2.0-xorg17.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 VirtualBox-OSE-4.0.0-makeself.patch, 1.1, 1.2 VirtualBox.spec, 1.7, 1.8 sources, 1.37, 1.38 vboxweb.service, 1.1, 1.2 VirtualBox-4.1.20-libcxx.patch, 1.1, NONE VirtualBox-OSE-3.2.0-visibility.patch, 1.1, NONE VirtualBox-OSE-4.0.0-32bit.patch, 1.1, NONE Virtual
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14823
Modified Files:
.cvsignore VirtualBox-OSE-4.0.0-makeself.patch VirtualBox.spec
sources vboxweb.service
Added Files:
VirtualBox-4.2.0-32bit.patch
VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-libcxx.patch VirtualBox-4.2.0-mesa.patch
VirtualBox-4.2.0-xorg17.patch
Removed Files:
VirtualBox-4.1.20-libcxx.patch
VirtualBox-OSE-3.2.0-visibility.patch
VirtualBox-OSE-4.0.0-32bit.patch
VirtualBox-OSE-4.1.10-mesa.patch
VirtualBox-OSE-4.1.2-testmangle.patch
VirtualBox-OSE-4.1.2-usblib.patch
VirtualBox-OSE-4.1.4-xorg17.patch
Log Message:
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 13 ++++++++++---
3 files changed, 19 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.0-32bit.patch ---
>From a9548501755beeec6fa11b0c261f167164a4ee70 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] 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 | 9 +++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 42ce775..0932637 100755
--- a/configure
+++ b/configure
@@ -2525,7 +2525,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
# tools/common/makeself*
#[ $OSE -ge 1 ] && check_makeself
fi
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 4debf81..59dae0d 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \
# 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_DEVICES_TESTS_FEATURES)
tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp
@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSize_INCS = \
--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit 2012-07-18 09:58:08.000000000 +0100
+++ b/src/VBox/VMM/testcase/Makefile.kmk 2012-09-02 04:04:34.551296386 +0100
@@ -21,9 +21,11 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstAsmStructs
-ifdef VBOX_WITH_RAW_MODE
- PROGRAMS += tstVMStructRC tstAsmStructsRC
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
+ ifdef VBOX_WITH_RAW_MODE
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
endif
if !defined(VBOX_ONLY_EXTPACKS) \
&& ( defined(VBOX_WITH_DTRACE_R3) \
@@ -77,16 +79,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
+endif
ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
VirtualBox-4.2.0-VBoxGuestLib.patch:
Makefile.kmk | 8 ++----
VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++++++++++++++++++++++++++++++++--------
2 files changed, 47 insertions(+), 14 deletions(-)
--- NEW FILE VirtualBox-4.2.0-VBoxGuestLib.patch ---
VBoxGuestR3LibRuntimeXF86.cpp:
Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
xalloc.c and verrorf.c
Author: Sérgio Basto <sergio(a)serjux.com>
--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
VBoxGuestR3LibVideo.cpp \
VBoxGuestR3LibRuntimeXF86.cpp
VBoxGuestR3LibXFree86_INCS = \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/include
VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
--- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
@@ -34,20 +34,55 @@
#include <iprt/log.h>
#include <iprt/mem.h>
#include <iprt/string.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <ctype.h>
extern "C" {
# define XFree86LOADER
-# include <xf86_ansic.h>
# include <errno.h>
# undef size_t
}
+/** Provide an VErrorF function when used stand-alone. */
+void VErrorF(const char *format, va_list args)
+{
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+}
+
+/* When using this file as part of a stand-alone (i.e., non-X-Server
+ * program, then the ultimate output routines have to be defined. */
+
+/** Provide an ErrorF function when used stand-alone. */
+void ErrorF(const char *format, ...)
+{
+ va_list args;
+
+ va_start(args, format);
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+ va_end(args);
+}
+
+void *xalloc(unsigned long n)
+{
+ if (!n)
+ n = 1;
+ return malloc(n);
+}
+
/* This is risky as it restricts call to the ANSI format type specifiers. */
RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
{
va_list args;
int cbRet;
va_start(args, pszFormat);
- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
va_end(args);
return cbRet >= 0 ? cbRet : 0;
}
@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
{
char *pszNext = NULL;
- xf86errno = 0;
- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
+ errno = 0;
+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
if (ppszNext)
*ppszNext = pszNext;
if (RT_UNLIKELY(pszValue == pszNext))
@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
ul = UINT32_MAX;
if (pu32)
*pu32 = (uint32_t) ul;
- if (RT_UNLIKELY(xf86errno == EINVAL))
+ if (RT_UNLIKELY(errno == EINVAL))
return VERR_INVALID_PARAMETER;
- if (RT_UNLIKELY(xf86errno == ERANGE))
+ if (RT_UNLIKELY(errno == ERANGE))
return VWRN_NUMBER_TOO_BIG;
- if (RT_UNLIKELY(xf86errno))
+ if (RT_UNLIKELY(errno))
/* RTErrConvertFromErrno() is not available */
return VERR_UNRESOLVED_ERROR;
if (RT_UNLIKELY(*pszValue == '-'))
@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
if (RT_UNLIKELY(*pszNext))
{
while (*pszNext)
- if (!xf86isspace(*pszNext))
+ if (!isspace(*pszNext))
return VWRN_TRAILING_CHARS;
return VWRN_TRAILING_SPACES;
}
@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
RTDECL(void) RTMemTmpFree(void *pv)
{
- xfree(pv);
+ free(pv);
}
VirtualBox-4.2.0-libcxx.patch:
Config.kmk | 2 +-
configure | 2 +-
src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +---
src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +-
src/VBox/HostDrivers/Support/Makefile.kmk | 2 +-
src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------
src/VBox/HostDrivers/win/Makefile.kmk | 2 +-
src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +-
src/VBox/Installer/win/Resources/Makefile.kmk | 2 +-
src/VBox/Installer/win/Stub/Makefile.kmk | 2 +-
src/VBox/Storage/testcase/Makefile.kmk | 2 +-
src/libs/liblzf-3.4/Makefile.kmk | 2 +-
src/libs/zlib-1.2.6/Makefile.kmk | 3 +--
14 files changed, 19 insertions(+), 22 deletions(-)
--- NEW FILE VirtualBox-4.2.0-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.
Was From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 18 Jun 2010 10:58:14 +0200
diff --git a/Config.kmk b/Config.kmk
index 0ea34d8..2ec388c 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3163,7 +3163,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl
TEMPLATE_VBOXR3EXE_LIBS = \
$(L4_LIBDIR)/libvboxserver.s.so \
$(L4_LIBDIR)/libuc++.0.s.so \
- supc++ gcc_eh gcc \
+ stdc++ \
$(L4_LIBDIR)/libdl.s.so \
$(L4_LIBDIR)/libuc.0.s.so
else ifeq ($(KBUILD_TARGET),os2)
diff --git a/configure b/configure
index 987cf1b..75d556c 100755
--- a/configure
+++ b/configure
@@ -2582,7 +2582,7 @@ fi
if [ "$OS" = "linux" ]; then
# don't check for the static libstdc++ in the PUEL version as we build the
# additions at a dedicated box
- [ $OSE -ge 1 ] && check_staticlibstdcxx
+ #[ $OSE -ge 1 ] && check_staticlibstdcxx
if [ $WITH_KMODS -eq 1 ]; then
check_linux
else
--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100
+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk 2012-09-02 02:55:41.970453638 +0100
@@ -195,7 +195,7 @@ endif #ifdef VBOX_WITH_WDDM
ifdef VBOXVIDEOWINDBG
DLLS += vbvdbg
-vbvdbg_TEMPLATE = VBOXR3STATIC
+vbvdbg_TEMPLATE = VBOXR3EXE
vbvdbg_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
vbvdbg_DEFS = UNICODE _UNICODE
vbvdbg_SOURCES = \
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2012-09-02 03:13:43.602348048 +0100
@@ -49,9 +49,7 @@ VBoxClient_LIBS = \
Xt
# Xtst
# These are static replacements for gcc-specific parts of libstdc++
-VBoxClient_LIBS += \
- supc++ \
- gcc_eh
+VBoxClient_LIBS += stdc++
ifdef VBOX_X11_SEAMLESS_GUEST
VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
VBoxClient_SOURCES += \
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
index ed0163b..2ee8418 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -957,7 +957,7 @@ endif # darwin
if defined(VBOX_WITH_VIDEOHWACCEL)
if1of ($(KBUILD_TARGET), win linux freebsd)
LIBRARIES += VBoxOGL2D
- VBoxOGL2D_TEMPLATE = VBOXR3STATIC
+ VBoxOGL2D_TEMPLATE = VBOXR3EXE
VBoxOGL2D_USES = qt4
VBoxOGL2D_SDKS = QT4
VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
--- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100
+++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100
@@ -94,7 +94,7 @@ SUPR3_SOURCES = \
#
# Static version of SUPR3.
#
-SUPR3Static_TEMPLATE = VBOXR3STATIC
+SUPR3Static_TEMPLATE = VBOXR3EXE
SUPR3Static_EXTENDS = SUPR3
#
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100
+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100
@@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# WinNetConfig - static library with host network interface config API
#
LIBRARIES.win += WinNetConfig
- WinNetConfig_TEMPLATE = VBOXR3STATIC
+ WinNetConfig_TEMPLATE = VBOXR3EXE
WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
WinNetConfig_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
WinNetConfig_SOURCES = \
@@ -154,7 +154,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetFltInstall
#
PROGRAMS.win += NetFltInstall
- NetFltInstall_TEMPLATE = VBOXR3STATIC
+ NetFltInstall_TEMPLATE = VBOXR3EXE
NetFltInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp
NetFltInstall_LIBS = \
@@ -169,7 +169,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetFltUninstall
#
PROGRAMS.win += NetFltUninstall
- NetFltUninstall_TEMPLATE = VBOXR3STATIC
+ NetFltUninstall_TEMPLATE = VBOXR3EXE
NetFltUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp
NetFltUninstall_LIBS = \
@@ -183,7 +183,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetAdpInstall
#
PROGRAMS.win += NetAdpInstall
- NetAdpInstall_TEMPLATE = VBOXR3STATIC
+ NetAdpInstall_TEMPLATE = VBOXR3EXE
NetAdpInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp
NetAdpInstall_LIBS = \
@@ -198,7 +198,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetAdpUninstall
#
PROGRAMS.win += NetAdpUninstall
- NetAdpUninstall_TEMPLATE = VBOXR3STATIC
+ NetAdpUninstall_TEMPLATE = VBOXR3EXE
NetAdpUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp
NetAdpUninstall_LIBS = \
@@ -212,7 +212,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# VBoxNetFltNobj
#
DLLS.win += VBoxNetFltNobj
- VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC
+ VBoxNetFltNobj_TEMPLATE = VBOXR3EXE
if defined(VBOX_SIGNING_MODE)
VBoxNetFltNobj_INSTTYPE = none
VBoxNetFltNobj_DEBUG_INSTTYPE = both
--- a/src/VBox/HostDrivers/win/Makefile.kmk.libcxx 2012-07-18 09:58:10.000000000 +0100
+++ b/src/VBox/HostDrivers/win/Makefile.kmk 2012-09-02 02:39:16.639533050 +0100
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
LIBRARIES += VBoxDrvCfg
-VBoxDrvCfg_TEMPLATE = VBOXR3STATIC
+VBoxDrvCfg_TEMPLATE = VBOXR3EXE
VBoxDrvCfg_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp
--- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk.libcxx 2012-08-03 13:28:30.000000000 +0100
+++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk 2012-09-02 02:59:34.062788499 +0100
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
include $(KBUILD_PATH)/subheader.kmk
DLLS += VBoxInstallHelper
-VBoxInstallHelper_TEMPLATE = VBOXR3STATIC
+VBoxInstallHelper_TEMPLATE = VBOXR3EXE
VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK)
--- a/src/VBox/Installer/win/Resources/Makefile.kmk.libcxx 2012-05-30 11:38:23.000000000 +0100
+++ b/src/VBox/Installer/win/Resources/Makefile.kmk 2012-09-02 02:57:56.559807746 +0100
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
include $(KBUILD_PATH)/subheader.kmk
DLLS += VBoxRes
-VBoxRes_TEMPLATE = VBOXR3STATIC
+VBoxRes_TEMPLATE = VBOXR3EXE
VBoxRes_DEPS = $(VBOX_SVN_REV_KMK)
VBoxRes_SOURCES = \
dummy.cpp \
diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk
index a8f89eb..6cf55cc 100644
--- a/src/VBox/Installer/win/Stub/Makefile.kmk
+++ b/src/VBox/Installer/win/Stub/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
if "$(KBUILD_TARGET_ARCH)" == "x86"
TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later.
-TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC
+TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE
TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE)
PROGRAMS.x86 += VBoxStub
diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk
index f935b05..40f6bf2 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES
#
# vbox-img - static because it migth be used as at standalone tool.
#
- vbox-img_TEMPLATE = VBOXR3STATIC
+ vbox-img_TEMPLATE = VBOXR3EXE
vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
vbox-img_SOURCES = \
vbox-img.cpp \
diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk
index 44088fa..0afe89a 100644
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
@@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \
lzf_c.c \
lzf_d.c
-VBox-liblzf-static_TEMPLATE = VBOXR3STATIC
+VBox-liblzf-static_TEMPLATE = VBOXR3EXE
VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE)
VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS)
VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86)
diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk
index fde8b7c..405d354 100644
--- a/src/libs/zlib-1.2.6/Makefile.kmk
+++ b/src/libs/zlib-1.2.6/Makefile.kmk
@@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \
inftrees.c \
inffast.c
-VBox-zlib-static_TEMPLATE = VBOXR3STATIC
+VBox-zlib-static_TEMPLATE = VBOXR3EXE
VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
--
1.7.1
VirtualBox-4.2.0-mesa.patch:
common/crOpenGL/Makefile.kmk | 21 ++----------
common/crOpenGL/fakedri_drv.c | 72 +++++++++++++++++++++++++++++++-----------
common/crOpenGL/fakedri_drv.h | 21 ++++++++----
x11/Makefile.kmk | 1
4 files changed, 73 insertions(+), 42 deletions(-)
--- NEW FILE VirtualBox-4.2.0-mesa.patch ---
fakedri_drv.c,h:
Just compile with X11 system source and we may remove bundle X11 source code.
--- ./src/VBox/Additions/x11/Makefile.kmk.orig 2012-09-23 01:00:38.301286632 +0100
+++ ./src/VBox/Additions/x11/Makefile.kmk 2012-09-23 01:00:45.135370696 +0100
@@ -24,7 +24,6 @@ if1of ($(KBUILD_TARGET), freebsd linux n
ifneq ($(KBUILD_TARGET), solaris)
include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
endif
- include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
endif
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100
@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
@@ -203,11 +197,6 @@ VBoxOGL_LIBS = \
$(VBOX_LIB_OGL_CRUTIL) \
$(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
ifdef VBoxOGL_FAKEDRI
VBoxOGL_LIBS += \
dl
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-09-14 23:53:17.013381550 +0100
@@ -17,7 +17,15 @@
*/
#define _GNU_SOURCE 1
+#define HAVE_STRNDUP 1
+#include <dlfcn.h>
+#include <elf.h>
+#include <unistd.h>
+#include <xf86.h>
+#include <xf86drm.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
#include "cr_error.h"
#include "cr_gl.h"
#include "cr_mem.h"
@@ -26,23 +34,6 @@
#include "dri_glx.h"
#include "iprt/mem.h"
#include "iprt/err.h"
-#include <dlfcn.h>
-#include <elf.h>
-#include <unistd.h>
-/** X server message type definitions. */
-typedef enum {
- X_PROBED, /* Value was probed */
- X_CONFIG, /* Value was given in the config file */
- X_DEFAULT, /* Value is a default */
- X_CMDLINE, /* Value was given on the command line */
- X_NOTICE, /* Notice */
- X_ERROR, /* Error message */
- X_WARNING, /* Warning message */
- X_INFO, /* Informational message */
- X_NONE, /* No prefix */
- X_NOT_IMPLEMENTED, /* Not implemented */
- X_UNKNOWN = -1 /* unknown -- this must always be last */
-} MessageType;
#define VBOX_NO_MESA_PATCH_REPORTS
@@ -104,8 +108,53 @@ static const __DRIswrastExtension *gpSwD
extern const __DRIextension * __driDriverExtensions[];
+//copy from /usr/share/xorg-x11-server-source/glx/dispatch.h
+#define SET_by_offset(disp, offset, fn) \
+ do { \
+ if ( (offset) < 0 ) { \
+ /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \
+ /* __func__, __LINE__, disp, offset, # fn); */ \
+ /* abort(); */ \
+ } \
+ else { \
+ ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \
+ } \
+ } while(0)
+
+// copy from glx/glapi.c
+
+/**
+ * Search the table of static entrypoint functions for the named function
+ * and return the corresponding glprocs_table_t entry.
+ */
+static const glprocs_table_t * find_entry( const char * n )
+{
+ GLuint i;
+ for (i = 0; static_functions[i].Name_offset >= 0; i++) {
+ const char *testName = gl_string_table + static_functions[i].Name_offset;
+ if (strcmp(testName, n) == 0) {
+ return &static_functions[i];
+ }
+ }
+ return NULL;
+}
+
+/**
+ * Return dispatch table offset of the named static (built-in) function.
+ * Return -1 if function not found.
+ */
+static GLint
+get_static_proc_offset(const char *funcName)
+{
+ const glprocs_table_t * const f = find_entry( funcName );
+ if (f) {
+ return f->Offset;
+ }
+ return -1;
+}
+
#define VBOX_SET_MESA_FUNC(table, name, func) \
- if (_glapi_get_proc_offset(name)>=0) SET_by_offset(table, _glapi_get_proc_offset(name), func); \
+ if (get_static_proc_offset(name)>=0) SET_by_offset(table, get_static_proc_offset(name), func); \
else crWarning("%s not found in mesa table", name)
#define GLAPI_ENTRY(Func) VBOX_SET_MESA_FUNC(vbox_glapi_table, "gl"#Func, cr_gl##Func);
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-13 13:14:21.000000000 +0000
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-27 23:14:15.058370962 +0100
@@ -20,13 +20,20 @@
#ifndef ___CROPENGL_FAKEDRIDRV_H
#define ___CROPENGL_FAKEDRIDRV_H
-#include "src/mesa/main/mtypes.h"
-#include "src/mesa/main/dd.h"
-#include "src/mesa/glapi/dispatch.h"
-#include "src/mesa/glapi/glapi.h"
-#include "src/mesa/glapi/glapitable.h"
-#include "src/mesa/glapi/glapioffsets.h"
-#include "src/mesa/drivers/dri/common/dri_util.h"
+//#include "/usr/share/xorg-x11-server-source/glx/glapi.h"
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
+extern GLuint
+_glapi_get_dispatch_table_size(void);
+
+extern struct _glapi_table *
+_glapi_get_dispatch(void);
+
+extern void
+_glapi_set_dispatch(struct _glapi_table *dispatch);
+
+//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
#include "glx_proto.h"
VirtualBox-4.2.0-xorg17.patch:
Config.kmk | 10 -
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 ++----
src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 10 -
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++++++-------
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
5 files changed, 94 insertions(+), 78 deletions(-)
--- NEW FILE VirtualBox-4.2.0-xorg17.patch ---
Build the X.Org driver only for the selected system X Server version.
Based on scripts by Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de>
Author: Sérgio Basto <sergio(a)serjux.com>
--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
+++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL
endif
if1of ($(KBUILD_TARGET), freebsd linux solaris)
- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
- VBOX_MESA_INCS = \
- $(VBOX_PATH_MESA_SOURCE) \
- $(VBOX_PATH_MESA_SOURCE)/include \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
+ VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1
endif
VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
--- ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
# This one has to be defined when building server code on systems where
# unsigned long is 64bits
vboxmouse_drv_DEFS.amd64 += _XSERVER64
- vboxmouse_drv_DEFS += \
- _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
- _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
- XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
- GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
- XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
- BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
- IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
- vboxmouse_drv_INCS := \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
- $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(PATH_SUB_CURRENT)
+vboxmouse_drv_DEFS += XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X \
+ IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
+vboxmouse_drv_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
vboxmouse_drv_SOURCES = \
vboxmouse.c
# Any global symbols in the driver object files will be added to XFree86's
@@ -57,9 +44,18 @@ if1of ($(KBUILD_TARGET), linux)
vboxmouse_drv_POST_CMDS = \
objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \
$(MV) -f $(out)-objcopy $(out)
-endif
-
+DLLS += vboxmouse_drv_17
+vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
+ DONT_DEFINE_WRAPPERS NO_ANSIC
+vboxmouse_drv_17_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
+vboxmouse_drv_17_SOURCES = \
+ vboxmouse.c
+else
#
# vboxmouse_drv_70
#
@@ -391,5 +387,7 @@ endif # neq ($(KBUILD_TARGET),linux)
# endif # ! VBOX_ONLY_ADDITIONS
endif # VBOX_WITH_TESTCASES
+endif # neq ($(KBUILD_TARGET),linux)
+
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-03-13 14:52:26.000000000 +0000
+++ ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-23 00:33:57.939600191 +0100
@@ -52,13 +52,9 @@
#include <xf86Module.h>
-#ifdef VBOX_GUESTR3XF86MOD
-# define _X_EXPORT
-#else
-# include <errno.h>
-# include <fcntl.h>
-# include <unistd.h>
-#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
#include "product-generated.h"
--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-07 03:24:32.187238932 +0100
@@ -35,45 +35,35 @@ vboxvideo_drv_DEFS.x86 = __i386__
# This one has to be defined when building server code on systems where
# unsigned long is 64bits
vboxvideo_drv_DEFS.amd64 += _XSERVER64
-vboxvideo_drv_DEFS = \
- _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
- _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
- XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
- GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
- XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
- BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
- IN_MODULE XFree86Module IN_XF86_MODULE IN_RT_STATIC
-vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
+vboxvideo_drv_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER IN_XF86_MODULE XORG_7X RENDER=1 \
+ IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
vboxvideo_drv_INCS = \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
- $(VBOX_PATH_X11_XFREE_4_3)/include/X11/extensions \
- $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
- $(VBOX_PATH_X11_XFREE_4_3)/include/fonts \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/afb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/fb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ddc \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/int10 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/i2c \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vbe \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/rac \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ramdac \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/shadowfb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vgahw \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf1bpp \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf24_32bpp \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf4bpp \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mfb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/miext/shadow \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/render \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
+ /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_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_SOURCES = \
pointer.c \
@@ -86,7 +76,7 @@ vboxvideo_drv_SOURCES = \
$(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
$(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
$(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
- $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp
+ $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp edid.c vboxvideo_dri.c
# Any global symbols in the driver object files will be added to XFree86's
# symbol table, which can cause problems if we e.g. define a symbol in two
# modules.
@@ -94,6 +84,44 @@ vboxvideo_drv_SOURCES = \
objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \
$(MV) -f $(out)-objcopy $(out)
+DLLS += vboxvideo_drv_17
+vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
+vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \
+ IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
+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_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES)
+
+ifdef NOT_FEDORA
+
+
#
# vboxvideo_drv_70
#
@@ -505,4 +533,6 @@ $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvi
# endif # ! VBOX_ONLY_ADDITIONS
endif # VBOX_WITH_TESTCASES
+endif # NOT_FEDORA
+
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000
+++ ./src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000
@@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK
#
tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
tstSetModeXOrg_CFLAGS += -std=c99
-tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE
+tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
tstSetModeXOrg_SOURCES = \
tstSetModeXOrg.c \
../setmode.c
-tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS)
+tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS)
# generate rules.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore 1 Sep 2012 21:06:01 -0000 1.37
+++ .cvsignore 30 Sep 2012 19:37:20 -0000 1.38
@@ -1 +1 @@
-VirtualBox-4.1.20.tar.bz2
+VirtualBox-4.2.0.tar.bz2
VirtualBox-OSE-4.0.0-makeself.patch:
configure | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: VirtualBox-OSE-4.0.0-makeself.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox-OSE-4.0.0-makeself.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.0.0-makeself.patch 3 Feb 2011 23:25:21 -0000 1.1
+++ VirtualBox-OSE-4.0.0-makeself.patch 30 Sep 2012 19:37:20 -0000 1.2
@@ -14,7 +14,7 @@
+++ b/configure
@@ -2527,7 +2527,7 @@ if [ "$OS" = "linux" ]; then
check_compiler_h
- #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
# tools/common/makeself*
- [ $OSE -ge 1 ] && check_makeself
+ #[ $OSE -ge 1 ] && check_makeself
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VirtualBox.spec 1 Sep 2012 21:06:01 -0000 1.7
+++ VirtualBox.spec 30 Sep 2012 19:37:20 -0000 1.8
@@ -1,7 +1,7 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
# Standard compiler flags, without:
-# -Wall -- VirtualBox takes care of reasonable warnings very well
+# -Wall -- VirtualBox takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
@@ -10,73 +10,77 @@
# major version number, while the kernel module abi is not guarranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel beta3
+#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-Name: VirtualBox
-Version: 4.1.20
-Release: 1%{?prerel:.%{prerel}}%{?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://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu...
-Source3: VirtualBox-90-vboxdrv.rules
-Source5: VirtualBox-60-vboxguest.rules
-Source6: VirtualBox.modules
-Source7: VirtualBox-guest.modules
-Source8: VirtualBox-vboxresize.desktop
-Source9: VirtualBox-00-vboxvideo.conf
-Source10: vboxweb.service
-Source11: vboxservice.service
-Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
-Patch2: VirtualBox-4.1.18-strings.patch
-Patch3: VirtualBox-4.1.20-libcxx.patch
-Patch5: VirtualBox-OSE-4.1.4-xorg17.patch
-Patch10: VirtualBox-OSE-4.0.0-32bit.patch
-#Patch11: VirtualBox-OSE-3.2.0-visibility.patch
-Patch15: VirtualBox-OSE-4.0.0-makeself.patch
-Patch16: VirtualBox-OSE-4.1.2-usblib.patch
-Patch17: VirtualBox-OSE-4.0.0-beramono.patch
-Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
-Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
-Patch23: VirtualBox-OSE-4.1.10-mesa.patch
+Name: VirtualBox
+Version: 4.2.0
+Release: 3%{?prerel:.%{prerel}}%{?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://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu...
+Source3: VirtualBox-90-vboxdrv.rules
+Source5: VirtualBox-60-vboxguest.rules
+Source6: VirtualBox.modules
+Source7: VirtualBox-guest.modules
+Source8: VirtualBox-vboxresize.desktop
+Source9: VirtualBox-00-vboxvideo.conf
+Source10: vboxweb.service
+Source11: vboxservice.service
+Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
+Patch2: VirtualBox-4.1.18-strings.patch
+Patch3: VirtualBox-4.2.0-libcxx.patch
+Patch5: VirtualBox-4.2.0-xorg17.patch
+%ifarch x86_64
+Patch10: VirtualBox-4.2.0-32bit.patch
+%endif
+Patch15: VirtualBox-OSE-4.0.0-makeself.patch
+Patch17: VirtualBox-OSE-4.0.0-beramono.patch
+Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
+Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
+Patch23: VirtualBox-4.2.0-mesa.patch
+Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
-%if 0%{?fedora} < 17
-BuildRequires: kBuild >= 0.1.98
+%if 0%{?fedora} < 16
+BuildRequires: kBuild >= 0.1.98
%endif
-BuildRequires: SDL-devel xalan-c-devel
-BuildRequires: openssl-devel
-BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel
-BuildRequires: yasm
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: python-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libcap-devel
-BuildRequires: qt4-devel
-BuildRequires: gsoap-devel
-BuildRequires: xz
-BuildRequires: pam-devel
-BuildRequires: mkisofs
-BuildRequires: java-devel >= 1.6
-BuildRequires: /usr/bin/pdflatex
-BuildRequires: libpng-devel
+BuildRequires: SDL-devel xalan-c-devel
+BuildRequires: openssl-devel
+BuildRequires: libcurl-devel
+BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel
+BuildRequires: yasm
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: python-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libcap-devel
+BuildRequires: qt4-devel
+BuildRequires: gsoap-devel
+BuildRequires: xz
+BuildRequires: pam-devel
+BuildRequires: mkisofs
+BuildRequires: java-devel >= 1.6
+BuildRequires: /usr/bin/pdflatex
+BuildRequires: libpng-devel
+#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
+#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
+#BuildRequires: /usr/lib/libc.so
+#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
# 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
-BuildRequires: xorg-x11-server-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXcomposite-devel
-BuildRequires: libXmu-devel
+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
+BuildRequires: xorg-x11-server-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXmu-devel
BuildRequires: systemd-units
Requires(post): systemd-units
@@ -85,20 +89,20 @@
# Plague-specific weirdness
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
-ExclusiveArch: i586 x86_64
+ExclusiveArch: i586 x86_64
%else
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64
%endif
-Provides: %{name}-OSE = %{version}-%{release}
-Obsoletes: %{name}-OSE < %{version}-%{release}
-Requires: %{name}-kmod = %{version}%{?prereltag}
-Provides: %{name}-kmod-common = %{version}%{?prereltag}
-Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
-Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
-Conflicts: %{name}-guest <= %{version}-%{release}
+Provides: %{name}-OSE = %{version}-%{release}
+Obsoletes: %{name}-OSE < %{version}-%{release}
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}-%{release}
+Provides: %{name}-OSE-kmod-common = %{version}-%{release}
+Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release}
+Conflicts: %{name}-guest <= %{version}-%{release}
%description
A general-purpose full virtualizer and emulator for 32-bit and
@@ -106,49 +110,49 @@
%package devel
-Summary: %{name} SDK
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: python-%{name} = %{version}-%{release}
-Provides: %{name}-OSE-devel = %{version}-%{release}
-Obsoletes: %{name}-OSE-devel < %{version}-%{release}
+Summary: %{name} SDK
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: python-%{name} = %{version}-%{release}
+Provides: %{name}-OSE-devel = %{version}-%{release}
+Obsoletes: %{name}-OSE-devel < %{version}-%{release}
%description devel
%{name} Software Development Kit.
%package -n python-%{name}
-Summary: Python bindings for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Provides: python-%{name}-OSE = %{version}-%{release}
-Obsoletes: python-%{name}-OSE < %{version}-%{release}
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: python-%{name}-OSE = %{version}-%{release}
+Obsoletes: python-%{name}-OSE < %{version}-%{release}
%description -n python-%{name}
Python XPCOM bindings to %{name}.
%package guest
-Summary: %{name} Guest Additions
-Group: System Environment/Base
-Provides: %{name}-OSE-guest = %{version}-%{release}
-Obsoletes: %{name}-OSE-guest < %{version}-%{release}
-Requires: %{name}-kmod = %{version}
-Provides: %{name}-kmod-common = %{version}
-Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
-Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
-Requires: xorg-x11-server-Xorg
-Requires: xorg-x11-xinit
-Provides: xorg-x11-drv-VirtualBox = %{version}-%{release}
-Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release}
-Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
-Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
+Summary: %{name} Guest Additions
+Group: System Environment/Base
+Provides: %{name}-OSE-guest = %{version}-%{release}
+Obsoletes: %{name}-OSE-guest < %{version}-%{release}
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}-%{release}
+Provides: %{name}-OSE-kmod-common = %{version}-%{release}
+Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release}
+Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-xinit
+Provides: xorg-x11-drv-VirtualBox = %{version}-%{release}
+Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release}
+Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
+Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
-Requires: %(xserver-sdk-abi-requires ansic)
-Requires: %(xserver-sdk-abi-requires videodrv)
-Requires: %(xserver-sdk-abi-requires xinput)
+Requires: %(xserver-sdk-abi-requires ansic)
+Requires: %(xserver-sdk-abi-requires videodrv)
+Requires: %(xserver-sdk-abi-requires xinput)
%endif
-Conflicts: %{name} <= %{version}-%{release}
+Conflicts: %{name} <= %{version}-%{release}
%description guest
@@ -159,8 +163,8 @@
%package kmodsrc
-Summary: %{name} kernel module source code
-Group: System Environment/Kernel
+Summary: %{name} kernel module source code
+Group: System Environment/Kernel
Provides: %{name}-OSE-kmodsrc = %{version}-%{release}
Obsoletes: %{name}-OSE-kmodsrc < %{version}-%{release}
@@ -170,39 +174,44 @@
%prep
-%setup -q
+%setup -qn %{name}-%{version}%{prereltag}
find -name '*.py[co]' -delete
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
%patch5 -p1 -b .xorg17
-%patch10 -p1 -b .32bit
-#%patch11 -p1 -b .visibility
%patch15 -p1 -b .makeself
-%patch16 -p1 -b .usblib
+%ifarch x86_64
+%patch10 -p1 -b .32bit
+%endif
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
-%patch20 -p1 -b .testmangle
%if 0%{?fedora} < 16
%patch22 -p1 -b .gsoap
%endif
-%if 0%{?fedora} > 16
%patch23 -p1 -b .mesa
-%endif
+%patch24 -p1 -b .guestlib
# Remove prebuilt binary tools
-%if 0%{?fedora} < 17
+%if 0%{?fedora} < 16
rm -rf kBuild
%endif
rm -rf tools
+# Remove some bundle X11 sources.
+rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11stubs
+
# CRLF->LF
sed -i 's/\r//' COPYING
%build
-./configure --disable-kmods --enable-webservice
+./configure --disable-kmods
+#--disable-java
+#--enable-webservice
+#--disable-xpcom
. ./env.sh
# VirtualBox build system installs and builds in the same step,
@@ -211,13 +220,13 @@
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
kmk %{_smp_mflags} \
- KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \
- VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
- VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
- VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
- VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \
- VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
- VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
+ KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \
+ VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
+ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
+ VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
+ VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \
+ VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+ VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_BUILD_PUBLISHER=_%{?vendor:%(echo %{vendor} \
| sed -e 's/ //g' | cut -c 1-9)}%{?!vendor:custom}
@@ -256,73 +265,73 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+#ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/VBoxTunctl \
+ obj/bin/VBoxTunctl \
# Components
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
- obj/bin/components/*
+ obj/bin/components/*
# Lib
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/*.so
+ obj/bin/*.so
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/V*.gc \
- obj/bin/V*.r0 \
- obj/bin/VBoxEFI*.fd
+ obj/bin/V*.gc \
+ obj/bin/V*.r0 \
+ obj/bin/VBoxEFI*.fd
# Documentation
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/UserManual.pdf
+ obj/bin/UserManual.pdf
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/VBoxHeadless \
- obj/bin/VBoxSDL \
- obj/bin/VBoxNetDHCP \
- obj/bin/VBoxNetAdpCtl \
- obj/bin/VirtualBox \
- obj/bin/VBoxManage \
- obj/bin/VBoxSVC \
- obj/bin/VBoxXPCOMIPCD \
- obj/bin/VBoxSysInfo.sh \
- obj/bin/vboxshell.py \
- obj/bin/VBoxTestOGL \
- obj/bin/VBoxExtPackHelperApp \
- obj/bin/vboxwebsrv \
- obj/bin/VBoxBalloonCtrl \
- obj/bin/webtest \
- obj/bin/VBoxBFE
+ obj/bin/VBoxHeadless \
+ obj/bin/VBoxSDL \
+ obj/bin/VBoxNetDHCP \
+ obj/bin/VBoxNetAdpCtl \
+ obj/bin/VirtualBox \
+ obj/bin/VBoxManage \
+ obj/bin/VBoxSVC \
+ obj/bin/VBoxXPCOMIPCD \
+ obj/bin/VBoxSysInfo.sh \
+ obj/bin/vboxshell.py \
+ obj/bin/VBoxTestOGL \
+ obj/bin/VBoxExtPackHelperApp \
+ obj/bin/VBoxBalloonCtrl \
+ obj/bin/VBoxBFE
+# obj/bin/vboxwebsrv \
+# obj/bin/webtest \
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
- obj/bin/nls/*
+ obj/bin/nls/*
# SDK
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
- python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
+ python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
popd
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
- obj/bin/VBox.png
+ obj/bin/VBox.png
#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
- SIZE=$(basename $S)
- install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
- install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
- [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
+ SIZE=$(basename $S)
+ install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
+ install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
+ [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
done
install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
@@ -333,51 +342,51 @@
%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
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
-install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \
- obj/bin/additions/mount.vboxsf
+install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \
+ obj/bin/additions/mount.vboxsf
-install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/additions/VBoxService \
- obj/bin/additions/VBoxClient \
- obj/bin/additions/VBoxControl
+install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+ obj/bin/additions/VBoxService \
+ obj/bin/additions/VBoxClient \
+ obj/bin/additions/VBoxControl
# Ideally, Xorg should autodetect this, but for some reason it no longer does
install -m 0644 -D %{SOURCE9} \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
install -m 0644 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
+ $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
install -m 0644 -D %{SOURCE11} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
+ $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
- $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
+ $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
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 0644 -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 0644 -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} \
- obj/bin/additions/VBoxOGL*.so
+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
install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \
- obj/bin/additions/pam_vbox.so
+ obj/bin/additions/pam_vbox.so
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
@@ -396,12 +405,12 @@
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}
tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
- %{name}-kmod-%{version}
+ %{name}-kmod-%{version}
# Menu entry
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
- --vendor='' obj/bin/virtualbox.desktop
+ --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
+ --vendor='' obj/bin/virtualbox.desktop
%post
# Group for USB devices
@@ -420,8 +429,8 @@
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
-# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
-# /sbin/udevadm settle >/dev/null 2>&1 || :
+# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
+# /sbin/udevadm settle >/dev/null 2>&1 || :
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
@@ -482,7 +491,7 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-%{_bindir}/vboxwebsrv
+#{_bindir}/vboxwebsrv
%{_bindir}/VBoxVRDP
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
@@ -496,8 +505,8 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-%{_libdir}/virtualbox/vboxwebsrv
-%{_libdir}/virtualbox/webtest
+#{_libdir}/virtualbox/vboxwebsrv
+#{_libdir}/virtualbox/webtest
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
@@ -550,6 +559,62 @@
%changelog
+* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
+- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
+VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
+
+* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
+- Disable websrv because fails to build on rawhide, temporarily I hope.
+
+* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
+- 4.2.0 released
+- Rebase and rework VirtualBox-4.2.0-xorg17.patch, add 2 new Definitions: XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
+- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch
+- Reorganize last 2 patches.
+- Revert attempt to remove 32-bits patch.
+
+* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.7.RC4
+- Another try to compile with 32-bits suport on x86_64.
+
+* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
+- Update to RC4.
+- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
+- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
+- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
+- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
+
+* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3
+- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64.
+
+* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.4.RC3
+- Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system.
+- Fix ABI/API breakages in X11 1.13.
+
+* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.3.RC3
+- fix requires kmod, with version with prerealeses.
+
+* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC3
+- vim :retab, reformat all tabs.
+- add BR # libstdc++.i686 and libc-devel.i686 for 32-bits
+BuildRequires: /usr/lib/libc.so
+BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
+- drop 32-bit patch and testmangle patch, no fails.
+- rename and remove some patches
+cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available
+cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available
+cvs diff: VirtualBox-4.2.0-libcxx.patch is a new entry, no comparison available
+cvs diff: VirtualBox-4.2.0-xorg17.patch is a new entry, no comparison available
+cvs diff: VirtualBox-OSE-3.2.0-visibility.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.0.0-32bit.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.1.2-testmangle.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.1.2-usblib.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available
+
+* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3
+- New major release, devel release of rpms .
+- rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch
+ and VirtualBox-OSE-4.0.0-32bit.patch
+
* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1
- New upstream release.
- Redo VirtualBox-4.1.20-libcxx.patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 1 Sep 2012 21:06:01 -0000 1.37
+++ sources 30 Sep 2012 19:37:20 -0000 1.38
@@ -1 +1 @@
-5784c6dda8a9d53f8f21b2d41eba903c VirtualBox-4.1.20.tar.bz2
+691b4134983ce7d89b9fb683305cb647 VirtualBox-4.2.0.tar.bz2
Index: vboxweb.service
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/vboxweb.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vboxweb.service 6 May 2012 22:01:27 -0000 1.1
+++ vboxweb.service 30 Sep 2012 19:37:20 -0000 1.2
@@ -1,5 +1,5 @@
[Unit]
-Description=VirtualBox OSE Web Service
+Description=VirtualBox Web Service
After=network.target
[Service]
--- VirtualBox-4.1.20-libcxx.patch DELETED ---
--- VirtualBox-OSE-3.2.0-visibility.patch DELETED ---
--- VirtualBox-OSE-4.0.0-32bit.patch DELETED ---
--- VirtualBox-OSE-4.1.10-mesa.patch DELETED ---
--- VirtualBox-OSE-4.1.2-testmangle.patch DELETED ---
--- VirtualBox-OSE-4.1.2-usblib.patch DELETED ---
--- VirtualBox-OSE-4.1.4-xorg17.patch DELETED ---
11 years, 6 months
- 1
- 0
rpms/VirtualBox/F-17 VirtualBox-4.2.0-32bit.patch, NONE, 1.1 VirtualBox-4.2.0-VBoxGuestLib.patch, NONE, 1.1 VirtualBox-4.2.0-libcxx.patch, NONE, 1.1 VirtualBox-4.2.0-mesa.patch, NONE, 1.1 VirtualBox-4.2.0-xorg17.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 VirtualBox-OSE-4.0.0-makeself.patch, 1.1, 1.2 VirtualBox.spec, 1.8, 1.9 sources, 1.37, 1.38 vboxweb.service, 1.1, 1.2 VirtualBox-OSE-3.2.0-visibility.patch, 1.1, NONE VirtualBox-OSE-4.0.0-32bit.patch, 1.1, NONE VirtualBox-OSE-4.1.10-mesa.patch, 1.1, NONE Virtu
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8125
Modified Files:
.cvsignore VirtualBox-OSE-4.0.0-makeself.patch VirtualBox.spec
sources vboxweb.service
Added Files:
VirtualBox-4.2.0-32bit.patch
VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-libcxx.patch VirtualBox-4.2.0-mesa.patch
VirtualBox-4.2.0-xorg17.patch
Removed Files:
VirtualBox-OSE-3.2.0-visibility.patch
VirtualBox-OSE-4.0.0-32bit.patch
VirtualBox-OSE-4.1.10-mesa.patch
VirtualBox-OSE-4.1.2-testmangle.patch
VirtualBox-OSE-4.1.2-usblib.patch
VirtualBox-OSE-4.1.4-xorg17.patch
Log Message:
push 4.2.0 to F17 and F16
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 13 ++++++++++---
3 files changed, 19 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.0-32bit.patch ---
>From a9548501755beeec6fa11b0c261f167164a4ee70 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] 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 | 9 +++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 42ce775..0932637 100755
--- a/configure
+++ b/configure
@@ -2525,7 +2525,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
# tools/common/makeself*
#[ $OSE -ge 1 ] && check_makeself
fi
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 4debf81..59dae0d 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \
# 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_DEVICES_TESTS_FEATURES)
tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp
@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSize_INCS = \
--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit 2012-07-18 09:58:08.000000000 +0100
+++ b/src/VBox/VMM/testcase/Makefile.kmk 2012-09-02 04:04:34.551296386 +0100
@@ -21,9 +21,11 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstAsmStructs
-ifdef VBOX_WITH_RAW_MODE
- PROGRAMS += tstVMStructRC tstAsmStructsRC
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
+ ifdef VBOX_WITH_RAW_MODE
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
endif
if !defined(VBOX_ONLY_EXTPACKS) \
&& ( defined(VBOX_WITH_DTRACE_R3) \
@@ -77,16 +79,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
+endif
ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
VirtualBox-4.2.0-VBoxGuestLib.patch:
Makefile.kmk | 8 ++----
VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++++++++++++++++++++++++++++++++--------
2 files changed, 47 insertions(+), 14 deletions(-)
--- NEW FILE VirtualBox-4.2.0-VBoxGuestLib.patch ---
VBoxGuestR3LibRuntimeXF86.cpp:
Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
xalloc.c and verrorf.c
Author: Sérgio Basto <sergio(a)serjux.com>
--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
VBoxGuestR3LibVideo.cpp \
VBoxGuestR3LibRuntimeXF86.cpp
VBoxGuestR3LibXFree86_INCS = \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/include
VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
--- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
@@ -34,20 +34,55 @@
#include <iprt/log.h>
#include <iprt/mem.h>
#include <iprt/string.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <ctype.h>
extern "C" {
# define XFree86LOADER
-# include <xf86_ansic.h>
# include <errno.h>
# undef size_t
}
+/** Provide an VErrorF function when used stand-alone. */
+void VErrorF(const char *format, va_list args)
+{
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+}
+
+/* When using this file as part of a stand-alone (i.e., non-X-Server
+ * program, then the ultimate output routines have to be defined. */
+
+/** Provide an ErrorF function when used stand-alone. */
+void ErrorF(const char *format, ...)
+{
+ va_list args;
+
+ va_start(args, format);
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+ va_end(args);
+}
+
+void *xalloc(unsigned long n)
+{
+ if (!n)
+ n = 1;
+ return malloc(n);
+}
+
/* This is risky as it restricts call to the ANSI format type specifiers. */
RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
{
va_list args;
int cbRet;
va_start(args, pszFormat);
- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
va_end(args);
return cbRet >= 0 ? cbRet : 0;
}
@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
{
char *pszNext = NULL;
- xf86errno = 0;
- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
+ errno = 0;
+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
if (ppszNext)
*ppszNext = pszNext;
if (RT_UNLIKELY(pszValue == pszNext))
@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
ul = UINT32_MAX;
if (pu32)
*pu32 = (uint32_t) ul;
- if (RT_UNLIKELY(xf86errno == EINVAL))
+ if (RT_UNLIKELY(errno == EINVAL))
return VERR_INVALID_PARAMETER;
- if (RT_UNLIKELY(xf86errno == ERANGE))
+ if (RT_UNLIKELY(errno == ERANGE))
return VWRN_NUMBER_TOO_BIG;
- if (RT_UNLIKELY(xf86errno))
+ if (RT_UNLIKELY(errno))
/* RTErrConvertFromErrno() is not available */
return VERR_UNRESOLVED_ERROR;
if (RT_UNLIKELY(*pszValue == '-'))
@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
if (RT_UNLIKELY(*pszNext))
{
while (*pszNext)
- if (!xf86isspace(*pszNext))
+ if (!isspace(*pszNext))
return VWRN_TRAILING_CHARS;
return VWRN_TRAILING_SPACES;
}
@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
RTDECL(void) RTMemTmpFree(void *pv)
{
- xfree(pv);
+ free(pv);
}
VirtualBox-4.2.0-libcxx.patch:
Config.kmk | 2 +-
configure | 2 +-
src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +---
src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +-
src/VBox/HostDrivers/Support/Makefile.kmk | 2 +-
src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------
src/VBox/HostDrivers/win/Makefile.kmk | 2 +-
src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +-
src/VBox/Installer/win/Resources/Makefile.kmk | 2 +-
src/VBox/Installer/win/Stub/Makefile.kmk | 2 +-
src/VBox/Storage/testcase/Makefile.kmk | 2 +-
src/libs/liblzf-3.4/Makefile.kmk | 2 +-
src/libs/zlib-1.2.6/Makefile.kmk | 3 +--
14 files changed, 19 insertions(+), 22 deletions(-)
--- NEW FILE VirtualBox-4.2.0-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.
Was From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 18 Jun 2010 10:58:14 +0200
diff --git a/Config.kmk b/Config.kmk
index 0ea34d8..2ec388c 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3163,7 +3163,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl
TEMPLATE_VBOXR3EXE_LIBS = \
$(L4_LIBDIR)/libvboxserver.s.so \
$(L4_LIBDIR)/libuc++.0.s.so \
- supc++ gcc_eh gcc \
+ stdc++ \
$(L4_LIBDIR)/libdl.s.so \
$(L4_LIBDIR)/libuc.0.s.so
else ifeq ($(KBUILD_TARGET),os2)
diff --git a/configure b/configure
index 987cf1b..75d556c 100755
--- a/configure
+++ b/configure
@@ -2582,7 +2582,7 @@ fi
if [ "$OS" = "linux" ]; then
# don't check for the static libstdc++ in the PUEL version as we build the
# additions at a dedicated box
- [ $OSE -ge 1 ] && check_staticlibstdcxx
+ #[ $OSE -ge 1 ] && check_staticlibstdcxx
if [ $WITH_KMODS -eq 1 ]; then
check_linux
else
--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100
+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk 2012-09-02 02:55:41.970453638 +0100
@@ -195,7 +195,7 @@ endif #ifdef VBOX_WITH_WDDM
ifdef VBOXVIDEOWINDBG
DLLS += vbvdbg
-vbvdbg_TEMPLATE = VBOXR3STATIC
+vbvdbg_TEMPLATE = VBOXR3EXE
vbvdbg_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
vbvdbg_DEFS = UNICODE _UNICODE
vbvdbg_SOURCES = \
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2012-09-02 03:13:43.602348048 +0100
@@ -49,9 +49,7 @@ VBoxClient_LIBS = \
Xt
# Xtst
# These are static replacements for gcc-specific parts of libstdc++
-VBoxClient_LIBS += \
- supc++ \
- gcc_eh
+VBoxClient_LIBS += stdc++
ifdef VBOX_X11_SEAMLESS_GUEST
VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
VBoxClient_SOURCES += \
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
index ed0163b..2ee8418 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -957,7 +957,7 @@ endif # darwin
if defined(VBOX_WITH_VIDEOHWACCEL)
if1of ($(KBUILD_TARGET), win linux freebsd)
LIBRARIES += VBoxOGL2D
- VBoxOGL2D_TEMPLATE = VBOXR3STATIC
+ VBoxOGL2D_TEMPLATE = VBOXR3EXE
VBoxOGL2D_USES = qt4
VBoxOGL2D_SDKS = QT4
VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
--- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100
+++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100
@@ -94,7 +94,7 @@ SUPR3_SOURCES = \
#
# Static version of SUPR3.
#
-SUPR3Static_TEMPLATE = VBOXR3STATIC
+SUPR3Static_TEMPLATE = VBOXR3EXE
SUPR3Static_EXTENDS = SUPR3
#
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100
+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100
@@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# WinNetConfig - static library with host network interface config API
#
LIBRARIES.win += WinNetConfig
- WinNetConfig_TEMPLATE = VBOXR3STATIC
+ WinNetConfig_TEMPLATE = VBOXR3EXE
WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
WinNetConfig_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
WinNetConfig_SOURCES = \
@@ -154,7 +154,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetFltInstall
#
PROGRAMS.win += NetFltInstall
- NetFltInstall_TEMPLATE = VBOXR3STATIC
+ NetFltInstall_TEMPLATE = VBOXR3EXE
NetFltInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp
NetFltInstall_LIBS = \
@@ -169,7 +169,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetFltUninstall
#
PROGRAMS.win += NetFltUninstall
- NetFltUninstall_TEMPLATE = VBOXR3STATIC
+ NetFltUninstall_TEMPLATE = VBOXR3EXE
NetFltUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp
NetFltUninstall_LIBS = \
@@ -183,7 +183,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetAdpInstall
#
PROGRAMS.win += NetAdpInstall
- NetAdpInstall_TEMPLATE = VBOXR3STATIC
+ NetAdpInstall_TEMPLATE = VBOXR3EXE
NetAdpInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp
NetAdpInstall_LIBS = \
@@ -198,7 +198,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# NetAdpUninstall
#
PROGRAMS.win += NetAdpUninstall
- NetAdpUninstall_TEMPLATE = VBOXR3STATIC
+ NetAdpUninstall_TEMPLATE = VBOXR3EXE
NetAdpUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp
NetAdpUninstall_LIBS = \
@@ -212,7 +212,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet
# VBoxNetFltNobj
#
DLLS.win += VBoxNetFltNobj
- VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC
+ VBoxNetFltNobj_TEMPLATE = VBOXR3EXE
if defined(VBOX_SIGNING_MODE)
VBoxNetFltNobj_INSTTYPE = none
VBoxNetFltNobj_DEBUG_INSTTYPE = both
--- a/src/VBox/HostDrivers/win/Makefile.kmk.libcxx 2012-07-18 09:58:10.000000000 +0100
+++ b/src/VBox/HostDrivers/win/Makefile.kmk 2012-09-02 02:39:16.639533050 +0100
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
LIBRARIES += VBoxDrvCfg
-VBoxDrvCfg_TEMPLATE = VBOXR3STATIC
+VBoxDrvCfg_TEMPLATE = VBOXR3EXE
VBoxDrvCfg_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp
--- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk.libcxx 2012-08-03 13:28:30.000000000 +0100
+++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk 2012-09-02 02:59:34.062788499 +0100
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
include $(KBUILD_PATH)/subheader.kmk
DLLS += VBoxInstallHelper
-VBoxInstallHelper_TEMPLATE = VBOXR3STATIC
+VBoxInstallHelper_TEMPLATE = VBOXR3EXE
VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK)
--- a/src/VBox/Installer/win/Resources/Makefile.kmk.libcxx 2012-05-30 11:38:23.000000000 +0100
+++ b/src/VBox/Installer/win/Resources/Makefile.kmk 2012-09-02 02:57:56.559807746 +0100
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
include $(KBUILD_PATH)/subheader.kmk
DLLS += VBoxRes
-VBoxRes_TEMPLATE = VBOXR3STATIC
+VBoxRes_TEMPLATE = VBOXR3EXE
VBoxRes_DEPS = $(VBOX_SVN_REV_KMK)
VBoxRes_SOURCES = \
dummy.cpp \
diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk
index a8f89eb..6cf55cc 100644
--- a/src/VBox/Installer/win/Stub/Makefile.kmk
+++ b/src/VBox/Installer/win/Stub/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
if "$(KBUILD_TARGET_ARCH)" == "x86"
TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later.
-TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC
+TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE
TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE)
PROGRAMS.x86 += VBoxStub
diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk
index f935b05..40f6bf2 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES
#
# vbox-img - static because it migth be used as at standalone tool.
#
- vbox-img_TEMPLATE = VBOXR3STATIC
+ vbox-img_TEMPLATE = VBOXR3EXE
vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
vbox-img_SOURCES = \
vbox-img.cpp \
diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk
index 44088fa..0afe89a 100644
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
@@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \
lzf_c.c \
lzf_d.c
-VBox-liblzf-static_TEMPLATE = VBOXR3STATIC
+VBox-liblzf-static_TEMPLATE = VBOXR3EXE
VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE)
VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS)
VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86)
diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk
index fde8b7c..405d354 100644
--- a/src/libs/zlib-1.2.6/Makefile.kmk
+++ b/src/libs/zlib-1.2.6/Makefile.kmk
@@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \
inftrees.c \
inffast.c
-VBox-zlib-static_TEMPLATE = VBOXR3STATIC
+VBox-zlib-static_TEMPLATE = VBOXR3EXE
VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
--
1.7.1
VirtualBox-4.2.0-mesa.patch:
common/crOpenGL/Makefile.kmk | 21 ++----------
common/crOpenGL/fakedri_drv.c | 72 +++++++++++++++++++++++++++++++-----------
common/crOpenGL/fakedri_drv.h | 21 ++++++++----
x11/Makefile.kmk | 1
4 files changed, 73 insertions(+), 42 deletions(-)
--- NEW FILE VirtualBox-4.2.0-mesa.patch ---
fakedri_drv.c,h:
Just compile with X11 system source and we may remove bundle X11 source code.
--- ./src/VBox/Additions/x11/Makefile.kmk.orig 2012-09-23 01:00:38.301286632 +0100
+++ ./src/VBox/Additions/x11/Makefile.kmk 2012-09-23 01:00:45.135370696 +0100
@@ -24,7 +24,6 @@ if1of ($(KBUILD_TARGET), freebsd linux n
ifneq ($(KBUILD_TARGET), solaris)
include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
endif
- include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
endif
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100
@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
@@ -203,11 +197,6 @@ VBoxOGL_LIBS = \
$(VBOX_LIB_OGL_CRUTIL) \
$(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
ifdef VBoxOGL_FAKEDRI
VBoxOGL_LIBS += \
dl
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-09-14 23:53:17.013381550 +0100
@@ -17,7 +17,15 @@
*/
#define _GNU_SOURCE 1
+#define HAVE_STRNDUP 1
+#include <dlfcn.h>
+#include <elf.h>
+#include <unistd.h>
+#include <xf86.h>
+#include <xf86drm.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
#include "cr_error.h"
#include "cr_gl.h"
#include "cr_mem.h"
@@ -26,23 +34,6 @@
#include "dri_glx.h"
#include "iprt/mem.h"
#include "iprt/err.h"
-#include <dlfcn.h>
-#include <elf.h>
-#include <unistd.h>
-/** X server message type definitions. */
-typedef enum {
- X_PROBED, /* Value was probed */
- X_CONFIG, /* Value was given in the config file */
- X_DEFAULT, /* Value is a default */
- X_CMDLINE, /* Value was given on the command line */
- X_NOTICE, /* Notice */
- X_ERROR, /* Error message */
- X_WARNING, /* Warning message */
- X_INFO, /* Informational message */
- X_NONE, /* No prefix */
- X_NOT_IMPLEMENTED, /* Not implemented */
- X_UNKNOWN = -1 /* unknown -- this must always be last */
-} MessageType;
#define VBOX_NO_MESA_PATCH_REPORTS
@@ -104,8 +108,53 @@ static const __DRIswrastExtension *gpSwD
extern const __DRIextension * __driDriverExtensions[];
+//copy from /usr/share/xorg-x11-server-source/glx/dispatch.h
+#define SET_by_offset(disp, offset, fn) \
+ do { \
+ if ( (offset) < 0 ) { \
+ /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \
+ /* __func__, __LINE__, disp, offset, # fn); */ \
+ /* abort(); */ \
+ } \
+ else { \
+ ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \
+ } \
+ } while(0)
+
+// copy from glx/glapi.c
+
+/**
+ * Search the table of static entrypoint functions for the named function
+ * and return the corresponding glprocs_table_t entry.
+ */
+static const glprocs_table_t * find_entry( const char * n )
+{
+ GLuint i;
+ for (i = 0; static_functions[i].Name_offset >= 0; i++) {
+ const char *testName = gl_string_table + static_functions[i].Name_offset;
+ if (strcmp(testName, n) == 0) {
+ return &static_functions[i];
+ }
+ }
+ return NULL;
+}
+
+/**
+ * Return dispatch table offset of the named static (built-in) function.
+ * Return -1 if function not found.
+ */
+static GLint
+get_static_proc_offset(const char *funcName)
+{
+ const glprocs_table_t * const f = find_entry( funcName );
+ if (f) {
+ return f->Offset;
+ }
+ return -1;
+}
+
#define VBOX_SET_MESA_FUNC(table, name, func) \
- if (_glapi_get_proc_offset(name)>=0) SET_by_offset(table, _glapi_get_proc_offset(name), func); \
+ if (get_static_proc_offset(name)>=0) SET_by_offset(table, get_static_proc_offset(name), func); \
else crWarning("%s not found in mesa table", name)
#define GLAPI_ENTRY(Func) VBOX_SET_MESA_FUNC(vbox_glapi_table, "gl"#Func, cr_gl##Func);
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-13 13:14:21.000000000 +0000
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-27 23:14:15.058370962 +0100
@@ -20,13 +20,20 @@
#ifndef ___CROPENGL_FAKEDRIDRV_H
#define ___CROPENGL_FAKEDRIDRV_H
-#include "src/mesa/main/mtypes.h"
-#include "src/mesa/main/dd.h"
-#include "src/mesa/glapi/dispatch.h"
-#include "src/mesa/glapi/glapi.h"
-#include "src/mesa/glapi/glapitable.h"
-#include "src/mesa/glapi/glapioffsets.h"
-#include "src/mesa/drivers/dri/common/dri_util.h"
+//#include "/usr/share/xorg-x11-server-source/glx/glapi.h"
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
+extern GLuint
+_glapi_get_dispatch_table_size(void);
+
+extern struct _glapi_table *
+_glapi_get_dispatch(void);
+
+extern void
+_glapi_set_dispatch(struct _glapi_table *dispatch);
+
+//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
#include "glx_proto.h"
VirtualBox-4.2.0-xorg17.patch:
Config.kmk | 10 -
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 ++----
src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 10 -
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++++++-------
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
5 files changed, 94 insertions(+), 78 deletions(-)
--- NEW FILE VirtualBox-4.2.0-xorg17.patch ---
Build the X.Org driver only for the selected system X Server version.
Based on scripts by Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de>
Author: Sérgio Basto <sergio(a)serjux.com>
--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
+++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL
endif
if1of ($(KBUILD_TARGET), freebsd linux solaris)
- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
- VBOX_MESA_INCS = \
- $(VBOX_PATH_MESA_SOURCE) \
- $(VBOX_PATH_MESA_SOURCE)/include \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
+ VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1
endif
VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
--- ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
# This one has to be defined when building server code on systems where
# unsigned long is 64bits
vboxmouse_drv_DEFS.amd64 += _XSERVER64
- vboxmouse_drv_DEFS += \
- _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
- _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
- XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
- GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
- XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
- BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
- IN_MODULE XFree86Module PNP_MOUSE IN_XF86_MODULE
- vboxmouse_drv_INCS := \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
- $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(PATH_SUB_CURRENT)
+vboxmouse_drv_DEFS += XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X \
+ IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
+vboxmouse_drv_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
vboxmouse_drv_SOURCES = \
vboxmouse.c
# Any global symbols in the driver object files will be added to XFree86's
@@ -57,9 +44,18 @@ if1of ($(KBUILD_TARGET), linux)
vboxmouse_drv_POST_CMDS = \
objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \
$(MV) -f $(out)-objcopy $(out)
-endif
-
+DLLS += vboxmouse_drv_17
+vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
+ DONT_DEFINE_WRAPPERS NO_ANSIC
+vboxmouse_drv_17_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
+vboxmouse_drv_17_SOURCES = \
+ vboxmouse.c
+else
#
# vboxmouse_drv_70
#
@@ -391,5 +387,7 @@ endif # neq ($(KBUILD_TARGET),linux)
# endif # ! VBOX_ONLY_ADDITIONS
endif # VBOX_WITH_TESTCASES
+endif # neq ($(KBUILD_TARGET),linux)
+
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-03-13 14:52:26.000000000 +0000
+++ ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-23 00:33:57.939600191 +0100
@@ -52,13 +52,9 @@
#include <xf86Module.h>
-#ifdef VBOX_GUESTR3XF86MOD
-# define _X_EXPORT
-#else
-# include <errno.h>
-# include <fcntl.h>
-# include <unistd.h>
-#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
#include "product-generated.h"
--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-07 03:24:32.187238932 +0100
@@ -35,45 +35,35 @@ vboxvideo_drv_DEFS.x86 = __i386__
# This one has to be defined when building server code on systems where
# unsigned long is 64bits
vboxvideo_drv_DEFS.amd64 += _XSERVER64
-vboxvideo_drv_DEFS = \
- _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
- _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
- XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
- GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
- XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
- BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
- IN_MODULE XFree86Module IN_XF86_MODULE IN_RT_STATIC
-vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
+vboxvideo_drv_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER IN_XF86_MODULE XORG_7X RENDER=1 \
+ IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
vboxvideo_drv_INCS = \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
- $(VBOX_PATH_X11_XFREE_4_3)/include/X11/extensions \
- $(VBOX_PATH_X11_XFREE_4_3)/include/extensions \
- $(VBOX_PATH_X11_XFREE_4_3)/include/fonts \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/afb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/fb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ddc \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/int10 \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/i2c \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vbe \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support/bus \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/rac \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/ramdac \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/shadowfb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/vgahw \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf1bpp \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf24_32bpp \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/xf4bpp \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mfb \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/mi \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/miext/shadow \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/render \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
+ /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_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_SOURCES = \
pointer.c \
@@ -86,7 +76,7 @@ vboxvideo_drv_SOURCES = \
$(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
$(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
$(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \
- $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp
+ $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp edid.c vboxvideo_dri.c
# Any global symbols in the driver object files will be added to XFree86's
# symbol table, which can cause problems if we e.g. define a symbol in two
# modules.
@@ -94,6 +84,44 @@ vboxvideo_drv_SOURCES = \
objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \
$(MV) -f $(out)-objcopy $(out)
+DLLS += vboxvideo_drv_17
+vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
+vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \
+ IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
+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_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES)
+
+ifdef NOT_FEDORA
+
+
#
# vboxvideo_drv_70
#
@@ -505,4 +533,6 @@ $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvi
# endif # ! VBOX_ONLY_ADDITIONS
endif # VBOX_WITH_TESTCASES
+endif # NOT_FEDORA
+
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000
+++ ./src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000
@@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK
#
tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
tstSetModeXOrg_CFLAGS += -std=c99
-tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE
+tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
tstSetModeXOrg_SOURCES = \
tstSetModeXOrg.c \
../setmode.c
-tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS)
+tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS)
# generate rules.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore 1 Sep 2012 20:06:29 -0000 1.37
+++ .cvsignore 30 Sep 2012 16:44:18 -0000 1.38
@@ -1 +1 @@
-VirtualBox-4.1.20.tar.bz2
+VirtualBox-4.2.0.tar.bz2
VirtualBox-OSE-4.0.0-makeself.patch:
configure | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: VirtualBox-OSE-4.0.0-makeself.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox-OSE-4.0.0-makeself.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.0.0-makeself.patch 3 Feb 2011 23:25:21 -0000 1.1
+++ VirtualBox-OSE-4.0.0-makeself.patch 30 Sep 2012 16:44:18 -0000 1.2
@@ -14,7 +14,7 @@
+++ b/configure
@@ -2527,7 +2527,7 @@ if [ "$OS" = "linux" ]; then
check_compiler_h
- #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
# tools/common/makeself*
- [ $OSE -ge 1 ] && check_makeself
+ #[ $OSE -ge 1 ] && check_makeself
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VirtualBox.spec 1 Sep 2012 20:06:34 -0000 1.8
+++ VirtualBox.spec 30 Sep 2012 16:44:19 -0000 1.9
@@ -1,7 +1,7 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
# Standard compiler flags, without:
-# -Wall -- VirtualBox takes care of reasonable warnings very well
+# -Wall -- VirtualBox takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
@@ -10,73 +10,77 @@
# major version number, while the kernel module abi is not guarranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-#global prerel beta3
+#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-Name: VirtualBox
-Version: 4.1.20
-Release: 1%{?prerel:.%{prerel}}%{?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://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu...
-Source3: VirtualBox-90-vboxdrv.rules
-Source5: VirtualBox-60-vboxguest.rules
-Source6: VirtualBox.modules
-Source7: VirtualBox-guest.modules
-Source8: VirtualBox-vboxresize.desktop
-Source9: VirtualBox-00-vboxvideo.conf
-Source10: vboxweb.service
-Source11: vboxservice.service
-Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
-Patch2: VirtualBox-4.1.18-strings.patch
-Patch3: VirtualBox-4.1.20-libcxx.patch
-Patch5: VirtualBox-OSE-4.1.4-xorg17.patch
-Patch10: VirtualBox-OSE-4.0.0-32bit.patch
-#Patch11: VirtualBox-OSE-3.2.0-visibility.patch
-Patch15: VirtualBox-OSE-4.0.0-makeself.patch
-Patch16: VirtualBox-OSE-4.1.2-usblib.patch
-Patch17: VirtualBox-OSE-4.0.0-beramono.patch
-Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
-Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
-Patch23: VirtualBox-OSE-4.1.10-mesa.patch
+Name: VirtualBox
+Version: 4.2.0
+Release: 3%{?prerel:.%{prerel}}%{?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://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu...
+Source3: VirtualBox-90-vboxdrv.rules
+Source5: VirtualBox-60-vboxguest.rules
+Source6: VirtualBox.modules
+Source7: VirtualBox-guest.modules
+Source8: VirtualBox-vboxresize.desktop
+Source9: VirtualBox-00-vboxvideo.conf
+Source10: vboxweb.service
+Source11: vboxservice.service
+Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
+Patch2: VirtualBox-4.1.18-strings.patch
+Patch3: VirtualBox-4.2.0-libcxx.patch
+Patch5: VirtualBox-4.2.0-xorg17.patch
+%ifarch x86_64
+Patch10: VirtualBox-4.2.0-32bit.patch
+%endif
+Patch15: VirtualBox-OSE-4.0.0-makeself.patch
+Patch17: VirtualBox-OSE-4.0.0-beramono.patch
+Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
+Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
+Patch23: VirtualBox-4.2.0-mesa.patch
+Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
-%if 0%{?fedora} < 17
-BuildRequires: kBuild >= 0.1.98
+%if 0%{?fedora} < 16
+BuildRequires: kBuild >= 0.1.98
%endif
-BuildRequires: SDL-devel xalan-c-devel
-BuildRequires: openssl-devel
-BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel
-BuildRequires: yasm
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: python-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libcap-devel
-BuildRequires: qt4-devel
-BuildRequires: gsoap-devel
-BuildRequires: xz
-BuildRequires: pam-devel
-BuildRequires: mkisofs
-BuildRequires: java-devel >= 1.6
-BuildRequires: /usr/bin/pdflatex
-BuildRequires: libpng-devel
+BuildRequires: SDL-devel xalan-c-devel
+BuildRequires: openssl-devel
+BuildRequires: libcurl-devel
+BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel
+BuildRequires: yasm
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: python-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libcap-devel
+BuildRequires: qt4-devel
+BuildRequires: gsoap-devel
+BuildRequires: xz
+BuildRequires: pam-devel
+BuildRequires: mkisofs
+BuildRequires: java-devel >= 1.6
+BuildRequires: /usr/bin/pdflatex
+BuildRequires: libpng-devel
+#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
+#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
+#BuildRequires: /usr/lib/libc.so
+#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
# 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
-BuildRequires: xorg-x11-server-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXcomposite-devel
-BuildRequires: libXmu-devel
+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
+BuildRequires: xorg-x11-server-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXmu-devel
BuildRequires: systemd-units
Requires(post): systemd-units
@@ -85,20 +89,20 @@
# Plague-specific weirdness
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
-ExclusiveArch: i586 x86_64
+ExclusiveArch: i586 x86_64
%else
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64
%endif
-Provides: %{name}-OSE = %{version}-%{release}
-Obsoletes: %{name}-OSE < %{version}-%{release}
-Requires: %{name}-kmod = %{version}%{?prereltag}
-Provides: %{name}-kmod-common = %{version}%{?prereltag}
-Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
-Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
-Conflicts: %{name}-guest <= %{version}-%{release}
+Provides: %{name}-OSE = %{version}-%{release}
+Obsoletes: %{name}-OSE < %{version}-%{release}
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}-%{release}
+Provides: %{name}-OSE-kmod-common = %{version}-%{release}
+Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release}
+Conflicts: %{name}-guest <= %{version}-%{release}
%description
A general-purpose full virtualizer and emulator for 32-bit and
@@ -106,49 +110,49 @@
%package devel
-Summary: %{name} SDK
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: python-%{name} = %{version}-%{release}
-Provides: %{name}-OSE-devel = %{version}-%{release}
-Obsoletes: %{name}-OSE-devel < %{version}-%{release}
+Summary: %{name} SDK
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: python-%{name} = %{version}-%{release}
+Provides: %{name}-OSE-devel = %{version}-%{release}
+Obsoletes: %{name}-OSE-devel < %{version}-%{release}
%description devel
%{name} Software Development Kit.
%package -n python-%{name}
-Summary: Python bindings for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Provides: python-%{name}-OSE = %{version}-%{release}
-Obsoletes: python-%{name}-OSE < %{version}-%{release}
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: python-%{name}-OSE = %{version}-%{release}
+Obsoletes: python-%{name}-OSE < %{version}-%{release}
%description -n python-%{name}
Python XPCOM bindings to %{name}.
%package guest
-Summary: %{name} Guest Additions
-Group: System Environment/Base
-Provides: %{name}-OSE-guest = %{version}-%{release}
-Obsoletes: %{name}-OSE-guest < %{version}-%{release}
-Requires: %{name}-kmod = %{version}
-Provides: %{name}-kmod-common = %{version}
-Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
-Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
-Requires: xorg-x11-server-Xorg
-Requires: xorg-x11-xinit
-Provides: xorg-x11-drv-VirtualBox = %{version}-%{release}
-Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release}
-Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
-Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
+Summary: %{name} Guest Additions
+Group: System Environment/Base
+Provides: %{name}-OSE-guest = %{version}-%{release}
+Obsoletes: %{name}-OSE-guest < %{version}-%{release}
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}-%{release}
+Provides: %{name}-OSE-kmod-common = %{version}-%{release}
+Obsoletes: %{name}-OSE-kmod-common < %{version}-%{release}
+Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-xinit
+Provides: xorg-x11-drv-VirtualBox = %{version}-%{release}
+Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release}
+Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
+Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
-Requires: %(xserver-sdk-abi-requires ansic)
-Requires: %(xserver-sdk-abi-requires videodrv)
-Requires: %(xserver-sdk-abi-requires xinput)
+Requires: %(xserver-sdk-abi-requires ansic)
+Requires: %(xserver-sdk-abi-requires videodrv)
+Requires: %(xserver-sdk-abi-requires xinput)
%endif
-Conflicts: %{name} <= %{version}-%{release}
+Conflicts: %{name} <= %{version}-%{release}
%description guest
@@ -159,8 +163,8 @@
%package kmodsrc
-Summary: %{name} kernel module source code
-Group: System Environment/Kernel
+Summary: %{name} kernel module source code
+Group: System Environment/Kernel
Provides: %{name}-OSE-kmodsrc = %{version}-%{release}
Obsoletes: %{name}-OSE-kmodsrc < %{version}-%{release}
@@ -170,39 +174,44 @@
%prep
-%setup -q
+%setup -qn %{name}-%{version}%{prereltag}
find -name '*.py[co]' -delete
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
%patch5 -p1 -b .xorg17
-%patch10 -p1 -b .32bit
-#%patch11 -p1 -b .visibility
%patch15 -p1 -b .makeself
-%patch16 -p1 -b .usblib
+%ifarch x86_64
+%patch10 -p1 -b .32bit
+%endif
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
-%patch20 -p1 -b .testmangle
%if 0%{?fedora} < 16
%patch22 -p1 -b .gsoap
%endif
-%if 0%{?fedora} > 16
%patch23 -p1 -b .mesa
-%endif
+%patch24 -p1 -b .guestlib
# Remove prebuilt binary tools
-%if 0%{?fedora} < 17
+%if 0%{?fedora} < 16
rm -rf kBuild
%endif
rm -rf tools
+# Remove some bundle X11 sources.
+rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11stubs
+
# CRLF->LF
sed -i 's/\r//' COPYING
%build
-./configure --disable-kmods --enable-webservice
+./configure --disable-kmods
+#--disable-java
+#--enable-webservice
+#--disable-xpcom
. ./env.sh
# VirtualBox build system installs and builds in the same step,
@@ -211,13 +220,13 @@
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
kmk %{_smp_mflags} \
- KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \
- VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
- VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
- VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
- VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \
- VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
- VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
+ KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \
+ VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
+ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
+ VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
+ VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \
+ VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+ VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_BUILD_PUBLISHER=_%{?vendor:%(echo %{vendor} \
| sed -e 's/ //g' | cut -c 1-9)}%{?!vendor:custom}
@@ -256,73 +265,73 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+#ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/VBoxTunctl \
+ obj/bin/VBoxTunctl \
# Components
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
- obj/bin/components/*
+ obj/bin/components/*
# Lib
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/*.so
+ obj/bin/*.so
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/V*.gc \
- obj/bin/V*.r0 \
- obj/bin/VBoxEFI*.fd
+ obj/bin/V*.gc \
+ obj/bin/V*.r0 \
+ obj/bin/VBoxEFI*.fd
# Documentation
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/UserManual.pdf
+ obj/bin/UserManual.pdf
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/VBoxHeadless \
- obj/bin/VBoxSDL \
- obj/bin/VBoxNetDHCP \
- obj/bin/VBoxNetAdpCtl \
- obj/bin/VirtualBox \
- obj/bin/VBoxManage \
- obj/bin/VBoxSVC \
- obj/bin/VBoxXPCOMIPCD \
- obj/bin/VBoxSysInfo.sh \
- obj/bin/vboxshell.py \
- obj/bin/VBoxTestOGL \
- obj/bin/VBoxExtPackHelperApp \
- obj/bin/vboxwebsrv \
- obj/bin/VBoxBalloonCtrl \
- obj/bin/webtest \
- obj/bin/VBoxBFE
+ obj/bin/VBoxHeadless \
+ obj/bin/VBoxSDL \
+ obj/bin/VBoxNetDHCP \
+ obj/bin/VBoxNetAdpCtl \
+ obj/bin/VirtualBox \
+ obj/bin/VBoxManage \
+ obj/bin/VBoxSVC \
+ obj/bin/VBoxXPCOMIPCD \
+ obj/bin/VBoxSysInfo.sh \
+ obj/bin/vboxshell.py \
+ obj/bin/VBoxTestOGL \
+ obj/bin/VBoxExtPackHelperApp \
+ obj/bin/VBoxBalloonCtrl \
+ obj/bin/VBoxBFE
+# obj/bin/vboxwebsrv \
+# obj/bin/webtest \
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
- obj/bin/nls/*
+ obj/bin/nls/*
# SDK
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
- python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
+ python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
popd
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
- obj/bin/VBox.png
+ obj/bin/VBox.png
#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
- SIZE=$(basename $S)
- install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
- install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
- [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
+ SIZE=$(basename $S)
+ install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
+ install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
+ [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
done
install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
@@ -333,51 +342,51 @@
%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
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
-install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \
- obj/bin/additions/mount.vboxsf
+install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \
+ obj/bin/additions/mount.vboxsf
-install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/additions/VBoxService \
- obj/bin/additions/VBoxClient \
- obj/bin/additions/VBoxControl
+install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+ obj/bin/additions/VBoxService \
+ obj/bin/additions/VBoxClient \
+ obj/bin/additions/VBoxControl
# Ideally, Xorg should autodetect this, but for some reason it no longer does
install -m 0644 -D %{SOURCE9} \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
+ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
install -m 0644 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
+ $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service
install -m 0644 -D %{SOURCE11} \
- $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
+ $RPM_BUILD_ROOT%{_unitdir}/vboxservice.service
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
- $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
+ $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
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 0644 -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 0644 -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} \
- obj/bin/additions/VBoxOGL*.so
+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
install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \
- obj/bin/additions/pam_vbox.so
+ obj/bin/additions/pam_vbox.so
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
@@ -396,12 +405,12 @@
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}
tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
- %{name}-kmod-%{version}
+ %{name}-kmod-%{version}
# Menu entry
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
- --vendor='' obj/bin/virtualbox.desktop
+ --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
+ --vendor='' obj/bin/virtualbox.desktop
%post
# Group for USB devices
@@ -420,8 +429,8 @@
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
-# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
-# /sbin/udevadm settle >/dev/null 2>&1 || :
+# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
+# /sbin/udevadm settle >/dev/null 2>&1 || :
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
@@ -482,7 +491,7 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-%{_bindir}/vboxwebsrv
+#{_bindir}/vboxwebsrv
%{_bindir}/VBoxVRDP
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
@@ -496,8 +505,8 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-%{_libdir}/virtualbox/vboxwebsrv
-%{_libdir}/virtualbox/webtest
+#{_libdir}/virtualbox/vboxwebsrv
+#{_libdir}/virtualbox/webtest
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
@@ -550,6 +559,62 @@
%changelog
+* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
+- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
+VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
+
+* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
+- Disable websrv because fails to build on rawhide, temporarily I hope.
+
+* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
+- 4.2.0 released
+- Rebase and rework VirtualBox-4.2.0-xorg17.patch, add 2 new Definitions: XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
+- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch
+- Reorganize last 2 patches.
+- Revert attempt to remove 32-bits patch.
+
+* Thu Sep 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.7.RC4
+- Another try to compile with 32-bits suport on x86_64.
+
+* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
+- Update to RC4.
+- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
+- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
+- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
+- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
+
+* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3
+- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64.
+
+* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.4.RC3
+- Also Compile guest drives vboxvideo_drv and vboxmouse_drv with X11 sources from system.
+- Fix ABI/API breakages in X11 1.13.
+
+* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.3.RC3
+- fix requires kmod, with version with prerealeses.
+
+* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC3
+- vim :retab, reformat all tabs.
+- add BR # libstdc++.i686 and libc-devel.i686 for 32-bits
+BuildRequires: /usr/lib/libc.so
+BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
+- drop 32-bit patch and testmangle patch, no fails.
+- rename and remove some patches
+cvs diff: VirtualBox-4.1.20-libcxx.patch was removed, no comparison available
+cvs diff: VirtualBox-4.1.20-x113.patch is a new entry, no comparison available
+cvs diff: VirtualBox-4.2.0-libcxx.patch is a new entry, no comparison available
+cvs diff: VirtualBox-4.2.0-xorg17.patch is a new entry, no comparison available
+cvs diff: VirtualBox-OSE-3.2.0-visibility.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.0.0-32bit.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.1.2-testmangle.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.1.2-usblib.patch was removed, no comparison available
+cvs diff: VirtualBox-OSE-4.1.4-xorg17.patch was removed, no comparison available
+
+* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3
+- New major release, devel release of rpms .
+- rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch
+ and VirtualBox-OSE-4.0.0-32bit.patch
+
* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1
- New upstream release.
- Redo VirtualBox-4.1.20-libcxx.patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 1 Sep 2012 20:06:34 -0000 1.37
+++ sources 30 Sep 2012 16:44:19 -0000 1.38
@@ -1 +1 @@
-5784c6dda8a9d53f8f21b2d41eba903c VirtualBox-4.1.20.tar.bz2
+691b4134983ce7d89b9fb683305cb647 VirtualBox-4.2.0.tar.bz2
Index: vboxweb.service
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/vboxweb.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vboxweb.service 29 Apr 2012 17:02:50 -0000 1.1
+++ vboxweb.service 30 Sep 2012 16:44:19 -0000 1.2
@@ -1,5 +1,5 @@
[Unit]
-Description=VirtualBox OSE Web Service
+Description=VirtualBox Web Service
After=network.target
[Service]
--- VirtualBox-OSE-3.2.0-visibility.patch DELETED ---
--- VirtualBox-OSE-4.0.0-32bit.patch DELETED ---
--- VirtualBox-OSE-4.1.10-mesa.patch DELETED ---
--- VirtualBox-OSE-4.1.2-testmangle.patch DELETED ---
--- VirtualBox-OSE-4.1.2-usblib.patch DELETED ---
--- VirtualBox-OSE-4.1.4-xorg17.patch DELETED ---
11 years, 6 months
- 1
- 0
rpms/minitube/F-16 minitube-1.9.0-1-disable-update-check.patch, NONE, 1.1 minitube.spec, 1.15, 1.16 sources, 1.12, 1.13
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3751
Modified Files:
minitube.spec sources
Added Files:
minitube-1.9.0-1-disable-update-check.patch
Log Message:
* Sun Sep 30 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.9.0-1
- update to 1.9.0-1
minitube-1.9.0-1-disable-update-check.patch:
MainWindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE minitube-1.9.0-1-disable-update-check.patch ---
diff -up src/MainWindow.cpp.orig src/MainWindow.cpp
--- src/MainWindow.cpp.orig 2012-09-30 09:56:23.326324428 +0300
+++ src/MainWindow.cpp 2012-09-30 09:59:08.923797874 +0300
@@ -130,7 +130,7 @@ MainWindow::MainWindow() :
mouseTimer->setSingleShot(true);
connect(mouseTimer, SIGNAL(timeout()), SLOT(hideMouse()));
- QTimer::singleShot(0, this, SLOT(checkForUpdate()));
+ //QTimer::singleShot(0, this, SLOT(checkForUpdate()));
}
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-16/minitube.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- minitube.spec 24 Aug 2012 06:55:07 -0000 1.15
+++ minitube.spec 30 Sep 2012 07:43:47 -0000 1.16
@@ -1,5 +1,5 @@
Name: minitube
-Version: 1.8.0
+Version: 1.9.0
Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -34,7 +34,7 @@
Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.8-1-disable-update-check.patch
+Patch1: minitube-1.9.0-1-disable-update-check.patch
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
@@ -106,6 +106,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Sun Sep 30 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.9.0-1
+- update to 1.9.0-1
+
* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
- 1.8.0
- clean spec file
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-16/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 24 Aug 2012 06:55:07 -0000 1.12
+++ sources 30 Sep 2012 07:43:47 -0000 1.13
@@ -1 +1 @@
-dabfe4776ab6a19eff14e644f68714bb minitube.tar.gz
+a60bb568519eb91035d5d6dc27ff1406 minitube.tar.gz
11 years, 7 months
- 1
- 0
rpms/minitube/F-17 minitube-1.9.0-1-disable-update-check.patch, NONE, 1.1 minitube.spec, 1.17, 1.18 sources, 1.12, 1.13
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3521
Modified Files:
minitube.spec sources
Added Files:
minitube-1.9.0-1-disable-update-check.patch
Log Message:
* Sun Sep 30 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.9.0-1
- update to 1.9.0-1
minitube-1.9.0-1-disable-update-check.patch:
MainWindow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE minitube-1.9.0-1-disable-update-check.patch ---
diff -up src/MainWindow.cpp.orig src/MainWindow.cpp
--- src/MainWindow.cpp.orig 2012-09-30 09:56:23.326324428 +0300
+++ src/MainWindow.cpp 2012-09-30 09:59:08.923797874 +0300
@@ -130,7 +130,7 @@ MainWindow::MainWindow() :
mouseTimer->setSingleShot(true);
connect(mouseTimer, SIGNAL(timeout()), SLOT(hideMouse()));
- QTimer::singleShot(0, this, SLOT(checkForUpdate()));
+ //QTimer::singleShot(0, this, SLOT(checkForUpdate()));
}
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-17/minitube.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- minitube.spec 24 Aug 2012 06:52:53 -0000 1.17
+++ minitube.spec 30 Sep 2012 07:41:53 -0000 1.18
@@ -1,5 +1,5 @@
Name: minitube
-Version: 1.8.0
+Version: 1.9.0
Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -34,7 +34,7 @@
Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.8-1-disable-update-check.patch
+Patch1: minitube-1.9.0-1-disable-update-check.patch
BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
@@ -106,6 +106,9 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Sun Sep 30 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.9.0-1
+- update to 1.9.0-1
+
* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.8.0-1
- 1.8.0
- clean spec file
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-17/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 24 Aug 2012 06:52:53 -0000 1.12
+++ sources 30 Sep 2012 07:41:53 -0000 1.13
@@ -1 +1 @@
-dabfe4776ab6a19eff14e644f68714bb minitube.tar.gz
+a60bb568519eb91035d5d6dc27ff1406 minitube.tar.gz
11 years, 7 months
- 1
- 0