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
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 ---