340.24340.24

3 files changed, 32 insertions, 11 deletions

diff --git a/install-from-cwd.c b/install-from-cwd.c
index 7b5542e..c107014 100644
--- a/install-from-cwd.c
+++ b/install-from-cwd.c
@@ -662,6 +662,7 @@ static Package *parse_manifest (Options *op)
     struct stat stat_buf;
     Package *p;
     char *manifest = MAP_FAILED, *ptr;
+    int opengl_files_packaged = FALSE;
     
     p = (Package *) nvalloc(sizeof (Package));
     
@@ -846,6 +847,12 @@ static Package *parse_manifest (Options *op)
                 op->uvm_files_packaged = TRUE;
             }
 
+            /* set opengl_files_packaged if any OpenGL files were packaged */
+
+            if (entry.caps.is_opengl) {
+                opengl_files_packaged = TRUE;
+            }
+
             nvfree(flag);
 
             /* some libs/symlinks have an arch field */
@@ -936,7 +943,13 @@ static Package *parse_manifest (Options *op)
         line++;
 
     } while (!done);
-    
+
+    /* If the package does not contain any OpenGL files, do not install
+     * OpenGL files */
+    if (!opengl_files_packaged) {
+        op->no_opengl_files = TRUE;
+    }
+
     munmap(manifest, len);
     if (fd != -1) close(fd);
 
diff --git a/misc.c b/misc.c
index f4276ce..3885598 100644
--- a/misc.c
+++ b/misc.c
@@ -1197,6 +1197,8 @@ static int detect_library(const char *library)
 
 void should_install_vdpau_wrapper(Options *op, Package *p)
 {
+    int i, vdpau_packaged = FALSE;
+
     /*
      * If the user did not specifically request installation or non-installation
      * of the VDPAU wrapper, default to installing only if the wrapper was not
@@ -1221,6 +1223,21 @@ void should_install_vdpau_wrapper(Options *op, Package *p)
         }
     }
 
+    for (i = 0; i < p->num_entries; i++) {
+        if (p->entries[i].type == FILE_TYPE_VDPAU_WRAPPER_LIB ||
+            p->entries[i].type == FILE_TYPE_VDPAU_WRAPPER_SYMLINK) {
+            vdpau_packaged = TRUE;
+
+            if (op->install_vdpau_wrapper != NV_OPTIONAL_BOOL_TRUE) {
+                invalidate_package_entry(&(p->entries[i]));
+            }
+        }
+    }
+
+    if (!vdpau_packaged) {
+        return;
+    }
+
     if (op->install_vdpau_wrapper == NV_OPTIONAL_BOOL_TRUE) {
         ui_message(op, "nvidia-installer will install the libvdpau and "
                        "libvdpau_trace libraries that were included with this "
@@ -1233,16 +1250,7 @@ void should_install_vdpau_wrapper(Options *op, Package *p)
                        "from the sources available at:\n\n"
                        "http://people.freedesktop.org/~aplattner/vdpau");
     } else {
-        int i;
-
         ui_log(op, "Skipping installation of the libvdpau wrapper library.");
-
-        for (i = 0; i < p->num_entries; i++) {
-            if (p->entries[i].type == FILE_TYPE_VDPAU_WRAPPER_LIB ||
-                p->entries[i].type == FILE_TYPE_VDPAU_WRAPPER_SYMLINK) {
-                invalidate_package_entry(&(p->entries[i]));
-            }
-        }
     }
 }
 
diff --git a/version.mk b/version.mk
index 95e697a..a7b8a27 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 340.17
+NVIDIA_VERSION = 340.24