[Pkg-virtualbox-commits] [virtualbox] 01/01: Working xorg 1.19
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Thu Dec 1 07:57:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository virtualbox.
commit 5a8a9ea13e7f555a7e27619078f41add2b635000
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Dec 1 08:55:03 2016 +0100
Working xorg 1.19
---
debian/changelog | 7 +-
debian/patches/new-xorg-1.19.patch | 181 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 +-
4 files changed, 193 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ac41641..2a86e9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-virtualbox (5.1.10-dfsg-2) experimental; urgency=medium
+virtualbox (5.1.10-dfsg-2) unstable; urgency=low
[ Gianfranco Costamagna, Peter Meiser ]
* Major rewrite of the guest-additions GL library handling
+ [ Gianfranco Costamagna ]
+ * Cherry-pick upstream fixes for xorg 1.19 (Closes: #845644)
+ - remove vboxvideo_drv_system.so, obsolete and useless
+ (according to upstream ticket 16052)
+
-- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 22 Nov 2016 18:48:42 +0100
virtualbox (5.1.10-dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/new-xorg-1.19.patch b/debian/patches/new-xorg-1.19.patch
new file mode 100644
index 0000000..2389b8d
--- /dev/null
+++ b/debian/patches/new-xorg-1.19.patch
@@ -0,0 +1,181 @@
+Description: upstream: 64269 64270
+Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+@@ -71,7 +71,7 @@
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
+- $(VBOX_MESA_INCS) \
++ $(VBOX_GL_INCS) \
+ /usr/include/drm \
+ /usr/include/libdrm
+ VBoxOGL_DEFS += VBOX_NO_NATIVEGL
+@@ -439,7 +439,7 @@
+ array
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLarrayspu_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
+ VBoxOGLarrayspu_INSTTYPE.win = none
+@@ -487,7 +487,7 @@
+ passthrough
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLpassthroughspu_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
+ VBoxOGLpassthroughspu_INSTTYPE.win = none
+@@ -536,7 +536,7 @@
+ pack
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLpackspu_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
+ VBoxOGLpackspu_INSTTYPE.win = none
+@@ -642,7 +642,7 @@
+ feedback
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLfeedbackspu_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
+ VBoxOGLfeedbackspu_INSTTYPE.win = none
+Index: virtualbox/src/VBox/Additions/x11/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/Makefile.kmk
++++ virtualbox/src/VBox/Additions/x11/Makefile.kmk
+@@ -20,12 +20,18 @@
+ # Include sub-makefiles.
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+ include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+- include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
+- ifneq ($(KBUILD_TARGET), solaris)
+- include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+- endif
+- ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+- include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
++ ifndef VBOX_NO_LEGACY_XORG_X11
++ include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
++ ifneq ($(KBUILD_TARGET), solaris)
++ include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
++ endif
++ # This should logically only be controlled by VBOX_NO_LEGACY_XORG_X11,
++ # as it is not used for drivers at all, but rather to build X11 clients
++ # on systems missing needed libraries.
++ ## @todo fix at some later point when it will not break people's workflows.
++ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
++ include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
++ endif
+ endif
+ endif
+
+Index: virtualbox/src/VBox/Additions/x11/x11include/mesa-7.2/README
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/x11include/mesa-7.2/README
++++ virtualbox/src/VBox/Additions/x11/x11include/mesa-7.2/README
+@@ -2,10 +2,6 @@
+ and executing
+
+ $ mkdir $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
+-$ for i in `find include src/mesa -name '*.h' | grep -v src/mesa/drivers` \
+- `find src/mesa/drivers/dri/common -name '*.h'`
+- do
+- cp --parents $i $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
+- done
++$ cp -r include/GL $VBOX_PATH/src/VBox/Additions/x11/x11include/mesa-7.2
+
+ in the mesa-7.2 directory.
+Index: virtualbox/src/VBox/GuestHost/OpenGL/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/GuestHost/OpenGL/Makefile.kmk
++++ virtualbox/src/VBox/GuestHost/OpenGL/Makefile.kmk
+@@ -54,7 +54,7 @@
+ VBoxOGLcrutil_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLcrutil_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ VBoxOGLcrutil_SOURCES = \
+ util/bbox.c \
+@@ -199,7 +199,7 @@
+ packer
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLcrpacker_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ VBoxOGLcrpacker_INTERMEDIATES = \
+ $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h \
+@@ -350,7 +350,7 @@
+ $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLspuload_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ VBoxOGLspuload_SOURCES = \
+ spu_loader/spuinit.c \
+@@ -423,7 +423,7 @@
+ state_tracker
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLcrstate_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ VBoxOGLcrstate_INTERMEDIATES = \
+ $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h \
+@@ -624,7 +624,7 @@
+ $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+ VBoxOGLerrorspu_INCS += \
+- $(VBOX_MESA_INCS)
++ $(VBOX_GL_INCS)
+ endif
+ VBoxOGLerrorspu_SOURCES = \
+ $(VBOX_PATH_CROGL_GENFILES)/errorspu.c \
+Index: virtualbox/src/VBox/Additions/x11/vboxvideo/helpers.c
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/vboxvideo/helpers.c
++++ virtualbox/src/VBox/Additions/x11/vboxvideo/helpers.c
+@@ -82,7 +82,7 @@
+
+ property_name = MakeAtom(pszName, strlen(pszName), TRUE);
+ VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
+- ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
++ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
+ }
+
+ void vbvxReprobeCursor(ScrnInfoPtr pScrn)
+Index: virtualbox/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
++++ virtualbox/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+@@ -1229,7 +1229,7 @@
+ updateGraphicsCapability(pScrn, TRUE);
+
+ /* Register block and wake-up handlers for getting new screen size hints. */
+- RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
++ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
+
+ /* software cursor */
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--- virtualbox-5.1.10-dfsg.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ virtualbox-5.1.10-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -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 := \
diff --git a/debian/patches/series b/debian/patches/series
index 5b32c83..b48bc21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
+new-xorg-1.19.patch
diff --git a/debian/rules b/debian/rules
index de607c9..b87b91f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,7 @@ override_dh_auto_build:
PATH_OUT=$(abspath out) \
TOOL_YASM_AS=yasm \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+ VBOX_NO_LEGACY_XORG_X11=1 \
VBOX_BUILD_PUBLISHER=_$(DIST_NAME) \
VBOX_WITH_REGISTRATION_REQUEST= \
VBOX_WITH_UPDATE_REQUEST= \
@@ -104,10 +105,10 @@ endif
override_dh_install:
dh_install -p$(sname) -X out/bin/VBoxDbg.so
dh_install --remaining-packages
-ifneq (,$(filter $(uxname), $(shell dh_listpackages)))
- install -m 644 -p -D out/bin/additions/vboxvideo_drv_system.so \
- debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
-endif
+#ifneq (,$(filter $(uxname), $(shell dh_listpackages)))
+# install -m 644 -p -D out/bin/additions/vboxvideo_drv_system.so \
+# debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
+#endif
# check if arch-any packages are being built
ifneq (,$(filter $(sxname), $(shell dh_listpackages)))
convert debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox.png \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list