new patch to fix build with xorg 1.19
authorJan Palus <atler@pld-linux.org>
Wed, 23 Nov 2016 11:01:03 +0000 (12:01 +0100)
committerJan Palus <atler@pld-linux.org>
Wed, 23 Nov 2016 11:01:03 +0000 (12:01 +0100)
do not build unused vboxvideo_drv_system

VirtualBox-no-vboxvideo.patch [new file with mode: 0644]
VirtualBox.spec

diff --git a/VirtualBox-no-vboxvideo.patch b/VirtualBox-no-vboxvideo.patch
new file mode 100644 (file)
index 0000000..60b721a
--- /dev/null
@@ -0,0 +1,12 @@
+Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
+--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig       2016-10-11 02:49:23.184986182 +0100
++++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk    2016-10-11 02:49:39.879176964 +0100
+@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
+- DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
++ DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
+  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
+  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_CFLAGS := \
index 976e7dd..14784ac 100644 (file)
@@ -81,6 +81,7 @@ Patch13:      x32.patch
 Patch14:       %{pname}-no-scrextend.patch
 Patch15:       %{pname}-multipython.patch
 Patch16:       %{pname}-lightdm-1.19.2.patch
+Patch17:       %{pname}-no-vboxvideo.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -535,6 +536,7 @@ cd ../..\
 %patch14 -p1
 %patch15 -p0
 %patch16 -p0
+%patch17 -p0
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
This page took 0.086585 seconds and 4 git commands to generate.