Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10959 Modified Files: .cvsignore VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox-4.3.0-libcxx.patch VirtualBox.spec sources Added Files: VirtualBox-4.3.10-xserver_guest.patch Removed Files: VirtualBox-4.3.6-mesa.patch Log Message: * Wed Sep 10 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.16-1 - New upstream release . - Fixed VirtualBox-4.3.0-VBoxGuestLib.patch . VirtualBox-4.3.10-xserver_guest.patch: Makefile.kmk | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) --- NEW FILE VirtualBox-4.3.10-xserver_guest.patch --- Just compile with X11 system source and we may remove bundle X11 source code. --- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100 +++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100 @@ -82,18 +82,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES 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)/xextproto-7.1.1 \ - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ $(VBOX_MESA_INCS) \ - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 + /usr/include/drm \ + /usr/include/libdrm VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif @@ -222,11 +216,20 @@ VBoxOGL_LIBS = \ $(VBOX_LIB_OGL_CRUTIL) \ $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_LIBS += \ - $(PATH_STAGE_LIB)/libXcomposite.so \ - $(PATH_STAGE_LIB)/libXdamage.so \ - $(PATH_STAGE_LIB)/libXfixes.so \ - $(PATH_STAGE_LIB)/libXext.so + if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86 ) + VBoxOGL_LIBS += \ + /usr/lib/libXcomposite.so \ + /usr/lib/libXdamage.so \ + /usr/lib/libXfixes.so \ + /usr/lib/libXext.so + endif + if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64 ) + VBoxOGL_LIBS += \ + /usr/lib64/libXcomposite.so \ + /usr/lib64/libXdamage.so \ + /usr/lib64/libXfixes.so \ + /usr/lib64/libXext.so + endif ifdef VBoxOGL_FAKEDRI ifeq ($(KBUILD_TARGET), freebsd) VBoxOGL_LIBS += \ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 11 Apr 2014 17:04:34 -0000 1.53 +++ .cvsignore 18 Sep 2014 22:22:56 -0000 1.54 @@ -1 +1 @@ -VirtualBox-4.3.10.tar.bz2 +VirtualBox-4.3.16.tar.bz2 VirtualBox-4.3.0-VBoxGuestLib.patch: Makefile.kmk | 4 ---- 1 file changed, 4 deletions(-) Index: VirtualBox-4.3.0-VBoxGuestLib.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox-4.3.0-VBoxGuestLib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-4.3.0-VBoxGuestLib.patch 11 Apr 2014 17:04:34 -0000 1.2 +++ VirtualBox-4.3.0-VBoxGuestLib.patch 18 Sep 2014 22:22:56 -0000 1.3 @@ -1,13 +1,15 @@ when we use VBOX_USE_SYSTEM_XORG_HEADERS , we don't need compile the very old libXFree86 (from xfree86.org) Sérgio Basto <sergio(a)serjux.com&gt; ---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.guestlib 2014-03-01 03:57:34.446124468 +0000 -+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-03-01 04:00:47.863997911 +0000 -@@ -38,7 +38,7 @@ endif - LIBRARIES += \ +--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2014-09-11 15:31:56.706906433 +0100 ++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-09-11 15:32:24.737206867 +0100 +@@ -39,10 +39,6 @@ LIBRARIES += \ VBoxGuestR3Lib \ VBoxGuestR3LibShared --ifndef VBOX_ONLY_TESTSUITE -+ifndef VBOX_USE_SYSTEM_XORG_HEADERS - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) + ifndef VBOX_ONLY_TESTSUITE +- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) +- LIBRARIES += \ +- VBoxGuestR3LibXFree86 +- endif + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) LIBRARIES += \ - VBoxGuestR3LibXFree86 + VBoxGuestR3LibXOrg VirtualBox-4.3.0-libcxx.patch: ./src/VBox/Runtime/Makefile.kmk | 2 +- ./src/VBox/Storage/testcase/Makefile.kmk | 4 ++-- ./src/libs/kStuff/Makefile.kmk | 2 +- Config.kmk | 2 +- b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +- b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- configure | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- 13 files changed, 19 insertions(+), 21 deletions(-) Index: VirtualBox-4.3.0-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox-4.3.0-libcxx.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- VirtualBox-4.3.0-libcxx.patch 11 Apr 2014 17:04:34 -0000 1.3 +++ VirtualBox-4.3.0-libcxx.patch 18 Sep 2014 22:22:56 -0000 1.4 @@ -23,15 +23,6 @@ # # SDKs for external libraries. -@@ -3784,7 +3776,7 @@ endif - # Unlike VBOXR3STATIC, this is strict wrt warnings and includes IPRT. - # - TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC --TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC -+TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE - TEMPLATE_VBoxR3Static_EXTENDS_BY = appending - TEMPLATE_VBoxR3Static_SDKS += VBOX_OPENSSL - TEMPLATE_VBoxR3Static_SDKS.win += VBOX_NTDLL --- a/configure +++ b/configure @@ -2582,7 +2582,7 @@ fi @@ -67,17 +58,6 @@ ifdef VBOX_X11_SEAMLESS_GUEST VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE VBoxClient_SOURCES += \ ---- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100 -+++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100 -@@ -94,7 +94,7 @@ SUPR3_SOURCES = \ - # - # Static version of SUPR3. - # --SUPR3Static_TEMPLATE = VBOXR3STATIC -+SUPR3Static_TEMPLATE = VBOXR3EXE - SUPR3Static_EXTENDS = SUPR3 - - # --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100 +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100 @@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet @@ -209,17 +189,6 @@ VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) ---- ./src/VBox/Runtime/Makefile.kmk.libcxx 2013-10-15 12:13:19.000000000 +0100 -+++ ./src/VBox/Runtime/Makefile.kmk 2013-10-28 03:08:32.053146036 +0000 -@@ -232,7 +232,7 @@ endif - # - # RuntimeR3 - Static Runtime for Ring-3 executables. - # --RuntimeR3_TEMPLATE = VBoxR3Static -+RuntimeR3_TEMPLATE = VBOXR3EXE - RuntimeR3_SDKS = VBOX_OPENSSL VBOX_LIBXML2 - RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK) - RuntimeR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP --- ./src/libs/kStuff/Makefile.kmk.orig 2012-12-27 18:36:01.629728244 +0000 +++ ./src/libs/kStuff/Makefile.kmk 2012-12-27 18:36:11.876827415 +0000 @@ -75,7 +75,7 @@ VBox-kStuff_SOURCES = \ @@ -231,3 +200,14 @@ VBox-kStuffStatic_EXTENDS = VBox-kStuff +--- ./src/VBox/Runtime/Makefile.kmk.libcxx 2014-07-15 23:08:58.294017830 +0100 ++++ ./src/VBox/Runtime/Makefile.kmk 2014-07-15 23:12:41.365417070 +0100 +@@ -221,7 +221,7 @@ endif + # + # RuntimeR3 - Static Runtime for Ring-3 executables. + # +-RuntimeR3_TEMPLATE = VBoxR3Static ++RuntimeR3_TEMPLATE = VBOXR3EXE + RuntimeR3_SDKS = VBOX_OPENSSL VBOX_LIBXML2 + RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK) + RuntimeR3_DEFS = \ Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- VirtualBox.spec 11 Apr 2014 17:04:34 -0000 1.55 +++ VirtualBox.spec 18 Sep 2014 22:22:56 -0000 1.56 @@ -26,7 +26,7 @@ #endif Name: VirtualBox -Version: 4.3.10 +Version: 4.3.16 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -49,13 +49,12 @@ Patch17: VirtualBox-OSE-4.0.0-beramono.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch22: VirtualBox-OSE-4.1.12-gsoap.patch -Patch23: VirtualBox-4.3.6-mesa.patch +Patch23: VirtualBox-4.3.10-xserver_guest.patch Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch Patch26: VirtualBox-4.3.0-no-bundles.patch +#Patch27: VirtualBox-4.3.10-gcc.patch -%if 0%{?fedora} < 16 -BuildRequires: kBuild >= 0.1.98 -%endif +BuildRequires: kBuild >= 0.1.9998 BuildRequires: SDL-devel xalan-c-devel BuildRequires: openssl-devel BuildRequires: libcurl-devel @@ -201,9 +200,7 @@ find -name '*.py[co]' -delete # Remove prebuilt binary tools -%if 0%{?fedora} < 16 rm -rf kBuild -%endif rm -rf tools # Remove bundle X11 sources and some lib sources, before patching. mv src/VBox/Additions/x11/x11include/mesa-7.2 . @@ -230,9 +227,10 @@ %if 0%{?fedora} < 16 %patch22 -p1 -b .gsoap %endif -%patch23 -p1 -b .mesa +%patch23 -p1 -b .xserver_guest %patch24 -p1 -b .guestlib %patch26 -p1 -b .nobundles +#patch27 -p1 -b .gcc # CRLF->LF sed -i 's/\r//' COPYING @@ -242,8 +240,7 @@ %if %{enable_webservice} --enable-webservice \ %endif -%if %{enable_docs} -%else +%if !%{enable_docs} --disable-docs \ %endif @@ -442,8 +439,8 @@ install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules # Install modules load script -install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf -install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf +install -p -m 0644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf +install -p -m 0644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf # Module Source Code mkdir -p %{name}-kmod-%{version} @@ -619,6 +616,24 @@ %changelog +* Wed Sep 10 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.16-1 +- New upstream release . +- Fixed VirtualBox-4.3.0-VBoxGuestLib.patch . + +* Sat Aug 23 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.14-2 +- Rebuild for new gcc https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.14-1 +- New upstream release . +- Unbunble kBuild, since KBuild from fedora is working again. + +* Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.12-1 +- New upstream release . +- Rename and split X11 and mesa (for guest) patches . + +* Fri May 02 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.10-2 +- Rebuild for new x11-xorg-server + * Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.10-1 - In vboxvideo guest drive, don't patch the source code of Mesa part that use glapi and use bundled x11include/mesa-7.2 headers of Mesa, which btw rawhide doesn't have it, F20 have glapi in xorg-x11-server-source, but by what Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-19/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Apr 2014 17:04:34 -0000 1.53 +++ sources 18 Sep 2014 22:22:56 -0000 1.54 @@ -1 +1 @@ -c3e9e61d5ed7c672bfc747fb8df4367b VirtualBox-4.3.10.tar.bz2 +16f8f3e5fea2677da7456bc8b6aff458 VirtualBox-4.3.16.tar.bz2 --- VirtualBox-4.3.6-mesa.patch DELETED ---