summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2012-04-05 07:45:44 +0000
committerLars Wendler <polynomial-c@gentoo.org>2012-04-05 07:45:44 +0000
commit6488e878e11a6c375ab80ac96b9dc2f2217a88f2 (patch)
treed9b76fb8bfe5af06002fbc5e57ee530a564cd618 /x11-drivers
parentVersion bump (bug #410811). Removed old (diff)
downloadgentoo-2-6488e878e11a6c375ab80ac96b9dc2f2217a88f2.tar.gz
gentoo-2-6488e878e11a6c375ab80ac96b9dc2f2217a88f2.tar.bz2
gentoo-2-6488e878e11a6c375ab80ac96b9dc2f2217a88f2.zip
Version bump (bug #410811). Removed old
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-video-virtualbox/ChangeLog8
-rw-r--r--x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild (renamed from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild)16
2 files changed, 19 insertions, 5 deletions
diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index a7372eea5eff..eae94ec70ced 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-drivers/xf86-video-virtualbox
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.86 2012/03/18 18:50:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.87 2012/04/05 07:45:44 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.1.12 (05 Apr 2012)
+
+ 05 Apr 2012; Lars Wendler <polynomial-c@gentoo.org>
+ -xf86-video-virtualbox-4.1.6-r1.ebuild, +xf86-video-virtualbox-4.1.12.ebuild:
+ Version bump (bug #410811). Removed old.
18 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Drop maintainer due retirement, bug #118003.
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
index 81e518a8405c..fee2ff7dd23a 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild,v 1.2 2012/01/19 14:24:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild,v 1.1 2012/04/05 07:45:44 polynomial-c Exp $
EAPI=2
-inherit eutils linux-mod multilib python versionator
+inherit eutils linux-mod multilib python versionator toolchain-funcs
MY_P=VirtualBox-${PV}
DESCRIPTION="VirtualBox video driver"
@@ -42,7 +42,7 @@ BUILD_TARGETS="all"
BUILD_TARGET_ARCH="${ARCH}"
MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
-S="${WORKDIR}/${MY_P}_OSE"
+S="${WORKDIR}/${MY_P}"
QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
@@ -80,6 +80,11 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
"${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}-link-lazy.patch"
+ fi
}
src_configure() {
@@ -119,8 +124,11 @@ src_install() {
cd "${S}/out/linux.${ARCH}/release/bin/additions"
insinto /usr/$(get_libdir)/xorg/modules/drivers
+ # xorg-server-1.12.x
+ if has_version ">=x11-base/xorg-server-1.12" ; then
+ newins vboxvideo_drv_112.so vboxvideo_drv.so
# xorg-server-1.11.x
- if has_version ">=x11-base/xorg-server-1.11" ; then
+ elif has_version ">=x11-base/xorg-server-1.11" ; then
newins vboxvideo_drv_111.so vboxvideo_drv.so
# xorg-server-1.10.x
elif has_version ">=x11-base/xorg-server-1.10" ; then