From 8136611603cbe2d3181643bf9767603016bb1287fa27f56612642ca953b0d88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 6 May 2015 16:53:12 +0000
Subject: [PATCH] - Try to build with system libs for X instead of localy built
 ones

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=185
---
 virtualbox.changes |  5 +++++
 virtualbox.spec    | 42 ++++++++++++++++++++++++++++++------------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/virtualbox.changes b/virtualbox.changes
index d22589c..6fe389f 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  6 16:52:56 UTC 2015 - tchvatal@suse.com
+
+- Try to build with system libs for X instead of localy built ones
+
 -------------------------------------------------------------------
 Wed May  6 15:51:43 UTC 2015 - tchvatal@suse.com
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 06ffbc1..86a0dde 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -108,11 +108,25 @@ BuildRequires:  udev
 BuildRequires:  update-desktop-files
 BuildRequires:  which
 BuildRequires:  xorg-x11
-BuildRequires:  xorg-x11-devel
 BuildRequires:  xorg-x11-server
 BuildRequires:  xorg-x11-server-sdk
 BuildRequires:  yasm
 BuildRequires:  zlib-devel-static
+BuildRequires:  pkgconfig(fontsproto)
+BuildRequires:  pkgconfig(randrproto)
+BuildRequires:  pkgconfig(renderproto)
+BuildRequires:  pkgconfig(resourceproto)
+BuildRequires:  pkgconfig(scrnsaverproto)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xau)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xdmcp)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xextproto)
+BuildRequires:  pkgconfig(xf86driproto)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xineramaproto)
+BuildRequires:  pkgconfig(xproto)
 Requires:       %{name}-host-kmp = %{version}
 Requires(post): sysvinit(syslog)
 Requires(pre):  permissions
@@ -295,13 +309,15 @@ rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
 #	--nofatal		try to avoid build fail caused by missing makeself package
 # NOT an autoconf configure macro
 ./configure \
-	--enable-vnc \
-	--enable-vde \
-	--disable-kmods \
-	--disable-java \
-	--disable-docs \
-	--nofatal \
-	--enable-webservice
+    --ose \
+    --enable-vnc \
+    --enable-vde \
+    --disable-kmods \
+    --with-linux="/usr" \
+    --disable-java \
+    --disable-docs \
+    --nofatal \
+    --enable-webservice
 
 # configure actually warns we should source env.sh (which seems like it could influence the build...)
 source ./env.sh
@@ -311,14 +327,16 @@ source ./env.sh
 # 	VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
 echo "build basic parts"
 %{_bindir}/kmk %{?_smp_mflags} \
-    VBOX_JAVA_HOME=%{_sysconfdir}/alternatives/java_sdk_openjdk/ \
     VBOX_GCC_WERR= \
     KBUILD_VERBOSE=2 \
+    VBOX_USE_SYSTEM_XORG_HEADERS=1 \
     VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
     TOOL_YASM_AS=yasm \
-    VBOX_USE_SYSTEM_XORG_HEADERS=1 \
-    VBOX_PATH_PACKAGE_DOCS=%{_docdir}/virtualbox \
-    all
+    VBOX_WITH_VMSVGA= VBOX_WITH_VMSVGA3D= \
+    VBOX_BUILD_PUBLISHER=_SUSE \
+    TOOL_GCC3_CFLAGS="%{optflags}" TOOL_GCC3_CXXFLAGS="%{optflags}" \
+    VBOX_GCC_OPT="%{optflags}"
+
 #
 # build kernel modules for guest and host (check novel-kmp package as example)
 # host  modules : vboxdrv,vboxnetflt,vboxnetadp