319.49319.49

6 files changed, 28 insertions, 9 deletions

diff --git a/command-list.c b/command-list.c
index 48506d0..adaedb8 100644
--- a/command-list.c
+++ b/command-list.c
@@ -599,6 +599,7 @@ static ConflictingFileInfo __xfree86_non_opengl_libs[] = {
     { "libnvidia-ml.",       13, /* strlen("libnvidia-ml.") */       NULL            },
     { "libnvidia-encode.",   17, /* strlen("libnvidia-encode.") */   NULL            },
     { "libnvidia-vgx.",      14, /* strlen("libnvidia-vgx.") */      NULL            },
+    { "libnvidia-ifr.",      14, /* strlen("libnvidia-ifr.") */      NULL            },
     { NULL,                  0,                                      NULL            }
 };
 
diff --git a/files.c b/files.c
index 692096f..b4f4829 100644
--- a/files.c
+++ b/files.c
@@ -680,6 +680,18 @@ int set_destinations(Options *op, Package *p)
             dir = path = "";
             break;
 
+        case FILE_TYPE_NVIFR_LIB:
+        case FILE_TYPE_NVIFR_LIB_SYMLINK:
+            if (p->entries[i].compat_arch == FILE_COMPAT_ARCH_COMPAT32) {
+                prefix = op->compat32_prefix;
+                dir = op->compat32_libdir;
+            } else {
+                prefix = op->opengl_prefix;
+                dir = op->opengl_libdir;
+            }
+            path = "";
+            break;
+
         default:
             
             /* 
diff --git a/manifest.c b/manifest.c
index 5d8bcf0..86cf6d1 100644
--- a/manifest.c
+++ b/manifest.c
@@ -104,6 +104,8 @@ static const struct {
     { ENTRY(NVIDIA_MODPROBE,        F, F, T, T, F, F, F ) },
     { ENTRY(NVIDIA_MODPROBE_MANPAGE,F, F, T, T, F, F, F ) },
     { ENTRY(MODULE_SIGNING_KEY,     F, F, T, F, F, F, F ) },
+    { ENTRY(NVIFR_LIB,              T, F, T, F, F, T, F ) },
+    { ENTRY(NVIFR_LIB_SYMLINK,      T, F, F, F, T, F, F ) }, 
 };
 
 /*
diff --git a/misc.c b/misc.c
index 92c3065..b16d339 100644
--- a/misc.c
+++ b/misc.c
@@ -2640,13 +2640,12 @@ static char *nouveau_blacklist_file_is_present(Options *op)
  *
  * Returns FALSE if the nouveau kernel driver is in use (cause
  * installation to abort); returns TRUE if the nouveau driver is not
- * in use and the user has not explicitly requested that the blacklist
- * file be written.
+ * in use, or if the nouveau check is to be skipped.
  */
 
 int check_for_nouveau(Options *op)
 {
-    int ret;
+    int ret, nouveau_detected;
     char *blacklist_files;
 
 #define NOUVEAU_POINTER_MESSAGE                                         \
@@ -2656,15 +2655,17 @@ int check_for_nouveau(Options *op)
 
     if (op->no_nouveau_check) return TRUE;
 
-    if (nouveau_is_present()) {
+    nouveau_detected = nouveau_is_present();
+
+    if (nouveau_detected) {
         ui_error(op, "The Nouveau kernel driver is currently in use "
                  "by your system.  This driver is incompatible with the NVIDIA "
                  "driver, and must be disabled before proceeding.  "
                  NOUVEAU_POINTER_MESSAGE);
     } else if (!op->disable_nouveau) {
-        /* If novueau isn't loaded, we can return early, unless the user
+        /* If nouveau isn't loaded, we can return early, unless the user
          * explicitly requested for the blacklist file to be written. */
-        return TRUE;
+        return !nouveau_detected;
     }
 
     blacklist_files = nouveau_blacklist_file_is_present(op);
@@ -2683,7 +2684,7 @@ int check_for_nouveau(Options *op)
              * written, don't return early, so that the files can be written
              * again, e.g. in case a file is present, but not in the right
              * place for this particular system. */
-            return FALSE;
+            return !nouveau_detected;
         }
     }
 
@@ -2712,7 +2713,8 @@ int check_for_nouveau(Options *op)
         }
     }
 
-    return FALSE;
+    /* Allow installation to continue if nouveau was not detected. */
+    return !nouveau_detected;
 }
 
 #define DKMS_STATUS  " status"
diff --git a/nvidia-installer.h b/nvidia-installer.h
index ee47562..9fb6749 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -261,6 +261,8 @@ typedef enum {
     FILE_TYPE_NVIDIA_MODPROBE,
     FILE_TYPE_NVIDIA_MODPROBE_MANPAGE,
     FILE_TYPE_MODULE_SIGNING_KEY,
+    FILE_TYPE_NVIFR_LIB,
+    FILE_TYPE_NVIFR_LIB_SYMLINK,
     FILE_TYPE_MAX
 } PackageEntryFileType;
 
diff --git a/version.mk b/version.mk
index 47298b6..b483dd1 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 319.32
+NVIDIA_VERSION = 319.49