packages: VirtualBox/VirtualBox.spec, VirtualBox/xserver-1.12.patch (NEW)=?UTF-8?Q?=20?=-...

[baggins]

Author: baggins                      Date: Tue Mar 20 18:28:30 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with xserver 1.12

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.422 -> 1.423) , xserver-1.12.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.422 packages/VirtualBox/VirtualBox.spec:1.423
--- packages/VirtualBox/VirtualBox.spec:1.422	Tue Mar 20 11:19:31 2012
+++ packages/VirtualBox/VirtualBox.spec	Tue Mar 20 19:28:25 2012
@@ -68,6 +68,7 @@
 Patch4:		%{pname}-vnc.patch
 Patch5:		%{pname}-dri.patch
 Patch6:		%{pname}-disable_build_NetBiosBin.patch
+Patch7:		xserver-1.12.patch
 # ubuntu patches
 Patch10:		16-no-update.patch
 Patch11:		18-system-xorg.patch
@@ -483,6 +484,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -997,6 +999,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.423  2012/03/20 18:28:25  baggins
+- fix build with xserver 1.12
+
 Revision 1.422  2012/03/20 10:19:31  baggins
 - release 17
 

================================================================
Index: packages/VirtualBox/xserver-1.12.patch
diff -u /dev/null packages/VirtualBox/xserver-1.12.patch:1.1
--- /dev/null	Tue Mar 20 19:28:30 2012
+++ packages/VirtualBox/xserver-1.12.patch	Tue Mar 20 19:28:25 2012
@@ -0,0 +1,20 @@
+--- VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/glx_c_exports.c~	2011-12-19 13:58:54.000000000 +0100
++++ VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/glx_c_exports.c	2012-03-20 19:23:14.921396646 +0100
+@@ -16,6 +16,7 @@
+  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+  */
+ 
++#include "xorg/xorg-server.h"
+ #include "stub.h"
+ #include "dri_glx.h"
+ #include "fakedri_drv.h"
+--- VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~	2012-03-20 18:05:06.047425764 +0100
++++ VirtualBox-4.1.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2012-03-20 19:26:39.608072546 +0100
+@@ -18,6 +18,7 @@
+ 
+ #define _GNU_SOURCE 1
+ 
++#include "xorg/xorg-server.h"
+ #include "cr_error.h"
+ #include "cr_gl.h"
+ #include "cr_mem.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org//packages/VirtualBox/VirtualBox.spec?r1=1.422&r2=1.423&f=u