x11proto-input: Changes to 'upstream-unstable'
autogen.sh |4 +++- configure.ac |3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit f33a329026c9f2eaa5fa436543e4feb0e54b685d Author: Peter Hutterer Date: Thu Mar 7 10:42:39 2013 +1000 inputproto 2.3 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 85dfaf1..e6f3db4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_WITH_ASCIIDOC commit f8428123019e7357891bbfc0aef21dbb4d0db10f Author: Colin Walters Date: Wed Jan 4 17:37:06 2012 -0500 autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then +$srcdir/configure "$@" +fi commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4 Author: Adam Jackson Date: Tue Jan 15 14:01:10 2013 -0500 configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson diff --git a/configure.ac b/configure.ac index 7c8e2eb..85dfaf1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_PREREQ([2.60]) AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_WITH_ASCIIDOC m4_ifndef([XORG_MACROS_VERSION], -- 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/e1uubwh-0001h7...@vasks.debian.org
x11proto-input: Changes to 'debian-unstable'
ChangeLog| 26 ++ autogen.sh |4 +++- configure.ac |3 +-- debian/changelog |4 ++-- 4 files changed, 32 insertions(+), 5 deletions(-) New commits: commit 273373fb07ef66d79dba1058a754e413f01c4a3b Author: Timo Aaltonen Date: Mon Apr 22 10:41:34 2013 +0300 update the changelogs diff --git a/ChangeLog b/ChangeLog index c7b6ea1..09e222b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +commit f33a329026c9f2eaa5fa436543e4feb0e54b685d +Author: Peter Hutterer +Date: Thu Mar 7 10:42:39 2013 +1000 + +inputproto 2.3 + +Signed-off-by: Peter Hutterer + +commit f8428123019e7357891bbfc0aef21dbb4d0db10f +Author: Colin Walters +Date: Wed Jan 4 17:37:06 2012 -0500 + +autogen.sh: Implement GNOME Build API + +http://people.gnome.org/~walters/docs/build-api.txt + +Signed-off-by: Adam Jackson + +commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4 +Author: Adam Jackson +Date: Tue Jan 15 14:01:10 2013 -0500 + +configure: Remove AM_MAINTAINER_MODE + +Signed-off-by: Adam Jackson + commit 4832c94775ee4a02cfaf53ba427d7cf677f70932 Merge: 48e3209 e93e9d0 Author: Peter Hutterer diff --git a/debian/changelog b/debian/changelog index 47fa4c3..34227f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -x11proto-input (2.2.99.1-1) UNRELEASED; urgency=low +x11proto-input (2.3-1) UNRELEASED; urgency=low - * New upstream release candidate. + * New upstream release. -- Maarten Lankhorst Tue, 08 Jan 2013 15:01:59 +0100 commit f33a329026c9f2eaa5fa436543e4feb0e54b685d Author: Peter Hutterer Date: Thu Mar 7 10:42:39 2013 +1000 inputproto 2.3 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 85dfaf1..e6f3db4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_WITH_ASCIIDOC commit f8428123019e7357891bbfc0aef21dbb4d0db10f Author: Colin Walters Date: Wed Jan 4 17:37:06 2012 -0500 autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then +$srcdir/configure "$@" +fi commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4 Author: Adam Jackson Date: Tue Jan 15 14:01:10 2013 -0500 configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson diff --git a/configure.ac b/configure.ac index 7c8e2eb..85dfaf1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_PREREQ([2.60]) AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_WITH_ASCIIDOC m4_ifndef([XORG_MACROS_VERSION], -- 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/e1uubwh-0001gd...@vasks.debian.org
x11proto-input: Changes to 'ubuntu'
ChangeLog| 26 ++ autogen.sh |4 +++- configure.ac |3 +-- debian/changelog | 11 +-- 4 files changed, 39 insertions(+), 5 deletions(-) New commits: commit 80e1164d382631a44c3f094d25cd76a417e2e200 Author: Timo Aaltonen Date: Mon Apr 22 10:43:00 2013 +0300 update the changelog diff --git a/debian/changelog b/debian/changelog index 34227f8..0a98698 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11proto-input (2.3-0ubuntu1) UNRELEASED; urgency=low + + * Merge from unreleased debian git. +- new upstream release + + -- Timo Aaltonen Mon, 22 Apr 2013 10:42:21 +0300 + x11proto-input (2.3-1) UNRELEASED; urgency=low * New upstream release. commit 273373fb07ef66d79dba1058a754e413f01c4a3b Author: Timo Aaltonen Date: Mon Apr 22 10:41:34 2013 +0300 update the changelogs diff --git a/ChangeLog b/ChangeLog index c7b6ea1..09e222b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +commit f33a329026c9f2eaa5fa436543e4feb0e54b685d +Author: Peter Hutterer +Date: Thu Mar 7 10:42:39 2013 +1000 + +inputproto 2.3 + +Signed-off-by: Peter Hutterer + +commit f8428123019e7357891bbfc0aef21dbb4d0db10f +Author: Colin Walters +Date: Wed Jan 4 17:37:06 2012 -0500 + +autogen.sh: Implement GNOME Build API + +http://people.gnome.org/~walters/docs/build-api.txt + +Signed-off-by: Adam Jackson + +commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4 +Author: Adam Jackson +Date: Tue Jan 15 14:01:10 2013 -0500 + +configure: Remove AM_MAINTAINER_MODE + +Signed-off-by: Adam Jackson + commit 4832c94775ee4a02cfaf53ba427d7cf677f70932 Merge: 48e3209 e93e9d0 Author: Peter Hutterer diff --git a/debian/changelog b/debian/changelog index 47fa4c3..34227f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -x11proto-input (2.2.99.1-1) UNRELEASED; urgency=low +x11proto-input (2.3-1) UNRELEASED; urgency=low - * New upstream release candidate. + * New upstream release. -- Maarten Lankhorst Tue, 08 Jan 2013 15:01:59 +0100 commit f33a329026c9f2eaa5fa436543e4feb0e54b685d Author: Peter Hutterer Date: Thu Mar 7 10:42:39 2013 +1000 inputproto 2.3 Signed-off-by: Peter Hutterer diff --git a/configure.ac b/configure.ac index 85dfaf1..e6f3db4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_WITH_ASCIIDOC commit f8428123019e7357891bbfc0aef21dbb4d0db10f Author: Colin Walters Date: Wed Jan 4 17:37:06 2012 -0500 autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then +$srcdir/configure "$@" +fi commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4 Author: Adam Jackson Date: Tue Jan 15 14:01:10 2013 -0500 configure: Remove AM_MAINTAINER_MODE Signed-off-by: Adam Jackson diff --git a/configure.ac b/configure.ac index 7c8e2eb..85dfaf1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_PREREQ([2.60]) AC_INIT([InputProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require xorg-macros: XORG_WITH_ASCIIDOC m4_ifndef([XORG_MACROS_VERSION], -- 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/e1uubwh-0001gs...@vasks.debian.org
xorg-server: Changes to 'debian-experimental'
ChangeLog| 98 +++ Xi/exevents.c|1 configure.ac |8 +- debian/changelog |5 - debian/control |2 debian/patches/02_hide_panoramix_symbol.diff | 13 --- debian/patches/series|1 dix/touch.c |3 hw/xfree86/os-support/shared/posix_tty.c |3 include/list.h |2 xfixes/xfixesint.h |2 11 files changed, 113 insertions(+), 25 deletions(-) New commits: commit 684d94d499a4f020be4e8b87a67e4a65c507ecfa Author: Timo Aaltonen Date: Mon Apr 22 10:37:11 2013 +0300 drop patch 02, upstream diff --git a/debian/changelog b/debian/changelog index 21f594d..f74663d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,6 @@ xorg-server (2:1.14.1-1) UNRELEASED; urgency=low - 04_int10-fix-pci_device_read_rom-usage.diff - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff * Bump x11proto-input-dev and libpixman-1-dev minimum versions. - * Add patch to fix build failure of xserver-xorg-core-udeb. -- 02_hide_panoramix_symbol.diff [ Timo Aaltonen ] * Refresh 02_Add-libnettle-as-option-for-sha1.diff. diff --git a/debian/patches/02_hide_panoramix_symbol.diff b/debian/patches/02_hide_panoramix_symbol.diff deleted file mode 100644 index 60c25ed..000 --- a/debian/patches/02_hide_panoramix_symbol.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h -index 334c71f..309954d 100644 a/xfixes/xfixesint.h -+++ b/xfixes/xfixesint.h -@@ -291,7 +291,7 @@ int - SProcXFixesDestroyPointerBarrier(ClientPtr client); - - /* Xinerama */ --extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr); -+_X_INTERNAL extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr); - void PanoramiXFixesInit(void); - void PanoramiXFixesReset(void); - diff --git a/debian/patches/series b/debian/patches/series index 810051d..3c8c1a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ ## Patches with a number < 100 are applied in debian. ## Ubuntu patches start with 100. 001_fedora_extramodes.patch -02_hide_panoramix_symbol.diff #13_debian_add_xkbpath_env_variable.diff 05_Revert-Unload-submodules.diff 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff commit 67effc60b9e58ffabc3f63bdec60fc6ff8385d76 Author: Timo Aaltonen Date: Mon Apr 22 10:34:52 2013 +0300 control: Bump inputproto build-dep to 2.3. diff --git a/debian/changelog b/debian/changelog index 65a6a0c..21f594d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ xorg-server (2:1.14.1-1) UNRELEASED; urgency=low * Refresh 04_int10-fix-pci_device_read_rom-usage.diff. * Drop 09_EXA-Track...diff, upstream. * control: Mark xvfb as M-A: foreign. + * control: Bump inputproto build-dep to 2.3. [ Robert Hooker ] * Update to a newer git snapshot, 7fe5e6dfa5c1e71 diff --git a/debian/control b/debian/control index 046959d..f2845e2 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Build-Depends: x11proto-xf86vidmode-dev (>= 2.2.99.1), xtrans-dev (>= 1.2.2), libxau-dev (>= 1:1.0.5-2), - x11proto-input-dev (>= 2.2.99.1), + x11proto-input-dev (>= 2.3), x11proto-dri2-dev (>= 2.8), libxdmcp-dev (>= 1:0.99.1), libxfont-dev (>= 1:1.4.2), commit 2949ba55e9f15e23393548cefae5cb0c95f113b6 Author: Timo Aaltonen Date: Mon Apr 22 10:27:56 2013 +0300 bump the changelogs diff --git a/ChangeLog b/ChangeLog index 6169721..eda3cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,101 @@ +commit f5796f98dadccf67c04f601178966614dd51a1b4 +Author: Peter Hutterer +Date: Wed Apr 17 16:12:00 2013 +1000 + +xserver 1.14.1 + +Signed-off-by: Peter Hutterer + +commit aac2d9d09c73fa2b9d02d8446718aa6ccd7e894a +Author: Dave Airlie +Date: Wed Apr 10 16:09:01 2013 +1000 + +xf86: fix flush input to work with Linux evdev devices. + +So when we VT switch back and attempt to flush the input devices, +we don't succeed because evdev won't return part of an event, +since we were only asking for 4 bytes, we'd only get -EINVAL back. + +This could later cause events to be flushed that we shouldn't have +gotten. + +This is a fix for CVE-2013-1940. + +Signed-off-by: Dave Airlie +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +(cherry picked from commit 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f) + +commit 2eec013569f6daa952482ac5d9db8acc71fe01aa +Author: Peter Hutterer +Date: Mon Feb 25 11:13:52 2013 +1000 + +dix: fix a comment + +Signed-off-by: Peter Hutterer +Reviewed-by: Keith Packard +(cherry picked from commit 11bead1fa205a1353e6a33c6024c7e8ace80be7c) +
xorg-server: Changes to 'upstream-experimental'
Xi/exevents.c|1 +
configure.ac |8
dix/touch.c |3 ++-
hw/xfree86/os-support/shared/posix_tty.c |3 ++-
include/list.h |2 +-
xfixes/xfixesint.h |2 ++
6 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit f5796f98dadccf67c04f601178966614dd51a1b4
Author: Peter Hutterer
Date: Wed Apr 17 16:12:00 2013 +1000
xserver 1.14.1
Signed-off-by: Peter Hutterer
diff --git a/configure.ac b/configure.ac
index 44982b3..4289863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-03-05"
-RELEASE_NAME="Keemun Mao Feng"
+AC_INIT([xorg-server], 1.14.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-04-17"
+RELEASE_NAME="Act Normal"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit aac2d9d09c73fa2b9d02d8446718aa6ccd7e894a
Author: Dave Airlie
Date: Wed Apr 10 16:09:01 2013 +1000
xf86: fix flush input to work with Linux evdev devices.
So when we VT switch back and attempt to flush the input devices,
we don't succeed because evdev won't return part of an event,
since we were only asking for 4 bytes, we'd only get -EINVAL back.
This could later cause events to be flushed that we shouldn't have
gotten.
This is a fix for CVE-2013-1940.
Signed-off-by: Dave Airlie
Reviewed-by: Peter Hutterer
Signed-off-by: Peter Hutterer
(cherry picked from commit 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f)
diff --git a/hw/xfree86/os-support/shared/posix_tty.c
b/hw/xfree86/os-support/shared/posix_tty.c
index ab3757a..4d08c1e 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -421,7 +421,8 @@ xf86FlushInput(int fd)
{
fd_set fds;
struct timeval timeout;
-char c[4];
+/* this needs to be big enough to flush an evdev event. */
+char c[256];
DebugF("FlushingSerial\n");
if (tcflush(fd, TCIFLUSH) == 0)
commit 2eec013569f6daa952482ac5d9db8acc71fe01aa
Author: Peter Hutterer
Date: Mon Feb 25 11:13:52 2013 +1000
dix: fix a comment
Signed-off-by: Peter Hutterer
Reviewed-by: Keith Packard
(cherry picked from commit 11bead1fa205a1353e6a33c6024c7e8ace80be7c)
diff --git a/dix/touch.c b/dix/touch.c
index 0db842c..891cc78 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -902,7 +902,8 @@ TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti,
InternalEvent *ev)
}
/**
- * Remove the touch pointer grab from the device. Called from AllowSome()
+ * Remove the touch pointer grab from the device. Called from
+ * DeactivatePointerGrab()
*/
void
TouchRemovePointerGrab(DeviceIntPtr dev)
commit bce06afc99ce1d948f9002e0c5c7bc29d66425da
Author: Peter Hutterer
Date: Thu Feb 28 10:43:05 2013 +1000
Xi: add a comment to make a condition a bit clearer
The commit message to 676447190190d8546165e21be242cf16dd69f5ae explains it,
but that doesn't stop the WTF moment when reading the code.
Signed-off-by: Peter Hutterer
Reviewed-by: Keith Packard
(cherry picked from commit 2967391c6d35f03121afa8003e0fb94b62495129)
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 609b126..f05e03d 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1896,6 +1896,7 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr
ti, InternalEvent *ev,
goto out;
}
+/* A client is waiting for the begin, don't give it a TouchEnd */
if (listener->state == LISTENER_AWAITING_BEGIN) {
listener->state = LISTENER_HAS_END;
goto out;
commit 8e16c2e3038c1c17cae73d8d9681dccce0fd402a
Author: Robert Morell
Date: Tue Mar 12 09:40:16 2013 -0700
list.h: Make xorg_list_init inline
Otherwise this file is emitted in every unit that includes it.
Signed-off-by: Robert Morell
Reviewed-by: Jamey Sharp
Reviewed-by: Peter Hutterer
Signed-off-by: Peter Hutterer
(cherry picked from commit 7050aae69c2a55dfdbb5c6af7882307e90ba4275)
diff --git a/include/list.h b/include/list.h
index 067c679..11de7c5 100644
--- a/include/list.h
+++ b/include/list.h
@@ -119,7 +119,7 @@ struct xorg_list {
*
* @param The list to initialized.
*/
-static void
+static inline void
xorg_list_init(struct xorg_list *list)
{
list->next = list->prev = list;
commit 44def3caf002f9fc53b971014e4e2d62afe39435
Author: Robert Morell
Date: Tue Mar 12 09:37:43 2013 -0700
configure.ac: Require inputproto 2.3
This picks up support for Xi pointer barriers in the protocol.
Signed-off-by: Robert Morell
Reviewed-by: Peter Hutterer
xorg-server: Changes to 'ubuntu+1'
ChangeLog |
98
Xi/exevents.c |
1
configure.ac |
8
debian/changelog |
105 -
debian/control|
8
debian/patches/02_hide_panoramix_symbol.diff |
13
debian/patches/228_autobind_gpu.patch |
50 +-
debian/patches/autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch |
192 +
debian/patches/config-add-no-removal.patch|
30 +
debian/patches/dix-allow-pixmap-dirty-helper-to-be-used-for-non-sha.patch |
40 +
debian/patches/no-nv.patch|
24 +
debian/patches/os-use-libunwind-to-generate-backtraces.patch |
206 ++
debian/patches/series |
21 -
debian/patches/xephyr-glx-register.patch |
39 +
debian/patches/xf86crtc-don-t-use-display-for-vx-vy-for-gpu-screens.patch |
65 +++
debian/patches/xfree86-no-xv-for-gpuscreens.patch |
36 +
debian/patches/xserver-call-CSR-for-gpus.patch|
46 ++
debian/rules |
2
dix/touch.c |
3
hw/xfree86/os-support/shared/posix_tty.c |
3
include/list.h|
2
xfixes/xfixesint.h|
2
22 files changed, 950 insertions(+), 44 deletions(-)
New commits:
commit f98a1a4e9a36999bf1fa9748273dd6b2da95b066
Author: Timo Aaltonen
Date: Mon Apr 22 11:16:37 2013 +0300
Dropped drm_device_keep_trying.patch, not needed anymore.
diff --git a/debian/changelog b/debian/changelog
index d31d677..e9a8e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-server (2:1.14.1-0ubuntu0.1) raring; urgency=low
165_man_xorg_conf_no_device_ident.patch
233-xf86events-valgrind.patch
236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
+ * Dropped drm_device_keep_trying.patch, not needed anymore.
[ Bryce Harrington ]
* 157_check_null_modes.patch: Dropped, patch included upstream.
diff --git a/debian/patches/drm_device_keep_trying.patch
b/debian/patches/drm_device_keep_trying.patch
deleted file mode 100644
index cac3fdd..000
--- a/debian/patches/drm_device_keep_trying.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From fe5802680b5ecf5ecef55b839f2f555882207d41 Mon Sep 17 00:00:00 2001
-From: Bryce Harrington
-Date: Wed, 13 Feb 2013 11:39:34 -0800
-Subject: [PATCH] If drm device couldn't be opened, keep trying for a sec.
-
-The kernel returns EACCES or EAGAIN on drm open when the drm device is
-currently unavailable, such as if it is in use by another process
-(e.g. plymouth), or hasn't finished initializing (e.g. on a really fast
-SSD). Check for errors when trying to open the device, and continue
-retrying for a short period before giving up.
-
-Fixes: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/982889
-
-Signed-off-by: Bryce Harrington
- hw/xfree86/os-support/linux/lnx_platform.c | 29 +---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
a/config/udev.c
-+++ b/config/udev.c
-@@ -98,7 +98,7 @@
- if (strncmp(sysname, "card", 4) != 0)
- return;
-
--LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path);
-+LogMessage(X_INFO, "config/udev: Adding drm device (%s) %s %s\n",
path, sysname, syspath);
-
- config_udev_odev_setup_attribs(path, syspath, NewGPUDeviceRequest);
- return;
-@@ -267,7 +267,7 @@
-
- if (strncmp(sysname,"card", 4) != 0)
- return;
--ErrorF("removing GPU device %s %d\n", syspath, path);
-+ErrorF("removing GPU device %s %s\n", syspath, path);
- if (!path)
- return;
-
-@@ -420,11 +420,23 @@
- #ifdef CONFIG_UDEV_KMS
-
- static Bool
-+get_pci_busid(const char *in, char *pci_str)
-+{
-+int ret, domain, bus, dev, func;
-+ret = sscanf(in, "/%04x:%02x:%02x.%d/drm/card%*d", &domain, &bus, &dev,
&func);
-+if (ret != 4)
-+return FALSE;
-+sprintf(pci_str, "pci:%04x:%02x:%02x.%d", domain, bus, dev, func);
-+return TRUE;
-+}
-+
-+static Bool
- config_udev_odev_setup_attribs(const char *path, const char *syspath,
-config_odev_probe_proc_ptr probe_callback)
- {
- struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
- int ret;
-+const char *platform;
-
-
libdrm: Changes to 'ubuntu-quantal'
New branch 'ubuntu-quantal' available with the following commits: -- 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/e1uucfn-0003gm...@vasks.debian.org
libdrm: Changes to 'ubuntu-precise'
New branch 'ubuntu-precise' available with the following commits: commit 02c7db2c15f9b02bad6a0f7b1d8920073b7b602b Author: Maarten Lankhorst Date: Mon Apr 22 15:46:59 2013 +0200 release to precise commit 645deada451406398728c7ce524b40579cbc824d Author: Maarten Lankhorst Date: Mon Apr 22 11:09:36 2013 +0200 Copy package from raring, and re-enable libdrm-nouveau1a. (LP: #1171340) commit dbf1e1a339a5c7c6a4c1e61b7300ab7863f1f1b2 Merge: 7f1aba0 29e7b2f Author: Maarten Lankhorst Date: Mon Apr 22 11:05:37 2013 +0200 Merge branch 'ubuntu' into ubuntu-quantal -- 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/e1uuh6f-00032i...@vasks.debian.org
libdrm: Changes to 'ubuntu-quantal'
.gitignore | 10 ChangeLog | 733 Makefile.am |8 configure.ac| 76 + debian/changelog| 50 - debian/control |5 debian/libdrm-dev.install |2 debian/libdrm-nouveau2.symbols |1 debian/patches/02_build_libkms_against_in_tree_drm.diff | 17 debian/patches/series |1 debian/rules|6 exynos/Makefile.am |2 exynos/exynos_drm.h | 52 + exynos/exynos_fimg2d.c | 630 + exynos/fimg2d.h | 325 +++ exynos/fimg2d_reg.h | 114 ++ freedreno/Makefile.am | 19 freedreno/README| 16 freedreno/freedreno_bo.c| 274 + freedreno/freedreno_device.c| 45 freedreno/freedreno_drmif.h | 99 ++ freedreno/freedreno_pipe.c | 227 freedreno/freedreno_priv.h | 117 ++ freedreno/freedreno_ringbuffer.c| 249 + freedreno/freedreno_ringbuffer.h| 87 + freedreno/kgsl_drm.h| 192 freedreno/libdrm_freedreno.pc.in| 11 freedreno/list.h| 137 ++ freedreno/msm_kgsl.h| 519 +++ intel/intel_bufmgr_gem.c| 22 intel/intel_chipset.h | 379 intel/intel_decode.c|4 libkms/Makefile.am |2 libkms/intel.c |1 libkms/linux.c |2 libkms/nouveau.c|1 man/Makefile.am | 63 + man/drm-kms.xml | 342 +++ man/drm-memory.xml | 430 + man/drm.xml | 137 ++ man/drmAvailable.xml| 75 + man/drmHandleEvent.xml | 102 ++ man/drmModeGetResources.xml | 139 +++ nouveau/abi16.c | 28 nouveau/libdrm_nouveau.pc.in|4 nouveau/nouveau.c | 21 nouveau/nouveau.h | 16 nouveau/private.h |2 nouveau/pushbuf.c | 16 omap/omap_drm.c |2 radeon/r600_pci_ids.h | 29 radeon/radeon_bo_gem.c | 16 radeon/radeon_cs_gem.c |2 radeon/radeon_surface.c | 405 +++- radeon/radeon_surface.h |2 tests/Makefile.am |4 tests/exynos/Makefile.am| 19 tests/exynos/exynos_fimg2d_test.c | 695 +++ tests/kmstest/Makefile.am |5 tests/modeprint/Makefile.am |5 tests/modetest/Makefile.am | 16 tests/vbltest/Makefile.am |6 xf86drmMode.c |5 63 files changed, 6697 insertions(+), 324 deletions(-) New commits: commit 7c88e4544a079a590a6fac05cd63f2441e9e619a Author: Maarten Lankhorst Date: Mon Apr 22 15:46:59 2013 +0200 release to quantal diff --git a/debian/changelog b/debian/changelog index d884e8e..2b54bb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.43-0ubuntu0.1) UNRELEASED; urgency=low +libdrm (2.4.43-0ubuntu0.1) quantal-proposed; urgency=low * Copy package from raring, and re-enable libdrm-nouveau1a. (LP: #1171340) commit 645deada451406398728c7ce524b40579cbc824d Author: Maarten Lankhorst Date: Mon Apr 22 11:09:36 2013 +0200 Copy package from raring, and re-enable libdrm-nouveau1a. (LP: #1171340) diff --git a/debian/changelog b/deb
Bug#636135: Affects all cards?
1:6.14.4-8 It appears this affects a broad range of Radeon chips. I just installed wheezy on a machine which I'll use to replace the laptop on which I first experienced this bug. Guess what - I have the same problem with kdm on the new machine. Now running Linux 3.8.5. -- 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/5175f02d.5030...@gmail.com
