rpms/gnome-desktop/devel concatenate-edid-descriptors.patch, NONE, 1.1 .cvsignore, 1.85, 1.86 gnome-desktop.spec, 1.214, 1.215 sources, 1.85, 1.86 give-me-back-my-rotations.patch, 1.1, NONE you-never-find-a-haystack-in-a-needle.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29184

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Added Files:
	concatenate-edid-descriptors.patch 
Removed Files:
	give-me-back-my-rotations.patch 
	you-never-find-a-haystack-in-a-needle.patch 
Log Message:
2.27.4


concatenate-edid-descriptors.patch:

--- NEW FILE concatenate-edid-descriptors.patch ---
diff -up gnome-desktop-2.27.4/libgnome-desktop/edid.h.concatenate-edid-descriptors gnome-desktop-2.27.4/libgnome-desktop/edid.h
--- gnome-desktop-2.27.4/libgnome-desktop/edid.h.concatenate-edid-descriptors	2009-04-19 13:39:06.000000000 -0400
+++ gnome-desktop-2.27.4/libgnome-desktop/edid.h	2009-07-15 12:49:00.883963393 -0400
@@ -183,12 +183,13 @@ struct MonitorInfo
 						 */
 
     /* Optional product description */
-    char		dsc_serial_number[14];
-    char		dsc_product_name[14];
-    char		dsc_string[14];		/* Unspecified ASCII data */
+    char	       *dsc_serial_number;
+    char	       *dsc_product_name;
+    char	       *dsc_string;		/* Unspecified ASCII data */
 };
 
 MonitorInfo *decode_edid (const uchar *data);
+void         free_edid (MonitorInfo *);
 char *       make_display_name (const char        *output_name,
 				const MonitorInfo *info);
 
diff -up gnome-desktop-2.27.4/libgnome-desktop/edid-parse.c.concatenate-edid-descriptors gnome-desktop-2.27.4/libgnome-desktop/edid-parse.c
--- gnome-desktop-2.27.4/libgnome-desktop/edid-parse.c.concatenate-edid-descriptors	2009-04-19 13:39:06.000000000 -0400
+++ gnome-desktop-2.27.4/libgnome-desktop/edid-parse.c	2009-07-15 12:53:51.648990812 -0400
@@ -349,27 +349,44 @@ decode_standard_timings (const uchar *ed
     return TRUE;
 }
 
-static void
-decode_lf_string (const uchar *s, int n_chars, char *result)
+static char *
+decode_lf_string (const uchar *s, int n_chars, char *prev)
 {
     int i;
+    char *ret, *tmp;
+
+    tmp = g_malloc0 (n_chars);
+
     for (i = 0; i < n_chars; ++i)
     {
 	if (s[i] == 0x0a)
 	{
-	    *result++ = '\0';
+	    tmp[i] = '\0';
 	    break;
 	}
 	else if (s[i] == 0x00)
 	{
 	    /* Convert embedded 0's to spaces */
-	    *result++ = ' ';
+	    tmp[i] = ' ';
 	}
 	else
 	{
-	    *result++ = s[i];
+	    tmp[i] = s[i];
 	}
     }
+
+    if (prev)
+    {
+       ret = g_strjoin(NULL, prev, tmp, NULL);
+       g_free(prev);
+       g_free(tmp);
+    }
+    else
+    {
+       ret = tmp;
+    }
+
+    return ret;
 }
 
 static void
@@ -379,13 +396,16 @@ decode_display_descriptor (const uchar *
     switch (desc[0x03])
     {
     case 0xFC:
-	decode_lf_string (desc + 5, 13, info->dsc_product_name);
+	info->dsc_product_name = decode_lf_string (desc + 5, 13,
+                                                   info->dsc_product_name);
 	break;
     case 0xFF:
-	decode_lf_string (desc + 5, 13, info->dsc_serial_number);
+	info->dsc_serial_number = decode_lf_string (desc + 5, 13,
+                                                    info->dsc_serial_number);
 	break;
     case 0xFE:
-	decode_lf_string (desc + 5, 13, info->dsc_string);
+	info->dsc_string = decode_lf_string (desc + 5, 13,
+                                             info->dsc_string);
 	break;
     case 0xFD:
 	/* Range Limits */
@@ -514,6 +534,18 @@ decode_check_sum (const uchar *edid,
     info->checksum = check;
 }
 
+void
+free_edid (MonitorInfo *info)
+{
+    if (info)
+    {
+	g_free (info->dsc_product_name);
+	g_free (info->dsc_serial_number);
+	g_free (info->dsc_string);
+    }
+    g_free (info);
+}
+
 MonitorInfo *
 decode_edid (const uchar *edid)
 {
diff -up gnome-desktop-2.27.4/libgnome-desktop/gnome-rr-config.c.concatenate-edid-descriptors gnome-desktop-2.27.4/libgnome-desktop/gnome-rr-config.c
--- gnome-desktop-2.27.4/libgnome-desktop/gnome-rr-config.c.concatenate-edid-descriptors	2009-06-29 19:35:54.000000000 -0400
+++ gnome-desktop-2.27.4/libgnome-desktop/gnome-rr-config.c	2009-07-15 12:47:57.734218844 -0400
@@ -491,7 +491,7 @@ gnome_rr_config_new_current (GnomeRRScre
 	    output->display_name = make_display_name (
 		gnome_rr_output_get_name (rr_output), info);
 		
-	    g_free (info);
+	    free_edid (info);
 		
 	    crtc = gnome_rr_output_get_crtc (rr_output);
 	    mode = crtc? gnome_rr_crtc_get_current_mode (crtc) : NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- .cvsignore	16 Jun 2009 14:03:35 -0000	1.85
+++ .cvsignore	15 Jul 2009 17:31:57 -0000	1.86
@@ -1 +1 @@
-gnome-desktop-2.27.3.tar.bz2
+gnome-desktop-2.27.4.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -p -r1.214 -r1.215
--- gnome-desktop.spec	7 Jul 2009 22:27:12 -0000	1.214
+++ gnome-desktop.spec	15 Jul 2009 17:31:57 -0000	1.215
@@ -11,14 +11,14 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
-Version: 2.27.3
-Release: 2%{?dist}
+Version: 2.27.4
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.27/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=581621
-Patch2: pnpids.patch
-# Backport from 2.27.4
-Patch3: gnome-desktop-2.27.3-edid-prop-name.patch
+Patch0: pnpids.patch
+Patch1: concatenate-edid-descriptors.patch
+
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,8 +76,8 @@ libgnomedesktop.
 
 %prep
 %setup -q
-%patch2 -p1 -b .pnpids.patch
-%patch3 -p1 -b .edid-name
+%patch0 -p1 -b .pnpids.patch
+%patch1 -p1 -b .concatenate-edid-descriptors
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -123,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Wed Jul 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-1
+- Update to 2.27.4
+- Some EDID handling improvements
+
 * Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 2.27.3-2
 - gnome-desktop-2.27.3-edid-prop-name.patch: Adapt to RANDR 1.3's new name
   for the EDID output property.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	16 Jun 2009 14:03:35 -0000	1.85
+++ sources	15 Jul 2009 17:31:57 -0000	1.86
@@ -1 +1 @@
-a4fd698181f3b22ca09564e149eb56a9  gnome-desktop-2.27.3.tar.bz2
+25c96e2a203edbad7372eb8b1096a0c0  gnome-desktop-2.27.4.tar.bz2


--- give-me-back-my-rotations.patch DELETED ---


--- you-never-find-a-haystack-in-a-needle.patch DELETED ---