xorg-server: Changes to 'debian-experimental'
ChangeLog | 461 ++ Xi/exevents.c | 19 Xi/xiselectev.c | 9 config/udev.c | 8 configure.ac| 6 debian/changelog| 24 debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 9 debian/patches/05_Revert-Unload-submodules.diff | 7 debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff | 7 debian/patches/08_xfree86_fix_ia64_inx_outx.diff| 64 + debian/patches/series | 1 dix/devices.c | 4 dix/events.c| 25 dix/getevents.c | 9 dix/touch.c | 32 exa/exa_priv.h | 1 exa/exa_unaccel.c | 16 hw/xfree86/common/Makefile.am | 3 hw/xfree86/common/xf86.h| 4 hw/xfree86/common/xf86Bus.c | 4 hw/xfree86/common/xf86Helper.c | 6 hw/xfree86/common/xf86Module.h | 2 hw/xfree86/common/xf86platformBus.c | 6 hw/xfree86/dri2/dri2.c | 74 - hw/xwin/InitOutput.c| 5 hw/xwin/Makefile.am | 3 hw/xwin/glx/Makefile.am | 3 include/input.h | 1 man/Xserver.man | 2 xkb/xkbAccessX.c| 2 30 files changed, 730 insertions(+), 87 deletions(-) New commits: commit 7d536cf2656eaeeb63e8fd29e2faf36d7cd18c23 Author: Timo Aaltonen Date: Fri Nov 23 09:45:37 2012 +0200 Drop 09_EXA-Track...diff, upstream. refresh other patches diff --git a/debian/changelog b/debian/changelog index 25d6597..23fcd94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xorg-server (2:1.13.0.901-1) UNRELEASED; urgency=low * Refresh 02_Add-libnettle-as-option-for-sha1.diff. * Remove 03_fix-panning.diff, upstream * Refresh 04_int10-fix-pci_device_read_rom-usage.diff. + * Drop 09_EXA-Track...diff, upstream. -- Robert Hooker Wed, 22 Aug 2012 11:12:17 -0400 diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff index fe5c641..49ddcf3 100644 --- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff +++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff @@ -10,16 +10,16 @@ Signed-off-by: Julien Cristau --- --- a/configure.ac +++ b/configure.ac -@@ -1339,7 +1339,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t +@@ -1361,7 +1361,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t # SHA1 hashing AC_ARG_WITH([sha1], -- [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto], -+ [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|nettle], +- [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI], ++ [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI|nettle], [choose SHA1 implementation])]) AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then -@@ -1422,6 +1422,16 @@ if test "x$with_sha1" = xlibcrypto; then +@@ -1457,6 +1457,16 @@ if test "x$with_sha1" = xlibcrypto; then SHA1_CFLAGS="$OPENSSL_CFLAGS" fi fi @@ -38,7 +38,7 @@ Signed-off-by: Julien Cristau AC_MSG_ERROR([No suitable SHA1 implementation found]) --- a/include/dix-config.h.in +++ b/include/dix-config.h.in -@@ -157,6 +157,9 @@ +@@ -160,6 +160,9 @@ /* Define to use libsha1 for SHA1 */ #undef HAVE_SHA1_IN_LIBSHA1 @@ -50,7 +50,7 @@ Signed-off-by: Julien Cristau --- a/os/xsha1.c
xorg-server: Changes to 'ubuntu'
ChangeLog |
461 ++
Xi/exevents.c |
19
Xi/xiselectev.c |
9
config/udev.c |
8
configure.ac|
6
debian/changelog|
96 +-
debian/control |
1
debian/patches/02_Add-libnettle-as-option-for-sha1.diff |
9
debian/patches/04_int10-fix-pci_device_read_rom-usage.diff |
43
debian/patches/05_Revert-Unload-submodules.diff |
28
debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff |
68 +
debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff |
49 +
debian/patches/08_xfree86_fix_ia64_inx_outx.diff|
64 +
debian/patches/229_udev-fix.diff|
34
debian/patches/231-scan-pci-after-probing-devices.patch |
38
debian/patches/235-composite-tracking.patch |
78 -
debian/patches/237-dix-set-the-device-transformation-matrix.patch |
42
debian/patches/series |
9
debian/xserver-common.install |
1
dix/devices.c |
4
dix/events.c|
25
dix/getevents.c |
9
dix/touch.c |
32
exa/exa_priv.h |
1
exa/exa_unaccel.c |
16
hw/xfree86/common/Makefile.am |
3
hw/xfree86/common/xf86.h|
4
hw/xfree86/common/xf86Bus.c |
4
hw/xfree86/common/xf86Helper.c |
6
hw/xfree86/common/xf86Module.h |
2
hw/xfree86/common/xf86platformBus.c |
6
hw/xfree86/dri2/dri2.c |
74 -
hw/xwin/InitOutput.c|
5
hw/xwin/Makefile.am |
3
hw/xwin/glx/Makefile.am |
3
include/input.h |
1
man/Xserver.man |
2
xkb/xkbAccessX.c|
2
38 files changed, 985 insertions(+), 280 deletions(-)
New commits:
commit 2a6b7ff45bdc02f3a1349ba5e9188dd135aaa578
Author: Timo Aaltonen
Date: Fri Nov 23 10:31:25 2012 +0200
drop patches now upstream
diff --git a/debian/changelog b/debian/changelog
index c59a867..d1f9560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.13.0.901-0ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from unreleased debian git.
+ * Dropped upstream patches:
+- 229_udev-fix.diff
+- 231-scan-pci-after-probing-devices.patch
+- 235-composite-tracking.patch
+- 237-dix-set-the-device-transformation-matrix.patch
+
+ -- Timo Aaltonen Fri, 23 Nov 2012 10:02:42 +0200
+
xorg-server (2:1.13.0.901-1) UNRELEASED; urgency=low
* New upstream release
diff --git a/debian/patches/229_udev-fix.diff b/debian/patches/229_udev-fix.diff
deleted file mode 100644
index 6cd0e22..000
--- a/debian/patches/229_udev-fix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-for input devices we handle change like remove/add, but for
-drm devices we get change events when we hotplug outputs,
-so lets just ignore change at this level, and let the drivers
-handle it. We may in the future want to route driver udev
-from here instead.
-
-Reported-by: Timo Aaltonen
-Signed-off-by: Dave Airlie
- config/udev.c | 8 +++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/config/udev.c b/config/udev.c
-index 03aca28..2adb613 100644
a/config/udev.c
-+++ b/config/udev.c
-@@ -300,9 +300,15 @@ wakeup_handler(pointer data, int err, pointer read_mask)
- return;
- action = udev_device_get_action(udev_device);
- if (action) {
--if (
Bug#667459: Update
Michel Dänzer @ 09/11/12 15:32: On Fre, 2012-11-09 at 14:52 +0100, Meike Reichle wrote: Michel Dänzer @ 09/11/12 10:03: On Fre, 2012-11-09 at 09:12 +0100, Meike Reichle wrote: I am using a standard Debian kernel (linux-image-3.2.0-4-686-pae) but apparently no KMS, I suppose my graphics card (Mobility Radeon HD 3200) does not support it. Not sure why it wouldn't, please provide your dmesg output. I've attached it to this mail. Hmm, thanks, but it doesn't show why KMS is disabled. Is it disabled in /etc/modprobe.d/radeon-kms.conf? It seems to be already enabled there: mre@jet:~$ cat /etc/modprobe.d/radeon-kms.conf options radeon modeset=1 mre@jet:~$ If that still doesn't explain it, can you try passing radeon.modeset=1 on the kernel command line and see if that enables it? That did the trick. With that command line I got KMS. I've attached the dmesg from that boot. I guess the question now it why it isn't enabled by /etc/modprobe.d/radeon-kms.conf ... Regards, Meike [0.00] Initializing cgroup subsys cpuset [0.00] Initializing cgroup subsys cpu [0.00] Linux version 3.2.0-4-686-pae (debian-ker...@lists.debian.org) (gcc version 4.6.3 (Debian 4.6.3-12) ) #1 SMP Debian 3.2.32-1 [0.00] BIOS-provided physical RAM map: [0.00] BIOS-e820: - 0009dc00 (usable) [0.00] BIOS-e820: 0009dc00 - 000a (reserved) [0.00] BIOS-e820: 000d - 0010 (reserved) [0.00] BIOS-e820: 0010 - 6fed (usable) [0.00] BIOS-e820: 6fed - 6fedc000 (ACPI data) [0.00] BIOS-e820: 6fedc000 - 6fede000 (ACPI NVS) [0.00] BIOS-e820: 6fede000 - 8000 (reserved) [0.00] BIOS-e820: e000 - f000 (reserved) [0.00] BIOS-e820: fec0 - fec1 (reserved) [0.00] BIOS-e820: fee0 - fee01000 (reserved) [0.00] BIOS-e820: fff0 - 0001 (reserved) [0.00] NX (Execute Disable) protection: active [0.00] DMI present. [0.00] DMI: LENOVO 287655G/287655G, BIOS 6XET44WW (1.27 ) 07/21/2010 [0.00] e820 update range: - 0001 (usable) ==> (reserved) [0.00] e820 remove range: 000a - 0010 (usable) [0.00] last_pfn = 0x6fed0 max_arch_pfn = 0x100 [0.00] MTRR default type: uncachable [0.00] MTRR fixed ranges enabled: [0.00] 0-9 write-back [0.00] A-B uncachable [0.00] C-C write-protect [0.00] D-D uncachable [0.00] E-F write-protect [0.00] MTRR variable ranges enabled: [0.00] 0 base 00 mask FF8000 write-back [0.00] 1 disabled [0.00] 2 disabled [0.00] 3 disabled [0.00] 4 disabled [0.00] 5 disabled [0.00] 6 disabled [0.00] 7 disabled [0.00] x86 PAT enabled: cpu 0, old 0x7040600070406, new 0x7010600070106 [0.00] found SMP MP-table at [c00f7df0] f7df0 [0.00] initial memory mapped : 0 - 01a0 [0.00] Base memory trampoline at [c0099000] 99000 size 16384 [0.00] init_memory_mapping: -379fe000 [0.00] 00 - 20 page 4k [0.00] 20 - 003780 page 2M [0.00] 003780 - 00379fe000 page 4k [0.00] kernel direct mapping tables up to 379fe000 @ 19fa000-1a0 [0.00] RAMDISK: 368f2000 - 37471000 [0.00] ACPI: RSDP 000f7ac0 00024 (v02 PTLTD ) [0.00] ACPI: XSDT 6fed1e2b 0005C (v01 LENOVO TP-6X1270 LTP ) [0.00] ACPI: FACP 6fedbb59 000F4 (v03 LENOVO TP-6X1270 ATI 000F4240) [0.00] ACPI: DSDT 6fed1e87 09CD2 (v01 LENOVO TP-6X1270 MSFT 0301) [0.00] ACPI: FACS 6feddfc0 00040 [0.00] ACPI: TCPA 6fedbcc1 00032 (v02 LENOVO TP-6X1270 PTEC ) [0.00] ACPI: SSDT 6fedbcf3 000D3 (v01 LENOVO TP-6X1270 AMD 0001) [0.00] ACPI: APIC 6fedbdc6 00050 (v01 LENOVO TP-6X1270 LTP ) [0.00] ACPI: MCFG 6fedbe16 0003C (v01 LENOVO TP-6X1270 LTP ) [0.00] ACPI: HPET 6fedbe52 00038 (v01 LENOVO TP-6X1270 LTP 0001) [0.00] ACPI: SLIC 6fedbe8a 00176 (v01 LENOVO TP-6X1270 LTP ) [0.00] ACPI: Local APIC address 0xfee0 [0.00] 900MB HIGHMEM available. [0.00] 889MB LOWMEM available. [0.00] mapped low ram: 0 - 379fe000 [0.00] low ram: 0 - 379fe000 [0.00] Zone PFN ranges: [0.00] DMA 0x0010 -> 0x1000 [0.00] Normal 0x1000 -> 0x000379fe [0.00] HighMem 0x000379fe -> 0x0006fed0 [0.00] Movable zone start PFN for eac
Bug#667459: Update
On Fre, 2012-11-23 at 17:24 +0100, Meike Reichle wrote: > Michel Dänzer @ 09/11/12 15:32: > > > > If that still doesn't explain it, can you try passing radeon.modeset=1 > > on the kernel command line and see if that enables it? > > That did the trick. With that command line I got KMS. I've attached the > dmesg from that boot. I guess the question now it why it isn't enabled by > /etc/modprobe.d/radeon-kms.conf ... Indeed... The only explanations I can think of: * /etc/modprobe.d/radeon-kms.conf says modeset=0 in the initrd. 'sudo update-initramfs -k $(uname -r) -u' should fix it in this case. * There's another configuration file on your system that says modeset=0. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1353688594.14487.21.camel@thor.local
Bug#667459: Update
Michel Dänzer @ 23/11/12 17:36: On Fre, 2012-11-23 at 17:24 +0100, Meike Reichle wrote: Michel Dänzer @ 09/11/12 15:32: If that still doesn't explain it, can you try passing radeon.modeset=1 on the kernel command line and see if that enables it? That did the trick. With that command line I got KMS. I've attached the dmesg from that boot. I guess the question now it why it isn't enabled by /etc/modprobe.d/radeon-kms.conf ... Indeed... The only explanations I can think of: * /etc/modprobe.d/radeon-kms.conf says modeset=0 in the initrd. 'sudo update-initramfs -k $(uname -r) -u' should fix it in this case. * There's another configuration file on your system that says modeset=0. update-initramfs fixed it. After that I could also re-upgrade the packages I had put on hold (see earlier mail for the list and versions). Thank you very much for helping me out on this! Kind regards, Meike -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/50afadc0.3070...@debian.org
Processed: unarchiving 600474
Processing commands for cont...@bugs.debian.org:
> unarchive 600474
Bug #600474 {Done: Julien Cristau }
[xserver-xorg-video-intel] some TrueType fonts are broken
Unarchived Bug 600474
> thanks
Stopping processing here.
Please contact me if you need assistance.
--
600474: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600474
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive:
http://lists.debian.org/handler.s.c.135369907929637.transcr...@bugs.debian.org
Bug#600474: some TrueType fonts are broken
Hello, On Sun, 25 Sep 2011 13:41:23 +0200 Julien Cristau wrote: > > Some fonts are rendered incorrectly after the latest X update. Not > > sure what exact package caused that, but anyway. > According to the linked upstream bug this got fixed, so closing. I still have this problem from time to time. Strange. -- WBR, Andrew signature.asc Description: PGP signature
