* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/files/, x11-drivers/xf86-video-virtualbox/
@ 2015-10-20 17:28 Richard Farina
0 siblings, 0 replies; 3+ messages in thread
From: Richard Farina @ 2015-10-20 17:28 UTC (permalink / raw
To: gentoo-commits
commit: bdc010d90284926bd6b294dd1a590a813044ac93
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 16:21:17 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 17:27:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc010d9
x11-drivers/xf86-video-virtualbox: fix linking to be more lazy
.../files/xf86-video-virtualbox-4.3.6-link-lazy.patch | 17 -----------------
.../files/xf86-video-virtualbox-link-lazy.patch | 16 ----------------
...28.ebuild => xf86-video-virtualbox-4.3.28-r1.ebuild} | 6 ++----
...30.ebuild => xf86-video-virtualbox-4.3.30-r1.ebuild} | 6 ++----
...0.4.ebuild => xf86-video-virtualbox-5.0.4-r1.ebuild} | 6 ++----
...0.6.ebuild => xf86-video-virtualbox-5.0.6-r1.ebuild} | 6 ++----
6 files changed, 8 insertions(+), 49 deletions(-)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
deleted file mode 100644
index 1dd6e46..0000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-4.3.6-link-lazy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-2012-02-26 Magnus Granberg <zorry@gentoo.org>
-
- #394757
- * Config.kmk TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
-
-diff -Naurw a/Config.kmk b/Config.kmk
---- a/Config.kmk 2013-12-18 16:05:32.000000000 +0000
-+++ b/Config.kmk 2014-01-11 15:46:48.950785377 +0000
-@@ -4997,7 +4997,7 @@
- endif
- TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS := $(filter-out $(VBOX_GCC_pipe) $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden),$(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)) -pipe
- TEMPLATE_VBOXGUESTR3EXE_CFLAGS := $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)
-- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out $(VBOX_GCC_ORIGIN_OPT) $(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux := $(filter-out $(VBOX_GCC_ORIGIN_OPT) $(VBOX_LD_as_needed),$(TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
- endif
- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
- endif
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch
deleted file mode 100644
index 081d4eb..0000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-link-lazy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-2012-02-26 Magnus Granberg <zorry@gentoo.org>
-
- #394757
- * Config.kmk TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux add -Wl,-z,lazy
-
---- Config.kmk 2011-12-19 13:58:30.000000000 +0100
-+++ Config.kmk 2012-02-26 12:40:07.497810044 +0100
-@@ -4429,7 +4429,7 @@ else # the gcc guys
- TEMPLATE_VBOXGUESTR3EXE_TOOL := $(subst GXX,GCC,$(TEMPLATE_VBOXR3EXE_TOOL))
- TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -fno-exceptions
- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
-- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
-+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) -Wl,-z,lazy
- endif
- TEMPLATE_VBOXGUESTR3EXE_INST = $(INST_ADDITIONS)
- TEMPLATE_VBOXGUESTR3EXE_DEFS := $(filter-out $(ARCH_BITS_DEFS), $(TEMPLATE_VBOXR3EXE_DEFS)) IN_GUEST IN_GUEST_R3 IN_RT_R3 $(VBOX_GC_ARCH_BITS_DEFS)
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
similarity index 97%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
index 8976e65..66f71bf 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
@@ -87,10 +87,8 @@ src_prepare() {
"${FILESDIR}/${PN}-4-makeself-check.patch" \
"${FILESDIR}/${PN}-4-mkisofs-check.patch"
- # Patch to link with lazy on hardened #394757
- if gcc-specs-now ; then
- epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
- fi
+ # link with lazy on hardened #394757
+ sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk
}
src_configure() {
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30-r1.ebuild
similarity index 97%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30-r1.ebuild
index 8b82944..945ff98 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.30-r1.ebuild
@@ -87,10 +87,8 @@ src_prepare() {
"${FILESDIR}/${PN}-4-makeself-check.patch" \
"${FILESDIR}/${PN}-4-mkisofs-check.patch"
- # Patch to link with lazy on hardened #394757
- if gcc-specs-now ; then
- epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
- fi
+ # link with lazy on hardened #394757
+ sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk
}
src_configure() {
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4-r1.ebuild
similarity index 97%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4-r1.ebuild
index f250ea4..d2ce741 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4-r1.ebuild
@@ -85,10 +85,8 @@ src_prepare() {
# unset useless/problematic checks in configure
epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
- # Patch to link with lazy on hardened #394757
- if gcc-specs-now ; then
- epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
- fi
+ # link with lazy on hardened #394757
+ sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk
}
src_configure() {
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6-r1.ebuild
similarity index 97%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6-r1.ebuild
index f250ea4..d2ce741 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.6-r1.ebuild
@@ -85,10 +85,8 @@ src_prepare() {
# unset useless/problematic checks in configure
epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
- # Patch to link with lazy on hardened #394757
- if gcc-specs-now ; then
- epatch "${FILESDIR}/${PN}-4.3.6-link-lazy.patch"
- fi
+ # link with lazy on hardened #394757
+ sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/files/, x11-drivers/xf86-video-virtualbox/
@ 2017-07-25 11:47 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2017-07-25 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 3505625d78efd28a7a4e5a12f56e788becc3fa1a
Author: Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Mon Jul 24 21:20:26 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 11:47:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3505625d
x11-drivers/xf86-video-virtualbox: fix bug #625690
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5202
.../xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch | 13 +++++++++++++
.../xf86-video-virtualbox-5.1.24.ebuild | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch
new file mode 100644
index 00000000000..c5d3c3fc730
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.24-Makefile.module.kms.patch
@@ -0,0 +1,13 @@
+Fix bug #625690
+
+--- a/src/VBox/Additions/linux/drm/Makefile.module.kms
++++ b/src/VBox/Additions/linux/drm/Makefile.module.kms
+@@ -50,7 +50,7 @@ MOD_CFLAGS = -Wno-declaration-after-statement -fshort-wchar -fno-pie
+ ifneq ($(KERN_VERSION),24)
+ MOD_CFLAGS += -include $(MANGLING)
+ endif
+-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include)
++MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+ # What on earth is this?
+ MOD_INCL += $(addprefix -I$(KBUILD_EXTMOD)/vboxvideo,/ /include)
+ MOD_INCL += -Iinclude/drm
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild
index 31448eb0c1a..3eb7cfa80d3 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.24.ebuild
@@ -75,7 +75,7 @@ pkg_setup() {
src_prepare() {
# Prepare the vboxvideo_drm Makefiles and build dir
- eapply "${FILESDIR}"/${PN}-5.1.4-Makefile.module.kms.patch
+ eapply "${FILESDIR}"/${PN}-5.1.24-Makefile.module.kms.patch
# Remove shipped binaries (kBuild,yasm), see bug #232775
rm -r kBuild/bin tools || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/files/, x11-drivers/xf86-video-virtualbox/
@ 2017-10-17 9:13 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2017-10-17 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 66cc657956afa033a7c3e85875a68a3d383c4048
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 09:13:34 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 09:13:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66cc6579
x11-drivers/xf86-video-virtualbox: Fixed sysmacros patch.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
.../xf86-video-virtualbox-5.1.30-sysmacros.patch | 20 ++++++++++++++++++++
.../xf86-video-virtualbox-5.1.30.ebuild | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.30-sysmacros.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.30-sysmacros.patch
new file mode 100644
index 00000000000..0ee85e52f00
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.30-sysmacros.patch
@@ -0,0 +1,20 @@
+--- VirtualBox-5.1.30/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
++++ VirtualBox-5.1.30/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
+@@ -64,6 +64,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+
+
+ /*********************************************************************************************************************************
+--- VirtualBox-5.1.30/src/VBox/Main/src-server/linux/USBGetDevices.cpp
++++ VirtualBox-5.1.30/src/VBox/Main/src-server/linux/USBGetDevices.cpp
+@@ -47,6 +47,7 @@
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/vfs.h>
+
+ #include <dirent.h>
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild
index 3eb7cfa80d3..816a3943e3c 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.30.ebuild
@@ -60,7 +60,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.1.10-xorg119.patch"
# fix bug #579946
- "${FILESDIR}/${PN}-5.1.22-sysmacros.patch"
+ "${FILESDIR}/${PN}-5.1.30-sysmacros.patch"
)
QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-17 9:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-17 9:13 [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-virtualbox/files/, x11-drivers/xf86-video-virtualbox/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2017-07-25 11:47 Lars Wendler
2015-10-20 17:28 Richard Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox