[Lunar-commits] <moonbase> NVIDIA-beta: compile with xf86vidmodeproto 2.3

[Paul Bredbury]

commit 58899ade39ca1f86df7db3ed11e951bff954e4e0
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Fri Oct 2 18:50:20 2009 +0700

    NVIDIA-beta: compile with xf86vidmodeproto 2.3
---
 x11/NVIDIA-beta/BUILD |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/x11/NVIDIA-beta/BUILD b/x11/NVIDIA-beta/BUILD
index e3e2693..f04150d 100644
--- a/x11/NVIDIA-beta/BUILD
+++ b/x11/NVIDIA-beta/BUILD
@@ -44,6 +44,12 @@
   cd $SOURCE_DIRECTORY/nvidia-settings-$VERSION &&
   sedit 's/-O -DNDEBUG/-DNDEBUG/' Makefile &&
   sedit '/CFLAGS = -Wall -g/d' src/XF86Config-parser/Makefile &&
+
+  # xf86vmode.h has been removed in xf86vidmodeproto 2.3
+  if [[ ! -e /usr/include/X11/extensions/xf86vmode.h ]] ; then
+    sedit "s:#include <X11/extensions/xf86vmode.h>:#include <X11/extensions/xf86vmproto.h>:" src/libXNVCtrlAttributes/NvCtrlAttributes{,VidMode,Glx}.c
+  fi &&
+
   make clean &&
   make &&
   make install ROOT=$SOURCE_DIRECTORY &&