[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, experimental, updated. debian/4.1.18-dfsg-2-19-ge1cad21

Felix Geyer fgeyer at debian.org
Sat Mar 2 23:36:51 UTC 2013


The following commit has been merged in the experimental branch:
commit e1cad211f034a07a76c843ff012e9d1729e81e98
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Mar 3 00:36:06 2013 +0100

    Some fixes for VBOX_USE_SYSTEM_XORG_HEADERS.

diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
index a555af1..d822ce6 100644
--- a/debian/patches/18-system-xorg.patch
+++ b/debian/patches/18-system-xorg.patch
@@ -40,3 +40,15 @@ 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) \
+ 	$(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+- VBoxOGL_LIBS += \
+- 	$(PATH_STAGE_LIB)/libXcomposite.so \
+- 	$(PATH_STAGE_LIB)/libXdamage.so \
+- 	$(PATH_STAGE_LIB)/libXfixes.so \
+- 	$(PATH_STAGE_LIB)/libXext.so
+  ifdef VBoxOGL_FAKEDRI
+   VBoxOGL_LIBS += \
+   	dl

-- 
virtualbox Debian packaging



More information about the Pkg-virtualbox-commits mailing list