4:39 a.m.
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21451
Modified Files:
.cvsignore VirtualBox-4.2.0-mesa.patch
VirtualBox-4.2.0-xorg17.patch VirtualBox.spec sources
Log Message:
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1.
Changeset r43588,
https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system
headers, and
"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build
it".
- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide,
can't buid it
on F18 and rawhide, new libxslt and new pdflatex problems.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 30 Sep 2012 19:37:20 -0000 1.38
+++ .cvsignore 29 Oct 2012 04:39:49 -0000 1.39
@@ -1 +1 @@
-VirtualBox-4.2.0.tar.bz2
+VirtualBox-4.2.4.tar.bz2
VirtualBox-4.2.0-mesa.patch:
Config.kmk | 10 ---
src/VBox/Additions/common/crOpenGL/Makefile.kmk | 21 +-----
src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 72 +++++++++++++++++------
src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 21 ++++--
src/VBox/Additions/x11/Makefile.kmk | 1
5 files changed, 74 insertions(+), 51 deletions(-)
Index: VirtualBox-4.2.0-mesa.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox-4.2.0-mesa.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-mesa.patch 30 Sep 2012 19:37:20 -0000 1.1
+++ VirtualBox-4.2.0-mesa.patch 29 Oct 2012 04:39:49 -0000 1.2
@@ -1,6 +1,25 @@
fakedri_drv.c,h:
Just compile with X11 system source and we may remove bundle X11 source code.
+--- ./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/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
VirtualBox-4.2.0-xorg17.patch:
vboxmouse/Makefile.kmk | 40 +++++++-------
vboxmouse/vboxmouse.c | 10 +--
vboxvideo/Makefile.kmk | 108 +++++++++++++++++++++++++---------------
vboxvideo/testcase/Makefile.kmk | 4 -
4 files changed, 93 insertions(+), 69 deletions(-)
Index: VirtualBox-4.2.0-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox-4.2.0-xorg17.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-xorg17.patch 30 Sep 2012 19:37:20 -0000 1.1
+++ VirtualBox-4.2.0-xorg17.patch 29 Oct 2012 04:39:49 -0000 1.2
@@ -2,25 +2,6 @@
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)
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- VirtualBox.spec 30 Sep 2012 19:41:48 -0000 1.9
+++ VirtualBox.spec 29 Oct 2012 04:39:49 -0000 1.10
@@ -14,8 +14,8 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print
toupper("%{prerel}")}')}
Name: VirtualBox
-Version: 4.2.0
-Release: 4%{?prerel:.%{prerel}}%{?dist}
+Version: 4.2.4
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -33,7 +33,6 @@
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
@@ -181,7 +180,6 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
-%patch5 -p1 -b .xorg17
%patch15 -p1 -b .makeself
%ifarch x86_64
%patch10 -p1 -b .32bit
@@ -212,9 +210,15 @@
%build
-./configure --disable-kmods
+./configure --disable-kmods \
+%if 0%{?fedora} > 17
+ --disable-docs
+%endif
+%if 0%{?fedora} < 18
+ --enable-webservice
+%endif
+
#--disable-java
-#--enable-webservice
#--disable-xpcom
. ./env.sh
@@ -230,6 +234,7 @@
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_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_BUILD_PUBLISHER=_%{?vendor:%(echo %{vendor} \
| sed -e 's/ //g' | cut -c 1-9)}%{?!vendor:custom}
@@ -269,7 +274,9 @@
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
+%if 0%{?fedora} < 18
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+%endif
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
@@ -290,8 +297,11 @@
obj/bin/VBoxEFI*.fd
# Documentation
+%if 0%{?fedora} < 18
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/UserManual.pdf
+%endif
+
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
@@ -308,10 +318,12 @@
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/VBoxBalloonCtrl \
+%if 0%{?fedora} < 18
+ obj/bin/vboxwebsrv \
+ obj/bin/webtest \
+%endif
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/*
@@ -327,7 +339,6 @@
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
-#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
@@ -340,14 +351,18 @@
install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
# Guest X.Org drivers
-# With the xorg17 patch, the _17 driver builds against what's
-# actually available for the system, so would probably be a 1.6
-# driver when compiled on Fedora 10, despite its name
-%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
-install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
+# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
+# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only
+# build the X.Org drivers against the installed system headers.
+# also wrote:
+# As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not
+# build it in this case.
+# and
+# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
+#
+# [1] https://www.virtualbox.org/changeset/43588/vbox
+
+install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
@@ -495,10 +510,14 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-#{_bindir}/vboxwebsrv
+%if 0%{?fedora} < 18
+%{_bindir}/vboxwebsrv
+%endif
%{_bindir}/VBoxVRDP
+%if 0%{?fedora} < 18
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
+%endif
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
@@ -509,8 +528,10 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-#{_libdir}/virtualbox/vboxwebsrv
-#{_libdir}/virtualbox/webtest
+%if 0%{?fedora} < 18
+%{_libdir}/virtualbox/vboxwebsrv
+%{_libdir}/virtualbox/webtest
+%endif
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
@@ -563,6 +584,14 @@
%changelog
+* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
+- New upstream release.
+- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1.
Changeset r43588,
+https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system
headers, and
+"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build
it".
+- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide,
can't buid it
+ on F18 and rawhide, new libxslt and new pdflatex problems.
+
* 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
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 30 Sep 2012 19:37:20 -0000 1.38
+++ sources 29 Oct 2012 04:39:49 -0000 1.39
@@ -1 +1 @@
-691b4134983ce7d89b9fb683305cb647 VirtualBox-4.2.0.tar.bz2
+d1ec2d2a3f2f3f0b277dfe2c520c2e33 VirtualBox-4.2.4.tar.bz2