On Qui, 2014-03-20 at 11:53 +0100, Michael Thayer wrote:
> Your patch makes the it use the source, but does it in a
> Fedora-specific
> way which would not help anyone else, so while that is valid enough,
> it
> only really makes sense for you to keep the patch as part of your
> package, not upstream it.
Hi, I dropped all Fedora-specific in the patch, so I don't patch
fakedri_drv.[c|h] and Config.kmk , and use remove all but
src/VBox/Additions/x11/x11include/mesa-7.2 bundle sources [1].
So I compile package with mesa-7.2 sources , which for now it will be
compatible for all Fedoras .
Integrate VBOX_USE_SYSTEM_XORG_HEADERS=1 for this patch will be great .
Many thanks,
[1]
rm -rf tools
# Remove bundle X11 sources and some lib sources, before patching.
mv src/VBox/Additions/x11/x11include/mesa-7.2 .
rm -rf src/VBox/Additions/x11/x11include/*
mv mesa-7.2 src/VBox/Additions/x11/x11include/
rm -rf src/VBox/Additions/x11/x11stubs
rm -rf src/VBox/GuestHost/OpenGL/include/GL
--
Sérgio M. B.
Just compile with X11 system source and we may remove bundle X11 source code.
--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100
@@ -82,18 +82,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
@@ -222,11 +216,20 @@ 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
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86 )
+ VBoxOGL_LIBS += \
+ /usr/lib/libXcomposite.so \
+ /usr/lib/libXdamage.so \
+ /usr/lib/libXfixes.so \
+ /usr/lib/libXext.so
+ endif
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64 )
+ VBoxOGL_LIBS += \
+ /usr/lib64/libXcomposite.so \
+ /usr/lib64/libXdamage.so \
+ /usr/lib64/libXfixes.so \
+ /usr/lib64/libXext.so
+ endif
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
_______________________________________________
vbox-dev mailing list
[email protected]
https://www.virtualbox.org/mailman/listinfo/vbox-dev
