[Pkg-virtualbox-commits] [virtualbox] 03/03: New upstream release
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Mar 3 13:16:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit a979d2eccb9f94a709baf5a253ea74e9a252eb0c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Mar 3 14:13:39 2015 +0100
New upstream release
---
debian/changelog | 3 +-
debian/control | 2 +-
debian/patches/37-fix-build.patch | 189 --------------------------------------
debian/patches/series | 1 -
4 files changed, 3 insertions(+), 192 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c3ee60d..0a964c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-virtualbox (4.3.22-dfsg-2) UNRELEASED; urgency=medium
+virtualbox (4.3.24-dfsg-1) experimental; urgency=medium
* Remove d/p/38-remove-hardcoded-gcc.patch, use --with-gcc and
--with-g++ configure flags.
+ * Remove d/p/37-fix-build.patch, merged upstream.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Mon, 23 Feb 2015 13:49:58 +0100
diff --git a/debian/control b/debian/control
index 6d6476f..8bcabde 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: bzip2,
dpkg-dev (>= 1.15.6~),
gcc-4.9,
g++-4.9,
- g++-multilib ( << 4:5-0 ) [amd64],
+ g++-multilib [amd64],
genisoimage,
gsoap (>= 2.8.16),
iasl,
diff --git a/debian/patches/37-fix-build.patch b/debian/patches/37-fix-build.patch
deleted file mode 100644
index ba89caf..0000000
--- a/debian/patches/37-fix-build.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Description: Fix build with VBOX_USE_SYSTEM_XORG_HEADERS defined
-Comment: this patch is released as MIT, for upstream inclusion.
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
- Michael Thayer
-Origin: debian, upstream
-Forwarded: https://www.virtualbox.org/pipermail/vbox-dev/2015-February/012854.html
-Last-Update: 2015-02-13
-
-diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-index 592d65e..6cdf46b 100644
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -130,7 +130,7 @@ vboxvideo_drv_SOURCES = \
- #
- DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
--vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700000000
-+vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=70000000
- ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
- vboxvideo_drv_70_CFLAGS += -D_XPG6 -Wno-shadow # Use XPG6 until we have moved the C++ bits into a library.
- endif
-@@ -147,7 +147,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
- DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
-+vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=70100000
- vboxvideo_drv_71_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.1.0
-@@ -161,7 +161,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
- DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
-+vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=10300000
- vboxvideo_drv_13_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.3.0.0
-@@ -175,7 +175,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES) edid.c
- DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
-+vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=10400000
- vboxvideo_drv_14_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.4.2
-@@ -189,7 +189,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
- DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
-+vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000
- if1of ($(KBUILD_TARGET), linux solaris)
- vboxvideo_drv_15_DEFS += \
- VBOX_DRI_OLD
-@@ -211,7 +211,7 @@ endif
- DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
-+vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000
- if1of ($(KBUILD_TARGET), linux solaris)
- vboxvideo_drv_16_DEFS += \
- VBOX_DRI_OLD
-@@ -229,7 +229,7 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
- DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
-+vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10699000
- vboxvideo_drv_17_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7
-@@ -247,7 +247,7 @@ endif
- DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
-+vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10800000
- vboxvideo_drv_18_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0
-@@ -261,7 +261,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
-+vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10900000
- vboxvideo_drv_19_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0
-@@ -275,7 +275,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-+vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11000000
- vboxvideo_drv_110_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0
-@@ -289,7 +289,7 @@ vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_111
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-+vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11100000
- vboxvideo_drv_111_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0
-@@ -303,7 +303,7 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_112
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-+vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11200000
- vboxvideo_drv_112_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0
-@@ -317,7 +317,7 @@ vboxvideo_drv_112_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_113
- vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
-+vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11300000
- vboxvideo_drv_113_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0
-@@ -331,7 +331,7 @@ vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_114
- vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
-+vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11400000
- vboxvideo_drv_114_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0
-@@ -345,7 +345,7 @@ vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_115
- vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000
-+vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11500000
- vboxvideo_drv_115_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0
-@@ -359,7 +359,7 @@ vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_116
- vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000
-+vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11600000
- vboxvideo_drv_116_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0
-@@ -373,7 +373,7 @@ vboxvideo_drv_116_SOURCES := $(vboxvideo_drv_17_SOURCES)
- DLLS += vboxvideo_drv_117
- vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
--vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101700000
-+vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11700000
- vboxvideo_drv_117_INCS = \
- $(vboxvideo_xorg_INCS) \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1
-@@ -388,7 +388,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
- vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_system_CFLAGS := \
- $(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
-- vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS)
-+ vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_, $(vboxvideo_15_DEFS))
- vboxvideo_drv_system_INCS += \
- $(PATH_ROOT)/src/VBox/Runtime/include \
- /usr/include/x11 \
-diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-index 381479c..29ff888 100644
---- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-+++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
-@@ -133,8 +133,8 @@ extern void GlxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
-
- /** Helper to work round different ways of getting the root window in different
- * server versions. */
--#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 700000000 \
-- && XORG_VERSION_CURRENT >= 100900000
-+#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \
-+ && XORG_VERSION_CURRENT >= 10900000
- # define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
- #else
- # define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex]
diff --git a/debian/patches/series b/debian/patches/series
index ae622e5..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
-37-fix-build.patch
--
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