Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=e5455150fd7db57ced2f570730917734d3a4bfe9

commit e5455150fd7db57ced2f570730917734d3a4bfe9
Author: Michel Hermier <herm...@frugalware.org>
Date:   Fri Oct 30 12:02:54 2009 +0100

nvidia.sh

* Remove the libvdpau conflict build code.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index f57a930..cad64e4 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -150,10 +150,6 @@ Fbuild_nvidia() {
Fmkdir usr/include/cuda
Ffilerel usr/include/cuda/* /usr/include/cuda/
fi
-       if [ -d usr/include/vdpau ]; then
-               Fmkdir usr/include/vdpau
-               Ffilerel usr/include/vdpau/* /usr/include/vdpau/
-       fi

# Install the xorg modules
Fmkdir usr/lib/xorg/modules/drivers
@@ -192,19 +188,10 @@ Fbuild_nvidia() {
Fln "libcuda.so.$_F_nvidia_linkver" "/usr/lib/libcuda.so"
Fln "libcuda.so.$_F_nvidia_linkver" "/usr/lib/libcuda.so.1"
fi
-       # libdvpau is now an external library
-#      if [ -e "usr/lib/libvdpau.so.$_F_nvidia_linkver" ]; then
-#              Fln "libvdpau.so.$_F_nvidia_linkver" "/usr/lib/libvdpau.so"
-#              Fln "libvdpau.so.$_F_nvidia_linkver" "/usr/lib/libvdpau.so.1"
-#      fi
if [ -e "usr/lib/libvdpau_nvidia.so.$_F_nvidia_linkver" ]; then
Fln "libvdpau_nvidia.so.$_F_nvidia_linkver" "/usr/lib/libvdpau_nvidia.so"
Fln "libvdpau_nvidia.so.$_F_nvidia_linkver" "/usr/lib/libvdpau_nvidia.so.1"
fi
-#      if [ -e "usr/lib/libvdpau_trace.so.$_F_nvidia_linkver" ]; then
-#              Fln "libvdpau_trace.so.$_F_nvidia_linkver" 
"/usr/lib/libvdpau_trace.so"
-#              Fln "libvdpau_trace.so.$_F_nvidia_linkver" 
"/usr/lib/libvdpau_trace.so.1"
-#      fi

# Weird TLS stuff
Fmkdir usr/lib/tls
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to