Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31195 Modified Files: .cvsignore VirtualBox.spec sources Added Files: VirtualBox-4.3.10-gcc.patch VirtualBox-4.3.10-xserver_guest.patch Removed Files: VirtualBox-4.2.6-gcc48.patch VirtualBox-4.3.6-mesa.patch Log Message: * 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 . VirtualBox-4.3.10-gcc.patch: configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE VirtualBox-4.3.10-gcc.patch --- --- ./configure.gcc 2014-05-02 19:18:06.929223329 +0100 +++ ./configure 2014-05-02 19:21:11.010309549 +0100 @@ -420,9 +420,9 @@ check_gcc() elif [ $cc_maj -lt 3 \ -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ - -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \ + -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \ -o $cc_maj -gt 4 ]; then - log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8" + log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10" fail really else log_success "found version $cc_ver" 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-20/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 31 Mar 2014 01:23:05 -0000 1.53 +++ .cvsignore 17 May 2014 00:54:26 -0000 1.54 @@ -1 +1 @@ -VirtualBox-4.3.10.tar.bz2 +VirtualBox-4.3.12.tar.bz2 Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- VirtualBox.spec 31 Mar 2014 01:23:06 -0000 1.58 +++ VirtualBox.spec 17 May 2014 00:54:26 -0000 1.59 @@ -26,7 +26,7 @@ #endif Name: VirtualBox -Version: 4.3.10 +Version: 4.3.12 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -49,9 +49,10 @@ 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 @@ -230,9 +231,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 +244,7 @@ %if %{enable_webservice} --enable-webservice \ %endif -%if %{enable_docs} -%else +%if !%{enable_docs} --disable-docs \ %endif @@ -442,8 +443,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 +620,13 @@ %changelog +* 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-20/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 31 Mar 2014 01:23:06 -0000 1.53 +++ sources 17 May 2014 00:54:26 -0000 1.54 @@ -1 +1 @@ -c3e9e61d5ed7c672bfc747fb8df4367b VirtualBox-4.3.10.tar.bz2 +b31908e98f6c271c59b97ce8154e31da VirtualBox-4.3.12.tar.bz2 --- VirtualBox-4.2.6-gcc48.patch DELETED --- --- VirtualBox-4.3.6-mesa.patch DELETED ---