[packages/VirtualBox/beta] - updated to 4.2.0 (final)

[charles]

commit 5d8f03ab9c661236eda2fab4afd79c2e1212bc36
Author: Karol Krenski <charles at pld-linux.org>
Date:   Thu Sep 13 20:06:00 2012 +0200

    - updated to 4.2.0 (final)

 18-system-xorg.patch |  6 ++++--
 VirtualBox.spec      | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 0a81950..972f9a6 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,7 +32,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		0.5
+%define		rel		1
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
@@ -41,10 +41,10 @@ Version:	4.2.0
 Release:	%{rel}
 License:	GPL v2
 Group:		Applications/Emulators
-Source0:	http://download.virtualbox.org/virtualbox/%{version}_RC4/%{pname}-%{version}_RC4.tar.bz2
-# Source0-md5:	697790b7d150569e6e3cc869242ddfe3
-Source1:	http://download.virtualbox.org/virtualbox/%{version}_RC4/VBoxGuestAdditions_%{version}_RC4.iso
-# Source1-md5:	861eedfbbb16eed27c46d2a2c35086d6
+Source0:	http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
+# Source0-md5:	691b4134983ce7d89b9fb683305cb647
+Source1:	http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
+# Source1-md5:	ee74e968bab97466c3b463a0b4d665f5
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
 Source5:	%{pname}-vboxnetflt.init
@@ -482,7 +482,7 @@ You should install this package in your Guest OS.
 Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 
 %prep
-%setup -q -n %{pname}-%{version}_RC4
+%setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
diff --git a/18-system-xorg.patch b/18-system-xorg.patch
index 4a28b93..235be27 100644
--- a/18-system-xorg.patch
+++ b/18-system-xorg.patch
@@ -18,18 +18,20 @@ diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Addi
 diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
 --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
 +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
+@@ -63,18 +63,12 @@
  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)/1.3/xorg \
+-	$(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 \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/5d8f03ab9c661236eda2fab4afd79c2e1212bc36