xserver-xorg-input-evdev: Changes to 'upstream-unstable'
configure.ac |5 +
man/evdev.man |2 +-
src/emuMB.c|6 ++
src/emuWheel.c |9 -
src/evdev.c| 57 ++---
5 files changed, 54 insertions(+), 25 deletions(-)
New commits:
commit c0bee1b4d6d3664322b2f35775675ac84354f702
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Jul 30 11:08:59 2009 +1000
evdev 2.2.3
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index 87a3b18..c89e356 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
-2.2.2,
+2.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
commit 8acc999d404b9b6012588e2021324553dda9405d
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Jul 30 09:38:31 2009 +1000
Evdev doesn't require inputproto.
None of the inputproto headers seem to be included anywhere.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 6f4634111a83808bc52e7e53733cf2d3bab0cccd)
Conflicts:
configure.ac
diff --git a/configure.ac b/configure.ac
index 3f23d21..87a3b18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,9 +68,6 @@ if test x$BUILD_TEST = xyes; then
AC_SUBST([DLOPEN_LIBS])
fi
-# Checks for extensions
-XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
-
# Checks for pkg-config packages. We need to be able to override sdkdir
# to satisfy silly distcheck requirements.
PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
commit 3cce7fa38a152ba66d379591e6e3ece60bd73fdd
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Fri Jun 26 09:37:29 2009 +1000
If a device fails to initialize relative axes, init the abs. axes instead.
Some devices have relative axes that don't count (scroll wheels). In this
case, don't claim we've initialized relative axes, continue with the
absolute axes instead.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit b07ab6ea97b779b26e7ae8326528c262cc9907a1)
diff --git a/src/evdev.c b/src/evdev.c
index 490fa44..acf2943 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1061,6 +1061,9 @@ EvdevAddRelClass(DeviceIntPtr device)
if (TestBit(REL_DIAL, pEvdev-rel_bitmask))
num_axes--;
+if (num_axes = 0)
+return !Success;
+
pEvdev-num_vals = num_axes;
memset(pEvdev-vals, 0, num_axes * sizeof(int));
@@ -1188,12 +1191,17 @@ EvdevInit(DeviceIntPtr device)
FIXME: somebody volunteer to fix this.
*/
if (pEvdev-flags EVDEV_RELATIVE_EVENTS) {
- EvdevAddRelClass(device);
-if (pEvdev-flags EVDEV_ABSOLUTE_EVENTS)
-xf86Msg(X_INFO,%s: relative axes found, ignoring absolute
- axes.\n, device-name);
- pEvdev-flags = ~EVDEV_ABSOLUTE_EVENTS;
-} else if (pEvdev-flags EVDEV_ABSOLUTE_EVENTS)
+if (EvdevAddRelClass(device) == Success)
+{
+if (pEvdev-flags EVDEV_ABSOLUTE_EVENTS)
+xf86Msg(X_INFO,%s: relative axes found, ignoring absolute
+axes.\n, device-name);
+pEvdev-flags = ~EVDEV_ABSOLUTE_EVENTS;
+} else
+pEvdev-flags = ~EVDEV_RELATIVE_EVENTS;
+}
+
+if (pEvdev-flags EVDEV_ABSOLUTE_EVENTS)
EvdevAddAbsClass(device);
#ifdef HAVE_PROPERTIES
commit c793aa27381dc346d88a3e7d8bdb90dd8d3ed39c
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Mon Jul 20 14:52:34 2009 +1000
Don't register middle mouse button emulation handlers for keyboards.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 2994825665790dc8e35b2944e0d411f3cc9f76fd)
diff --git a/src/emuMB.c b/src/emuMB.c
index 41d0d2c..b29f552 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -327,6 +327,9 @@ EvdevMBEmuPreInit(InputInfoPtr pInfo)
void
EvdevMBEmuOn(InputInfoPtr pInfo)
{
+if (!pInfo-dev-button) /* don't init for keyboards */
+return;
+
RegisterBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
EvdevMBEmuWakeupHandler,
(pointer)pInfo);
@@ -335,6 +338,9 @@ EvdevMBEmuOn(InputInfoPtr pInfo)
void
EvdevMBEmuFinalize(InputInfoPtr pInfo)
{
+if (!pInfo-dev-button) /* don't cleanup for keyboards */
+return;
+
RemoveBlockAndWakeupHandlers (EvdevMBEmuBlockHandler,
EvdevMBEmuWakeupHandler,
(pointer)pInfo);
commit 9f3632c0b6c181706daf661646de5994217c0bb2
Author: Oliver McFadden oliver.mcfad...@nokia.com
Date: Thu Jul 16 18:25:37 2009 +0300
Coverity Prevent: NO_EFFECT in EvdevWheelEmuSetProperty:
Event unsigned_compare: Comparing unsigned less than zero is never true.
pEvdev-emulateWheel.timeout 0UL
xserver-xorg-input-evdev: Changes to 'refs/tags/xserver-xorg-input-evdev-1_2.2.3-1'
Tag 'xserver-xorg-input-evdev-1_2.2.3-1' created by Brice Goglin bgog...@debian.org at 2009-07-30 07:28 + Tagging upload of xserver-xorg-input-evdev 1:2.2.3-1 to unstable. Changes since xserver-xorg-input-evdev-1_2.2.2-1: Asbj�rn Sannes (1): evdev: Fix spelling of property in man page to match source code. #22571 Brice Goglin (5): Merge tag 'xf86-input-evdev-2.2.3' into debian-unstable New upstream release Merge branch 'debian-unstable' of git://git.debian.org/pkg-xorg/xsfbs into debian-unstable Bump Standards-Version to 3.8.2 now that we have README.source Prepare changelog for upload David Nusinow (1): Add README.source Derek Upham (1): evdev: Prevent driver from processing motion events that it has not configured. #21832 Julien Cristau (3): xsfbs: repack.sh needs to be executable xsfbs: don't run dpkg --print-installation-architecture Kill custom readlink function Oliver McFadden (1): Coverity Prevent: NO_EFFECT in EvdevWheelEmuSetProperty: Peter Hutterer (9): Only label axes and buttons if the device has axes or buttons. Up the number of button labels atoms to EVDEV_MAXBUTTONS. Ensure enough buttons are advertised to pass the button mapping. Only initialize the number of buttons we actually have. Deal with BTN_3 to BTN_9 buttons. Don't register middle mouse button emulation handlers for keyboards. If a device fails to initialize relative axes, init the abs. axes instead. Evdev doesn't require inputproto. evdev 2.2.3 --- ChangeLog | 162 ++ configure.ac |5 - debian/README.source | 73 ++ debian/changelog |9 ++ debian/control|2 debian/xsfbs/xsfbs.sh | 12 --- man/evdev.man |2 src/emuMB.c |6 + src/emuWheel.c|9 -- src/evdev.c | 57 ++--- 10 files changed, 299 insertions(+), 38 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-evdev: Changes to 'debian-unstable'
ChangeLog | 162 ++ configure.ac |5 - debian/README.source | 73 ++ debian/changelog |9 ++ debian/control|2 debian/xsfbs/xsfbs.sh | 12 --- man/evdev.man |2 src/emuMB.c |6 + src/emuWheel.c|9 -- src/evdev.c | 57 ++--- 10 files changed, 299 insertions(+), 38 deletions(-) New commits: commit 55a8ac46b2ecc65837e2a1718a8872f509245629 Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 09:14:51 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index e7bebc5..9d7d76f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-input-evdev (1:2.2.3-1) UNRELEASED; urgency=low +xserver-xorg-input-evdev (1:2.2.3-1) unstable; urgency=low * New upstream release. + Fix corrupted mouse motion events sending pointer to top-left of screen, cloces: #528994. * Add README.source, bump Standards-Version to 3.8.2. - -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 09:14:15 +0200 + -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 09:14:44 +0200 xserver-xorg-input-evdev (1:2.2.2-1) unstable; urgency=low commit ebe1b7319765a9eae8aa12cd2f06c1ca41ed2f3d Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 09:14:34 2009 +0200 Bump Standards-Version to 3.8.2 now that we have README.source diff --git a/debian/changelog b/debian/changelog index 27dd888..e7bebc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ xserver-xorg-input-evdev (1:2.2.3-1) UNRELEASED; urgency=low * New upstream release. + Fix corrupted mouse motion events sending pointer to top-left of screen, cloces: #528994. + * Add README.source, bump Standards-Version to 3.8.2. - -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 09:10:10 +0200 + -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 09:14:15 +0200 xserver-xorg-input-evdev (1:2.2.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2bcc7fe..726b204 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git commit 8c90225187e9e695b96bd49b6435f58b34cb0e67 Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 09:10:44 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 70c7df3..28313ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,165 @@ +commit c0bee1b4d6d3664322b2f35775675ac84354f702 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Thu Jul 30 11:08:59 2009 +1000 + +evdev 2.2.3 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 8acc999d404b9b6012588e2021324553dda9405d +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Thu Jul 30 09:38:31 2009 +1000 + +Evdev doesn't require inputproto. + +None of the inputproto headers seem to be included anywhere. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +(cherry picked from commit 6f4634111a83808bc52e7e53733cf2d3bab0cccd) + +Conflicts: + + configure.ac + +commit 3cce7fa38a152ba66d379591e6e3ece60bd73fdd +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Fri Jun 26 09:37:29 2009 +1000 + +If a device fails to initialize relative axes, init the abs. axes instead. + +Some devices have relative axes that don't count (scroll wheels). In this +case, don't claim we've initialized relative axes, continue with the +absolute axes instead. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +(cherry picked from commit b07ab6ea97b779b26e7ae8326528c262cc9907a1) + +commit c793aa27381dc346d88a3e7d8bdb90dd8d3ed39c +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Mon Jul 20 14:52:34 2009 +1000 + +Don't register middle mouse button emulation handlers for keyboards. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +(cherry picked from commit 2994825665790dc8e35b2944e0d411f3cc9f76fd) + +commit 9f3632c0b6c181706daf661646de5994217c0bb2 +Author: Oliver McFadden oliver.mcfad...@nokia.com +Date: Thu Jul 16 18:25:37 2009 +0300 + +Coverity Prevent: NO_EFFECT in EvdevWheelEmuSetProperty: + +Event unsigned_compare: Comparing unsigned less than zero is never true. pEvdev-emulateWheel.timeout 0UL +342if (pEvdev-emulateWheel.timeout 0) + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +(cherry picked from commit 9bfd9e8a3683f14860149ae9f842e88828cc0960) + +commit 06b303f26d5fab17b7d82dbf2bda3f77dad2364c +Author: Asbj�rn Sannes a...@sannes.org +Date: Wed Jul 1 09:51:12 2009 +0200 + +
Processing of xserver-xorg-input-evdev_2.2.3-1_i386.changes
xserver-xorg-input-evdev_2.2.3-1_i386.changes uploaded successfully to localhost along with the files: xserver-xorg-input-evdev_2.2.3-1.dsc xserver-xorg-input-evdev_2.2.3.orig.tar.gz xserver-xorg-input-evdev_2.2.3-1.diff.gz xserver-xorg-input-evdev_2.2.3-1_i386.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-evdev_2.2.3-1_i386.changes ACCEPTED
Accepted: xserver-xorg-input-evdev_2.2.3-1.diff.gz to pool/main/x/xserver-xorg-input-evdev/xserver-xorg-input-evdev_2.2.3-1.diff.gz xserver-xorg-input-evdev_2.2.3-1.dsc to pool/main/x/xserver-xorg-input-evdev/xserver-xorg-input-evdev_2.2.3-1.dsc xserver-xorg-input-evdev_2.2.3-1_i386.deb to pool/main/x/xserver-xorg-input-evdev/xserver-xorg-input-evdev_2.2.3-1_i386.deb xserver-xorg-input-evdev_2.2.3.orig.tar.gz to pool/main/x/xserver-xorg-input-evdev/xserver-xorg-input-evdev_2.2.3.orig.tar.gz Override entries for your package: xserver-xorg-input-evdev_2.2.3-1.dsc - source x11 xserver-xorg-input-evdev_2.2.3-1_i386.deb - optional x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-r128: Changes to 'upstream-unstable'
Makefile.am |2 +- configure.ac | 11 ++- src/r128_driver.c | 21 + src/r128_probe.c |4 4 files changed, 36 insertions(+), 2 deletions(-) New commits: commit 39dac77d3f2b5d69f13dc3aff17a4a245462fcc0 Author: Dave Airlie airl...@redhat.com Date: Thu Jul 30 12:04:28 2009 +1000 r128: bump for release 6.8.1 diff --git a/configure.ac b/configure.ac index 1342662..4e0f463 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-r128], -6.8.0, +6.8.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-r128) commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e Author: Dave Airlie airl...@redhat.com Date: Tue Jul 28 15:22:41 2009 +1000 r128: change to using ABI version check diff --git a/src/r128_driver.c b/src/r128_driver.c index a4a5cea..d6448b6 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -87,7 +87,7 @@ #include xf86.h #include xf86_OSproc.h #include xf86PciInfo.h -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6 #include xf86RAC.h #include xf86Resources.h #endif diff --git a/src/r128_probe.c b/src/r128_probe.c index c61da4c..412da92 100644 --- a/src/r128_probe.c +++ b/src/r128_probe.c @@ -46,8 +46,12 @@ #include xf86.h #include xf86PciInfo.h -#ifndef XSERVER_LIBPCIACCESS + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6 #include xf86Resources.h +#endif + +#ifndef XSERVER_LIBPCIACCESS static Bool R128Probe(DriverPtr drv, int flags); #endif commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f Author: Dave Airlie airl...@redhat.com Date: Tue Jul 28 13:32:32 2009 +1000 r128: update for resources/RAC API removal diff --git a/src/r128_driver.c b/src/r128_driver.c index 90e2246..a4a5cea 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -87,8 +87,10 @@ #include xf86.h #include xf86_OSproc.h #include xf86PciInfo.h +#ifndef XSERVER_LIBPCIACCESS #include xf86RAC.h #include xf86Resources.h +#endif #include xf86cmap.h #include xf86xv.h #include vbe.h @@ -1980,10 +1982,12 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) PCI_DEV_DEV(info-PciInfo), PCI_DEV_FUNC(info-PciInfo)); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(info-pEnt-index, 0, ResNone)) goto fail; if (xf86SetOperatingState(resVga, info-pEnt-index, ResUnusedOpr)) goto fail; pScrn-racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR; +#endif pScrn-monitor = pScrn-confScreen-monitor; if (!R128PreInitVisual(pScrn))goto fail; diff --git a/src/r128_probe.c b/src/r128_probe.c index bfec1eb..c61da4c 100644 --- a/src/r128_probe.c +++ b/src/r128_probe.c @@ -45,9 +45,9 @@ #include xf86.h #include xf86PciInfo.h -#include xf86Resources.h #ifndef XSERVER_LIBPCIACCESS +#include xf86Resources.h static Bool R128Probe(DriverPtr drv, int flags); #endif commit 38d301388cfa1f228a6fa0cddf5b7ad6258154d2 Author: Gaetan Nadon mems...@videotron.ca Date: Wed Jul 15 15:44:01 2009 -0400 Use XORG_CHANGELOG macro to create ChangeLog. #22611 Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Global maintenance on all modules Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/Makefile.am b/Makefile.am index c8dcab8..1f4c3c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,6 @@ CLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log .changelog.tmp mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' 2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 0d1f125..1342662 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,10 @@ AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AM_MAINTAINER_MODE # Checks for programs. @@ -132,6 +136,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION XORG_CHECK_LINUXDOC +XORG_CHANGELOG AC_MSG_NOTICE( [Please change the Driver line in xorg.conf from ati to r128 or install] commit 178e6f509bb8b351cfa01425ada7331781843954 Author: Peter Hutterer peter.hutte...@who-t.net Date: Thu Jul 16 11:51:08 2009 +1000 Update to xextproto 7.1 support. DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/configure.ac b/configure.ac index eed1586..0d1f125 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6
xserver-xorg-video-r128: Changes to 'refs/tags/xserver-xorg-video-r128-6.8.1-1'
Tag 'xserver-xorg-video-r128-6.8.1-1' created by Brice Goglin bgog...@debian.org at 2009-07-30 08:20 + Tagging upload of xserver-xorg-video-r128 6.8.1-1 to unstable. Changes since xserver-xorg-video-r128-6.8.0+git20090201.08d56c88-2: Alan Coopersmith (2): Remove xorgconfig xorgcfg from See Also list in man page Add README with pointers to mailing list, bugzilla git repos Brice Goglin (7): r128 Suggests: firmware-linux Move -dbg package to section debug Merge branch 'debian-unstable' of git://git.debian.org/pkg-xorg/xsfbs into debian-unstable Bump Standards-Version to 3.8.2 now that we have README.source Merge tag 'xf86-video-r128-6.8.1' into debian-unstable New upstream release Prepare changelog for upload Dave Airlie (3): r128: update for resources/RAC API removal r128: change to using ABI version check r128: bump for release 6.8.1 David Nusinow (4): Add a note in NEWS.Debian about firmware-linux Remove 01_gen_pci_ids.diff. Don't try to install the now missing PCI IDs text file Add README.source Gaetan Nadon (1): Use XORG_CHANGELOG macro to create ChangeLog. #22611 John Nielsen (1): R128: fix zaphod dualhead after libpciaccess switch Julien Cristau (2): xsfbs: don't run dpkg --print-installation-architecture Kill custom readlink function Matthieu Herrb (2): Kill bare RCS id. Don't de-reference a NULL pointer in R128FreeScreen in the error path. Peter Hutterer (1): Update to xextproto 7.1 support. --- ChangeLog | 136 +++-- Makefile.am|2 configure.ac | 11 ++ debian/NEWS| 10 ++ debian/README.source | 73 + debian/changelog | 16 +++ debian/control |4 debian/patches/01_gen_pci_ids.diff | 18 debian/patches/series |1 debian/xserver-xorg-video-r128.install |1 debian/xsfbs/xsfbs.sh | 12 -- src/r128_driver.c | 21 + src/r128_probe.c |4 13 files changed, 235 insertions(+), 74 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-r128: Changes to 'debian-unstable'
ChangeLog | 136 +++--- Makefile.am |2 configure.ac | 11 +++- debian/NEWS |4 - debian/README.source | 73 ++ debian/changelog |6 +- debian/control|2 debian/xsfbs/xsfbs.sh | 12 src/r128_driver.c | 21 +++ src/r128_probe.c |4 + 10 files changed, 213 insertions(+), 58 deletions(-) New commits: commit f5ec887f93d1c3cbc8a72d1f2d2c11a574eee091 Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 10:08:35 2009 +0200 Prepare changelog for upload diff --git a/debian/NEWS b/debian/NEWS index 4a746b2..199c654 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) experimental; urgency=low +xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low * The standard linux kernels in Debian as of version 2.6.29-1 do not contain the firmware necessary to allow the r128 driver to use 3D @@ -6,7 +6,7 @@ xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) experimental; urgency=low firmware-linux package in non-free, and must be installed to use this feature. - -- David Nusinow dnusi...@debian.org Wed, 29 Apr 2009 21:21:04 -0400 + -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 10:12:54 +0200 xserver-xorg-video-r128 (1:6.8.1~git20080301.d855d208-1) experimental; urgency=low diff --git a/debian/changelog b/debian/changelog index e3f673c..fc80102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-r128 (6.8.1-1) UNRELEASED; urgency=low +xserver-xorg-video-r128 (6.8.1-1) unstable; urgency=low [ Brice Goglin ] * New upstream release. @@ -12,7 +12,7 @@ xserver-xorg-video-r128 (6.8.1-1) UNRELEASED; urgency=low * Remove 01_gen_pci_ids.diff. The server uses a built-in table now to choose drivers. - -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 10:07:48 +0200 + -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 10:08:31 +0200 xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-2) unstable; urgency=low commit 8c3422c40f5d4bb6470858601f82c95443091d94 Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 10:08:26 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index 364a67e..da0a08f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,61 @@ +commit 39dac77d3f2b5d69f13dc3aff17a4a245462fcc0 +Author: Dave Airlie airl...@redhat.com +Date: Thu Jul 30 12:04:28 2009 +1000 + +r128: bump for release 6.8.1 + +commit d519ef9adca6e60bbafbc5649f1bafef43cebb4e +Author: Dave Airlie airl...@redhat.com +Date: Tue Jul 28 15:22:41 2009 +1000 + +r128: change to using ABI version check + +commit e3568b4e5d404076c0f02c1b64af35c8e6d5745f +Author: Dave Airlie airl...@redhat.com +Date: Tue Jul 28 13:32:32 2009 +1000 + +r128: update for resources/RAC API removal + +commit 38d301388cfa1f228a6fa0cddf5b7ad6258154d2 +Author: Gaetan Nadon mems...@videotron.ca +Date: Wed Jul 15 15:44:01 2009 -0400 + +Use XORG_CHANGELOG macro to create ChangeLog. #22611 + +Adding the macro in configure.ac and use it in Makefile.am +Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 +Global maintenance on all modules + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 178e6f509bb8b351cfa01425ada7331781843954 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Thu Jul 16 11:51:08 2009 +1000 + +Update to xextproto 7.1 support. + +DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers +need to include dpmsconst.h if xextproto 7.1 is available. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 5d8a8df3aca2f14366946e48df9b674d7254ce04 +Author: Matthieu Herrb matthieu.he...@laas.fr +Date: Sat Jun 13 19:20:24 2009 +0200 + +Don't de-reference a NULL pointer in R128FreeScreen in the error path. + +If R128PreInit() failed, R128FreeRec() was already called and info +will be NULL. + +commit 771c707eb2bba21b6013327bb62859c37be08673 +Author: John Nielsen li...@jnielsen.net +Date: Fri Apr 17 16:16:57 2009 -0400 + +R128: fix zaphod dualhead after libpciaccess switch + +fixes bug 21251 + commit 08d56c886c6f5cb848e4f5079a66da781ef6da21 Author: Alan Coopersmith alan.coopersm...@sun.com Date: Fri Jan 30 20:58:51 2009 -0800 @@ -167,7 +225,7 @@ Date: Mon Feb 25 07:10:48 2008 +1000 fixup check for EXA composite pointed out by Alan Swanson commit 85e470e64f629de72e361c0e2e29998d1bf4 -Merge: 27ddb39... 1b84c76... +Merge: 27ddb39 1b84c76 Author: Alex Deucher a...@samba.(none) Date: Sun Feb 24 05:37:22 2008 -0500 @@ -855,7 +913,7 @@ Date: Mon Jan 14 16:11:09 2008 -0500 Fixes bug 14001 commit 729da30c80d6545b75c8faea44754634f477cc09 -Merge: 000741e... 625a885... +Merge: 000741e 625a885 Author: Alex Deucher
Processing of xserver-xorg-video-r128_6.8.1-1_i386.changes
xserver-xorg-video-r128_6.8.1-1_i386.changes uploaded successfully to localhost along with the files: xserver-xorg-video-r128_6.8.1-1.dsc xserver-xorg-video-r128_6.8.1.orig.tar.gz xserver-xorg-video-r128_6.8.1-1.diff.gz xserver-xorg-video-r128_6.8.1-1_i386.deb xserver-xorg-video-r128-dbg_6.8.1-1_i386.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-r128_6.8.1-1_i386.changes ACCEPTED
Accepted: xserver-xorg-video-r128-dbg_6.8.1-1_i386.deb to pool/main/x/xserver-xorg-video-r128/xserver-xorg-video-r128-dbg_6.8.1-1_i386.deb xserver-xorg-video-r128_6.8.1-1.diff.gz to pool/main/x/xserver-xorg-video-r128/xserver-xorg-video-r128_6.8.1-1.diff.gz xserver-xorg-video-r128_6.8.1-1.dsc to pool/main/x/xserver-xorg-video-r128/xserver-xorg-video-r128_6.8.1-1.dsc xserver-xorg-video-r128_6.8.1-1_i386.deb to pool/main/x/xserver-xorg-video-r128/xserver-xorg-video-r128_6.8.1-1_i386.deb xserver-xorg-video-r128_6.8.1.orig.tar.gz to pool/main/x/xserver-xorg-video-r128/xserver-xorg-video-r128_6.8.1.orig.tar.gz Override entries for your package: xserver-xorg-video-r128-dbg_6.8.1-1_i386.deb - extra debug xserver-xorg-video-r128_6.8.1-1.dsc - source x11 xserver-xorg-video-r128_6.8.1-1_i386.deb - optional x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-mga: Changes to 'refs/tags/xserver-xorg-video-mga-1_1.4.11.dfsg-1'
Tag 'xserver-xorg-video-mga-1_1.4.11.dfsg-1' created by Brice Goglin bgog...@debian.org at 2009-07-30 10:40 + Tagging upload of xserver-xorg-video-mga 1:1.4.11.dfsg-1 to unstable. Changes since xserver-xorg-video-mga-1_1.4.10.dfsg-1: Adam Jackson (4): Remove redundant MGAuseI2C macro Normalize DDC for the second head. Do E-EDID if built against a server that supports it. Remove useless loader symbol lists. Alan Coopersmith (1): Fill in COPYING file, add SubmittingPatches URL to README Brice Goglin (6): Merge branch 'debian-unstable' of git://git.debian.org/pkg-xorg/xsfbs into debian-unstable Bump Standards-Version to 3.8.2 now that we have README.source New upstream release Update debian/copyright from upstream COPYING Don't try to install usr/share/xserver-xorg/pci/* anymore Prepare changelog for upload Dave Airlie (3): mga: update for resources/RAC API removal mga: change to using ABI version check mga: bump for release 1.4.11 David Nusinow (3): Remove 01_gen_pci_ids.diff. Renumber 03_no_nonfree.diff to 01. Add README.source Gaetan Nadon (1): xf86-video-mga: use XORG_CHANGELOG macro to create ChangeLog. #22611 Julien Cristau (3): xsfbs: repack.sh needs to be executable xsfbs: don't run dpkg --print-installation-architecture Kill custom readlink function --- COPYING | 241 ChangeLog | 62 Makefile.am |2 README| 13 configure.ac |8 debian/README.source | 73 + debian/changelog | 14 debian/control|2 debian/copyright | 185 +++- debian/patches/01_gen_pci_ids.diff| 28 - debian/patches/01_no_nonfree.diff | 12 debian/patches/03_no_nonfree.diff | 12 debian/patches/series |3 debian/xserver-xorg-video-mga.install |1 debian/xsfbs/xsfbs.sh | 12 src/mga.h |2 src/mga_bios.c|1 src/mga_driver.c | 484 -- src/mga_esc.c |2 src/mga_merge.c |1 src/mga_shadow.c |1 src/mga_video.c |1 22 files changed, 709 insertions(+), 451 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-mga: Changes to 'upstream-unstable'
COPYING | 241 ++-
Makefile.am |2
README | 13 +
configure.ac |8
src/mga.h|2
src/mga_bios.c |1
src/mga_driver.c | 484 ++-
src/mga_esc.c|2
src/mga_merge.c |1
src/mga_shadow.c |1
src/mga_video.c |1
11 files changed, 379 insertions(+), 377 deletions(-)
New commits:
commit 319bba2b759ec64287935e2fb16491f75a3169af
Author: Dave Airlie airl...@redhat.com
Date: Thu Jul 30 12:04:28 2009 +1000
mga: bump for release 1.4.11
diff --git a/configure.ac b/configure.ac
index 1067ffe..3f5803f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-mga],
-1.4.10,
+1.4.11,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-mga)
commit e29477ef4d4ae50c39ef608ad0e2344c5c68ed40
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 15:22:40 2009 +1000
mga: change to using ABI version check
diff --git a/src/mga_driver.c b/src/mga_driver.c
index 1d0eb8e..e0b724b 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -53,7 +53,7 @@
#include xf86.h
#include xf86_OSproc.h
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
#include xf86Resources.h
#include xf86RAC.h
#endif
commit 26ca92acc58b74202ec5eacaffc8e418d878da5e
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 13:32:31 2009 +1000
mga: update for resources/RAC API removal
diff --git a/src/mga.h b/src/mga.h
index a831862..18652a8 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -464,9 +464,9 @@ typedef struct {
#else
pciVideoPtrPciInfo;
PCITAG PciTag;
+xf86AccessRec Access;
#endif
const struct mga_device_attributes * chip_attribs;
-xf86AccessRec Access;
intChipset;
int ChipRev;
diff --git a/src/mga_bios.c b/src/mga_bios.c
index c015077..b533dd1 100644
--- a/src/mga_bios.c
+++ b/src/mga_bios.c
@@ -41,7 +41,6 @@
/* All drivers should typically include these */
#include xf86.h
#include xf86_OSproc.h
-#include xf86Resources.h
/* All drivers need this */
diff --git a/src/mga_driver.c b/src/mga_driver.c
index d1e2210..1d0eb8e 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -52,7 +52,11 @@
/* All drivers should typically include these */
#include xf86.h
#include xf86_OSproc.h
+
+#ifndef XSERVER_LIBPCIACCESS
#include xf86Resources.h
+#include xf86RAC.h
+#endif
/* All drivers need this */
@@ -75,7 +79,7 @@
#include micmap.h
#include xf86DDC.h
-#include xf86RAC.h
+
#include vbe.h
#include fb.h
@@ -435,25 +439,25 @@ static SymTabRec MGAChipsets[] = {
};
static PciChipsets MGAPciChipsets[] = {
-{ PCI_CHIP_MGA2064,PCI_CHIP_MGA2064,
(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGA1064,PCI_CHIP_MGA1064,
(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGA2164,PCI_CHIP_MGA2164,
(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGA2164_AGP, PCI_CHIP_MGA2164_AGP,(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGAG100,PCI_CHIP_MGAG100,
(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGAG100_PCI, PCI_CHIP_MGAG100_PCI,(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGAG200,PCI_CHIP_MGAG200,
(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGAG200_PCI, PCI_CHIP_MGAG200_PCI,(resRange*)RES_SHARED_VGA },
+{ PCI_CHIP_MGA2064,PCI_CHIP_MGA2064, RES_SHARED_VGA },
+{ PCI_CHIP_MGA1064,PCI_CHIP_MGA1064, RES_SHARED_VGA },
+{ PCI_CHIP_MGA2164,PCI_CHIP_MGA2164, RES_SHARED_VGA },
+{ PCI_CHIP_MGA2164_AGP, PCI_CHIP_MGA2164_AGP,RES_SHARED_VGA },
+{ PCI_CHIP_MGAG100,PCI_CHIP_MGAG100, RES_SHARED_VGA },
+{ PCI_CHIP_MGAG100_PCI, PCI_CHIP_MGAG100_PCI,RES_SHARED_VGA },
+{ PCI_CHIP_MGAG200,PCI_CHIP_MGAG200, RES_SHARED_VGA },
+{ PCI_CHIP_MGAG200_PCI, PCI_CHIP_MGAG200_PCI,RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_SE_B_PCI, PCI_CHIP_MGAG200_SE_B_PCI,
- (resRange*)RES_SHARED_VGA },
+ RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_SE_A_PCI, PCI_CHIP_MGAG200_SE_A_PCI,
- (resRange*)RES_SHARED_VGA },
+ RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_EV_PCI, PCI_CHIP_MGAG200_EV_PCI,
- (resRange*)RES_SHARED_VGA },
+ RES_SHARED_VGA },
{ PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI,
- (resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGAG400,PCI_CHIP_MGAG400,
(resRange*)RES_SHARED_VGA },
-{ PCI_CHIP_MGAG550,PCI_CHIP_MGAG550,
(resRange*)RES_SHARED_VGA },
-{ -1, -1, (resRange*)RES_UNDEFINED }
+ RES_SHARED_VGA },
+{ PCI_CHIP_MGAG400,PCI_CHIP_MGAG400, RES_SHARED_VGA },
+{ PCI_CHIP_MGAG550,PCI_CHIP_MGAG550, RES_SHARED_VGA },
+{ -1,
xserver-xorg-video-mga: Changes to 'debian-unstable'
COPYING | 241 ChangeLog | 62 Makefile.am |2 README| 13 configure.ac |8 debian/README.source | 73 + debian/changelog | 10 debian/control|2 debian/copyright | 185 +++- debian/xserver-xorg-video-mga.install |1 debian/xsfbs/xsfbs.sh | 12 src/mga.h |2 src/mga_bios.c|1 src/mga_driver.c | 484 -- src/mga_esc.c |2 src/mga_merge.c |1 src/mga_shadow.c |1 src/mga_video.c |1 18 files changed, 690 insertions(+), 411 deletions(-) New commits: commit 91650ca8894472142c9e9cb3c00f7129e7200919 Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 12:33:10 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index f5f4922..689d42f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-mga (1:1.4.11.dfsg-1) UNRELEASED; urgency=low +xserver-xorg-video-mga (1:1.4.11.dfsg-1) unstable; urgency=low [ David Nusinow ] * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to @@ -10,7 +10,7 @@ xserver-xorg-video-mga (1:1.4.11.dfsg-1) UNRELEASED; urgency=low * Add README.source, bump Standards-Version to 3.8.2. * Update debian/copyright from upstream's COPYING. - -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 12:25:16 +0200 + -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 12:33:04 +0200 xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low commit 85ef08383242ed58d2d90487538dbe08efd8a51a Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 12:32:48 2009 +0200 Don't try to install usr/share/xserver-xorg/pci/* anymore diff --git a/debian/xserver-xorg-video-mga.install b/debian/xserver-xorg-video-mga.install index 8a9f4ba..614cfb4 100644 --- a/debian/xserver-xorg-video-mga.install +++ b/debian/xserver-xorg-video-mga.install @@ -1,3 +1,2 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* -usr/share/xserver-xorg/pci/* commit 1db132450c33f81b6a9fed2e2f13c32de5ec7364 Author: Brice Goglin bgog...@debian.org Date: Thu Jul 30 12:25:34 2009 +0200 Update debian/copyright from upstream COPYING diff --git a/debian/changelog b/debian/changelog index 00134c3..f5f4922 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ xserver-xorg-video-mga (1:1.4.11.dfsg-1) UNRELEASED; urgency=low [ Brice Goglin ] * New upstream release. * Add README.source, bump Standards-Version to 3.8.2. + * Update debian/copyright from upstream's COPYING. - -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 12:17:43 +0200 + -- Brice Goglin bgog...@debian.org Thu, 30 Jul 2009 12:25:16 +0200 xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 41b7da5..a5e621c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,34 @@ This package was downloaded from +git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mga. +Release tarballs are available at http://xorg.freedesktop.org/releases/individual/driver/ +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. + +*** + Copyright 1989, 1998 The Open Group Permission to use, copy,
Processing of xserver-xorg-video-mga_1.4.11.dfsg-1_i386.changes
xserver-xorg-video-mga_1.4.11.dfsg-1_i386.changes uploaded successfully to localhost along with the files: xserver-xorg-video-mga_1.4.11.dfsg-1.dsc xserver-xorg-video-mga_1.4.11.dfsg.orig.tar.gz xserver-xorg-video-mga_1.4.11.dfsg-1.diff.gz xserver-xorg-video-mga_1.4.11.dfsg-1_i386.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-video-mga_1.4.11.dfsg-1_i386.changes ACCEPTED
Accepted: xserver-xorg-video-mga_1.4.11.dfsg-1.diff.gz to pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.11.dfsg-1.diff.gz xserver-xorg-video-mga_1.4.11.dfsg-1.dsc to pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.11.dfsg-1.dsc xserver-xorg-video-mga_1.4.11.dfsg-1_i386.deb to pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.11.dfsg-1_i386.deb xserver-xorg-video-mga_1.4.11.dfsg.orig.tar.gz to pool/main/x/xserver-xorg-video-mga/xserver-xorg-video-mga_1.4.11.dfsg.orig.tar.gz Override entries for your package: xserver-xorg-video-mga_1.4.11.dfsg-1.dsc - source x11 xserver-xorg-video-mga_1.4.11.dfsg-1_i386.deb - optional x11 Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Processed: reassign 539271 to xserver-xorg, forcibly merging 535624 539271
Processing commands for cont...@bugs.debian.org: reassign 539271 xserver-xorg Bug #539271 [installation-reports] Xorg installation failed Bug reassigned from package 'installation-reports' to 'xserver-xorg'. Bug #539271 [xserver-xorg] Xorg installation failed Ignoring request to alter found versions of bug #539271 to the same values previously set Bug #539271 [xserver-xorg] Xorg installation failed Ignoring request to alter fixed versions of bug #539271 to the same values previously set forcemerge 535624 539271 Bug#535624: Command dpkg-reconfigure -phigh xserver-xorg doesn't create /etc/X11/xorg.conf Bug#539271: Xorg installation failed Bug#538077: installation-reports: Netinstall 5.0.2: empty xorg.conf and wrong keymap Forcibly Merged 535624 538077 539271. End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#539206: video-radeon: OSD flickering in mplayer/xv
On Wed, 2009-07-29 at 21:25 +0200, Michal Suchanek wrote: Package: xserver-xorg-video-radeon Version: 1:6.12.2-3 Severity: normal File: video-radeon Running mplayer with xv output on this hardware causes flickering with both textured video and overlay. Only the OSD and subtitles flicker, and only in the part of the screen where the video is displayed. I'm afraid that's an inherent issue of textured video, as in contrast to a video overlay the video and other elements overwrite each other. The gl output prevents this flickering but causes occasional video tearing, probably because it is simply slow. This probably works due to double buffering. In the future this may be possible with XVideo as well by using a pixmap as the 'back buffer', but it's not implemented yet, though somebody posted a patch for it to an upstream mailing list a while ago. I have never observed such flickering with the intel driver or Radeon 9200 card. Using textured video as well, not an overlay? -- Earthling Michel Dänzer |http://www.vmware.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
Bug#539206: video-radeon: OSD flickering in mplayer/xv
On Wed, 2009-07-29 at 21:25 +0200, Michal Suchanek wrote: Package: xserver-xorg-video-radeon Version: 1:6.12.2-3 Severity: normal File: video-radeon Running mplayer with xv output on this hardware causes flickering with both textured video and overlay. Sorry, missed 'and overlay' before. How do you choose one or the other? Are you sure you aren't actually getting textured in both cases? E.g. with overlay, do you see the video lagging behind when moving the mplayer window? -- Earthling Michel Dänzer |http://www.vmware.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
Bug#538810: video-radeon: direct rendering: graphics deceleration?
On Thu, 2009-07-30 at 01:36 +0200, Michal Suchanek wrote: The majority of time is spent in: (with -fps) 181333 53.6798 radeon.koradeon.ko radeon_do_wait_for_idle (without -fps) 287349 59.3526 radeon.koradeon.ko radeon_freelist_get This indicates the GPU is the bottleneck, but I'm not sure why it would be that slow... though one thing I notice now is that the card only has a 64 bit wide memory bus, that could be the bottleneck. What kind of numbers does x11perf -copywinwin500 -aa10text -repeat 1 give? (Preferably without a compositing manager running) -- Earthling Michel Dänzer |http://www.vmware.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
Bug#539338: mkfontscale: add option to recurse subdirectories
X-Debbugs-CC: Juliusz Chroboczek juliusz.chroboc...@pps.jussieu.fr
Package: xfonts-utils
Version: 1:7.4+1
Severity: wishlist
Hi Juliusz, everyone,
in the medium run it might be nice to use /usr/share/fonts/truetype in
the X font path. However, fonts seem to be organized into subdirectories.
To facilitate using the directory with adding only one element to the X
font path, the attached patch implements recursive scanning of
subdirectories in mkfontscale.
I appreciate feedback and if you could consider adopting it.
Acknowledgement: Julien Cristau answered questions on IRC, so if I have
gotten anything right here, it's to his credit, all errors are my own.
Kind regards and thanks for your work on Debian and X
T.
P.S.: If this patch seems feasible (even if only in Debian), I would
submit a follow-up to add a packaging system trigger to keep font
information up to date in that directory.
--
Thomas Viehmann, http://thomas.viehmann.net/
diff -dur orig/xfonts-utils-7.4+1/mkfontscale/mkfontscale.c xfonts-utils-7.4+1/mkfontscale/mkfontscale.c
--- orig/xfonts-utils-7.4+1/mkfontscale/mkfontscale.c 2008-05-11 00:01:42.0 +0200
+++ xfonts-utils-7.4+1/mkfontscale/mkfontscale.c 2009-07-30 20:49:23.0 +0200
@@ -31,6 +31,7 @@
#include unistd.h
#include errno.h
#include ctype.h
+#include sys/stat.h
#include X11/Xos.h
#include X11/fonts/fontenc.h
@@ -103,6 +104,7 @@
static FT_Library ft_library;
static float bigEncodingFuzz = 0.02;
+static int recurse;
static int relative;
static int doScalable;
static int doBitmaps;
@@ -154,6 +156,7 @@
doScalable = 1;
onlyEncodings = 0;
relative = 0;
+recurse = 0;
reencodeLegacy = 1;
encodingsToDo = NULL;
@@ -217,6 +220,9 @@
} else if(strcmp(argv[argn], -r) == 0) {
relative = 1;
argn++;
+} else if(strcmp(argv[argn], -R) == 0) {
+recurse = 1;
+argn++;
} else if(strcmp(argv[argn], -l) == 0) {
reencodeLegacy = !reencodeLegacy;
argn++;
@@ -749,57 +755,20 @@
return 0;
}
+
static int
-doDirectory(char *dirname_given, int numEncodings, ListPtr encodingsToDo)
+scanDirectory(char *dirname, char *dir_prefix, int xl, HashTablePtr entries)
{
-char *dirname, *fontscale_name, *filename, *encdir;
-FILE *fontscale, *encfile;
DIR *dirp;
struct dirent *entry;
+struct stat statbuf;
+ListPtr encoding, xlfd, lp;
+char* filename;
+char* prefixedname;
+int rc, found;
+int isBitmap=0;
FT_Error ftrc;
FT_Face face;
-ListPtr encoding, xlfd, lp;
-HashTablePtr entries;
-HashBucketPtr *array;
-int i, n, found, rc;
-int isBitmap=0,xl=0;
-
-if (exclusionSuffix)
-xl = strlen (exclusionSuffix);
-
-i = strlen(dirname_given);
-if(i == 0)
-dirname = dsprintf(./);
-else if(dirname_given[i - 1] != '/')
-dirname = dsprintf(%s/, dirname_given);
-else
-dirname = dsprintf(%s, dirname_given);
-
-if(dirname == NULL) {
-perror(dirname);
-exit(1);
-}
-
-if (onlyEncodings)
- goto encodings;
-
-entries = makeHashTable();
-if(doBitmaps !doScalable) {
-readFontScale(entries, dirname);
-}
-
-if(strcmp(outfilename, -) == 0)
-fontscale_name = NULL;
-else {
-if(outfilename[0] == '/')
-fontscale_name = dsprintf(%s, outfilename);
-else
-fontscale_name = dsprintf(%s%s, dirname, outfilename);
-if(fontscale_name == NULL) {
-perror(fontscale_name);
-exit(1);
-}
-}
dirp = opendir(dirname);
if(dirp == NULL) {
@@ -808,17 +777,6 @@
return 0;
}
-if(fontscale_name == NULL)
-fontscale = stdout;
-else
-fontscale = fopen(fontscale_name, wb);
-
-if(fontscale == NULL) {
-fprintf(stderr, %s: , fontscale_name);
-perror(fopen(w));
-return 0;
-}
-
while((entry = readdir(dirp)) != NULL) {
int have_face = 0;
char *xlfd_name = NULL;
@@ -831,7 +789,24 @@
}
filename = dsprintf(%s%s, dirname, entry-d_name);
+if (recurse (strcmp(entry-d_name, .) != 0) (strcmp(entry-d_name, ..) != 0)
+ (stat(filename, statbuf) == 0) S_ISDIR(statbuf.st_mode)) {
+ char* prefix;
+ int retval;
+ free(filename);
+ filename = dsprintf(%s%s/, dirname, entry-d_name);
+ prefix = dsprintf(%s%s/, dir_prefix, entry-d_name);
+ retval = scanDirectory(filename, prefix, xl, entries);
+ free(filename);
+ free(prefix);
+ if (retval == 0) {
+ closedir(dirp);
+ return 0;
+ }
+ continue;
+ }
+prefixedname = dsprintf(%s%s, dir_prefix, entry-d_name);
if(doBitmaps)
rc = bitmapIdentify(filename, xlfd_name);
else
@@ -892,7 +867,7 @@
xlfd = listCons(s, xlfd);
} else {
/* Not
Processed: [bts-link] source package xserver-xorg-input-synaptics
Processing commands for cont...@bugs.debian.org: # # bts-link upstream status pull for source package xserver-xorg-input-synaptics # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org Setting user to bts-link-upstr...@lists.alioth.debian.org (was bts-link-de...@lists.alioth.debian.org). # remote status report for #528538 # * https://bugs.freedesktop.org/show_bug.cgi?id=21001 # * remote status changed: REOPENED - RESOLVED # * remote resolution changed: (?) - FIXED # * closed upstream tags 528538 + fixed-upstream Bug #528538 [xserver-xorg-input-synaptics] [xserver-xorg-input-synaptics] VertScrolling stops working after update to version 1.1.0 Added tag(s) fixed-upstream. usertags 528538 - status-REOPENED Bug#528538: [xserver-xorg-input-synaptics] VertScrolling stops working after update to version 1.1.0 Usertags were: status-REOPENED. Usertags are now: . usertags 528538 + status-RESOLVED resolution-FIXED Bug#528538: [xserver-xorg-input-synaptics] VertScrolling stops working after update to version 1.1.0 There were no usertags set. Usertags are now: status-RESOLVED resolution-FIXED. thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#535624: commited patch
Hi,
I've just uploaded the fixed version, it should hit lenny-proposed-updates
soon. I'm attaching the applied patch.
--
If you think your users are idiots, only idiots will use it.
-- Linus Torvalds
Saludos /\/\ /\ `/
diff -Naru xorg-7.3+19/debian/changelog xorg-7.3+20/debian/changelog
--- xorg-7.3+19/debian/changelog 2009-06-08 06:53:50.0 -0300
+++ xorg-7.3+20/debian/changelog 2009-07-30 15:46:35.465524673 -0300
@@ -1,3 +1,10 @@
+xorg (1:7.3+20) stable; urgency=low
+
+ * Non-maintainer upload, supervised by Julien Cristau.
+ * xserver-xorg.postinst: fix for the previous patch. Closes: #535624
+
+ -- Maximiliano Curia m...@debian.org Wed, 22 Jul 2009 16:26:29 -0300
+
xorg (1:7.3+19) stable; urgency=low
* xserver-xorg.postinst: default to the fbdev driver on sparc, even when we
diff -Naru xorg-7.3+19/debian/xserver-xorg.postinst.in xorg-7.3+20/debian/xserver-xorg.postinst.in
--- xorg-7.3+19/debian/xserver-xorg.postinst.in 2009-06-03 16:24:40.0 -0300
+++ xorg-7.3+20/debian/xserver-xorg.postinst.in 2009-07-30 15:22:57.245526254 -0300
@@ -932,7 +932,10 @@
# Don't touch the config on upgrades except to deal with known issues with old
# configs.
if [ -z $UPGRADE ] || dpkg --compare-versions $2 le 1:7.0.14 || \
- [ $ARCHITECTURE = sparc ] dpkg --compare-versions $2 lt-nl 1:7.3+19; then
+ { [ $ARCHITECTURE = sparc ] \
+ dpkg --compare-versions $2 lt-nl 1:7.3+19; } || \
+ { [ -n $(find $XORGCONFIG -maxdepth 0 -size 0 2/dev/null) ] \
+ [ $2 = 1:7.3+19 ]; }; then
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it. if we're reconfiguring, overwrite
# it regardless and back it up.
[bts-link] source package xserver-xorg-video-ati
# # bts-link upstream status pull for source package xserver-xorg-video-ati # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #529830 # * https://bugs.freedesktop.org/show_bug.cgi?id=22140 # * remote status changed: (?) - NEW usertags 529830 + status-NEW thanks -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[bts-link] source package xserver-xorg-input-synaptics
# # bts-link upstream status pull for source package xserver-xorg-input-synaptics # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #528538 # * https://bugs.freedesktop.org/show_bug.cgi?id=21001 # * remote status changed: REOPENED - RESOLVED # * remote resolution changed: (?) - FIXED # * closed upstream tags 528538 + fixed-upstream usertags 528538 - status-REOPENED usertags 528538 + status-RESOLVED resolution-FIXED thanks -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xorg: Changes to 'debian-lenny'
debian/changelog|7 +++
debian/xserver-xorg.postinst.in |5 -
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 89b8ea3587eafe48c80740a8912d390702e6b02d
Author: Maximiliano Curia m...@debian.org
Date: Wed Jul 22 16:26:29 2009 -0300
Fix stupid bug in xserver-xorg.postinst
Shell scripting fail.
``||'' and ``'' have the same precedence in shell, so we ended up with
an empty xorg.conf after installing 1:7.3+19.
Debian bug#535624.
Signed-off-by: Julien Cristau jcris...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 18477f8..c44450e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3+20) stable; urgency=low
+
+ * Non-maintainer upload, supervised by Julien Cristau.
+ * xserver-xorg.postinst: fix for the previous patch. Closes: #535624
+
+ -- Maximiliano Curia m...@debian.org Wed, 22 Jul 2009 16:26:29 -0300
+
xorg (1:7.3+19) stable; urgency=low
* xserver-xorg.postinst: default to the fbdev driver on sparc, even when we
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 5beb891..8aef64a 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -932,7 +932,10 @@ fi
# Don't touch the config on upgrades except to deal with known issues with old
# configs.
if [ -z $UPGRADE ] || dpkg --compare-versions $2 le 1:7.0.14 || \
- [ $ARCHITECTURE = sparc ] dpkg --compare-versions $2 lt-nl 1:7.3+19;
then
+ { [ $ARCHITECTURE = sparc ] \
+ dpkg --compare-versions $2 lt-nl 1:7.3+19; } || \
+ { [ -n $(find $XORGCONFIG -maxdepth 0 -size 0 2/dev/null) ] \
+ [ $2 = 1:7.3+19 ]; }; then
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it. if we're reconfiguring, overwrite
# it regardless and back it up.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xorg: Changes to 'refs/tags/xorg-1_7.3+20'
Tag 'xorg-1_7.3+20' created by Julien Cristau jcris...@debian.org at 2009-07-30 20:18 + Tagging upload of xorg 1:7.3+20 to stable. Changes since xorg-1_7.3+19: Maximiliano Curia (1): Fix stupid bug in xserver-xorg.postinst --- debian/changelog|7 +++ debian/xserver-xorg.postinst.in |5 - 2 files changed, 11 insertions(+), 1 deletion(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#538810: video-radeon: direct rendering: graphics deceleration?
2009/7/30 Michel Dänzer daen...@debian.org: On Thu, 2009-07-30 at 01:36 +0200, Michal Suchanek wrote: The majority of time is spent in: (with -fps) 181333 53.6798 radeon.ko radeon.ko radeon_do_wait_for_idle (without -fps) 287349 59.3526 radeon.ko radeon.ko radeon_freelist_get This indicates the GPU is the bottleneck, but I'm not sure why it would be that slow... though one thing I notice now is that the card only has a 64 bit wide memory bus, that could be the bottleneck. What kind of numbers does x11perf -copywinwin500 -aa10text -repeat 1 give? (Preferably without a compositing manager running) This is the output: x11perf - X11 performance program, version 1.2 The X.Org Foundation server version 10602901 on :0.0 from heretic Fri Jul 31 00:06:24 2009 Sync time adjustment is 0.1073 msecs. 320 reps @ 0.0018 msec (554000.0/sec): Char in 80-char aa line (Charter 10) 8000 reps @ 0.6963 msec ( 1440.0/sec): Copy 500x500 from window to window The next thing to try might be to install the drm modules that came with the mesa library. I would expect that like CPU operations the GPU operations can be optimized so a later code could have better results. Unfortunately. unlike Intel ATI did not hand out optimization manuals for their chips so there is not much hope in improving the performance. Thanks Michal -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#539206: video-radeon: OSD flickering in mplayer/xv
2009/7/30 Michel Dänzer daen...@debian.org: On Wed, 2009-07-29 at 21:25 +0200, Michal Suchanek wrote: Package: xserver-xorg-video-radeon Version: 1:6.12.2-3 Severity: normal File: video-radeon Running mplayer with xv output on this hardware causes flickering with both textured video and overlay. Sorry, missed 'and overlay' before. How do you choose one or the other? Are you sure you aren't actually getting textured in both cases? E.g. with overlay, do you see the video lagging behind when moving the mplayer window? You can choose the adaptor with the option -vo xv:adaptor=n xvinfo shows two adaptors. This time overlay is the first so it's actually the default. When moving the window containing the overlay the overlay position is indeed not updated as fast as the window moves. The good thing is that this time I was unable to reproduce the issue. However, last time the OSD would flicker no matter what options for xv I used. Thanks Michal -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
