Bug#405409: xbase-clients: [xconsole] Segmentation falut when the initial scroll
Package: xbase-clients Version: 1:7.1.ds-3 Severity: normal A xconsole process receives a SIGSEGV signal, when the xconsole scroll the logs for the first time after its startup. For example, when the default height of xconsole is 4 text lines, the following script induces a segmentation fault: #!/bin/sh /usr/bin/xconsole for i in 0 1 2 3; do echo $i logger test.sh: $i sleep 1 done # END of test script There seems to be a workaround: After a xconsole process starts, focus the xconsole and push Ctrl-C (i.e., clean up logs in the xconsole). Then, scrolls don't induce any segmentation fault in my Debian box. -- System Information: Debian Release: 4.0 APT prefers testing APT policy: (500, 'testing') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18-3-xen-686 Locale: LANG=ja_JP.eucJP, LC_CTYPE=ja_JP.eucJP (charmap=EUC-JP) Versions of packages xbase-clients depends on: ii libc6 2.3.6.ds1-8GNU C Library: Shared libraries ii libfontconfig12.4.1-2generic font configuration library ii libfreetype6 2.2.1-5FreeType 2 font engine, shared lib ii libfs62:1.0.0-4 X11 Font Services library ii libgl1-mesa-glx [libgl1] 6.5.1-0.4 A free implementation of the OpenG ii libice6 1:1.0.1-2 X11 Inter-Client Exchange library ii libpng12-01.2.15~beta5-1 PNG library - runtime ii libsm61:1.0.1-3 X11 Session Management library ii libx11-6 2:1.0.3-4 X11 client-side library ii libxau6 1:1.0.1-2 X11 authorisation library ii libxaw7 1:1.0.2-4 X11 Athena Widget library ii libxcursor1 1.1.7-4X cursor management library ii libxext6 1:1.0.1-2 X11 miscellaneous extension librar ii libxft2 2.1.8.2-8 FreeType-based font drawing librar ii libxi61:1.0.1-4 X11 Input extension library ii libxkbfile1 1:1.0.3-2 X11 keyboard file manipulation lib ii libxmu6 1:1.0.2-2 X11 miscellaneous utility library ii libxmuu1 1:1.0.2-2 X11 miscellaneous micro-utility li ii libxrandr22:1.1.0.2-5X11 RandR extension library ii libxrender1 1:0.9.1-3 X Rendering Extension client libra ii libxss1 1:1.1.0-1 X11 Screen Saver extension library ii libxt61:1.0.2-2 X11 toolkit intrinsics library ii libxtrap6 1:1.0.0-4 X11 event trapping extension libra ii libxtst6 1:1.0.1-5 X11 Testing -- Resource extension ii libxv11:1.0.2-1 X11 Video extension library ii libxxf86dga1 2:1.0.1-2 X11 Direct Graphics Access extensi ii libxxf86vm1 1:1.0.1-2 X11 XFree86 video mode extension l ii x11-common1:7.1.0-8 X Window System (X.Org) infrastruc ii zlib1g1:1.2.3-13 compression library - runtime xbase-clients recommends no packages. -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
compiz: Changes to 'master'
debian/changelog |4 ++-
debian/patches/015_optional-fbo.patch | 44 ++
debian/patches/series |1
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 66858e79139c0a63a1d58a0826d9fc60026b23d7
Author: Thierry Reding [EMAIL PROTECTED]
Date: Wed Jan 3 12:41:45 2007 +0100
Add patch to add a command-line option for making the use of FBOs optional.
Some DRI drivers seem to be buggy when it comes to FBO support. This option
can be used to work around such drivers.
diff --git a/debian/changelog b/debian/changelog
index f0f50b4..8125bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ compiz (0.3.6-1) experimental; urgency=l
be used to write additional decorators.
* Add patch 014_tfp-server-extension that makes compiz look for
GLX_EXT_texture_from_pixmap in the server extensions too.
+ * Add patch 015_optional-fbo which adds a command-line option for disabling
+the use of FBOs (work around buggy drivers).
- -- Thierry Reding [EMAIL PROTECTED] Wed, 3 Jan 2007 11:23:11 +0100
+ -- Thierry Reding [EMAIL PROTECTED] Wed, 3 Jan 2007 12:39:23 +0100
compiz (0.3.4-1) experimental; urgency=low
diff --git a/debian/patches/015_optional-fbo.patch
b/debian/patches/015_optional-fbo.patch
new file mode 100644
index 000..011181e
--- /dev/null
+++ b/debian/patches/015_optional-fbo.patch
@@ -0,0 +1,44 @@
+diff --git a/src/main.c b/src/main.c
+index bf1d5d1..4f5bab3 100644
+--- a/src/main.c
b/src/main.c
+@@ -81,6 +81,7 @@ Bool replaceCurrentWm = FALSE;
+ Bool indirectRendering = FALSE;
+ Bool strictBinding = TRUE;
+ Bool noDetection = FALSE;
++Bool noFBO = FALSE;
+
+ #ifdef USE_COW
+ Bool useCow = TRUE;
+@@ -100,6 +101,7 @@ usage (void)
+ [--sm-disable]
+ [--sm-client-id ID]
+ [--no-detection]
++ [--no-fbo]
+ [--version]\n
+
+ #ifdef USE_COW
+@@ -196,6 +198,10 @@ main (int argc, char **argv)
+ {
+ strictBinding = FALSE;
+ }
++ else if (!strcmp (argv[i], --no-fbo))
++ {
++ noFBO = TRUE;
++ }
+
+ #ifdef USE_COW
+ else if (!strcmp (argv[i], --use-root-window))
+diff --git a/src/screen.c b/src/screen.c
+index f0b93e1..db6dad1 100644
+--- a/src/screen.c
b/src/screen.c
+@@ -1804,7 +1804,7 @@ addScreen (CompDisplay *display,
+ }
+
+ s-fbo = 0;
+-if (strstr (glExtensions, GL_EXT_framebuffer_object))
++if (!noFBO strstr (glExtensions, GL_EXT_framebuffer_object))
+ {
+ s-genFramebuffers = (GLGenFramebuffersProc)
+ getProcAddress (s, glGenFramebuffersEXT);
diff --git a/debian/patches/series b/debian/patches/series
index 451c06f..bf6a47f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
012_debian-kde-includes-dir.patch
013_set-qtdir-fallback.patch
014_tfp-server-extension.patch
+015_optional-fbo.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
compiz: Changes to 'master'
debian/patches/015_optional-fbo.patch | 33 +
1 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit 3439bcea670a683f29279dc6d26b2aad484e885e
Author: Thierry Reding [EMAIL PROTECTED]
Date: Wed Jan 3 13:14:15 2007 +0100
Fix the 015_optional-fbo patch.
Declare the noFBO variable src/screen.c so it can be used in that file.
diff --git a/debian/patches/015_optional-fbo.patch
b/debian/patches/015_optional-fbo.patch
index 011181e..217f6b4 100644
--- a/debian/patches/015_optional-fbo.patch
+++ b/debian/patches/015_optional-fbo.patch
@@ -1,8 +1,8 @@
-diff --git a/src/main.c b/src/main.c
-index bf1d5d1..4f5bab3 100644
a/src/main.c
-+++ b/src/main.c
-@@ -81,6 +81,7 @@ Bool replaceCurrentWm = FALSE;
+Index: compiz.git/src/main.c
+===
+--- compiz.git.orig/src/main.c 2007-01-03 12:39:16.0 +0100
compiz.git/src/main.c 2007-01-03 13:09:29.0 +0100
+@@ -81,6 +81,7 @@
Bool indirectRendering = FALSE;
Bool strictBinding = TRUE;
Bool noDetection = FALSE;
@@ -10,7 +10,7 @@ index bf1d5d1..4f5bab3 100644
#ifdef USE_COW
Bool useCow = TRUE;
-@@ -100,6 +101,7 @@ usage (void)
+@@ -100,6 +101,7 @@
[--sm-disable]
[--sm-client-id ID]
[--no-detection]
@@ -18,7 +18,7 @@ index bf1d5d1..4f5bab3 100644
[--version]\n
#ifdef USE_COW
-@@ -196,6 +198,10 @@ main (int argc, char **argv)
+@@ -196,6 +198,10 @@
{
strictBinding = FALSE;
}
@@ -29,11 +29,20 @@ index bf1d5d1..4f5bab3 100644
#ifdef USE_COW
else if (!strcmp (argv[i], --use-root-window))
-diff --git a/src/screen.c b/src/screen.c
-index f0b93e1..db6dad1 100644
a/src/screen.c
-+++ b/src/screen.c
-@@ -1804,7 +1804,7 @@ addScreen (CompDisplay *display,
+Index: compiz.git/src/screen.c
+===
+--- compiz.git.orig/src/screen.c 2007-01-03 13:09:29.0 +0100
compiz.git/src/screen.c2007-01-03 13:10:13.0 +0100
+@@ -45,6 +45,8 @@
+
+ #include compiz.h
+
++extern Bool noFBO;
++
+ #define DETECT_REFRESH_RATE_DEFAULT TRUE
+
+ #define SCREEN_HSIZE_DEFAULT 4
+@@ -1807,7 +1809,7 @@
}
s-fbo = 0;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#371144: xserver-xorg-video-i810: xrandr kills xserver
Daniel wrote: 'xrandr -s 1' kills xserver and Ian wrote: Package: xserver-xorg-video-i810 Version: 1:1.5.1.0-2.1 Followup-For: Bug #371144 I found that the current git head source fixes this for me Indeed, i810 1.6 has long since entered Debian and we plan to ship etch with 1.7.2. On my system at least (1.7.2-3) 'xrandr -s' works fine. Daniel, could you kindly confirm that the xrandr crash no longer occurs under xserver-xorg-video-i810 1.7.2-3 with xserver-xorg-core 1.1.1-13 (or xserver-xorg 7.1.0-9) ? If so, we'll close this bug. Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#384938: xserver-xorg-video-i810: only allows 640x480
Joshua wrote: Package: xserver-xorg-video-i810 Version: 1:1.5.1.0-2 Severity: important In Xorg.0.log, I get: Not using mode 800x600 (no mode of this name) Joshua, has this problem persisted in xserver-xorg-video-i810 1.7.2-3 ? If so, does deleting (moving) /etc/X11/xorg.conf and running dpkg-reconfigure xserver-xorg help (rewriting a new xorg.conf from scratch)? Otherwise, you could try installing 915resolution to see if it helps to activate the mode you want (915resolution -l will list the available modes). Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to 'master'
New branch 'master' available with the following commits: commit ebc7124c593e7185b5e46dda8f65273fd17ce161 Author: Thierry Reding [EMAIL PROTECTED] Date: Tue Sep 26 10:26:34 2006 + Add some more watch files. commit 5e9bf9c9b63788b57a41e013d1b1734d67c2e0d7 Author: David Nusinow [EMAIL PROTECTED] Date: Mon Aug 28 00:14:58 2006 + * Merge x11proto-input from 7.1 branch to trunk now that it's in unstable commit 2e3c18e7b556be926d7a4643de57a5e326ef42ad Author: David Nusinow [EMAIL PROTECTED] Date: Sun Aug 27 23:55:36 2006 + Rename the protocol dirs to match the debian package names, like the other packages in the repo commit cacb4272e44c08e0544b86d075b00fad669b1d83 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Mar 24 02:44:27 2006 + Prepare protocol headers for upload to unstable. Tags to follow. commit 192f5e9d7b754d4505a33319dd0021036c3f339f Author: Michel Dänzer [EMAIL PROTECTED] Date: Thu Feb 9 16:08:24 2006 + Add epoch to versioned Pre-Depends on x11-common to make upgrades from monolithic x11-common work. commit 85c8801dfa857d3f2ad0abb26c86aaeac55bf590 Author: David Nusinow [EMAIL PROTECTED] Date: Mon Jan 23 02:45:38 2006 + Set protocol headers to be uploaded to experimental commit adae600c82e24c79ce018a2fcff90581168bd3c6 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Dec 30 19:37:27 2005 + Update proto headers to 7.0 with packaging commit d39ae03f9836f6d870c8d478ccc905e348c7d773 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Dec 30 00:24:15 2005 + Vendor drop of proto and lib for 7.0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to 'trunk'
New branch 'trunk' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to 'X11R7.1'
New branch 'X11R7.1' available with the following commits: commit 1f6c2d7550d123c5016c3ee58bf9b74b3d4f11af Author: David Nusinow [EMAIL PROTECTED] Date: Sat Jul 1 23:59:00 2006 + Rename protocol header vendor dirs to use svn best practices -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to 'refs/tags/1.4-1'
Tag '1.4-1' created by Drew Parsons [EMAIL PROTECTED] at 1970-01-01 00:00 +0100 Changes since the dawn of time: David Nusinow: Vendor drop of proto and lib for 7.0 Update proto headers to 7.0 with packaging Set protocol headers to be uploaded to experimental Prepare protocol headers for upload to unstable. Tags to follow. Rename the protocol dirs to match the debian package names, like the other packages in the repo * Merge x11proto-input from 7.1 branch to trunk now that it's in unstable Michel Dänzer: Add epoch to versioned Pre-Depends on x11-common to make upgrades from Thierry Reding: Add some more watch files. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to '7.1'
New branch '7.1' available with the following commits: commit f3ce3d89dade15bd8cd022b053c2bf67cd9e39ad Author: Branden Robinson [EMAIL PROTECTED] Date: Tue Aug 1 15:29:08 2006 + Use only the major version, minor version, and major patch number components of the Policy Manual revision in Standards-Version, because the minor patch level will be changed when only cosmetic, typographical or other edits are made which neither change the meaning of the document nor affect the contents of packages. See Policy Manual §5.6.11. (The real reason for this commit, as with r2615, is to test tweaks to the repository's commit-email.pl script.) commit 5e555b048d236ffa60846590a29cd0fe43952bf0 Author: Andres Salomon [EMAIL PROTECTED] Date: Fri Jul 21 07:16:29 2006 + Add myself as an uploader and prepare releases. commit 5f7d5bab026684d7ff095e18a189f4a7094de88e Author: Andres Salomon [EMAIL PROTECTED] Date: Thu Jul 20 08:42:48 2006 + * Bump standards version to 3.7.2.0. * Version x11-common pre-dep in -dev package to 1:7.0.0 to match the rest of Debian. commit 14d011c2faa140d50f54a99f1a8d88438456dece Author: Andres Salomon [EMAIL PROTECTED] Date: Thu Jul 20 08:16:59 2006 + Drop dependencies on x11-common in -dev packages where there was already a pre-depends upon the package. commit 1c079b8ec12110b634f2a7d42c13b1b6583ca0ef Author: Andres Salomon [EMAIL PROTECTED] Date: Thu Jul 20 08:07:08 2006 + Change build-dep-indep to normal build-deps in various proto packages, as dh_clean is called from within the clean rule. This shuts lintian up. commit f10c1ae2b560a803412424a4383e09b81d929017 Author: Andres Salomon [EMAIL PROTECTED] Date: Mon Jul 17 05:29:25 2006 + When building arch-dependent stuff, run dh_install w/ --list-missing. commit 93a53a81fb564df1f5fcbbf8c2bbb78b24cdd715 Author: Andres Salomon [EMAIL PROTECTED] Date: Mon Jul 17 04:44:49 2006 + Idempotency fixes; everywhere where we're using a separate build directory, we tend to create it via mkdir obj-$(foo). This doesn't work if rebuilding, because the directory already exists. Instead, only create it if there's no directory there already. commit 899a4a59e9b3e38bd618c42a286b8a4da942eec9 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jul 2 00:13:30 2006 + Rename protocol header working dirs to use svn best practices -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to 'upstream-master'
New branch 'upstream-master' available with the following commits:
commit a0be30da79e35e7d503c6eeb9021c2f63beb2176
Author: Daniel Stone [EMAIL PROTECTED]
Date: Sun Oct 22 16:40:11 2006 +0300
DeviceAbs{Area,Calib}: properly align 32-bit types
Decorate CARD32s and INT32s with B32.
commit b1b3dbfd9b00d47c84c213bc6b7d61c5e8c80466
Author: Daniel Stone [EMAIL PROTECTED]
Date: Sun Oct 22 16:30:56 2006 +0300
DevicePresenceNotify: add deviceid field, with explanation
Add deviceid field, and an explanation of same in XInput.h.
deviceid is only used if a specific device changed, and control
is non-zero if a specific control on that device changed.
commit 06ffd1e6b600d4e3f55ce7da69448a284ff5dac6
Author: Zephaniah E. Hull [EMAIL PROTECTED]
Date: Sat Oct 21 03:58:53 2006 -0400
DEVICE_TOUCHPAD - DEVICE_ABS_CALIB.
As it's really calibration for absolute devices, add some stuff.
DEVICE_ABS_AREA
Defines the area of the screen that an absolute device covers if it is
sending
core events.
commit 1fab95863efc2bbf9a5b836b3de31da4a956b4bd
Author: Daniel Stone [EMAIL PROTECTED]
Date: Fri Oct 20 00:33:13 2006 +0300
add DEVICE_ENABLE control, add core indication
Add DEVICE_ENABLE control, which allows specific devices to be
enabled or disabled at runtime.
Add 'iscore' flag to DEVICE_CORE, which indicates whether or not the
device is a virtual core device.
commit 926251a486b57197d735a426887acad6fdfd7dc6
Author: Daniel Stone [EMAIL PROTECTED]
Date: Tue Jul 18 11:56:37 2006 -0400
add XExtensionKeyboard and XExtensionPointer classes
Add two new classes of device, XExtensionKeyboard, and XExtensionPointer.
commit 7a4a2a3e733378abced0a184627adfda4ed387b9
Author: Daniel Stone [EMAIL PROTECTED]
Date: Mon Jul 17 19:34:45 2006 -0400
add DevicePresenceNotify event, clean up
Add DevicePresenceNotify event, which indicates that something in the device
list changed (Kristian Høgsberg, Red Hat).
Add a core event control, which toggles the sending or not of core events by
an extended device.
Clean up some random detritus from the MetroLink merge.
commit 6767671f502964d385aa41de3a45fb479c6330c0
Author: Alan Coopersmith [EMAIL PROTECTED]
Date: Fri Jul 14 18:56:18 2006 -0700
renamed: .cvsignore - .gitignore
commit 4cc2697880ae61723094dacf78ffe77d81f6e0ee
Author: Kevin E Martin [EMAIL PROTECTED]
Date: Thu Dec 15 00:24:37 2005 +
Update package version number for final X11R7 release candidate.
commit 3ade2fe8443f572abeee73b4fa8e986e4a054017
Author: Kevin E Martin [EMAIL PROTECTED]
Date: Wed Oct 19 02:48:14 2005 +
Update package version number for RC1 release.
commit 67498db2df7435d9d59eda4ac444c6560da839b3
Author: Eric Anholt [EMAIL PROTECTED]
Date: Tue Aug 2 19:19:38 2005 +
Add basic .cvsignore files for proto modules.
commit 742a1eb222d662fc9247ab7c1bd337ffef01eafb
Author: Kevin E Martin [EMAIL PROTECTED]
Date: Fri Jul 29 21:22:55 2005 +
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 9161a356397a07002e03cf1846d212c7154f4c52
Author: Daniel Stone [EMAIL PROTECTED]
Date: Sat May 21 04:04:21 2005 +
Set version to 1.3.
commit 492f0a9e16bfe9cfb2c7b888b5b5e511db2bf83b
Author: Adam Jackson [EMAIL PROTECTED]
Date: Thu May 19 00:22:39 2005 +
revert last change, didn't do right thing at all, sorry for the noise
commit ec71e17293b90ff5eeaa97566751fc5c3955904a
Author: Adam Jackson [EMAIL PROTECTED]
Date: Thu May 19 00:10:18 2005 +
Require automake 1.7 in AM_INIT_AUTOMAKE
commit 242316c65e53d1bba244e4f35e5a93718b0ea8d0
Author: Josh Triplett [EMAIL PROTECTED]
Date: Mon May 16 03:30:03 2005 +
Add COPYING file for Input.
commit 5c5945a47990b7bc077bcfdbabb6e0003cbf1659
Author: Søren Sandmann Pedersen [EMAIL PROTECTED]
Date: Mon May 9 18:20:04 2005 +
Change all the protonames from extensionExt to extensionProto.
commit 518f527ab685d2d082796460113bb7a9ea9bfe15
Author: Kevin E Martin [EMAIL PROTECTED]
Date: Fri May 6 01:46:30 2005 +
Initial build system files for proto module.
commit 4254b2967e3c5f256138f35de1ab49efff87220c
Author: Egbert Eich [EMAIL PROTECTED]
Date: Fri Apr 23 18:43:06 2004 +
Merging XORG-CURRENT into trunk
commit ca910a158bdc060d17cf3c00f93c82c3a6ee6f05
Author: Egbert Eich [EMAIL PROTECTED]
Date: Sun Mar 14 08:31:35 2004 +
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 08e413c25f385e51466ef3309d880c1f63bf0a73
Author: Egbert Eich [EMAIL PROTECTED]
x11proto-input: Changes to 'refs/tags/inputproto-X11R7.0-1.3.2'
Tag 'inputproto-X11R7.0-1.3.2' created by David Nusinow [EMAIL PROTECTED] at 1970-01-01 00:00 +0100 Changes since the dawn of time: David Nusinow: Vendor drop of proto and lib for 7.0 Update proto headers to 7.0 with packaging Set protocol headers to be uploaded to experimental Prepare protocol headers for upload to unstable. Tags to follow. Michel Dänzer: Add epoch to versioned Pre-Depends on x11-common to make upgrades from -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to 'refs/tags/inputproto-1.4'
Tag 'inputproto-1.4' created by Daniel Stone [EMAIL PROTECTED] at 2006-11-02
01:45 +0100
inputproto 1.4
Changes since the dawn of time:
Adam Jackson:
Require automake 1.7 in AM_INIT_AUTOMAKE
revert last change, didn't do right thing at all, sorry for the noise
Alan Coopersmith:
renamed: .cvsignore - .gitignore
Daniel Stone:
Set version to 1.3.
add DevicePresenceNotify event, clean up
add XExtensionKeyboard and XExtensionPointer classes
add DEVICE_ENABLE control, add core indication
DevicePresenceNotify: add deviceid field, with explanation
DeviceAbs{Area,Calib}: properly align 32-bit types
Egbert Eich:
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
readding XFree86's cvs IDs
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
Merging XORG-CURRENT into trunk
Eric Anholt:
Add basic .cvsignore files for proto modules.
Josh Triplett:
Add COPYING file for Input.
Kaleb Keithley:
R6.6 is the Xorg base-line
XFree86 4.3.0.1
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
Kevin E Martin:
Initial build system files for proto module.
Various changes preparing packages for RC0:
Update package version number for RC1 release.
Update package version number for final X11R7 release candidate.
Søren Sandmann Pedersen:
Change all the protonames from extensionExt to extensionProto.
Zephaniah E. Hull:
DEVICE_TOUCHPAD - DEVICE_ABS_CALIB.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
x11proto-input: Changes to 'refs/tags/x11proto-input-1.3.2-4'
Tag 'x11proto-input-1.3.2-4' created by Andres Salomon [EMAIL PROTECTED] at 1970-01-01 00:00 +0100 Changes since the dawn of time: Andres Salomon: Idempotency fixes; everywhere where we're using a separate build directory, When building arch-dependent stuff, run dh_install w/ --list-missing. Change build-dep-indep to normal build-deps in various proto packages, as Drop dependencies on x11-common in -dev packages where there was already * Bump standards version to 3.7.2.0. Add myself as an uploader and prepare releases. David Nusinow: Rename protocol header working dirs to use svn best practices -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#384938: xserver-xorg-video-i810: only allows 640x480
On Thu, Jan 04, 2007 at 12:50:36AM +1100, Drew Parsons wrote: Joshua wrote: Package: xserver-xorg-video-i810 Version: 1:1.5.1.0-2 Severity: important In Xorg.0.log, I get: Not using mode 800x600 (no mode of this name) Joshua, has this problem persisted in xserver-xorg-video-i810 1.7.2-3 ? I don't think so. I forgot to update this bug report. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
500.- start bonus, play 1 hour for free and keep all wins
Long time no hear Galen, 500.- start bonus, play 1 hour for free and keep all wins http://coimror.com/micro/16/
mesa: Changes to 'origin'
New branch 'origin' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
mesa: Changes to 'master'
configs/debian|4 ++--
configs/debian-static |4 ++--
debian/changelog | 24
debian/control|2 +-
4 files changed, 29 insertions(+), 5 deletions(-)
New commits:
commit 6da132343758c4c02c3765ac59b2c4abdf00dbdb
Author: Julien Cristau [EMAIL PROTECTED]
Date: Wed Jan 3 16:59:06 2007 +0100
* Non-maintainer upload.
* Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
(closes: #394311). Thanks to Michel Dänzer for the fix, and to Ryan
Richter for the report and testing.
diff --git a/configs/debian b/configs/debian
index 793fb60..2af0d1f 100644
--- a/configs/debian
+++ b/configs/debian
@@ -7,9 +7,9 @@ CXX = c++
DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L
-D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS `pkg-config
--cflags x11 xext`
-DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall -fPIC
+DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall -fPIC -fno-strict-aliasing
-DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fPIC
+DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fPIC -fno-strict-aliasing
DEBIAN_OPT_CFLAGS = -O2
diff --git a/configs/debian-static b/configs/debian-static
index 0b5318e..95e4d69 100644
--- a/configs/debian-static
+++ b/configs/debian-static
@@ -7,9 +7,9 @@ CXX = c++
DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L
-D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall
+DEBIAN_COMMON_CFLAGS = -std=c99 -pedantic -Wall -fno-strict-aliasing
-DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall
+DEBIAN_COMMON_CXXFLAGS = -ansi -pedantic -Wall -fno-strict-aliasing
DEBIAN_OPT_CFLAGS = -O2
diff --git a/debian/changelog b/debian/changelog
index 2e6676f..6586376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (6.5.1-0.5) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with -fno-strict-aliasing to fix misbuild of i965_dri.so
+(closes: #394311). Thanks to Michel Dänzer for the fix, and to Ryan
+Richter for the report and testing.
+
+ -- Julien Cristau [EMAIL PROTECTED] Wed, 3 Jan 2007 13:48:20 +0100
+
mesa (6.5.1-0.4) unstable; urgency=medium
* Non-maintainer upload (and brown paper bag release).
commit 1dd29785cf6f9dd593118920fe767b5a4dbb0de0
Author: Julien Cristau [EMAIL PROTECTED]
Date: Wed Jan 3 13:43:46 2007 +0100
Import changes from the mesa 6.5.1-0.4 NMU.
diff --git a/debian/changelog b/debian/changelog
index 6c395f4..2e6676f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (6.5.1-0.4) unstable; urgency=medium
+
+ * Non-maintainer upload (and brown paper bag release).
+ * _Depend_ on libx11-dev from libgl1-mesa-dev; revert previous change.
+Fixes FTBFS in other packages. (Really Closes: #396498)
+
+ -- Steinar H. Gunderson [EMAIL PROTECTED] Sat, 11 Nov 2006 13:55:20 +0100
+
mesa (6.5.1-0.3) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 83a9056..8217fb8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Mesa package maintainers [EMAIL PROTECTED]
Uploaders: Marcelo E. Magallon [EMAIL PROTECTED]
Standards-Version: 3.7.2
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper ( 4), build-essential (=
11), libdrm-dev (= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils,
libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config,
x11proto-gl-dev (= 1.4.8) , dpkg-dev (= 1.13.19), libx11-dev
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper ( 4), build-essential (=
11), libdrm-dev (= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils,
libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config,
x11proto-gl-dev (= 1.4.8) , dpkg-dev (= 1.13.19)
Package: libgl1-mesa-swx11
Section: libs
@@ -99,7 +99,7 @@ Description: A free implementation of th
Package: libgl1-mesa-dev
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${source:Version}),
libgl1-mesa-glx (=${binary:Version}), libgl1-mesa-dri (= ${binary:Version})
+Depends: ${shlibs:Depends}, libx11-dev, libc6-dev, mesa-common-dev (=
${source:Version}), libgl1-mesa-glx (=${binary:Version}), libgl1-mesa-dri (=
${binary:Version})
Conflicts: libgl-dev, libgl1-mesa-dri-dev
Replaces: libgl-dev, libgl1-mesa-dri-dev
Provides: libgl-dev, libgl1-mesa-dri-dev
commit 5681987ee4b981fd2e741a804d4fe1a4a350a521
Author: Julien Cristau [EMAIL PROTECTED]
Date: Wed Jan 3 13:41:57 2007 +0100
Import changes from the mesa 6.5.1-0.3 NMU.
diff --git a/debian/changelog b/debian/changelog
index 7473aee..6c395f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (6.5.1-0.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build-depend on libx11-dev; fixes FTBFS. (Closes: #396498)
+
+ -- Steinar H. Gunderson [EMAIL
mesa: Changes to 'refs/tags/mesa-6.5.1-0.3'
Tag 'mesa-6.5.1-0.3' created by Julien Cristau [EMAIL PROTECTED] at 2007-01-03 12:42 +0100 Tagging upload of mesa-6.5.1-0.3. Changes since mesa-6.5.1-0.2: Julien Cristau: Import changes from the mesa 6.5.1-0.3 NMU. --- debian/changelog |7 +++ debian/control |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
mesa: Changes to 'refs/tags/mesa-6.5.1-0.4'
Tag 'mesa-6.5.1-0.4' created by Julien Cristau [EMAIL PROTECTED] at 2007-01-03 12:44 +0100 Tagging upload of mesa-6.5.1-0.4. Changes since mesa-6.5.1-0.3: Julien Cristau: Import changes from the mesa 6.5.1-0.4 NMU. --- debian/changelog |8 debian/control |4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
mesa: Changes to 'refs/tags/mesa-6.5.1-0.2'
Tag 'mesa-6.5.1-0.2' created by Julien Cristau [EMAIL PROTECTED] at 2007-01-03 12:40 +0100 Tagging upload of mesa-6.5.1-0.2. Changes since mesa-6.5.1-0.1: David Nusinow: Commit diff of 6.5.1-0.2 so we've got a record of it here. --- bin/installmesa | 74 configs/debian |2 configs/debian-debug-i386 |7 configs/debian-debug_i386 |2 configs/debian-dri |8 configs/debian-dri-amd64|5 configs/debian-dri-i386 |4 configs/debian-dri-powerpc |5 configs/debian-glide-i386 |7 configs/debian-glide_i386 |2 configs/debian-i386 |7 configs/debian-static |2 configs/debian-static-i386 |7 configs/debian-static_i386 |2 configs/debian_i386 |2 debian/changelog| 16 debian/mesa-swx11-source.install| 469 debian/rules|4 docs/README.X11 | 314 docs/VERSIONS | 1492 - docs/enums.txt | 42 docs/mesa.css | 33 doxygen/.cvsignore | 15 doxygen/Makefile| 33 doxygen/README | 10 doxygen/array_cache.doxy| 50 doxygen/common.doxy | 1153 - doxygen/core_subset.doxy| 226 doxygen/doxy.bat| 19 doxygen/glapi.doxy | 49 doxygen/header.html | 17 doxygen/header_subset.html | 11 doxygen/main.doxy | 50 doxygen/math.doxy | 49 doxygen/math_subset.doxy| 177 doxygen/miniglx.doxy| 179 doxygen/radeon_subset.doxy | 203 doxygen/shader.doxy | 49 doxygen/swrast.doxy | 48 doxygen/swrast_setup.doxy | 49 doxygen/tnl.doxy| 50 doxygen/tnl_dd.doxy | 49 include/GL/Makefile.am | 43 include/GL/foomesa.h| 76 include/GL/glut_h.dja | 340 include/GL/miniglx.h| 482 include/GLES/egl.h | 324 include/GLES/egltypes.h | 45 progs/demos/.cvsignore | 48 progs/demos/Windows/all.dsp | 101 progs/demos/Windows/bounce.dsp | 112 progs/demos/Windows/clearspd.dsp| 112 progs/demos/Windows/cubemap.dsp | 112 progs/demos/Windows/demos.dsw | 782 progs/demos/Windows/drawpix.dsp | 112 progs/demos/Windows/fire.dsp| 112 progs/demos/Windows/gears.dsp | 112 progs/demos/Windows/geartrain.dsp | 112 progs/demos/Windows/glinfo.dsp
mesa: Changes to 'refs/tags/mesa-6.5.1-0.5'
Tag 'mesa-6.5.1-0.5' created by Julien Cristau [EMAIL PROTECTED] at 2007-01-03 16:46 +0100 Tagging upload of mesa 6.5.1-0.5 to unstable. Changes since mesa-6.5.1-0.4: Julien Cristau: * Non-maintainer upload. --- configs/debian|4 ++-- configs/debian-static |4 ++-- debian/changelog |9 + 3 files changed, 13 insertions(+), 4 deletions(-) --- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
git-migration: Changes to 'master'
clone | 26 ++ 1 files changed, 22 insertions(+), 4 deletions(-) New commits: commit 0726222645eb8e6e4f25056e8f7244b4566825e3 Author: Thierry Reding [EMAIL PROTECTED] Date: Wed Jan 3 17:50:06 2007 +0100 Implement the proposed XSF git archive policy. diff --git a/clone b/clone index 5df6b30..da15d46 100755 --- a/clone +++ b/clone @@ -13,17 +13,35 @@ ( debian=$(echo $line | cut -d' ' -f1) upstream=$(echo $line | cut -d' ' -f2) + echo Setting up $debian for cloning... if [ -d $debian.git/.git/remotes ]; then # create remote `origin' branch for the alioth repositories cat $debian.git/.git/remotes/origin EOF URL: ssh://git.debian.org/git/pkg-xorg/$debian.git -Pull: refs/heads/master:refs/heads/master-origin +Push: refs/heads/master:refs/heads/debian-unstable +Push: refs/heads/upstream-master:refs/heads/upstream-master EOF + ( + cd $debian.git + git-branch | sed -e 's/^\*\? \+//' | + ( + read b + while [ x$b != x ]; do + if [ x$b != xmaster ]; then + echo Pull: refs/heads/$b:refs/heads/svn-$b \ + .git/remotes/origin + fi + + read b + done + ) + ) + # create remote `upstream' branch cat $debian.git/.git/remotes/upstream EOF URL: git://anongit.freedesktop.org/git/$upstream -Pull: refs/heads/master:refs/heads/master-upstream +Pull: refs/heads/master:refs/heads/upstream-master EOF # fetch latest master head from upstream branch @@ -31,8 +49,8 @@ EOF fi # cleanup .git directory, removing leftover SVN migration files - rm $debian.git/.git/svn2git - rm $debian.git/.git/svn-authors + rm -f $debian.git/.git/svn2git + rm -f $debian.git/.git/svn-authors read line done -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
git-migration: Changes to 'master'
clone |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 1b1515ec6b91ab9aa7e4e4cb31bc8465f5d8fac4 Author: Thierry Reding [EMAIL PROTECTED] Date: Wed Jan 3 17:58:05 2007 +0100 Convert Pull: lines to Push: lines. diff --git a/clone b/clone index da15d46..e22f7b2 100755 --- a/clone +++ b/clone @@ -29,7 +29,7 @@ EOF read b while [ x$b != x ]; do if [ x$b != xmaster ]; then - echo Pull: refs/heads/$b:refs/heads/svn-$b \ + echo Push: refs/heads/$b:refs/heads/svn-$b \ .git/remotes/origin fi -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#405458: xterm: postinstall script fails on a symbolic link update
Package: xterm Version: 222-1etch1 Severity: minor xterm upgrade (version 222-1etch1), apt-get log : - Errors were encountered while processing: xterm E: Sub-process /usr/bin/dpkg returned an error code (1) [EMAIL PROTECTED] /etc # apt-get install -f Reading package lists... Done Building dependency tree... Done 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 1 not fully installed or removed. Need to get 0B of archives. After unpacking 0B of additional disk space will be used. Setting up xterm (222-1etch1) ... ln: creating symbolic link `/usr/share/man/man1/x-terminal-emulator.1.gz' to `/etc/alternatives/x-terminal-emulator.1.gz': File exists dpkg: error processing xterm (--configure): subprocess post-installation script returned error exit status 1 Errors were encountered while processing: xterm E: Sub-process /usr/bin/dpkg returned an error code (1) - -- System Information: Debian Release: 4.0 Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18-3-686 Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15) Versions of packages xterm depends on: ii libc62.3.6.ds1-8 GNU C Library: Shared libraries ii libfontconfig1 2.4.1-2 generic font configuration library ii libice6 1:1.0.1-2 X11 Inter-Client Exchange library ii libncurses5 5.5-5 Shared libraries for terminal hand ii libsm6 1:1.0.1-3 X11 Session Management library ii libx11-6 2:1.0.3-4 X11 client-side library ii libxaw7 1:1.0.2-4 X11 Athena Widget library ii libxext6 1:1.0.1-2 X11 miscellaneous extension librar ii libxft2 2.1.8.2-8 FreeType-based font drawing librar ii libxmu6 1:1.0.2-2 X11 miscellaneous utility library ii libxt6 1:1.0.2-2 X11 toolkit intrinsics library ii xbitmaps 1.0.1-2 Base X bitmaps Versions of packages xterm recommends: ii xutils 1:7.1.ds.3-1 X Window System utility programs -- no debconf information This e-mail is intended only for the above addressee. It may contain privileged information. If you are not the addressee you must not copy, distribute, disclose or use any of the information in it. If you have received it in error please delete it and immediately notify the sender. Security Notice: all e-mail, sent to or from this address, may be accessed by someone other than the recipient, for system management and security reasons. This access is controlled under Regulation of security reasons. This access is controlled under Regulation of Investigatory Powers Act 2000, Lawful Business Practises. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#405201: Debian bug #405201
On Wed, Jan 3, 2007 at 08:16:15 -0500, Rob Springer wrote: Hey Julien - I'm only replying to you (and not this issue) since I have no new information to yet offer, but I also experience this issue, and am willing to be a guinea pig or to try and find out any more information that might be helpful in diagnosing it. As is Nico, I'm using the proprietary nVidia driver with unstable's X binaries, and sometime this weekend (Sunday?), all my openGL apps (in this case, a wine app) started crashing X. Basically, I'm willing to serve as another datapoint however it might be useful...assuming it might be useful. If you're working on something else, then sorry for bothering! Hi Rob, if you're able to build the server with debugging symbols, and get a backtrace from the server (probably by running gdb over an ssh connection), it would probably help us find the problem. Cheers, Julien signature.asc Description: Digital signature
Bug#390913: Problem still present in 1.7.2-3
After reading the last entry in this bug report, I tried 1.7.2-3. The changelog of 1.7.2-2 indicates that the issue may have been solved by an upstream patch, but unfortunately it is not. Suspending to RAM leaves the X server failing after resume. That is, the X server still crashes over and over again (being restarted by kdm). Rene pgpDr4IkrEZNe.pgp Description: PGP signature
xorg 1:7.1.0-9 MIGRATED to testing
FYI: The status of the xorg source package in Debian's testing distribution has changed. Previous version: 1:7.1.0-8 Current version: 1:7.1.0-9 -- This email is automatically generated; [EMAIL PROTECTED] is responsible. See http://people.debian.org/~henning/trille/ for more information. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#384938: marked as done (only allows 640x480)
Your message dated Thu, 04 Jan 2007 11:12:55 +1100 with message-id [EMAIL PROTECTED] and subject line Bug#384938: xserver-xorg-video-i810: only allows 640x480 has caused the attached Bug report to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database) ---BeginMessage--- Package: xserver-xorg-video-i810 Version: 1:1.5.1.0-2 Severity: important In Xorg.0.log, I get: Not using mode 800x600 (no mode of this name) It was working before I upgraded. I'll send the full log xorg.conf separately. -- System Information: Debian Release: 3.0 APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.17.7-b1 Locale: LANG=C, LC_CTYPE=C Versions of packages xserver-xorg-video-i810 depends on: ii libc6 2.3.6-16 GNU C Library: Shared libraries ii xserver-xorg-core 2:1.0.2-10 X.Org X server -- core server -- no debconf information ---End Message--- ---BeginMessage--- On Wed, 2007-01-03 at 19:43 +0530, Joshua N Pritikin wrote: On Thu, Jan 04, 2007 at 12:50:36AM +1100, Drew Parsons wrote: Joshua, has this problem persisted in xserver-xorg-video-i810 1.7.2-3 ? I don't think so. I forgot to update this bug report. Good-o, I'll close this bug then. Thanks for the feedback, Drew ---End Message---
Re: x11proto-input: Changes to 'master'
New branch 'master' available I can't see x11proto-input at http://git.debian.org/. Is the alioth git repository different to this one? If so, does it have a gitweb interface? Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: x11proto-input: Changes to 'master'
On Thu, Jan 4, 2007 at 11:25:23 +1100, Drew Parsons wrote: New branch 'master' available I can't see x11proto-input at http://git.debian.org/. Is the alioth git repository different to this one? If so, does it have a gitweb interface? Fixed now. .git/HEAD pointed to refs/heads/master, which doesn't exist. I just changed it to point to refs/heads/debian-unstable. Cheers, Julien signature.asc Description: Digital signature
Bug#405201: [fwd] Re: Bug#405201: xserver-xorg-core: latest xorg crashes upon OpenGL request (nvidia proprietary driver)
On Tue, Jan 2, 2007 at 01:37:16 +0100, Nico wrote: Le 02/01/2007 01:31, Julien Cristau écrivait : And my question was about which version you had installed before, which you don't answer here. Sorry, I think I did. Since this laptop was installed on friday from scratch and upgraded on sunday to crash OpenGL, the previous version was 2:1.1.1-12. Can you downgrade back to -12, and make sure that this version really works for you? Thanks, Julien signature.asc Description: Digital signature
Bug#403325: xserver-xorg-video-i810: 810 driver appears not to like some standard VESA modes (like 1280x1024)
Alan wrote: It appears an upgrade (possibly to xserver-xorg-server-core) on or about 12 December 2006 caused this driver to no longer recognise the standard VESA modes and as a result it now forces itself into 640x480 mode. Hi Alan, does the behaviour change if you install and configure 915resolution? 915resolution -l should list the available modes. Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#256475: xserver-xorg-video-i810: Need to use external program to get a sharp 1400x1050 resolution
Jose Carlos Garcia Sogo wrote: I'm a owner of a i855 chipset in a Dell Inspiron 510m, with BIOS version A05. Using out of the box XWindow and configuring it for 1400x1050 resolution, which is the max for this computer, works but I get fuzzy horizontal lines. This is best seen when X is loading, at the dotted screen with cursor that it's seen before any window manager starts. For fixing it I have to use a external program, called 855resolution The equivalent program available in Debian etch is called 915resolution. Incidentally, two years have now passed since you originally filed this bug. Do you still need to use 915resolution under xserver-xorg-video-i810 1.7.2-3 or does your computer now work without it? Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: git-migration: Changes to 'master'
On Wed, Jan 03, 2007 at 05:53:29PM +0100, Thierry Reding wrote: clone | 26 ++ 1 files changed, 22 insertions(+), 4 deletions(-) New commits: commit 0726222645eb8e6e4f25056e8f7244b4566825e3 Author: Thierry Reding [EMAIL PROTECTED] Date: Wed Jan 3 17:50:06 2007 +0100 Implement the proposed XSF git archive policy. diff --git a/clone b/clone index 5df6b30..da15d46 100755 --- a/clone +++ b/clone @@ -13,17 +13,35 @@ ( debian=$(echo $line | cut -d' ' -f1) upstream=$(echo $line | cut -d' ' -f2) + echo Setting up $debian for cloning... if [ -d $debian.git/.git/remotes ]; then # create remote `origin' branch for the alioth repositories cat $debian.git/.git/remotes/origin EOF URL: ssh://git.debian.org/git/pkg-xorg/$debian.git -Pull: refs/heads/master:refs/heads/master-origin +Push: refs/heads/master:refs/heads/debian-unstable +Push: refs/heads/upstream-master:refs/heads/upstream-master Why did you use 'upstream-master'? I probably was unclear in what I wrote down, looking back on the draft. What I had in mind was 'upstream-unstable', 'upstream-experimental', etc. I'm not certain that this is the best way to divide up the branches though. Do you think having 'upstream-master' is a better way of handling things? - David Nusinow -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#398860: savage: a fix for respawn crash regression
Committed. thanks!
Alex
On 12/24/06, Alex Deucher [EMAIL PROTECTED] wrote:
This is the right fix. I'll check it in the next few days.
Thanks!
Alex
On 12/22/06, Mikko Rapeli [EMAIL PROTECTED] wrote:
Hello,
The savage driver some time a go started crashing when respawned from
kdm et al. When MapMMIO and MapFB functions were merged to MapMem[1], one
MapFB call in SavageScreenInit was not replaced with MapMem:
http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-savage.git;a=commitdiff_plain;h=2f8352df6488476b0c1a46798eca5dd38827444b;hp=6f9abbb972834561cd8494a1d4fb47402b285d7d
Here's a patch which fixes the issue. It works on my Thinkpad T20,
though I don't really understand the details.
-Mikko
--- xserver-xorg-video-savage-2.1.2.orig/src/savage_driver.c
+++ xserver-xorg-video-savage-2.1.2/src/savage_driver.c
@@ -3088,6 +3088,9 @@
SavageEnableMMIO(pScrn);
+if (!SavageMapMem(pScrn))
+return FALSE;
+
psav-FBStart2nd = 0;
if (psav-overlayDepth) {
___
xorg mailing list
[EMAIL PROTECTED]
http://lists.freedesktop.org/mailman/listinfo/xorg
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
X Strike Force X.Org X11 SVN commit: r4177 - trunk/driver/xserver-xorg-video-savage/debian/patches
Author: julien Date: 2007-01-03 22:41:14 -0500 (Wed, 03 Jan 2007) New Revision: 4177 Modified: trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff Log: Add reference to upstream commit. Modified: trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff === --- trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff 2007-01-01 18:56:41 UTC (rev 4176) +++ trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff 2007-01-04 03:41:14 UTC (rev 4177) @@ -5,6 +5,7 @@ MapFB call in SavageScreenInit was not replaced with MapMem. See Debian bugs #397084 and #398860. +Committed upstream as 3e2d370e291f5f222de88075f1f285446cca0569. Index: xserver-xorg-video-savage/src/savage_driver.c === -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: Re: x11proto-input: Changes to 'master'
New branch 'master' available I can't see x11proto-input at http://git.debian.org/. Is the alioth git repository different to this one? If so, does it have a gitweb interface? Fixed now. .git/HEAD pointed to refs/heads/master, which doesn't exist. I just changed it to point to refs/heads/debian-unstable. I see it now, thanks. Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: git-migration: Changes to 'master'
David asked: URL: ssh://git.debian.org/git/pkg-xorg/$debian.git -Pull: refs/heads/master:refs/heads/master-origin +Push: refs/heads/master:refs/heads/debian-unstable +Push: refs/heads/upstream-master:refs/heads/upstream-master Why did you use 'upstream-master'? I probably was unclear in what I wrote down, looking back on the draft. What I had in mind was 'upstream-unstable', 'upstream-experimental', etc. I'm not certain that this is the best way to divide up the branches though. Do you think having 'upstream-master' is a better way of handling things? The way I understood it, we wanted our copies of the upstream branches to keep their own upstream names verbatim but with an upstream- prefixed to avert name clashes. Otherwise it would get really confusing figuring out which of our upstream- branches corresponds to which actual branch upstream. On a different note, if we're forgoing a master branch in favour of debian-unstable, then when I run git clone, which branch will present by default, will it be debian-unstable? Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-core: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 13d60ff66f06a312ef080747b820388a7114dfdc Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:31:16 2007 -0500 Revert Remove debian dir temporarily This reverts commit 6dfb5b0807b6b72229789d19a7d7480b271a198a. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-core: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 90ef3b4a04a7d9c3735327303e623109cc2c541b Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:30:49 2007 -0500 Initial commit of upstream sources commit 6dfb5b0807b6b72229789d19a7d7480b271a198a Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:30:02 2007 -0500 Remove debian dir temporarily -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#386290: #386290: xserver-xorg-video-i810: i810 driver causes hangs on 82830 (ICH3)
Andrew wrote: With Xorg 6.8 and above, using 24 bit color, with any amount of stolen memory and apparently any other combination of options, causes the machine to lock up if the system returns from console to X11 for any reason. Hi Andrew, some patches were applied to xserver-xorg-video-i810 1.7.2-2 which fixed certain lockup bugs. Using the most recent version of the driver, does your computer still experience lockup under 24bit colour? If it's still there, the X log (/var/log/Xorg.0.log or Xorg.0.log.old) might possibly be useful to us. Thanks, Drew -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: git-migration: Changes to 'master'
Hi Drew, On Thu, Jan 04, 2007 at 02:25:05PM +1100, Drew Parsons wrote: David asked: URL: ssh://git.debian.org/git/pkg-xorg/$debian.git -Pull: refs/heads/master:refs/heads/master-origin +Push: refs/heads/master:refs/heads/debian-unstable +Push: refs/heads/upstream-master:refs/heads/upstream-master Why did you use 'upstream-master'? I probably was unclear in what I wrote down, looking back on the draft. What I had in mind was 'upstream-unstable', 'upstream-experimental', etc. I'm not certain that this is the best way to divide up the branches though. Do you think having 'upstream-master' is a better way of handling things? The way I understood it, we wanted our copies of the upstream branches to keep their own upstream names verbatim but with an upstream- prefixed to avert name clashes. Otherwise it would get really confusing figuring out which of our upstream- branches corresponds to which actual branch upstream. I'm not really sure if that would work out. Aside from master, there's no really long-lived branches from upstream, so if we were to use any of the other branches from upstream, we'd have to re-create it every time we wanted to use a different short lived topic branch with a new name. Even harder would be if we wanted to pull from multiple topic branches (which is something I'm thinking about doing for the server). The thought of having upstream-pci-rework-randr1.2-for-server-1.2 sounds really horrendous to me :-) I had envisioned that if you want to know which upstream version we pulled from, you can just checkout the appropriate upstream branch and run git log. If you do want to map by name what version we're shipping, we could use the tag name (upstream-1.2 for example), but then we'd have to create a new upstream branch every time upstream makes a new release, which would quickly get ugly. Besides, that's why we have tags anyway. The idea behind having a simple 1:1 mapping between our debian branch and the upstream branch at least makes it simple on our end to see what upstream version maps to what debian distro. You can check out the upstream-unstable, check the log, and know that that's what's in unstable. Granted, checking the log isn't instant recognition, but it prevents us from having too many branches getting out of control. Please correct me if I'm misinterpreting you. I wouldn't be surprised if I missed something in your message. On a different note, if we're forgoing a master branch in favour of debian-unstable, then when I run git clone, which branch will present by default, will it be debian-unstable? That's the idea. I'm setting up the beryl repositories right now according to this system, and I'm setting HEAD to be debian-unstable by default. I'm currently using upstream-unstable to import the upstream source, but if we decide to use upstream-master (or whatever else) it'll pretty trivial to create the new branch and delete the old one. - David Nusinow -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: Debian XSF SVN to git migration
On Tue, Jan 02, 2007 at 11:49:53PM +1100, Drew Parsons wrote: David wrote: After discussing this with Michel on irc, it doesn't look like it'll be possible to use git the way I had written down. I've revised the policy based on what Michel and I discussed[0]. It's much simplified, and basically behaves as you expect it to. If you want to work on bleeding edge stuff from upstream, just pulling from the debian* branch should give you the packaging. We believe it won't overwrite local changes if you've cloned from, say, freedesktop.org because the history should be intact. The one weird thing is that there's no master branch by default, nor is there an upstream branch, both of which git-buildpackage expects by default. It's trivial to locally create those branches depending on what you're doing though. I'm going to wait a little while longer to see what everyone thinks. I want to make sure everyone is back from holidays and had a chance to chew this over before we make the move. - David Nusinow [0] http://wiki.debian.org/XStrikeForce/git-usage Your ideas seem to make sense, though I haven't spent as much time thinking it all through as you Thierry, Michel and others have. With all the various branches coming from different directions all at once, it's tricky to keep the proposed policy all in one's head all at once. Would it be possible to commit one of the lesser, smaller modules to git, one of the protos, say? With some hands on access I think it might be easier to evaluate whether it all holds together the way we want it to. libdrm is already there, but it's not quite xorg. Thierry already went ahead with this, and if you want anything else just go for it. I think we've nailed down a good way to handle things for the most part, and anything that's left can be easily repaired later once we sort out the upstream naming stuff. It looks like we're pretty much ready to make the move finally. Drew p.s. The first and third points in the tutorial at http://wiki.debian.org/XStrikeForce/git-usage, is one of them redundant? Yeah, the tutorial needs updating. Once we get the upstream naming scheme sorted out, I'll update it and actually make it nice. I'd like to have that page be a lot more comprehensive than it is, and it needs some work. - David Nusinow -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-manager: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit d7767789a438c1fec0276e36c6471b444716567f Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 22:10:53 2007 -0500 Revert Temporarily remove debian This reverts commit d69baa3f1749290e652466349ba7122a8faf400e. commit eb4c6d9593ee15e06fdebea2e2a7fdc58d6af9b5 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 22:10:34 2007 -0500 Import version 0.1.3 commit d69baa3f1749290e652466349ba7122a8faf400e Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 22:09:51 2007 -0500 Temporarily remove debian -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-manager: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-plugins: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit d549f8952624f34ecf572d7c9699b053a79a3a81 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:41:00 2007 -0500 Revert Temporarily remove debian dir This reverts commit 6ed185cdac65fb5d55c5ee37f792e90f1115cbfd. commit 2201fb69bc82248b312c0375e3b9a858c668da95 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:40:10 2007 -0500 Add upstream package version 0.1.3 commit 6ed185cdac65fb5d55c5ee37f792e90f1115cbfd Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:38:59 2007 -0500 Temporarily remove debian dir -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-plugins: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-settings: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
beryl-settings: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 4ab73f5468a573081a255b35354c5a51864b1eed Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:56:30 2007 -0500 Revert Temporarily remove debian dir This reverts commit 1d81bde6e1efe0ea743567853315fe3253fd7608. commit 9e40263ce9fb38d7b9ada9b879367b5a7a9ab66a Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:56:05 2007 -0500 Check in version 0.1.3 commit 1d81bde6e1efe0ea743567853315fe3253fd7608 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 21:55:22 2007 -0500 Temporarily remove debian dir -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
emerald: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
emerald: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit f5680600b0d9078b922381554256771b8cf8644c Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 22:16:45 2007 -0500 Revert Temporarily remove debian dir This reverts commit b43309d4bd44ce47418690a91ec03f069121c924. commit 432a7003b0a20938d70288fa6d3421f4d8c9e1a1 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 22:16:30 2007 -0500 Add version 0.1.3 commit b43309d4bd44ce47418690a91ec03f069121c924 Author: David Nusinow [EMAIL PROTECTED] Date: Wed Jan 3 22:16:04 2007 -0500 Temporarily remove debian dir -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#383918: marked as done (FTBFS on non-DRM systems)
Your message dated Thu, 04 Jan 2007 15:41:47 +1100
with message-id [EMAIL PROTECTED]
and subject line Bug#383918: xserver-xorg-video-i810: FTBFS on non-DRM systems
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
---BeginMessage---
Package: xserver-xorg-video-i810
Version: 2:1.6.5-1
Severity: important
Tags: patch
Hi,
This package FTBFS on systems that don't have DRM, here is a patch.
Samuel
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: hurd-i386 (i686-AT386)
Shell: /bin/sh linked to /bin/bash
Kernel: GNU-Mach 1.3/Hurd-0.3
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages xserver-xorg-video-i810 depends on:
ii libc0.3 2.3.6-18-youpi1 GNU C Library: Shared libraries
ii xserver-xorg-core1:1.1.1-2 X.Org X server -- core server
xserver-xorg-video-i810 recommends no packages.
-- no debconf information
diff -ur xserver-xorg-video-i810-1.6.5/debian/control xserver-xorg-video-i810-1.6.5-hurd/debian/control
--- xserver-xorg-video-i810-1.6.5/debian/control 2006-08-20 17:28:24.0 +
+++ xserver-xorg-video-i810-1.6.5-hurd/debian/control 2006-08-20 17:09:48.0 +
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0), pkg-config, xserver-xorg-dev (= 1.1.1-1), x11proto-gl-dev, x11proto-video-dev, libdrm-dev, libgl1-mesa-dev | libgl-dev, libxvmc-dev (= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev ( 2.0), x11proto-xf86dri-dev
+Build-Depends: debhelper (= 4.0.0), pkg-config, xserver-xorg-dev (= 1.1.1-1), x11proto-gl-dev, x11proto-video-dev, libdrm-dev [!hurd-i386], libgl1-mesa-dev | libgl-dev, libxvmc-dev (= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev ( 2.0) [!hurd-i386], x11proto-xf86dri-dev
Standards-Version: 3.6.1
Package: xserver-xorg-video-i810
diff -ur xserver-xorg-video-i810-1.6.5/src/brw_structs.h xserver-xorg-video-i810-1.6.5-hurd/src/brw_structs.h
--- xserver-xorg-video-i810-1.6.5/src/brw_structs.h 2006-08-08 22:51:25.0 +
+++ xserver-xorg-video-i810-1.6.5-hurd/src/brw_structs.h 2006-08-20 17:23:05.0 +
@@ -28,6 +28,8 @@
#ifndef BRW_STRUCTS_H
#define BRW_STRUCTS_H
+#include GL/gl.h
+
/* Command packets:
*/
struct header
diff -ur xserver-xorg-video-i810-1.6.5/src/i810_driver.c xserver-xorg-video-i810-1.6.5-hurd/src/i810_driver.c
--- xserver-xorg-video-i810-1.6.5/src/i810_driver.c 2006-08-10 20:40:39.0 +
+++ xserver-xorg-video-i810-1.6.5-hurd/src/i810_driver.c 2006-08-20 19:06:38.0 +
@@ -333,6 +333,8 @@
NULL
};
+#endif /* I830_ONLY */
+
const char *I810shadowSymbols[] = {
shadowInit,
shadowSetup,
@@ -340,8 +342,6 @@
NULL
};
-#endif /* I830_ONLY */
-
#ifndef I810_DEBUG
int I810_DEBUG = (0
/* | DEBUG_ALWAYS_SYNC */
@@ -408,9 +408,9 @@
#ifdef XF86DRI
I810drmSymbols,
I810driSymbols,
+#endif
I810shadowSymbols,
I810shadowFBSymbols,
-#endif
I810vbeSymbols, vbeOptionalSymbols,
I810ddcSymbols, I810int10Symbols, NULL);
diff -ur xserver-xorg-video-i810-1.6.5/src/i830_accel.c xserver-xorg-video-i810-1.6.5-hurd/src/i830_accel.c
--- xserver-xorg-video-i810-1.6.5/src/i830_accel.c 2006-08-08 22:51:25.0 +
+++ xserver-xorg-video-i810-1.6.5-hurd/src/i830_accel.c 2006-08-20 17:17:35.0 +
@@ -395,6 +395,7 @@
return XAAInit(pScreen, infoPtr);
}
+#ifdef XF86DRI
static unsigned int
CheckTiling(ScrnInfoPtr pScrn)
{
@@ -416,6 +417,9 @@
return tiled;
}
+#else
+#define CheckTiling(pScrn) 0
+#endif
void
I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,
---End Message---
---BeginMessage---
Package: xserver-xorg-video-i810
This package FTBFS on systems that don't have DRM, here is a patch.
The patch was applied upstream and appeared in the i810 1.7 drivers, now
present in etch, so closing this bug.
Drew
---End Message---
Re: git-migration: Changes to 'master'
* David Nusinow wrote: [...] On Wed, Jan 03, 2007 at 05:53:29PM +0100, Thierry Reding wrote: clone | 26 ++ 1 files changed, 22 insertions(+), 4 deletions(-) New commits: commit 0726222645eb8e6e4f25056e8f7244b4566825e3 Author: Thierry Reding [EMAIL PROTECTED] Date: Wed Jan 3 17:50:06 2007 +0100 Implement the proposed XSF git archive policy. [...] Why did you use 'upstream-master'? I probably was unclear in what I wrote down, looking back on the draft. What I had in mind was 'upstream-unstable', 'upstream-experimental', etc. I'm not certain that this is the best way to divide up the branches though. Do you think having 'upstream-master' is a better way of handling things? - David Nusinow We've already discussed this on IRC, but here goes for everyone to read: since it's pretty difficult to figure out which tags to create the upstream-* branches off for each package, I thought to just put upstream-master into the repositories so that there would be some reference from which the other branches could be split off. After discussing this with David on IRC, I believe it would be better to rename upstream-master to upstream-unstable. Since we're pretty much at the beginning of a new release cycle, it would be the logical choice to have unstable track upstream's master. Once upstream tags releases, upstream-unstable could be updated to those tags to comply with the policy. This would leave it up to people working on the packages to create the upstream-etch (based off the corresponding upstream tag) and debian-etch branches for etch support. The same goes for experimental packages or for lenny once we get to its freeze. For some packages upstream's master might not be the optimal choice (take the X server for instance), but it should be possible to roll back upstream- and debian-unstable to some other tag or branch manually later on. We've settled on this primarily so most of the cloning, naming and possibly pushing can be scripted. It would still be good to have upstream's master branch when working on a package (for cherry-picking), so we've been thinking about ways to make it as easy as possible to pull it in while keeping it out of the Alioth repositories. Since git doesn't support anything similar to svn:externals and hooks don't seem to be able to do this when a repo is cloned, the only alternative would seem to be a script that needs to be run manually on each repository that clones upstream's master branch into the local repository. Does this sound about right to everyone? Thierry signature.asc Description: Digital signature
Re: Debian XSF SVN to git migration
* David Nusinow wrote: On Mon, Dec 25, 2006 at 02:16:23PM +0100, Michel Dänzer wrote: On Sat, 2006-12-23 at 15:29 -0500, David Nusinow wrote: [...] After discussing this with Michel on irc, it doesn't look like it'll be possible to use git the way I had written down. I've revised the policy based on what Michel and I discussed[0]. It's much simplified, and basically behaves as you expect it to. If you want to work on bleeding edge stuff from upstream, just pulling from the debian* branch should give you the packaging. We believe it won't overwrite local changes if you've cloned from, say, freedesktop.org because the history should be intact. The one weird thing is that there's no master branch by default, nor is there an upstream branch, both of which git-buildpackage expects by default. It's trivial to locally create those branches depending on what you're doing though. I'm going to wait a little while longer to see what everyone thinks. I want to make sure everyone is back from holidays and had a chance to chew this over before we make the move. - David Nusinow [0] http://wiki.debian.org/XStrikeForce/git-usage The usage page still mentions that upstream changes should be cherry-picked into the master branch which we won't be using anymore. I'm guessing cherry-picks should go into upstream-* branches instead of the debian-* ones? Thierry signature.asc Description: Digital signature
