525.53

doc/Makefile

@@ -67,16 +67,18 @@ HOST_CFLAGS += $(common_cflags)
 # build rules
 ##############################################################################
 
-.PNONY: all install MANPAGE_install clean clobber
-
+.PHONY: all
 all: $(MANPAGE)
 
+.PHONY: install
 install: MANPAGE_install
 
+.PHONY: MANPAGE_install
 MANPAGE_install: $(MANPAGE)
 	$(MKDIR) $(MANDIR)
 	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
 
+.PHONY: clean clobber
 clean clobber:
 	rm -rf $(MANPAGE) *~ $(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d \
 		$(GEN_MANPAGE_OPTS) $(OPTIONS_1_INC)
@@ -88,6 +90,7 @@ clean clobber:
 
 AUTO_TEXT = ".\\\" WARNING: THIS FILE IS AUTO-GENERATED!  Edit $< instead."
 
+.PHONY: doc
 doc: $(MANPAGE)
 
 GEN_MANPAGE_OPTS_SRC  = ../src/gen-manpage-opts.c

doc/version.mk

@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 520.56.06
+NVIDIA_VERSION = 525.53
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))

samples/Makefile

@@ -67,25 +67,26 @@ SAMPLE_SOURCES        += nv-control-warpblend.c
 # build rules
 ##############################################################################
 
-.PHONY: all clean clobber install
-
 # define the rule to build each object file
 $(foreach src, $(SAMPLE_SOURCES), $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
 
 # define the rule to link each sample app from its corresponding object file
 define link_sample_from_object
   $$(OUTPUTDIR)/$(1:.c=): $$(call BUILD_OBJECT_LIST,$(1)) $$(LIBXNVCTRL)
 	$$(call quiet_cmd,LINK) $$(CFLAGS) $$(LDFLAGS) $$(BIN_LDFLAGS) -o $$@ $$< $$(LIBXNVCTRL) $$(LIBS)
-  all:: $$(OUTPUTDIR)/$(1:.c=)
+
+  .PHONY: all
+  all: $$(OUTPUTDIR)/$(1:.c=)
   SAMPLES += $$(OUTPUTDIR)/$(1:.c=)
 endef
 
 $(foreach sample,$(SAMPLE_SOURCES),$(eval $(call link_sample_from_object,$(sample))))
 
-
+.PHONY: clean clobber
 clean clobber:
 	rm -rf *~ $(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d $(SAMPLES) $(LIBXNVCTRL)
 
+.PHONY: install
 install:
 	@# don't install samples, this is just to satisfy the top-level
 	@# recursion rule

samples/version.mk

@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 520.56.06
+NVIDIA_VERSION = 525.53
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))

src/Makefile

@@ -50,12 +50,26 @@ ifeq (1,$(WAYLAND_AVAILABLE))
   BUILD_WAYLANDLIB = 1
 endif
 
-ifndef GTK2_CFLAGS
-  GTK2_CFLAGS          := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
+ifndef GTK2_AVAILABLE
+  GTK2_AVAILABLE := $(shell $(PKG_CONFIG) --exists gtk+-2.0 && echo 1)
 endif
 
-ifndef GTK2_LDFLAGS
-  GTK2_LDFLAGS         := -Wl,--no-as-needed $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+ifeq (1,$(GTK2_AVAILABLE))
+  ifndef GTK2_CFLAGS
+    GTK2_CFLAGS          := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
+  endif
+
+  ifndef GTK2_LDFLAGS
+    GTK2_LDFLAGS         := -Wl,--no-as-needed $(shell $(PKG_CONFIG) --libs gtk+-2.0)
+  endif
+else
+  GTK2_CFLAGS ?=
+  GTK2_LDFLAGS ?=
+endif
+
+# If GTK2_CFLAGS is set, try and build GTK2LIB
+ifdef GTK2_CFLAGS
+  BUILD_GTK2LIB = 1
 endif
 
 ifndef GTK3_AVAILABLE
@@ -127,10 +141,16 @@ NVIDIA_SETTINGS = $(OUTPUTDIR)/nvidia-settings
 
 NVIDIA_SETTINGS_VERSION := $(NVIDIA_VERSION)
 
-GTK2LIB_NAME = libnvidia-gtk2.so
-GTK2LIB_DIR  = $(OUTPUTDIR)/gtk2
-GTK2LIB = $(OUTPUTDIR)/$(GTK2LIB_NAME)
-GTK2LIB_SONAME = $(GTK2LIB_NAME).$(NVIDIA_SETTINGS_VERSION)
+ifdef BUILD_GTK2LIB
+  GTK2LIB_NAME = libnvidia-gtk2.so
+  GTK2LIB_DIR  = $(OUTPUTDIR)/gtk2
+  GTK2LIB = $(OUTPUTDIR)/$(GTK2LIB_NAME)
+  GTK2LIB_SONAME = $(GTK2LIB_NAME).$(NVIDIA_SETTINGS_VERSION)
+else
+  # This value is empty if we are not building GTK2 so that the
+  # nvidia-settings build step has this as an empty dependency.
+  GTK2LIB =
+endif
 
 ifdef BUILD_GTK3LIB
   GTK3LIB_NAME = libnvidia-gtk3.so
@@ -247,8 +267,10 @@ CFLAGS     += -DPROGRAM_NAME=\"nvidia-settings\"
 
 $(call BUILD_OBJECT_LIST,$(XCP_SRC)): CFLAGS += -fPIC
 
-$(call BUILD_OBJECT_LIST_WITH_DIR,$(GTK_SRC),$(GTK2LIB_DIR)): \
-    CFLAGS += $(GTK2_CFLAGS) -fPIC -I $(XCONFIG_PARSER_DIR)/..
+ifdef BUILD_GTK2LIB
+  $(call BUILD_OBJECT_LIST_WITH_DIR,$(GTK_SRC),$(GTK2LIB_DIR)): \
+      CFLAGS += $(GTK2_CFLAGS) -fPIC -I $(XCONFIG_PARSER_DIR)/..
+endif
 
 ifdef BUILD_GTK3LIB
   $(call BUILD_OBJECT_LIST_WITH_DIR,$(GTK_SRC),$(GTK3LIB_DIR)): \
@@ -277,26 +299,31 @@ endef
 # build rules
 ##############################################################################
 
-.PHONY: all install NVIDIA_SETTINGS_install clean clobber
-
+.PHONY: all
 all: $(NVIDIA_SETTINGS) $(GTK2LIB) $(GTK3LIB) $(WAYLANDLIB)
 
+.PHONY: install
 install: NVIDIA_SETTINGS_install NVIDIA_GTKLIB_install WAYLAND_LIB_install
 
+.PHONY: NVIDIA_GTKLIB_install
 NVIDIA_GTKLIB_install: $(GTK2LIB) $(GTK3LIB)
 	$(MKDIR) $(LIBDIR)
+ifdef BUILD_GTK2LIB
 	$(INSTALL) $(INSTALL_LIB_ARGS) $(GTK2LIB) \
 	    $(LIBDIR)/$(GTK2LIB_SONAME)
+endif
 ifdef BUILD_GTK3LIB
 	$(INSTALL) $(INSTALL_LIB_ARGS) $(GTK3LIB) \
 	    $(LIBDIR)/$(GTK3LIB_SONAME)
 endif
 
+.PHONY: WAYLAND_LIB_install
 WAYLAND_LIB_install: $(WAYLANDLIB)
 	$(MKDIR) $(LIBDIR)
 	$(INSTALL) $(INSTALL_LIB_ARGS) $(WAYLANDLIB) \
 	    $(LIBDIR)/$(WAYLANDLIB_SONAME)
 
+.PHONY: NVIDIA_SETTINGS_install
 NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
 	$(MKDIR) $(BINDIR)
 	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
@@ -306,13 +333,15 @@ $(NVIDIA_SETTINGS).unstripped: $(OBJS) $(LIBXNVCTRL)
 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
 	    -rdynamic -o $@ $(OBJS) $(LIBXNVCTRL) $(LIBS)
 
+ifdef BUILD_GTK2LIB
 $(eval $(call DEBUG_INFO_RULES, $(GTK2LIB)))
 $(GTK2LIB).unstripped: $(LIBXNVCTRL) $(GTK2_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
 	$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
 	    $(LIBXNVCTRL) $(LIBS) $(GTK2_LIBS) \
 	    -Wl,--unresolved-symbols=ignore-all -o $@ \
 	    -Wl,-soname -Wl,$(GTK2LIB_SONAME) \
 	    $(GTK2_OBJS) $(IMAGE_OBJS) $(XCP_OBJS)
+endif
 
 ifdef BUILD_GTK3LIB
 $(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
@@ -339,15 +368,24 @@ endif
 $(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
 $(foreach src,$(XCP_SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
 
+ifndef BUILD_GTK3LIB
+  ifndef BUILD_GTK2LIB
+    $(error Neither GTK2 nor GTK3 build dependencies found; please check `pkg-config --exists gtk+-3.0`)
+  endif
+endif
+
+.PHONY: clean clobber
 clean clobber:
 	rm -rf $(NVIDIA_SETTINGS) *~ \
 		$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d \
 		$(GTK2LIB) $(GTK3LIB) $(GTK2LIB_DIR) $(GTK3LIB_DIR) \
 		$(WAYLANDLIB) $(WAYLANDLIB_DIR) \
 		$(IMAGE_HEADERS) $(LIBXNVCTRL)
 
+ifdef BUILD_GTK2LIB
 $(foreach src,$(GTK_SRC), \
     $(eval $(call DEFINE_OBJECT_RULE_WITH_DIR,TARGET,$(src),$(GTK2LIB_DIR))))
+endif
 
 ifdef BUILD_GTK3LIB
 $(foreach src,$(GTK_SRC), \
@@ -366,7 +404,9 @@ $(foreach png,$(IMAGE_FILES), \
 # Build $(IMAGE_HEADERS)
 $(foreach png,$(IMAGE_FILES), \
   $(eval $(call BINARY_DATA_HEADER_RULE,$(png))))
-$(GTK2_OBJS): $(IMAGE_HEADERS)
+ifdef BUILD_GTK2LIB
+  $(GTK2_OBJS): $(IMAGE_HEADERS)
+endif
 ifdef BUILD_GTK3LIB
   $(GTK3_OBJS): $(IMAGE_HEADERS)
 endif

src/glxinfo.c

@@ -611,6 +611,7 @@ void print_eglinfo(const char *display_name, CtrlSystemList *systems)
 {
     CtrlSystem     *system;
     CtrlTargetNode *node;
+    CtrlTargetType target;
     ReturnStatus   status = NvCtrlSuccess;
 
     char *egl_vendor        = NULL;
@@ -626,12 +627,18 @@ void print_eglinfo(const char *display_name, CtrlSystemList *systems)
         return;
     }
 
-    /* Print information for each screen */
-    for (node = system->targets[X_SCREEN_TARGET]; node; node = node->next) {
+    if (system->has_nv_control) {
+        target = X_SCREEN_TARGET;
+    } else {
+        target = GPU_TARGET;
+    }
+
+    /* Print information for each target */
+    for (node = system->targets[target]; node; node = node->next) {
 
         CtrlTarget *t = node->t;
 
-        /* No screen, move on */
+        /* No target, move on */
         if (!t->h) continue;
 
         nv_msg(NULL, "EGL Information for %s:", t->name);
@@ -695,7 +702,11 @@ void print_eglinfo(const char *display_name, CtrlSystemList *systems)
         SAFE_FREE(egl_extensions);
         SAFE_FREE(egl_config_attribs);
 
-    } /* Done looking at all screens */
+        /* If using a gpu, only process the first target */
+        if (target == GPU_TARGET) {
+            break;
+        }
+    } /* Done looking at all targets */
 
 
     /* Fall through */

src/gtk+-2.x/ctkcolorcorrection.c

@@ -1178,6 +1178,10 @@ void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i,
                                    gboolean randr)
 {
     ctk_help_heading(b, i, "Color Correction");
+    ctk_help_para(b, i, "These controls and values are used to create "
+                  "a color profile for this display. It is not currently "
+                  "possible to provide the current color correction values "
+                  "if they have been changed by an external tool.");
 
     ctk_help_term(b, i, "Active Color Channel");
     ctk_help_para(b, i, "%s", __active_color_help);