[Lunar-commits] <moonbase> NVIDIA: resolved vdpau conflict

[Zbigniew Luszpinski]

commit 657861f755890c07838ee3b0dacdfe0a70d289bb
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Thu Feb 11 22:07:50 2010 +0100

    NVIDIA: resolved vdpau conflict
---
 x11/NVIDIA/BUILD |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/x11/NVIDIA/BUILD b/x11/NVIDIA/BUILD
index 3500a59..7ab657f 100644
--- a/x11/NVIDIA/BUILD
+++ b/x11/NVIDIA/BUILD
@@ -4,9 +4,11 @@
   rm -f usr/X11R6/lib/modules/libnvidia-wfb* &&
   sedit '/wfb/d' .manifest &&
   rm -f usr/lib/libvdpau.so* \
-        usr/lib/libvdpau_trace.so* &&
+        usr/lib/vdpau/libvdpau_trace.so* &&
+  rm -rf usr/include/vdpau &&
   sedit '/libvdpau.so/d' .manifest &&
   sedit '/libvdpau_trace.so/d' .manifest &&
+  sedit '/include\/vdpau/d' .manifest &&
 
   # Clean up old install before doing new one
   ./nvidia-installer --uninstall --silent &&