summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-04-24 14:04:07 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-04-24 14:04:07 +0000
commit799eca62fc1852bfdbb50e9ef42e8a3f97332310 (patch)
treefc156a71d645056b2d12db854e559eec731a8471 /x11-drivers
parentRemove ispell from rdepend. If someone test with aspell we can add that one b... (diff)
downloadgentoo-2-799eca62fc1852bfdbb50e9ef42e8a3f97332310.tar.gz
gentoo-2-799eca62fc1852bfdbb50e9ef42e8a3f97332310.tar.bz2
gentoo-2-799eca62fc1852bfdbb50e9ef42e8a3f97332310.zip
fixes for FreeBSD: update paths, do not try to install unavailable libs and desktop entries.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog7
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild53
2 files changed, 34 insertions, 26 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 63d38d75ef3a..41becc8d938d 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-drivers/nvidia-drivers
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.336 2012/04/15 16:54:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.337 2012/04/24 14:04:07 aballier Exp $
+
+ 24 Apr 2012; Alexis Ballier <aballier@gentoo.org>
+ nvidia-drivers-295.40.ebuild:
+ fixes for FreeBSD: update paths, do not try to install unavailable libs and
+ desktop entries.
15 Apr 2012; Markus Meier <maekke@gentoo.org> nvidia-drivers-295.40.ebuild:
x86 stable, bug #411617
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
index 6a364f197f97..8389521a53f0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.3 2012/04/15 16:54:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.4 2012/04/24 14:04:07 aballier Exp $
EAPI="2"
@@ -54,8 +54,8 @@ QA_TEXTRELS_x86="
QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
usr/lib/opengl/nvidia/lib/libGL.so.1
usr/lib/libnvidia-glcore.so.1
+ usr/lib/libvdpau_nvidia.so.1
usr/lib/libnvidia-cfg.so.1
- usr/lib/libnvidia-ml.so.1
usr/lib/opengl/nvidia/extensions/libglx.so.1
usr/lib/xorg/modules/drivers/nvidia_drv.so"
@@ -235,6 +235,7 @@ pkg_setup() {
# set variables to where files are in the package structure
if use kernel_FreeBSD; then
+ S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
NV_DOC="${S}/doc"
NV_EXEC="${S}/obj"
NV_LIB="${S}/obj"
@@ -344,10 +345,10 @@ src_install() {
newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
elif use x86-fbsd; then
insinto /boot/modules
- doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
+ doins "${S}/src/nvidia.kld" || die
exeinto /boot/modules
- doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
+ doexe "${S}/src/nvidia.ko" || die
fi
# NVIDIA kernel <-> userspace driver config lib
@@ -360,25 +361,27 @@ src_install() {
/usr/$(get_libdir)/libnvidia-cfg.so || \
die "failed to create libnvidia-cfg.so symlink"
- # NVIDIA monitoring library
- dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \
- die "failed to install libnvidia-ml"
- dosym libnvidia-ml.so.${NV_SOVER} \
- /usr/$(get_libdir)/libnvidia-ml.so.1 || \
- die "failed to create libnvidia-ml.so symlink"
- dosym libnvidia-ml.so.1 \
- /usr/$(get_libdir)/libnvidia-ml.so || \
- die "failed to create libnvidia-ml.so symlink"
-
- # NVIDIA video decode <-> CUDA
- dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \
- die "failed to install libnvcuvid.so"
- dosym libnvcuvid.so.${NV_SOVER} \
- /usr/$(get_libdir)/libnvcuvid.so.1 || \
- die "failed to create libnvcuvid.so symlink"
- dosym libnvcuvid.so.1 \
- /usr/$(get_libdir)/libnvcuvid.so || \
- die "failed to create libnvcuvid.so symlink"
+ if use kernel_linux; then
+ # NVIDIA monitoring library
+ dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \
+ die "failed to install libnvidia-ml"
+ dosym libnvidia-ml.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libnvidia-ml.so.1 || \
+ die "failed to create libnvidia-ml.so symlink"
+ dosym libnvidia-ml.so.1 \
+ /usr/$(get_libdir)/libnvidia-ml.so || \
+ die "failed to create libnvidia-ml.so symlink"
+
+ # NVIDIA video decode <-> CUDA
+ dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \
+ die "failed to install libnvcuvid.so"
+ dosym libnvcuvid.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libnvcuvid.so.1 || \
+ die "failed to create libnvcuvid.so symlink"
+ dosym libnvcuvid.so.1 \
+ /usr/$(get_libdir)/libnvcuvid.so || \
+ die "failed to create libnvcuvid.so symlink"
+ fi
# Xorg DDX driver
insinto /usr/$(get_libdir)/xorg/modules/drivers
@@ -430,7 +433,7 @@ src_install() {
# Helper Apps
exeinto /opt/bin/
doexe ${NV_EXEC}/nvidia-xconfig || die
- doexe ${NV_EXEC}/nvidia-debugdump || die
+ use kernel_linux && { doexe ${NV_EXEC}/nvidia-debugdump || die ; }
if use gtk; then
doexe ${NV_EXEC}/nvidia-settings || die
fi
@@ -440,7 +443,7 @@ src_install() {
fi
# Desktop entries for nvidia-settings
- if use gtk; then
+ if use gtk && use kernel_linux ; then
sed -e 's:__UTILS_PATH__:/opt/bin:' \
-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
-i "${NV_EXEC}/nvidia-settings.desktop"