From b328d7834d4cbb6c65fa04823efc67b6ee9965b5 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 26 Feb 2014 22:02:22 +0100 Subject: [PATCH] - up to 4.3.8 --- 18-system-xorg.patch | 16 ++++++++++++++-- VirtualBox.spec | 8 ++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/18-system-xorg.patch b/18-system-xorg.patch index 96248ae..35f64db 100644 --- a/18-system-xorg.patch +++ b/18-system-xorg.patch @@ -8,9 +8,9 @@ Author: Michael Meskes , Felix Geyer ifndef VBOX_ONLY_TESTSUITE if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) - LIBRARIES += \ -- VBoxGuestR3LibXFree86 +- VBoxGuestR3LibXFree86 +# LIBRARIES += \ -+# VBoxGuestR3LibXFree86 ++# VBoxGuestR3LibXFree86 endif endif LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 @@ -55,3 +55,15 @@ Author: Michael Meskes , Felix Geyer ifdef VBoxOGL_FAKEDRI VBoxOGL_LIBS += \ dl +diff -urN VirtualBox-4.3.8.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-4.3.8.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-02-26 12:57:53.419736985 +0100 ++++ VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-02-26 12:59:09.746407116 +0100 +@@ -376,7 +376,7 @@ + /usr/include/libdrm \ + /usr/include/xorg \ + /usr/include/pixman-1 +- vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_15_SOURCES) ++ vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES) + endif + + diff --git a/VirtualBox.spec b/VirtualBox.spec index 0ba5216..3a2c4f3 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -54,19 +54,19 @@ exit 1 %define bkpkg %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done) %define ikpkg %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done) -%define rel 3 +%define rel 1 %define pname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 4.3.6 +Version: 4.3.8 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/Emulators Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2 -# Source0-md5: 4bc874039f169215152fb40ca5062784 +# Source0-md5: 422ab09b7eb9c0564b55a6a0a6e6678f Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso -# Source1-md5: 13ea7dddbd3da36c76a6ee734a2b6a70 +# Source1-md5: f23d3980a509418b2dcb614483271ffa Source2: vboxservice.init Source3: vboxservice.service Source4: %{pname}.sh -- 2.44.0