Hello community,
here is the log from the commit of package xrandr for openSUSE:Factory checked in at 2014-04-01 06:46:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xrandr (Old)
and /work/SRC/openSUSE:Factory/.xrandr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrandr"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xrandr/xrandr.changes 2013-10-17 20:46:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xrandr.new/xrandr.changes 2014-04-01 06:46:30.000000000 +0200
@@ -1,0 +2,14 @@
+Sat Mar 29 01:24:09 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 1.4.2:
+ This minor bugfix release restores the ability to disconnect
+ providers from each other using "0x0" as the provider XID. For
+ example, to disconnect a display offload sink from its source,
+ use: "xrandr --setprovideroutputsource <sink> 0x0"
+ This release also formats the GUID provided by DisplayPort 1.2
+ displays in traditional GUID form.
+ Finally, this release increases the precision of refresh rate
+ calculations to disambiguate modes with very similar refresh
+ rates and to improve the accuracy for interlaced modes.
+
+-------------------------------------------------------------------
Old:
----
xrandr-1.4.1.tar.bz2
New:
----
xrandr-1.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrandr.spec ++++++
--- /var/tmp/diff_new_pack.lHz0Gj/_old 2014-04-01 06:46:30.000000000 +0200
+++ /var/tmp/diff_new_pack.lHz0Gj/_new 2014-04-01 06:46:30.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xrandr
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: xrandr
-Version: 1.4.1
+Version: 1.4.2
Release: 0
Summary: Primitive command line interface to RandR extension
License: MIT
++++++ xrandr-1.4.1.tar.bz2 -> xrandr-1.4.2.tar.bz2 ++++++
++++ 8402 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.1/ChangeLog new/xrandr-1.4.2/ChangeLog
--- old/xrandr-1.4.1/ChangeLog 2013-07-17 08:31:09.000000000 +0200
+++ new/xrandr-1.4.2/ChangeLog 2014-03-28 19:04:19.000000000 +0100
@@ -1,3 +1,105 @@
+commit 31f5fa6a47db154abb47cf16e9f6cc4d983ad371
+Author: Aaron Plattner
+Date: Thu Mar 27 11:37:07 2014 -0700
+
+ xrandr 1.4.2
+
+ Signed-off-by: Aaron Plattner
+
+commit 934a424a05a296c0b8af015476e11b191d55eba3
+Author: Aaron Plattner
+Date: Fri Mar 21 10:35:56 2014 -0700
+
+ xrandr: document how to disconnect RandR 1.4 providers
+
+ Commit a6217be2d5a93a4c7b48f4081a4a8e14c3c97014 restored the ability to
+ disconnect RandR 1.4 providers from each other, but it's not clear from the
+ documentation how to actually do that. Try to clarify by mentioning it in the
+ man page.
+
+ Signed-off-by: Aaron Plattner
+ Reviewed-by: Dave Airlie
+
+commit a6217be2d5a93a4c7b48f4081a4a8e14c3c97014
+Author: Dave Airlie
+Date: Fri May 3 10:05:04 2013 +1000
+
+ xrandr: allow disconnecting of offload and outputs
+
+ Before the lookup code passing a 0 XID would disconnect,
+ this fixes it backup.
+
+ Signed-off-by: Dave Airlie
+ Reviewed-by: Aaron Plattner
+ Tested-by: Aaron Plattner
+ Signed-off-by: Aaron Plattner
+
+commit 00c795e99fe29ecd56e05e915e508c7af0ac39ad
+Author: Ville Syrjälä
+Date: Fri May 31 17:01:54 2013 +0300
+
+ xrandr: Use floating point for VTotal when calculating refresh rate
+
+ Interlaced modes generally have an odd VTotal, so we lose half a line
+ from VTotal when we divide by two. That causes the final refresh rate
+ to be slightly off. Make VTotal a double to avoid the problem.
+
+ Signed-off-by: Ville Syrjälä
+ Reviewed-by: Aaron Plattner
+
+commit 8f9b993342fddfceaa1afbec2996ce10038f10d7
+Author: Ville Syrjälä
+Date: Fri May 31 17:01:53 2013 +0300
+
+ xrandr: Use more decimal places when printing various rates
+
+ Using just one decimal place for dotclock and refresh rates loses quite
+ a bit of information. When dealing with 60Hz vs. 59.94Hz refresh rate
+ modes for example, it's useful to see at least two decimal places. For
+ the dotclock in similar cases, three decimal places seems quite a bit
+ better than just one.
+
+ Signed-off-by: Ville Syrjälä
+ Reviewed-by: Aaron Plattner
+
+commit 7ede207f9064fd88427026e38818819c2c8422bb
+Author: Aaron Plattner
+Date: Fri Jan 3 05:48:17 2014 -0800
+
+ Special-case printing of the GUID property
+
+ Rather than printing GUIDs as 16 signed decimal integers, print them in
+ {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} format.
+
+ Signed-off-by: Aaron Plattner
+ Reviewed-by: Alex Deucher
+
+commit e7a19c8b5a26c8bfd76a7399a1a15eac01184261
+Author: Aaron Plattner
+Date: Fri Jan 3 05:22:02 2014 -0800
+
+ Move EDID printing into a helper function
+
+ Localize the specialness of EDID printing by moving it into a single function,
+ print_edid, which prints the binary EDID data. Remove the is_edid parameter
+ from everything else.
+
+ Signed-off-by: Aaron Plattner
+ Reviewed-by: Alex Deucher
+
+commit a29728ca9599fd08da1243e9b422ac26a24cc05b
+Author: Aaron Plattner
+Date: Fri Jan 3 05:14:35 2014 -0800
+
+ Split output property printing into a helper function
+
+ Move the body of the code that prints the actual output property values into a
+ helper function. This will make it easier for this function to select
+ special-case property printers for properties that need special formatting.
+
+ Signed-off-by: Aaron Plattner
+ Reviewed-by: Alex Deucher
+
commit c5334bb4137d6ea7b8c8b10d51131b9450d1106b
Author: Alan Coopersmith
Date: Tue Jul 16 23:30:27 2013 -0700
@@ -104,7 +206,7 @@
Signed-off-by: Aaron Plattner
commit 3e5f160c4198a5160be5e9a3f21ba3f4130d4318
-Merge: dac72db bd16618
+Merge: dac72dbbc750 bd166184f6c1
Author: Aaron Plattner
Date: Tue Feb 12 12:30:20 2013 -0800
@@ -1370,7 +1472,7 @@
Fix build outside of the source dir
commit 63ba316bcbe8ad61ba63d9fe62c82e7d56dcc399
-Merge: a813c4d 1b95e32
+Merge: a813c4da7f0b 1b95e32b4b0a
Author: Julien Cristau
Date: Mon Dec 1 21:33:35 2008 +0100
@@ -1848,7 +1950,7 @@
Update version number to 1.2.0 for release.
commit 13cef2baa884039e96f5dfd9245bb949aed99448
-Merge: 065f09c a175972
+Merge: 065f09cc304d a175972de6fb
Author: Keith Packard
Date: Sun Feb 18 21:26:50 2007 -0800
@@ -1890,7 +1992,7 @@
Display set of available CRTCs per output in --verbose mode.
commit 067cafb5cda0aa6e34773e888fd469ff657760c2
-Merge: 7c25c24 b0a00df
+Merge: 7c25c245bceb b0a00df69f83
Author: Keith Packard
Date: Wed Jan 31 15:25:35 2007 -0800
@@ -2049,7 +2151,7 @@
Actually respect the --fb option
commit 7b32611632ab08b6a123db5df1c2b919b3a12104
-Merge: a0df3aa 4bb1a9c
+Merge: a0df3aa81205 4bb1a9cd6f9c
Author: Keith Packard
Date: Tue Dec 19 15:58:38 2006 -0800
@@ -2062,7 +2164,7 @@
Correct format for sscanf to double variable "dpi"
commit 4bb1a9cd6f9cc3ed61d7913528afa3f573092833
-Merge: b6c0382 6ef400f
+Merge: b6c03827bae7 6ef400f35d7d
Author: Keith Packard
Date: Wed Dec 13 11:36:36 2006 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.1/configure.ac new/xrandr-1.4.2/configure.ac
--- old/xrandr-1.4.1/configure.ac 2013-07-17 08:30:53.000000000 +0200
+++ new/xrandr-1.4.2/configure.ac 2014-03-27 19:36:53.000000000 +0100
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xrandr], [1.4.1],
+AC_INIT([xrandr], [1.4.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrandr])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.1/man/xrandr.man new/xrandr-1.4.2/man/xrandr.man
--- old/xrandr-1.4.1/man/xrandr.man 2013-07-17 08:30:53.000000000 +0200
+++ new/xrandr-1.4.2/man/xrandr.man 2014-03-21 18:34:57.000000000 +0100
@@ -126,10 +126,14 @@
Set \fIsource\fP as the source of display output images for \fIprovider\fP.
This is only possible if \fIsource\fP and \fIprovider\fP have the \fBSource
Output\fR and \fBSink Output\fR capabilities, respectively.
+If \fIsource\fP is \fB0x0\fP, then \fIprovider\fP is disconnected from its
+current output source.
.IP "\-\-setprovideroffloadsink \fIprovider\fP \fIsink\fP"
Set \fIprovider\fP as a render offload device for \fIsink\fP.
This is only possible if \fIprovider\fP and \fIsink\fP have the \fBSource
Offload\fR and \fBSink Offload\fR capabilities, respectively.
+If \fIsink\fP is \fB0x0\fP, then \fIprovider\fP is disconnected from its current
+render offload sink.
.PP
.SH "RandR version 1.3 options"
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.1/missing new/xrandr-1.4.2/missing
--- old/xrandr-1.4.1/missing 2013-07-17 08:30:58.000000000 +0200
+++ new/xrandr-1.4.2/missing 2014-03-27 19:52:34.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.4.1/xrandr.c new/xrandr-1.4.2/xrandr.c
--- old/xrandr-1.4.1/xrandr.c 2013-07-17 08:30:53.000000000 +0200
+++ new/xrandr-1.4.2/xrandr.c 2014-03-12 16:49:20.000000000 +0100
@@ -543,7 +543,7 @@
mode_refresh (XRRModeInfo *mode_info)
{
double rate;
- unsigned int vTotal = mode_info->vTotal;
+ double vTotal = mode_info->vTotal;
if (mode_info->modeFlags & RR_DoubleScan) {
/* doublescan doubles the number of lines */
@@ -1566,7 +1566,7 @@
rr_outputs[o] = crtc->outputs[o]->output.xid;
mode = crtc->mode_info->id;
if (verbose) {
- printf ("crtc %d: %12s %6.1f +%d+%d", crtc->crtc.index,
+ printf ("crtc %d: %12s %6.2f +%d+%d", crtc->crtc.index,
crtc->mode_info->name, mode_refresh (crtc->mode_info),
crtc->x, crtc->y);
for (o = 0; o < crtc->noutput; o++)
@@ -2342,19 +2342,10 @@
static void
-print_output_property_value(Bool is_edid,
- int value_format, /* 8, 16, 32 */
+print_output_property_value(int value_format, /* 8, 16, 32 */
Atom value_type, /* XA_{ATOM,INTEGER,CARDINAL} */
const void *value_bytes)
{
- /* special-case the EDID */
- if (is_edid && value_format == 8)
- {
- const uint8_t *val = value_bytes;
- printf ("%02" PRIx8, *val);
- return;
- }
-
if (value_type == XA_ATOM && value_format == 32)
{
const Atom *val = value_bytes;
@@ -2415,6 +2406,88 @@
}
static void
+print_edid(int nitems, const unsigned char *prop)
+{
+ int k;
+
+ printf ("\n\t\t");
+
+ for (k = 0; k < nitems; k++)
+ {
+ if (k != 0 && (k % 16) == 0)
+ {
+ printf ("\n\t\t");
+ }
+
+ printf("%02" PRIx8, prop[k]);
+ }
+
+ printf("\n");
+}
+
+static void
+print_guid(const unsigned char *prop)
+{
+ int k;
+
+ printf("{");
+
+ for (k = 0; k < 16; k++)
+ {
+ printf("%02" PRIX8, prop[k]);
+ if (k == 3 || k == 5 || k == 7 || k == 9)
+ {
+ printf("-");
+ }
+ }
+
+ printf("}\n");
+}
+
+static void
+print_output_property(const char *atom_name,
+ int value_format,
+ Atom value_type,
+ int nitems,
+ const unsigned char *prop)
+{
+ int bytes_per_item = value_format / 8;
+ int k;
+
+ /*
+ * Check for properties that need special formatting.
+ */
+ if (strcmp (atom_name, "EDID") == 0 && value_format == 8 &&
+ value_type == XA_INTEGER)
+ {
+ print_edid (nitems, prop);
+ return;
+ }
+ else if (strcmp (atom_name, "GUID") == 0 && value_format == 8 &&
+ value_type == XA_INTEGER && nitems == 16)
+ {
+ print_guid (prop);
+ return;
+ }
+
+ for (k = 0; k < nitems; k++)
+ {
+ if (k != 0)
+ {
+ if ((k % 16) == 0)
+ {
+ printf ("\n\t\t");
+ }
+ }
+ print_output_property_value (value_format, value_type,
+ prop + (k * bytes_per_item));
+ printf (" ");
+ }
+
+ printf ("\n");
+}
+
+static void
get_providers (void)
{
XRRProviderResources *pr;
@@ -2448,6 +2521,8 @@
{
int i;
+ if ((name->kind & name_xid) && name->xid == 0)
+ return NULL;
for (i = 0; i < num_providers; i++) {
provider_t *p = &providers[i];
name_kind_t common = name->kind & p->provider.kind;
@@ -3231,7 +3306,7 @@
provider = find_provider (&provider_name);
source = find_provider(&output_source_provider_name);
- XRRSetProviderOutputSource(dpy, provider->provider.xid, source->provider.xid);
+ XRRSetProviderOutputSource(dpy, provider->provider.xid, source ? source->provider.xid : 0);
}
if (provsetoffsink)
{
@@ -3246,7 +3321,7 @@
provider = find_provider (&provider_name);
sink = find_provider(&offload_sink_provider_name);
- XRRSetProviderOffloadSink(dpy, provider->provider.xid, sink->provider.xid);
+ XRRSetProviderOffloadSink(dpy, provider->provider.xid, sink ? sink->provider.xid : 0);
}
if (setit_1_2)
{
@@ -3510,8 +3585,7 @@
Atom actual_type;
XRRPropertyInfo *propinfo;
char *atom_name = XGetAtomName (dpy, props[j]);
- Bool is_edid = strcmp (atom_name, "EDID") == 0;
- int bytes_per_item, k;
+ int k;
XRRGetOutputProperty (dpy, output->output.xid, props[j],
0, 100, False, False,
@@ -3522,33 +3596,10 @@
propinfo = XRRQueryOutputProperty(dpy, output->output.xid,
props[j]);
- bytes_per_item = actual_format / 8;
-
printf ("\t%s: ", atom_name);
- if (is_edid)
- {
- printf ("\n\t\t");
- }
-
- for (k = 0; k < nitems; k++)
- {
- if (k != 0)
- {
- if ((k % 16) == 0)
- {
- printf ("\n\t\t");
- }
- }
- print_output_property_value (is_edid, actual_format,
- actual_type,
- prop + (k * bytes_per_item));
- if (!is_edid)
- {
- printf (" ");
- }
- }
- printf ("\n");
+ print_output_property(atom_name, actual_format,
+ actual_type, nitems, prop);
if (propinfo->range && propinfo->num_values > 0)
{
@@ -3557,10 +3608,10 @@
for (k = 0; k < propinfo->num_values / 2; k++)
{
printf ("(");
- print_output_property_value (False, 32, actual_type,
+ print_output_property_value (32, actual_type,
(unsigned char *) &(propinfo->values[k * 2]));
printf (", ");
- print_output_property_value (False, 32, actual_type,
+ print_output_property_value (32, actual_type,
(unsigned char *) &(propinfo->values[k * 2 + 1]));
printf (")");
if (k < propinfo->num_values / 2 - 1)
@@ -3573,7 +3624,7 @@
printf ("\t\tsupported: ");
for (k = 0; k < propinfo->num_values; k++)
{
- print_output_property_value (False, 32, actual_type,
+ print_output_property_value (32, actual_type,
(unsigned char *) &(propinfo->values[k]));
if (k < propinfo->num_values - 1)
printf (", ");
@@ -3592,7 +3643,7 @@
XRRModeInfo *mode = find_mode_by_xid (output_info->modes[j]);
int f;
- printf (" %s (0x%x) %6.1fMHz",
+ printf (" %s (0x%x) %6.3fMHz",
mode->name, (int)mode->id,
(double)mode->dotClock / 1000000.0);
for (f = 0; mode_flags[f].flag; f++)
@@ -3603,10 +3654,10 @@
if (j < output_info->npreferred)
printf (" +preferred");
printf ("\n");
- printf (" h: width %4d start %4d end %4d total %4d skew %4d clock %6.1fKHz\n",
+ printf (" h: width %4d start %4d end %4d total %4d skew %4d clock %6.2fKHz\n",
mode->width, mode->hSyncStart, mode->hSyncEnd,
mode->hTotal, mode->hSkew, mode_hsync (mode) / 1000);
- printf (" v: height %4d start %4d end %4d total %4d clock %6.1fHz\n",
+ printf (" v: height %4d start %4d end %4d total %4d clock %6.2fHz\n",
mode->height, mode->vSyncStart, mode->vSyncEnd, mode->vTotal,
mode_refresh (mode));
mode->modeFlags |= ModeShown;
@@ -3633,7 +3684,7 @@
if (strcmp (jmode->name, kmode->name) != 0) continue;
mode_shown[k] = True;
kmode->modeFlags |= ModeShown;
- printf (" %6.1f", mode_refresh (kmode));
+ printf (" %6.2f", mode_refresh (kmode));
if (kmode == output->mode_info)
printf ("*");
else
@@ -3654,13 +3705,13 @@
if (!(mode->modeFlags & ModeShown))
{
- printf (" %s (0x%x) %6.1fMHz\n",
+ printf (" %s (0x%x) %6.3fMHz\n",
mode->name, (int)mode->id,
(double)mode->dotClock / 1000000.0);
- printf (" h: width %4d start %4d end %4d total %4d skew %4d clock %6.1fKHz\n",
+ printf (" h: width %4d start %4d end %4d total %4d skew %4d clock %6.2fKHz\n",
mode->width, mode->hSyncStart, mode->hSyncEnd,
mode->hTotal, mode->hSkew, mode_hsync (mode) / 1000);
- printf (" v: height %4d start %4d end %4d total %4d clock %6.1fHz\n",
+ printf (" v: height %4d start %4d end %4d total %4d clock %6.2fHz\n",
mode->height, mode->vSyncStart, mode->vSyncEnd, mode->vTotal,
mode_refresh (mode));
}
@@ -3750,7 +3801,7 @@
if (rate == rates[i])
break;
if (i == nrate) {
- fprintf (stderr, "Rate %.1f Hz not available for this size\n", rate);
+ fprintf (stderr, "Rate %.2f Hz not available for this size\n", rate);
exit (1);
}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org