313.09313.09

5 files changed, 23 insertions, 15 deletions

diff --git a/command-list.c b/command-list.c
index 4530ed9..98c9723 100644
--- a/command-list.c
+++ b/command-list.c
@@ -594,6 +594,7 @@ static ConflictingFileInfo __xfree86_non_opengl_libs[] = {
     { "libnvcuvid.",         11, /* strlen("libnvcuvid.") */         NULL            },
     { "libnvidia-ml.",       13, /* strlen("libnvidia-ml.") */       NULL            },
     { "libnvidia-encode.",   17, /* strlen("libnvidia-encode.") */   NULL            },
+    { "libnvidia-vgx.",      14, /* strlen("libnvidia-vgx.") */      NULL            },
     { NULL,                  0,                                      NULL            }
 };
 
diff --git a/files.c b/files.c
index abfa9c0..23cd757 100644
--- a/files.c
+++ b/files.c
@@ -620,6 +620,13 @@ int set_destinations(Options *op, Package *p)
             path = "";
             break;
 
+        case FILE_TYPE_VGX_LIB:
+        case FILE_TYPE_VGX_SYMLINK:
+            prefix = op->opengl_prefix;
+            dir = op->opengl_libdir;
+            path = "";
+            break;
+
         case FILE_TYPE_OPENGL_HEADER:
             prefix = op->opengl_prefix;
             dir = op->opengl_incdir;
diff --git a/install-from-cwd.c b/install-from-cwd.c
index 784743b..a7b040c 100644
--- a/install-from-cwd.c
+++ b/install-from-cwd.c
@@ -83,10 +83,6 @@ int install_from_cwd(Options *op)
         "appropriate; see the file /usr/share/doc/"
         "NVIDIA_GLX-1.0/README.txt for details.";
 
-    static const char suse_edit_your_xf86config[] =
-        "On SuSE Linux/United Linux please use SaX2 now to enable "
-        "the NVIDIA driver.";
-
     /*
      * validate the manifest file in the cwd, and process it, building
      * a Package struct
@@ -317,11 +313,7 @@ int install_from_cwd(Options *op)
                        "complete.", p->description, p->version);
         } else {
             
-            if ((op->distro == SUSE) || (op->distro == UNITED_LINUX)) {
-                msg = suse_edit_your_xf86config;
-            } else {
-                msg = edit_your_xf86config;
-            }
+            msg = edit_your_xf86config;
             
             ui_message(op, "Installation of the %s (version: %s) is now "
                        "complete.  %s", p->description,
@@ -773,6 +765,10 @@ static Package *parse_manifest (Options *op)
                 p->entries[n].flags |= FILE_TYPE_ENCODEAPI_LIB;
             else if (strcmp(flag, "ENCODEAPI_LIB_SYMLINK") == 0)
                 p->entries[n].flags |= FILE_TYPE_ENCODEAPI_SYMLINK;
+            else if (strcmp(flag, "VGX_LIB") == 0)
+                p->entries[n].flags |= FILE_TYPE_VGX_LIB;
+            else if (strcmp(flag, "VGX_LIB_SYMLINK") == 0)
+                p->entries[n].flags |= FILE_TYPE_VGX_SYMLINK;
             else {
                 nvfree(flag);
                 goto invalid_manifest_file;
diff --git a/nvidia-installer.h b/nvidia-installer.h
index 3ff9489..580d69f 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -277,7 +277,7 @@ typedef struct __package {
 
 /* file types */
 
-#define FILE_TYPE_MASK                          0x0000000fffffffffULL
+#define FILE_TYPE_MASK                          0x0000003fffffffffULL
 
 #define FILE_TYPE_KERNEL_MODULE_SRC             0x0000000000000001ULL
 #define FILE_TYPE_KERNEL_MODULE_CMD             0x0000000000000002ULL
@@ -316,7 +316,8 @@ typedef struct __package {
 #define FILE_TYPE_GLX_MODULE_SYMLINK            0x0000000200000000ULL
 #define FILE_TYPE_ENCODEAPI_LIB                 0x0000000400000000ULL
 #define FILE_TYPE_ENCODEAPI_SYMLINK             0x0000000800000000ULL
-
+#define FILE_TYPE_VGX_LIB                       0x0000001000000000ULL
+#define FILE_TYPE_VGX_SYMLINK                   0x0000002000000000ULL
 
 /* file class: this is used to distinguish OpenGL libraries */
 
@@ -350,7 +351,8 @@ typedef struct __package {
                                     FILE_TYPE_VDPAU_LIB          | \
                                     FILE_TYPE_NVCUVID_LIB        | \
                                     FILE_TYPE_KERNEL_MODULE_SRC  | \
-                                    FILE_TYPE_ENCODEAPI_LIB)
+                                    FILE_TYPE_ENCODEAPI_LIB      | \
+                                    FILE_TYPE_VGX_LIB)
 
 #define FILE_TYPE_HAVE_PATH        (FILE_TYPE_XMODULE_SHARED_LIB | \
                                     FILE_TYPE_XMODULE_SYMLINK    | \
@@ -397,7 +399,8 @@ typedef struct __package {
                                     FILE_TYPE_UTILITY_BIN_SYMLINK| \
                                     FILE_TYPE_VDPAU_SYMLINK      | \
                                     FILE_TYPE_NVCUVID_SYMLINK    | \
-                                    FILE_TYPE_ENCODEAPI_SYMLINK)
+                                    FILE_TYPE_ENCODEAPI_SYMLINK  | \
+                                    FILE_TYPE_VGX_SYMLINK)
 
 #define FILE_TYPE_NEWSYM           (FILE_TYPE_XMODULE_NEWSYM)
 
@@ -416,7 +419,8 @@ typedef struct __package {
                                     FILE_TYPE_UTILITY_LIB        | \
                                     FILE_TYPE_VDPAU_LIB          | \
                                     FILE_TYPE_NVCUVID_LIB        | \
-                                    FILE_TYPE_ENCODEAPI_LIB)
+                                    FILE_TYPE_ENCODEAPI_LIB      | \
+                                    FILE_TYPE_VGX_LIB)
 
 #define FILE_TYPE_OPENGL_FILE      (FILE_TYPE_OPENGL_HEADER      | \
                                     FILE_TYPE_OPENGL_LIB         | \
diff --git a/version.mk b/version.mk
index 6db0208..f91d9f6 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 310.19
+NVIDIA_VERSION = 313.09