285.03285.03

2 files changed, 40 insertions, 1 deletions

diff --git a/XF86Config-parser/Merge.c b/XF86Config-parser/Merge.c
index e302e5e..67ba8e2 100644
--- a/XF86Config-parser/Merge.c
+++ b/XF86Config-parser/Merge.c
@@ -713,6 +713,38 @@ static int xconfigMergeLayout(XConfigPtr dstConfig, XConfigPtr srcConfig)
 
 
 /*
+ * xconfigMergeExtensions() - Updates information in the destination's extension
+ * section with that of the source's extension section. 
+ * Currently considering composite extension only.
+ *
+ */
+static int  xconfigMergeExtensions(XConfigPtr dstConfig, XConfigPtr srcConfig)
+{
+   if (srcConfig->extensions) {
+        XConfigOptionPtr option;
+
+        /* Extension section was not found, create a new one */
+        if (!dstConfig->extensions) {
+            dstConfig->extensions =
+                (XConfigExtensionsPtr) calloc(1, sizeof(XConfigExtensionsRec));
+            if (!dstConfig->extensions) return 0;
+        }
+
+        option = srcConfig->extensions->options;
+        while (option) {
+            xconfigMergeOption(&(dstConfig->extensions->options),
+                               &(srcConfig->extensions->options),
+                               xconfigOptionName(option),
+                               &(dstConfig->extensions->comment));
+            option = option->next;
+        }
+    }
+
+    return 1;
+
+} /* xconfigMergeExtensions() */
+
+/*
  * xconfigMergeConfigs() - Merges the source X configuration with the
  * destination X configuration.
  *
@@ -763,6 +795,13 @@ int xconfigMergeConfigs(XConfigPtr dstConfig, XConfigPtr srcConfig)
         return 0;
     }
 
+    /* Merge the extensions */
+    
+    if (!xconfigMergeExtensions(dstConfig, srcConfig)) {
+        return 0;
+    }
+
+
     return 1;
 
 } /* xconfigMergeConfigs() */
diff --git a/version.mk b/version.mk
index c8a2600..8b72bdb 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 280.13
+NVIDIA_VERSION = 285.03