[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#689448: marked as done (unblock: xorg-server/2:1.12.4-1)

Your message dated Fri, 19 Oct 2012 06:27:04 +0100
with message-id <1350624424.32448.16.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#689448: unblock: xorg-server/2:1.12.4-1
has caused the Debian Bug report #689448,
regarding unblock: xorg-server/2:1.12.4-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
689448: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=689448
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package xorg-server

unblock xorg-server/2:1.12.4-1

One revert for a regression from 1.12.3.902 (sorry about that one, I was
aware of it but somehow thought it wasn't in 1.12.3.902), plus a couple
more fixes that might help ia64.  And an added conflict for a driver
that's no longer shipped, which will hopefully help apt with the upgrade
path.

diff --git a/ChangeLog b/ChangeLog
index 3fc89f8..1a89ccc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit dfc03ef3fda3572db590c2096272c990d434163e
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date:   Sun Aug 26 22:11:00 2012 -0700
+
+    configure.ac: Version bump to 1.12.4
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 8995fcf260895ad288146b78d4c42b6f3b838d4f
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date:   Sun Aug 26 22:09:49 2012 -0700
+
+    XQuartz: Bump version to 2.7.3
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
 commit a6d7400507f220d6f98b853def7904586fb1eadd
 Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 Date:   Sun Aug 19 09:07:33 2012 -0700
diff --git a/configure.ac b/configure.ac
index 28c9cf8..7c7e69e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.3.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-08-19"
+AC_INIT([xorg-server], 1.12.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-08-27"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 0043c70..77da19b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xorg-server (2:1.12.4-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * int10: fix pci_device_read_rom usage (closes: #686153).  Thanks, Stephan
+    Schreiber!
+  * Revert 'Unload submodules' (closes: #686152).  Seems to introduce a
+    regression, let's try that again later.  Thanks, Stephan Schreiber!
+  * Revert "fb: reorder Bresenham error correction to avoid overshoot".  Fixes
+    regression introduced in 1.12.3.902 (fdo#54168, closes: #688908)
+  * Add conflicts against obsolete evtouch input driver (hopefully closes:
+    #687268)
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 30 Sep 2012 12:47:00 +0200
+
 xorg-server (2:1.12.3.902-1) unstable; urgency=low
 
   * New upstream release candidate
diff --git a/debian/control b/debian/control
index 8db33e2..d8f3735 100644
--- a/debian/control
+++ b/debian/control
@@ -119,6 +119,8 @@ Breaks:
  xserver-xorg-video-vga (<= 1:4.1.0-8),
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
+Conflicts:
+ xserver-xorg-input-evtouch,
 Provides:
  ${videoabi},
  ${inputabi},
diff --git a/debian/patches/04_int10-fix-pci_device_read_rom-usage.diff b/debian/patches/04_int10-fix-pci_device_read_rom-usage.diff
new file mode 100644
index 0000000..e33351f
--- /dev/null
+++ b/debian/patches/04_int10-fix-pci_device_read_rom-usage.diff
@@ -0,0 +1,45 @@
+From ccef32b333cde427e728d30253c221d9d7aabb3a Mon Sep 17 00:00:00 2001
+From: Stephan Schreiber <info@fs-driver.org>
+Date: Wed, 29 Aug 2012 19:58:23 +0200
+Subject: [PATCH] int10: fix pci_device_read_rom usage
+
+I noticed that the build-in int10 driver always reports
+"Unable to retrieve all of segment 0x0C0000."
+even though the entire BIOS data is retrieved with success.
+
+The associated code is in hw/xfree86/int10/generic.c, in the function
+xf86ExtendedInitInt10():
+
+    if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
+        xf86DrvMsg(screen, X_WARNING,
+                   "Unable to retrieve all of segment 0x0C0000.\n");
+    }
+
+The function pci_device_read_rom() is from libpciaccess; its return
+value is not a size but an error status code: 0 means success.
+If pci_device_read_rom() returns 0 for success, the warning is generated.
+
+The proposed patch corrects the evaluation of the return value of
+pci_device_read_rom() and of the supplied BIOS size.
+
+Debian bug#686153
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ hw/xfree86/int10/generic.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: xorg-server/hw/xfree86/int10/generic.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/int10/generic.c
++++ xorg-server/hw/xfree86/int10/generic.c
+@@ -178,7 +178,8 @@ xf86ExtendedInitInt10(int entityIndex, i
+      */
+     vbiosMem = (char *) base + V_BIOS;
+     memset(vbiosMem, 0, 2 * V_BIOS_SIZE);
+-    if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
++    if (pci_device_read_rom(pInt->dev, vbiosMem) != 0
++        || pInt->dev->rom_size < V_BIOS_SIZE) {
+         xf86DrvMsg(screen, X_WARNING,
+                    "Unable to retrieve all of segment 0x0C0000.\n");
+     }
diff --git a/debian/patches/05_Revert-Unload-submodules.diff b/debian/patches/05_Revert-Unload-submodules.diff
new file mode 100644
index 0000000..b48b2d2
--- /dev/null
+++ b/debian/patches/05_Revert-Unload-submodules.diff
@@ -0,0 +1,33 @@
+From 272537ae14a04911fcf2fec51492fa0f91c4a676 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Wed, 29 Aug 2012 20:16:40 +0200
+Subject: [PATCH] Revert "Unload submodules."
+
+This reverts commit 0d4bb5442ceb8e8e4a8de6cfc4203cae469eee72.
+
+This doesn't seem to work quite well.  See Debian bug#686152.
+---
+ hw/xfree86/common/xf86Helper.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
+index 8c948cf..620c9b8 100644
+--- a/hw/xfree86/common/xf86Helper.c
++++ b/hw/xfree86/common/xf86Helper.c
+@@ -1554,7 +1554,13 @@ xf86LoadOneModule(char *name, pointer opt)
+ void
+ xf86UnloadSubModule(pointer mod)
+ {
++    /*
++     * This is disabled for now.  The loader isn't smart enough yet to undo
++     * relocations.
++     */
++#if 0
+     UnloadSubModule(mod);
++#endif
+ }
+ 
+ Bool
+-- 
+1.7.10.4
+
diff --git a/debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff b/debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
new file mode 100644
index 0000000..c3a6e50
--- /dev/null
+++ b/debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
@@ -0,0 +1,68 @@
+From 10aaa5d2ffa62df99f03c857dc78e6ff2b33c183 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 30 Sep 2012 12:02:11 +0200
+Subject: [PATCH] Revert "fb: reorder Bresenham error correction to avoid
+ overshoot."
+
+This reverts commit 3e62f48edf47a59d923ac58b6d4262b02456a556.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54168
+Debian: http://buss.debian.org/688908
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ fb/fbseg.c |   18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/fb/fbseg.c b/fb/fbseg.c
+index 1848387..0e4e0a9 100644
+--- a/fb/fbseg.c
++++ b/fb/fbseg.c
+@@ -65,12 +65,6 @@ fbBresSolid(DrawablePtr pDrawable,
+     if (axis == X_AXIS) {
+         bits = 0;
+         while (len--) {
+-            if (e >= 0) {
+-                WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits));
+-                bits = 0;
+-                dst += dstStride;
+-                e += e3;
+-            }
+             bits |= mask;
+             mask = fbBresShiftMask(mask, signdx, dstBpp);
+             if (!mask) {
+@@ -80,12 +74,21 @@ fbBresSolid(DrawablePtr pDrawable,
+                 mask = mask0;
+             }
+             e += e1;
++            if (e >= 0) {
++                WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits));
++                bits = 0;
++                dst += dstStride;
++                e += e3;
++            }
+         }
+         if (bits)
+             WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits));
+     }
+     else {
+         while (len--) {
++            WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));
++            dst += dstStride;
++            e += e1;
+             if (e >= 0) {
+                 e += e3;
+                 mask = fbBresShiftMask(mask, signdx, dstBpp);
+@@ -94,9 +97,6 @@ fbBresSolid(DrawablePtr pDrawable,
+                     mask = mask0;
+                 }
+             }
+-            WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask));
+-            dst += dstStride;
+-            e += e1;
+         }
+     }
+ 
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 731a4e0..1094eaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,6 @@
 02_Add-libnettle-as-option-for-sha1.diff
 03_fix-panning.diff
 #13_debian_add_xkbpath_env_variable.diff
+04_int10-fix-pci_device_read_rom-usage.diff
+05_Revert-Unload-submodules.diff
+06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 4b6d9d1..460047c 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.7.2</string>
+		<string>2.7.3</string>
 	<key>CFBundleVersion</key>
-		<string>2.7.2</string>
+		<string>2.7.3</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
On Wed, 2012-10-03 at 18:59 +0100, Adam D. Barratt wrote:
> On Tue, 2012-10-02 at 20:28 +0200, Julien Cristau wrote:
> > Please unblock package xorg-server
> 
> Unblocked; thanks.
> 
> I'm leaving the bug open until we can add the unblock-udeb, which will
> be after d-i beta 3.

Done.

Regards,

Adam

--- End Message ---
Reply to: