Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9626 Modified Files: VirtualBox-4.1.20-x113.patch Added Files: VirtualBox-4.2.4-no-bundles.patch Log Message: * Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.4-1 - New upstream release. - Fix some changelog dates. VirtualBox-4.2.4-no-bundles.patch: Config.kmk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- NEW FILE VirtualBox-4.2.4-no-bundles.patch --- --- ./Config.kmk.libcxx 2012-10-26 17:23:13.000000000 +0100 +++ ./Config.kmk 2012-11-24 14:46:31.187664914 +0000 @@ -2587,26 +2587,25 @@ VBOXLNX32GUEST_SUFF_LIB = .a # SDKs for external libraries. # SDK_VBOX_LIBXML2 = . -SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include +SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2 SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS # note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link # libxml against VBoxRT SDK_VBOX_LIBPNG = . -SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8 +SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15 SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB) SDK_VBOX_ZLIB = . if1of ($(KBUILD_TARGET), os2 solaris win) - SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.6 + SDK_VBOX_ZLIB_INCS ?= /usr/include/ SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB) else SDK_VBOX_ZLIB_INCS ?= SDK_VBOX_ZLIB_LIBS ?= z SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE endif - SDK_VBOX_OPENSSL = Only for VBoxRT and/or statically linked programs. SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS) VirtualBox-4.1.20-x113.patch: vboxvideo.c | 55 +++++++++++++++++++++++-------------------------------- vboxvideo.h | 2 +- vboxvideo_dri.c | 4 ++-- 3 files changed, 26 insertions(+), 35 deletions(-) Index: VirtualBox-4.1.20-x113.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.1.20-x113.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-4.1.20-x113.patch 25 Dec 2012 01:38:33 -0000 1.2 +++ VirtualBox-4.1.20-x113.patch 25 Dec 2012 03:28:52 -0000 1.3 @@ -1,4 +1,4 @@ -X.org 1.13 patch , not in use, just stay for references. +X.org 1.13 patch , not in use, stay just for references. Reference: http://www.mail-archive.com/xorg-devel@lists.x.org/msg30282.html [PATCH 01/19] xserver: remove index from CloseScreen (API/ABI breakage) Dave Airlie