[packages/VirtualBox] - started update to 4.3.0
baggins
baggins at pld-linux.org
Wed Oct 16 09:13:21 CEST 2013
commit 600ebcbfeeeb62b090286aef31c6a5507c438d80
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Oct 16 09:13:11 2013 +0200
- started update to 4.3.0
VirtualBox-dri.patch | 33 +++++++++++++++++++--------------
VirtualBox.spec | 10 +++++-----
2 files changed, 24 insertions(+), 19 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c0b7c94..2ab6df4 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,19 +32,19 @@
%define _enable_debug_packages 0
%endif
-%define rel 8
+%define rel 0.1
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{_alt_kernel}
-Version: 4.2.16
+Version: 4.3.0
Release: %{rel}
License: GPL v2
Group: Applications/Emulators
Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: c4a36e2099a317f4715cd3861cdae238
+# Source0-md5: 1f49237686d095859f3dbea0941f8b12
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 6074747feb9ae8b6eec365616347eef3
+# Source1-md5: 6b72a59aba1660afa4f430faa88d727a
Source2: vboxservice.init
Source3: %{pname}-vboxdrv.init
Source4: %{pname}-vboxguest.init
@@ -538,7 +538,7 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
+#%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
diff --git a/VirtualBox-dri.patch b/VirtualBox-dri.patch
index be8ee24..6d914cc 100644
--- a/VirtualBox-dri.patch
+++ b/VirtualBox-dri.patch
@@ -1,16 +1,21 @@
---- VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~ 2011-06-30 18:33:33.000000000 +0200
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 21:58:45.900949411 +0200
-@@ -37,10 +37,10 @@
-
- //@todo this could be different...
- #ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/xorg/modules/dri:/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/x86_64-linux-gnu/dri"
-+# define DRI_XORG_DRV_DIR "/usr/lib64/xorg/modules/drivers/"
+--- VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c~ 2011-06-30 18:33:33.000000000 +0200
++++ VirtualBox-4.3.0/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 21:58:45.900949411 +0200
+@@ -37,15 +37,15 @@
+ # define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+ # define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+ # else
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
+-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/xorg/modules/dri:/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/x86_64-linux-gnu/dri"
++# define DRI_XORG_DRV_DIR "/usr/lib64/xorg/modules/drivers/"
+ # endif
#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/i386-linux-gnu/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+ # ifdef RT_OS_FREEBSD
+ # define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
+ # define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
+ # else
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri:/usr/lib/xorg/modules/i386-linux-gnu/dri"
+ # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+ # endif
#endif
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/600ebcbfeeeb62b090286aef31c6a5507c438d80
More information about the pld-cvs-commit
mailing list