Package: nvidia-settings
Version: 1.0+20050525-2
Severity: normal
Tags: patch

When trying to build 'nvidia-settings' on amd64/unstable, 
I get a linker error because the library search path for X11 is set
to '/usr/X11R6/lib64' on amd64.

Please change that to '/usr/X11R6/lib'.

With the attached patch 'nvidia-settings' can be compiled
on amd64. The patch also adds a missing Build-Depends on 'libxv-dev'
to debian/control.

Regards
Andreas Jochens

diff -urN ../tmp-orig/nvidia-settings-1.0+20050525/Makefile ./Makefile
--- ../tmp-orig/nvidia-settings-1.0+20050525/Makefile   2005-09-09 
09:13:15.000000000 +0000
+++ ./Makefile  2005-09-09 08:55:21.000000000 +0000
@@ -54,11 +54,7 @@
 endif
 
 ifndef X11R6_LIB_DIR
-  ifeq ($(BUILD_OS)-$(BUILD_ARCH),Linux-x86_64)
-    X11R6_LIB_DIR = /usr/X11R6/lib64
-  else
-    X11R6_LIB_DIR = /usr/X11R6/lib
-  endif
+  X11R6_LIB_DIR = /usr/X11R6/lib
 endif
 
 ifndef X11R6_INC_DIR
diff -urN ../tmp-orig/nvidia-settings-1.0+20050525/debian/control 
./debian/control
--- ../tmp-orig/nvidia-settings-1.0+20050525/debian/control     2005-09-09 
09:13:15.000000000 +0000
+++ ./debian/control    2005-09-09 09:10:48.000000000 +0000
@@ -2,7 +2,7 @@
 Section: contrib/x11
 Priority: optional
 Maintainer: Randall Donald <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev, libxext-dev, xutils, 
libxrandr-dev, xlibmesa-gl-dev, libxxf86vm-dev 
+Build-Depends: debhelper, libgtk2.0-dev, libxv-dev, libxext-dev, xutils, 
libxrandr-dev, xlibmesa-gl-dev, libxxf86dga-dev, libxxf86vm-dev 
 Standards-Version: 3.6.0
 
 Package: nvidia-settings
diff -urN ../tmp-orig/nvidia-settings-1.0+20050525/samples/Makefile 
./samples/Makefile
--- ../tmp-orig/nvidia-settings-1.0+20050525/samples/Makefile   2005-05-25 
18:20:16.000000000 +0000
+++ ./samples/Makefile  2005-09-09 08:55:11.000000000 +0000
@@ -54,11 +54,7 @@
 endif
 
 ifndef X11R6_LIB_DIR
-  ifeq ($(BUILD_OS)-$(BUILD_ARCH),Linux-x86_64)
-    X11R6_LIB_DIR = /usr/X11R6/lib64
-  else
-    X11R6_LIB_DIR = /usr/X11R6/lib
-  endif
+  X11R6_LIB_DIR = /usr/X11R6/lib
 endif
 
 LIBXNVCTRL_DIR = ../src/libXNVCtrl


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to