diff -Nru nvidia-settings-304-304.64/debian/changelog nvidia-settings-304-304.116/debian/changelog --- nvidia-settings-304-304.64/debian/changelog 2013-11-08 12:56:22.000000000 +0000 +++ nvidia-settings-304-304.116/debian/changelog 2013-11-08 12:56:23.000000000 +0000 @@ -1,8 +1,25 @@ -nvidia-settings-304 (304.64-0ubuntu1~xedgers~precise1) precise; urgency=low +nvidia-settings-304 (304.116-0ubuntu1~xedgers~precise1) precise; urgency=medium - * Copied from raring + * New upstream release - -- Rico Tzschichholz Fri, 18 Jan 2013 13:35:08 +0100 + -- Rico Tzschichholz Fri, 08 Nov 2013 13:33:08 +0100 + +nvidia-settings-304 (304.88-0ubuntu2) saucy; urgency=low + + * debian/control.in: + - Add transitional packages for nvidia-settings. + - Conflict/replace/provide nvidia-settings-binary. + + -- Alberto Milone Wed, 10 Jul 2013 12:18:59 +0200 + +nvidia-settings-304 (304.88-0ubuntu1) raring; urgency=low + + * New upstream release: + - Match the ABI in the 304.88 release. + * debian/rules: + - Make sure that the sources are installed correctly. + + -- Alberto Milone Wed, 10 Apr 2013 16:40:51 +0200 nvidia-settings-304 (304.64-0ubuntu1) raring; urgency=low diff -Nru nvidia-settings-304-304.64/debian/control nvidia-settings-304-304.116/debian/control --- nvidia-settings-304-304.64/debian/control 2013-11-08 12:56:22.000000000 +0000 +++ nvidia-settings-304-304.116/debian/control 2013-11-08 12:56:23.000000000 +0000 @@ -13,18 +13,9 @@ Package: nvidia-settings-304 Architecture: i386 amd64 lpia Depends: python-gtk2, pkg-config, screen-resolution-extra (>= 0.12), ${shlibs:Depends} -Conflicts: libxnvctrl-dev, nvidia-settings, nvidia-settings-updates, - nvidia-settings-experimental-304, nvidia-settings-experimental-310, - nvidia-settings-310-updates, nvidia-settings-310, - nvidia-settings-304-updates -Replaces: libxnvctrl-dev, nvidia-settings, nvidia-settings-updates, - nvidia-settings-experimental-304, nvidia-settings-experimental-310, - nvidia-settings-310-updates, nvidia-settings-310, - nvidia-settings-304-updates -Provides: nvidia-settings, nvidia-settings-updates, - nvidia-settings-experimental-304, nvidia-settings-experimental-310, - nvidia-settings-310-updates, nvidia-settings-310, - nvidia-settings-304-updates +Conflicts: libxnvctrl-dev, nvidia-settings-binary +Replaces: libxnvctrl-dev, nvidia-settings-binary +Provides: nvidia-settings-binary Description: Tool for configuring the NVIDIA graphics driver The nvidia-settings utility is a tool for configuring the NVIDIA Linux graphics driver. It operates by communicating with the NVIDIA @@ -34,3 +25,10 @@ Values such as brightness and gamma, XVideo attributes, temperature, and OpenGL settings can be queried and configured via nvidia-settings. +Package: nvidia-settings +Architecture: i386 amd64 lpia +Depends: nvidia-settings-304 +Description: Transitional package for nvidia-settings + This is a transitional package for nvidia-settings, and can be + safely removed after the installation is complete. + . diff -Nru nvidia-settings-304-304.64/debian/control.in nvidia-settings-304-304.116/debian/control.in --- nvidia-settings-304-304.64/debian/control.in 2013-11-08 12:56:22.000000000 +0000 +++ nvidia-settings-304-304.116/debian/control.in 2013-11-08 12:56:23.000000000 +0000 @@ -13,18 +13,9 @@ Package: #PKGNAME# Architecture: i386 amd64 lpia Depends: python-gtk2, pkg-config, screen-resolution-extra (>= 0.12), ${shlibs:Depends} -Conflicts: libxnvctrl-dev, nvidia-settings, nvidia-settings-updates, - nvidia-settings-experimental-304, nvidia-settings-experimental-310, - nvidia-settings-310-updates, nvidia-settings-310, - nvidia-settings-304-updates -Replaces: libxnvctrl-dev, nvidia-settings, nvidia-settings-updates, - nvidia-settings-experimental-304, nvidia-settings-experimental-310, - nvidia-settings-310-updates, nvidia-settings-310, - nvidia-settings-304-updates -Provides: nvidia-settings, nvidia-settings-updates, - nvidia-settings-experimental-304, nvidia-settings-experimental-310, - nvidia-settings-310-updates, nvidia-settings-310, - nvidia-settings-304-updates +Conflicts: libxnvctrl-dev, nvidia-settings-binary +Replaces: libxnvctrl-dev, nvidia-settings-binary +Provides: nvidia-settings-binary Description: Tool for configuring the NVIDIA graphics driver The nvidia-settings utility is a tool for configuring the NVIDIA Linux graphics driver. It operates by communicating with the NVIDIA @@ -34,3 +25,10 @@ Values such as brightness and gamma, XVideo attributes, temperature, and OpenGL settings can be queried and configured via nvidia-settings. +Package: nvidia-settings +Architecture: i386 amd64 lpia +Depends: #PKGNAME# +Description: Transitional package for nvidia-settings + This is a transitional package for nvidia-settings, and can be + safely removed after the installation is complete. + . diff -Nru nvidia-settings-304-304.64/debian/rules nvidia-settings-304-304.116/debian/rules --- nvidia-settings-304-304.64/debian/rules 2013-11-08 12:56:22.000000000 +0000 +++ nvidia-settings-304-304.116/debian/rules 2013-11-08 12:56:23.000000000 +0000 @@ -102,7 +102,7 @@ dh binary override_dh_auto_install: - dh_auto_install -- prefix=$(CURDIR)/debian/$(PKG_name)$(PKG_libdir) + dh_auto_install -- DESTDIR=$(CURDIR)/debian/$(PKG_name)$(PKG_libdir) override_dh_installman: dh_installman diff -Nru nvidia-settings-304-304.64/doc/version.mk nvidia-settings-304-304.116/doc/version.mk --- nvidia-settings-304-304.64/doc/version.mk 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/doc/version.mk 2013-10-29 04:51:07.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 304.64 +NVIDIA_VERSION = 304.116 diff -Nru nvidia-settings-304-304.64/samples/version.mk nvidia-settings-304-304.116/samples/version.mk --- nvidia-settings-304-304.64/samples/version.mk 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/samples/version.mk 2013-10-29 04:51:07.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 304.64 +NVIDIA_VERSION = 304.116 diff -Nru nvidia-settings-304-304.64/src/common-utils/common-utils.c nvidia-settings-304-304.116/src/common-utils/common-utils.c --- nvidia-settings-304-304.64/src/common-utils/common-utils.c 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/common-utils/common-utils.c 2013-10-29 04:51:08.000000000 +0000 @@ -281,6 +281,19 @@ } /* tilde_expansion() */ +/* + * nv_prepend_to_string_list() - add a new string to a string list, delimited + * by the given string delimiter. The original list is freed. + */ + +char *nv_prepend_to_string_list(char *list, const char *item, const char *delim) +{ + char *new_list = nvstrcat(item, list ? delim : NULL, list, NULL); + nvfree(list); + return new_list; +} + + /****************************************************************************/ /* TextRows helper functions */ /****************************************************************************/ diff -Nru nvidia-settings-304-304.64/src/common-utils/common-utils.h nvidia-settings-304-304.116/src/common-utils/common-utils.h --- nvidia-settings-304-304.64/src/common-utils/common-utils.h 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/common-utils/common-utils.h 2013-10-29 04:51:08.000000000 +0000 @@ -48,6 +48,7 @@ void nvfree(void *s); char *tilde_expansion(const char *str); +char *nv_prepend_to_string_list(char *list, const char *item, const char *delim); TextRows *nv_format_text_rows(const char *prefix, const char *str, diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrection.c nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrection.c --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrection.c 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrection.c 2013-10-29 04:51:08.000000000 +0000 @@ -1008,18 +1008,19 @@ } /* do_confirm_countdown() */ -GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table, - const gchar *title, - gboolean randr) +GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table) { GtkTextIter i; GtkTextBuffer *b; - + const gchar *title = "X Server Color Correction"; + b = gtk_text_buffer_new(table); gtk_text_buffer_get_iter_at_offset(b, &i, 0); - ctk_color_correction_tab_help(b, &i, title, randr); + ctk_help_title(b, &i, "%s Help", title); + + ctk_color_correction_tab_help(b, &i, title, FALSE /* randr */); ctk_help_heading(b, &i, "Reset Hardware Defaults"); ctk_help_para(b, &i, __resest_button_help); @@ -1034,12 +1035,12 @@ const gchar *title, gboolean randr) { - ctk_help_title(b, i, "%s Help", title); + ctk_help_heading(b, i, "Color Correction"); - ctk_help_heading(b, i, "Active Color Channel"); + ctk_help_term(b, i, "Active Color Channel"); ctk_help_para(b, i, __active_color_help); - ctk_help_heading(b, i, "Brightness, Contrast and Gamma"); + ctk_help_term(b, i, "Brightness, Contrast and Gamma"); ctk_help_para(b, i, "The Brightness, Contrast and Gamma sliders " "allow you to adjust the brightness, contrast, " "or gamma values for the selected color channel(s). This " @@ -1066,6 +1067,6 @@ "to manipulate the X screen's gamma ramps", title); } - ctk_help_heading(b, i, "Confirm Current Changes"); + ctk_help_term(b, i, "Confirm Current Changes"); ctk_help_para(b, i, __confirm_button_help); } diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrection.h nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrection.h --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrection.h 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrection.h 2013-10-29 04:51:08.000000000 +0000 @@ -79,9 +79,7 @@ GtkWidget* ctk_color_correction_new (NvCtrlAttributeHandle *, CtkConfig *, ParsedAttribute *, CtkEvent *); -GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *, - const gchar *title, - gboolean randr); +GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *); void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i, const gchar *title, gboolean randr); diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.c nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrectionpage.c --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.c 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrectionpage.c 2013-10-29 04:51:08.000000000 +0000 @@ -123,8 +123,7 @@ } -GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table, - const gchar *title) +GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table) { - return ctk_color_correction_create_help(table, title, FALSE /* randr */); + return ctk_color_correction_create_help(table); } diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.h nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrectionpage.h --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.h 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkcolorcorrectionpage.h 2013-10-29 04:51:08.000000000 +0000 @@ -79,8 +79,7 @@ GtkWidget* ctk_color_correction_page_new (NvCtrlAttributeHandle *, CtkConfig *, ParsedAttribute *, CtkEvent *); -GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *, - const gchar *title); +GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *); G_END_DECLS diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-304-304.116/src/gtk+-2.x/ctkdisplayconfig-utils.c --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkdisplayconfig-utils.c 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkdisplayconfig-utils.c 2013-10-29 04:51:08.000000000 +0000 @@ -822,28 +822,65 @@ * * A best match is: * - * - The modelines are the same. * - The modelines match in width & height. + * - Then, the modelines match the ViewPortIn. * **/ int display_find_closest_mode_matching_modeline(nvDisplayPtr display, nvModeLinePtr modeline) { - nvModePtr mode; + const int targetWidth = modeline->data.hdisplay; + const int targetHeight = modeline->data.vdisplay; + + nvModePtr mode, best_mode = NULL; int mode_idx; - int match_idx = -1; + int best_idx = -1; mode_idx = 0; for (mode = display->modes; mode; mode = mode->next) { - if (mode->modeline->data.vdisplay == modeline->data.vdisplay && - mode->modeline->data.hdisplay == modeline->data.hdisplay) { - match_idx = mode_idx; + if (!mode->modeline) { + continue; + } + + if (mode->modeline->data.hdisplay == targetWidth && + mode->modeline->data.vdisplay == targetHeight) { + nvModePtr tmp_mode = mode; + int tmp_idx = mode_idx; + + /* We already have a match. Let's figure out if the + * currently considered mode is the closer to what we + * want. + */ + if (best_mode) { + Bool current_match_vpin = + (mode->dim[W] == targetWidth && + mode->dim[H] == targetHeight); + Bool best_match_vpin = + (best_mode->dim[W] == targetWidth && + best_mode->dim[H] == targetHeight); + + /* Try to find reasons why we should prefer the + * previous match over the currently considered + * mode by checking which one has a matching + * ViewPortIn. + * + * If both are equally close, we keep our previous + * match. + */ + if ((!current_match_vpin && best_match_vpin) || + (current_match_vpin && best_match_vpin)) { + tmp_mode = best_mode; + tmp_idx = best_idx; + } + /* Fallthrough. */ + } + best_mode = tmp_mode; + best_idx = tmp_idx; } - if (mode->modeline == modeline) break; mode_idx++; } - return match_idx; + return best_idx; } /* display_find_closest_mode_matching_modeline() */ diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkdisplaydevice.c nvidia-settings-304-304.116/src/gtk+-2.x/ctkdisplaydevice.c --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkdisplaydevice.c 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkdisplaydevice.c 2013-10-29 04:51:08.000000000 +0000 @@ -897,7 +897,6 @@ if (ctk_color_correction == NULL) { return; } - ctk_object->color_correction_tab = ctk_color_correction; ctk_object->color_correction_available = TRUE; box = gtk_hbox_new(FALSE, 0); diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkdisplaydevice.h nvidia-settings-304-304.116/src/gtk+-2.x/ctkdisplaydevice.h --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkdisplaydevice.h 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkdisplaydevice.h 2013-10-29 04:51:08.000000000 +0000 @@ -71,7 +71,6 @@ GtkWidget *edid; GtkWidget *dithering_controls; GtkWidget *color_controls; - GtkWidget *color_correction_tab; gboolean color_correction_available; diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkmultisample.c nvidia-settings-304-304.116/src/gtk+-2.x/ctkmultisample.c --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkmultisample.c 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkmultisample.c 2013-10-29 04:51:08.000000000 +0000 @@ -372,7 +372,7 @@ for (i = 0; i < ctk_multisample->fsaa_translation_table_size; i++) ctk_multisample->active_attributes |= - (1 << (__FSAA+ctk_multisample->fsaa_translation_table[i])); + (__FSAA << ctk_multisample->fsaa_translation_table[i]); /* FXAA Option button */ diff -Nru nvidia-settings-304-304.64/src/gtk+-2.x/ctkwindow.c nvidia-settings-304-304.116/src/gtk+-2.x/ctkwindow.c --- nvidia-settings-304-304.64/src/gtk+-2.x/ctkwindow.c 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/gtk+-2.x/ctkwindow.c 2013-10-29 04:51:08.000000000 +0000 @@ -687,10 +687,9 @@ ctk_window->attribute_list, ctk_event); if (child) { - const char *title = "X Server Color Correction"; - help = ctk_color_correction_page_create_help(tag_table, title); + help = ctk_color_correction_page_create_help(tag_table); add_page(child, help, ctk_window, &iter, NULL, - title, NULL, NULL, NULL); + "X Server Color Correction", NULL, NULL, NULL); } } diff -Nru nvidia-settings-304-304.64/src/version.mk nvidia-settings-304-304.116/src/version.mk --- nvidia-settings-304-304.64/src/version.mk 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/src/version.mk 2013-10-29 04:51:07.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 304.64 +NVIDIA_VERSION = 304.116 diff -Nru nvidia-settings-304-304.64/version.mk nvidia-settings-304-304.116/version.mk --- nvidia-settings-304-304.64/version.mk 2012-11-06 17:02:52.000000000 +0000 +++ nvidia-settings-304-304.116/version.mk 2013-10-29 04:51:07.000000000 +0000 @@ -1 +1 @@ -NVIDIA_VERSION = 304.64 +NVIDIA_VERSION = 304.116