[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.2.10-dfsg-1

[Felix Geyer]

The following commit has been merged in the master branch:
commit dbb1c7a8b3678d81d6912f312c94e45e7a06ea50
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu May 9 11:20:00 2013 +0200

    Link VBoxOGL against the X libraries it requires.

diff --git a/debian/changelog b/debian/changelog
index 0d80e26..a7b64ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ virtualbox (4.2.10-dfsg-1) experimental; urgency=low
   * Fix build failure with the Debian wheezy kernel which backports the drm
     subsystem from Linux 3.4. (Closes: #703358)
   * Drop build-dependency on bcc as it's not needed anymore.
+  * Link VBoxOGL against the X libraries it requires.
+    - Update 18-system-xorg.patch
 
  -- Felix Geyer <fgeyer at debian.org>  Sun, 31 Mar 2013 19:46:38 +0200
 
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index d822ce6..a5279a6 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -40,15 +40,18 @@ Author: Michael Meskes <meskes at debian.org>, Felix Geyer <fgeyer at debian.org>
   VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
  endif
  
-@@ -203,11 +197,6 @@ VBoxOGL_LIBS = \
- 	$(VBOX_LIB_OGL_CRUTIL) \
+@@ -204,10 +198,10 @@ VBoxOGL_LIBS = \
  	$(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
  if1of ($(KBUILD_TARGET), linux solaris freebsd)
-- VBoxOGL_LIBS += \
+  VBoxOGL_LIBS += \
 - 	$(PATH_STAGE_LIB)/libXcomposite.so \
 - 	$(PATH_STAGE_LIB)/libXdamage.so \
 - 	$(PATH_STAGE_LIB)/libXfixes.so \
 - 	$(PATH_STAGE_LIB)/libXext.so
++ 	Xcomposite \
++ 	Xdamage \
++ 	Xfixes \
++ 	Xext
   ifdef VBoxOGL_FAKEDRI
    VBoxOGL_LIBS += \
    	dl

-- 
virtualbox Debian packaging