[gentoo-commits] gentoo-x86 commit in media-video/nvidia-settings/files: nvidia-settings-169.04-no-display.patch digest-nvidia-settings-169.04

[Piotr Jaroszynski (peper)]

peper       07/11/20 20:24:19

  Added:                nvidia-settings-169.04-no-display.patch
                        digest-nvidia-settings-169.04
  Log:
  Add 169.04 with a patch allowing to run nvidia-setting without :0. Thanks to Tommy Yu <a_korner@×××××××.com> in bug #94240.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch?rev=1.1&content-type=text/plain

Index: nvidia-settings-169.04-no-display.patch
===================================================================
diff -ur nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.c nvidia-settings-1.0/src/gtk+-2.x/ctkui.c
--- nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.c	2007-11-15 01:43:51.000000000 +0100
+++ nvidia-settings-1.0/src/gtk+-2.x/ctkui.c	2007-11-20 21:07:50.000000000 +0100
@@ -37,6 +37,11 @@
     gtk_init(argc, argv);
 }
 
+gboolean ctk_init_check(int *argc, char **argv[])
+{
+    return gtk_init_check(argc, argv);
+}
+
 char *ctk_get_display(void)
 {
     return gdk_get_display();
diff -ur nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.h nvidia-settings-1.0/src/gtk+-2.x/ctkui.h
--- nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.h	2007-11-15 01:43:51.000000000 +0100
+++ nvidia-settings-1.0/src/gtk+-2.x/ctkui.h	2007-11-20 21:07:50.000000000 +0100
@@ -28,9 +28,12 @@
 #include "NvCtrlAttributes.h"
 #include "parse.h"
 #include "config-file.h"
+#include <gtk/gtk.h>
 
 void ctk_init(int *argc, char **argv[]);
 
+gboolean ctk_init_check(int *argc, char **argv[]);
+
 char *ctk_get_display(void);
 
 void ctk_main(NvCtrlAttributeHandle **, int,
Only in nvidia-settings-1.0/src/gtk+-2.x: ctkui.h.orig
diff -ur nvidia-settings-1.0-old/src/nvidia-settings.c nvidia-settings-1.0/src/nvidia-settings.c
--- nvidia-settings-1.0-old/src/nvidia-settings.c	2007-11-15 01:43:51.000000000 +0100
+++ nvidia-settings-1.0/src/nvidia-settings.c	2007-11-20 21:10:31.000000000 +0100
@@ -22,6 +22,8 @@
  *
  */
 
+#include <gtk/gtk.h>
+
 #include "NvCtrlAttributes.h"
 
 #include "command-line.h"
@@ -44,7 +46,9 @@
     NvCtrlAttributeHandle **vcsc_handles = NULL;
     Options *op;
     int ret, i, num_screen_handles, num_gpu_handles, num_vcsc_handles;
-    
+    char *dpy = NULL;
+    int gui = 0;
+
     /*
      * initialize the ui
      *
@@ -52,14 +56,21 @@
      * may not even use the gui, but we want the toolkit to have a
      * chance to parse the commandline before we do... we should
      * investigate gtk_init_check().
+     *
+     * gui flag used to decide if gtk should be used or not, as
+     * use might just use control the display from a remote console
+     * but for some reason cannot initialize the gtk gui. - TY 2005-05-27
      */
-    
-    ctk_init(&argc, &argv);
-    
+
+
+    if (ctk_init_check(&argc, &argv) == TRUE) {
+        dpy = ctk_get_display();
+        gui = 1;
+    }
+
     /* parse the commandline */
     
-    op = parse_command_line(argc, argv, ctk_get_display());
-
+    op = parse_command_line(argc, argv, dpy);
     /* process any query or assignment commandline options */
 
     if (op->num_assignments || op->num_queries) {
@@ -67,6 +78,14 @@
         return ret ? 0 : 1;
     }
     
+    /* quit here if display is undefineds - TY 2005-05-27 */
+
+    if (op->ctrl_display == NULL) {
+        nv_error_msg("Display is undefined, please run `%s --help` "
+                     "for usage information.\n", argv[0]);
+        return 1;
+    }
+    
     /* initialize the parsed attribute list */
 
     p = nv_parsed_attribute_init();
@@ -165,6 +184,14 @@
     }
     
     /* pass control to the gui */
+    /*
+     * if gtk wasn't initiated, exit here.
+     * Using a -c flag without gtk would behave as if using -l - TY 2005-05-27
+     */
+    if (gui == 0) {
+        nv_error_msg("Unable to create gui.\n");
+        return 1;
+    }
 
     ctk_main(screen_handles, num_screen_handles,
              gpu_handles, num_gpu_handles,



1.1                  media-video/nvidia-settings/files/digest-nvidia-settings-169.04

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/digest-nvidia-settings-169.04?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvidia-settings/files/digest-nvidia-settings-169.04?rev=1.1&content-type=text/plain

Index: digest-nvidia-settings-169.04
===================================================================
MD5 fa954e504cb5b89b400968fcbd86ff27 nvidia-settings-169.04.tar.gz 1288405
RMD160 678a82a290b7f5ca5385e74405f36e926e308a0f nvidia-settings-169.04.tar.gz 1288405
SHA256 83c6b760b8322dba96252633d80441d70a8c65e5e172b9db6a73edbdd1eb45fc nvidia-settings-169.04.tar.gz 1288405



-- 
gentoo-commits@g.o mailing list