From 6488e878e11a6c375ab80ac96b9dc2f2217a88f2 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 5 Apr 2012 07:45:44 +0000 Subject: Version bump (bug #410811). Removed old (Portage version: 2.2.0_alpha99/cvs/Linux x86_64) --- x11-drivers/xf86-video-virtualbox/ChangeLog | 8 +- .../xf86-video-virtualbox-4.1.12.ebuild | 167 +++++++++++++++++++++ .../xf86-video-virtualbox-4.1.6-r1.ebuild | 159 -------------------- 3 files changed, 174 insertions(+), 160 deletions(-) create mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild (limited to 'x11-drivers/xf86-video-virtualbox') 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 + -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 metadata.xml: Drop maintainer due retirement, bug #118003. diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild new file mode 100644 index 000000000000..fee2ff7dd23a --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.12.ebuild @@ -0,0 +1,167 @@ +# 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.12.ebuild,v 1.1 2012/04/05 07:45:44 polynomial-c Exp $ + +EAPI=2 + +inherit eutils linux-mod multilib python versionator toolchain-funcs + +MY_P=VirtualBox-${PV} +DESCRIPTION="VirtualBox video driver" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dri" + +RDEPEND="x11-base/xorg-server[-minimal] + x11-libs/libXcomposite" +DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.999 + =dev-lang/python-2* + >=dev-lang/yasm-0.6.2 + sys-devel/dev86 + sys-power/iasl + x11-proto/fontsproto + x11-proto/randrproto + x11-proto/renderproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + x11-libs/libXdmcp + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXext + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2.4.5 )" + +BUILD_TARGETS="all" +BUILD_TARGET_ARCH="${ARCH}" +MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)" + +S="${WORKDIR}/${MY_P}" + +QA_TEXTRELS_x86="usr/lib/VBoxOGL.so" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" + + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + # Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR} + cp -a "${S}"/src/VBox/Additions/linux/drm \ + "${WORKDIR}/vboxvideo_drm" || die "cannot copy vboxvideo_drm directory" + cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \ + "${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile" + + # stupid new header references... + for vboxheader in {product,version}-generated.h ; do + ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ + "${WORKDIR}/vboxvideo_drm/${vboxheader}" + done + + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -rf kBuild/bin tools + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk + + # Ugly hack to build the opengl part of the video driver + epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch" + + # unset useless/problematic checks in configure + 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() { + # build the user-space tools, warnings are harmless + ./configure --nofatal \ + --disable-xpcom \ + --disable-sdl-ttf \ + --disable-pulse \ + --disable-alsa \ + --build-headless || die "configure failed" + source ./env.sh +} + +src_compile() { + for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \ + /src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \ + /src/VBox/Additions/x11/vboxvideo ; do + cd "${S}"${each} + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk failed" + done + + if use dri; then + # Now creating the kernel modules. We must do this _after_ + # we compiled the user-space tools as we need two of the + # automatically generated header files. (>=3.2.0) + linux-mod_src_compile + fi +} + +src_install() { + if use dri; then + linux-mod_src_install + fi + + 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 + 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 + newins vboxvideo_drv_110.so vboxvideo_drv.so + # xorg-server-1.9.x + else + newins vboxvideo_drv_19.so vboxvideo_drv.so + fi + + # Guest OpenGL driver + insinto /usr/$(get_libdir) + doins -r VBoxOGL* || die + + if use dri ; then + dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so + fi +} + +pkg_postinst() { + elog "You need to edit the file /etc/X11/xorg.conf and set:" + elog "" + elog " Driver \"vboxvideo\"" + elog "" + elog "in the Graphics device section (Section \"Device\")" + elog "" + if use dri; then + elog "To use the kernel drm video driver, please add:" + elog "\"vboxvideo\" to:" + if has_version sys-apps/openrc; then + elog "/etc/conf.d/modules" + else + elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}" + fi + elog "" + fi +} 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.6-r1.ebuild deleted file mode 100644 index 81e518a8405c..000000000000 --- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.6-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# 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 $ - -EAPI=2 - -inherit eutils linux-mod multilib python versionator - -MY_P=VirtualBox-${PV} -DESCRIPTION="VirtualBox video driver" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dri" - -RDEPEND="x11-base/xorg-server[-minimal] - x11-libs/libXcomposite" -DEPEND="${RDEPEND} - >=dev-util/kbuild-0.1.999 - =dev-lang/python-2* - >=dev-lang/yasm-0.6.2 - sys-devel/dev86 - sys-power/iasl - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto - x11-libs/libXdmcp - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXext - dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2.4.5 )" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)" - -S="${WORKDIR}/${MY_P}_OSE" - -QA_TEXTRELS_x86="usr/lib/VBoxOGL.so" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" - - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR} - cp -a "${S}"/src/VBox/Additions/linux/drm \ - "${WORKDIR}/vboxvideo_drm" || die "cannot copy vboxvideo_drm directory" - cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \ - "${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile" - - # stupid new header references... - for vboxheader in {product,version}-generated.h ; do - ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ - "${WORKDIR}/vboxvideo_drm/${vboxheader}" - done - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -rf kBuild/bin tools - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk - - # Ugly hack to build the opengl part of the video driver - epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch" - - # unset useless/problematic checks in configure - epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \ - "${FILESDIR}/${PN}-4-makeself-check.patch" \ - "${FILESDIR}/${PN}-4-mkisofs-check.patch" -} - -src_configure() { - # build the user-space tools, warnings are harmless - ./configure --nofatal \ - --disable-xpcom \ - --disable-sdl-ttf \ - --disable-pulse \ - --disable-alsa \ - --build-headless || die "configure failed" - source ./env.sh -} - -src_compile() { - for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \ - /src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \ - /src/VBox/Additions/x11/vboxvideo ; do - cd "${S}"${each} - MAKE="kmk" emake TOOL_YASM_AS=yasm \ - KBUILD_PATH="${S}/kBuild" \ - || die "kmk failed" - done - - if use dri; then - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - linux-mod_src_compile - fi -} - -src_install() { - if use dri; then - linux-mod_src_install - fi - - cd "${S}/out/linux.${ARCH}/release/bin/additions" - insinto /usr/$(get_libdir)/xorg/modules/drivers - - # xorg-server-1.11.x - if 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 - newins vboxvideo_drv_110.so vboxvideo_drv.so - # xorg-server-1.9.x - else - newins vboxvideo_drv_19.so vboxvideo_drv.so - fi - - # Guest OpenGL driver - insinto /usr/$(get_libdir) - doins -r VBoxOGL* || die - - if use dri ; then - dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so - fi -} - -pkg_postinst() { - elog "You need to edit the file /etc/X11/xorg.conf and set:" - elog "" - elog " Driver \"vboxvideo\"" - elog "" - elog "in the Graphics device section (Section \"Device\")" - elog "" - if use dri; then - elog "To use the kernel drm video driver, please add:" - elog "\"vboxvideo\" to:" - if has_version sys-apps/openrc; then - elog "/etc/conf.d/modules" - else - elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}" - fi - elog "" - fi -} -- cgit v1.2.3-65-gdbad