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

Bug#523970: marked as done (xorg-server: FTBFS on hurd-i386)

Your message dated Thu, 14 May 2009 16:32:10 +0000
with message-id <E1M4dqs-000501-Mu@ries.debian.org>
and subject line Bug#523970: fixed in xorg-server 2:1.6.1.901-2
has caused the Debian Bug report #523970,
regarding xorg-server: FTBFS on hurd-i386
to be marked as done.

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

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


-- 
523970: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523970
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: xorg-server
Version: 2:1.6.0-1
Severity: important
Tags: patch

Hello,

xorg-server FTBFS on hurd-i386 due to a few small things, here is a
patch.

Samuel

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.29 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel
<y> t1 faich
<y> les programmes ils segfaultent jamais quand on veut
 -+- #ens-mim en plein débogage -+-

--- hw/xfree86/os-support/bus/Pci.h.orig	2009-04-13 21:21:10.000000000 +0000
+++ hw/xfree86/os-support/bus/Pci.h	2009-04-13 21:22:38.000000000 +0000
@@ -169,7 +169,7 @@
 #endif /* !defined(DEBUGPCI) */
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
-	defined(__DragonFly__) || defined(__sun)
+	defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
 #define ARCH_PCI_INIT bsdPciInit
 #endif
 
--- configure.ac.orig	2009-04-13 21:38:24.000000000 +0000
+++ configure.ac	2009-04-13 21:38:27.000000000 +0000
@@ -1356,6 +1356,9 @@
 	  gnu*)
 	  	XORG_OS="gnu"
 		XORG_OS_SUBDIR="hurd"
+		# Use the same stubs as BSD for old functions, since we now
+		# use libpciaccess for PCI
+		xorg_bus_bsdpci="yes"
 		;;
 	  *)
 	  	XORG_OS="unknown"
--- hw/xfree86/os-support/hurd/Makefile.am.orig	2009-04-13 23:05:45.000000000 +0000
+++ hw/xfree86/os-support/hurd/Makefile.am	2009-04-13 23:07:12.000000000 +0000
@@ -5,6 +5,7 @@
 		$(srcdir)/../shared/VTsw_noop.c \
 		$(srcdir)/../shared/posix_tty.c \
 		$(srcdir)/../shared/stdResource.c \
+		$(srcdir)/../shared/vidmem.c \
 		$(srcdir)/../shared/sigiostubs.c \
 		$(srcdir)/../shared/pm_noop.c \
 		$(srcdir)/../shared/kmod_noop.c \
--- hw/xfree86/os-support/shared/stdResource.c.orig	2009-04-13 23:15:07.000000000 +0000
+++ hw/xfree86/os-support/shared/stdResource.c	2009-04-13 23:15:33.000000000 +0000
@@ -44,7 +44,7 @@
 #include "bus/Pci.h"
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
-	defined(__DragonFly__) || defined(__sun)
+	defined(__DragonFly__) || defined(__sun) || defined(__GNU__)
 #define xf86StdAccResFromOS xf86AccResFromOS
 #endif
 
--- hw/xfree86/os-support/hurd/hurd_video.c.orig	2009-02-25 19:12:12.000000000 +0000
+++ hw/xfree86/os-support/hurd/hurd_video.c	2009-04-13 23:55:16.000000000 +0000
@@ -41,8 +41,8 @@
 /**************************************************************************
  * Video Memory Mapping section                                            
  ***************************************************************************/
-pointer 
-xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
+static pointer 
+mapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
 {
     mach_port_t device,iopl_dev;
     memory_object_t iopl_mem;
@@ -95,8 +95,8 @@
     return (pointer)addr;
 }
 
-void 
-xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size)
+static void 
+unmapVidMem(int ScreenNum,pointer Base,unsigned long Size)
 {
     kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size);
     if( err )
@@ -107,12 +107,6 @@
     return;
 }
 
-Bool 
-xf86LinearVidMem()
-{
-    return(TRUE);
-}
-
 /**************************************************************************
  * I/O Permissions section                                                 
  ***************************************************************************/
@@ -143,14 +137,10 @@
 }
 
 void
-xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base,
-	unsigned long Size)
+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 {
+	pVidMem->linearSupported = TRUE;
+	pVidMem->mapMem = mapVidMem;
+	pVidMem->unmapMem = unmapVidMem;
+	pVidMem->initialised = TRUE;
 }
-
-Bool
-xf86CheckMTRR(int s)
-{
-	return FALSE;
-}
-

--- End Message ---
--- Begin Message --- 
Source: xorg-server
Source-Version: 2:1.6.1.901-2

We believe that the bug you reported is fixed in the latest version of
xorg-server, which is due to be installed in the Debian FTP archive:

xdmx-tools_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xdmx-tools_1.6.1.901-2_i386.deb
xdmx_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xdmx_1.6.1.901-2_i386.deb
xnest_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xnest_1.6.1.901-2_i386.deb
xorg-server_1.6.1.901-2.diff.gz
  to pool/main/x/xorg-server/xorg-server_1.6.1.901-2.diff.gz
xorg-server_1.6.1.901-2.dsc
  to pool/main/x/xorg-server/xorg-server_1.6.1.901-2.dsc
xserver-common_1.6.1.901-2_all.deb
  to pool/main/x/xorg-server/xserver-common_1.6.1.901-2_all.deb
xserver-xephyr_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xserver-xephyr_1.6.1.901-2_i386.deb
xserver-xfbdev_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xserver-xfbdev_1.6.1.901-2_i386.deb
xserver-xorg-core-dbg_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-core-dbg_1.6.1.901-2_i386.deb
xserver-xorg-core_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-core_1.6.1.901-2_i386.deb
xserver-xorg-dev_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xserver-xorg-dev_1.6.1.901-2_i386.deb
xvfb_1.6.1.901-2_i386.deb
  to pool/main/x/xorg-server/xvfb_1.6.1.901-2_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 523970@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julien Cristau <jcristau@debian.org> (supplier of updated xorg-server package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Thu, 14 May 2009 17:37:40 +0200
Source: xorg-server
Binary: xserver-xorg-core xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-xfbdev xserver-xorg-core-dbg xserver-common
Architecture: source all i386
Version: 2:1.6.1.901-2
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Julien Cristau <jcristau@debian.org>
Description: 
 xdmx       - distributed multihead X server
 xdmx-tools - Distributed Multihead X tools
 xnest      - Nested X server
 xserver-common - common files used by various X servers
 xserver-xephyr - nested X server
 xserver-xfbdev - Linux framebuffer device tiny X server
 xserver-xorg-core - Xorg X server - core server
 xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols)
 xserver-xorg-dev - Xorg X server - development files
 xvfb       - Virtual Framebuffer 'fake' X server
Closes: 523970 524822 524853 525475
Changes: 
 xorg-server (2:1.6.1.901-2) unstable; urgency=low
 .
   * Merge from upstream server-1.6-branch (commit a9f85dce).
   * Fix FTBFS on kfreebsd (closes: #525475).  Thanks, Petr Salinger!
 .
 xorg-server (2:1.6.1.901-1) experimental; urgency=low
 .
   * New upstream development release
     + fixes crash in CheckMotion with xinerama (closes: #524853)
     + Refresh 20_hurd-i386.diff
 .
   [ Brice Goglin ]
   * Add 20_hurd-i386.diff to fix FTBFS on hurd-i386,
     thanks Samuel Thibault! (closes: #523970)
 .
   [ David Nusinow ]
   * Have the reportbug script append lshal and drm info.
     The drm info comes from grepping dmesg output.
 .
   [ Julien Cristau ]
   * Properly initialize libgcrypt in the libgcrypt patch (closes: #524822).
     Thanks, Sven Joachim!
Checksums-Sha1: 
 4ec827ed57cc50eb54f8a917864ded1ad407e25b 3229 xorg-server_1.6.1.901-2.dsc
 d6cb7c4c1926a0a3ce3036cf47a498078e88ea9c 83680 xorg-server_1.6.1.901-2.diff.gz
 547bfea2f0274b327c92b5154d3e7bbae8111078 50022 xserver-common_1.6.1.901-2_all.deb
 9f4f452818ad6e7a6d37fd76262cf12d20328125 2168058 xserver-xorg-core_1.6.1.901-2_i386.deb
 1111ef87788974d8014efa812a99599c7dec787a 978228 xserver-xorg-dev_1.6.1.901-2_i386.deb
 1fa417d107556d7630988c7bf99fbf5b3f6bf105 1479096 xdmx_1.6.1.901-2_i386.deb
 c3fb1292fccf58237d48f0ad3369a25808f5be17 795740 xdmx-tools_1.6.1.901-2_i386.deb
 0c428f311dd7bf8f05e43f8e277141b746773163 1386580 xnest_1.6.1.901-2_i386.deb
 7205fbbfb2f7de5a5135af357fa351906ad82e35 1496026 xvfb_1.6.1.901-2_i386.deb
 30dd1cfd67540e2b1792958e63eae029ed2efebe 1569156 xserver-xephyr_1.6.1.901-2_i386.deb
 2bc31381059dd3ee10450fdb231a1f860948e714 1521014 xserver-xfbdev_1.6.1.901-2_i386.deb
 ab99713c469a3bbb956658f71d498f52a8f4760b 6119134 xserver-xorg-core-dbg_1.6.1.901-2_i386.deb
Checksums-Sha256: 
 60f6858b542c7ebc9014519011d4b963fa2816c1d57baf4292500c8502b7cba5 3229 xorg-server_1.6.1.901-2.dsc
 01e2c3c5399866c46b8db9044090eb672005a99412734f85eff95a7c2cc3bfc7 83680 xorg-server_1.6.1.901-2.diff.gz
 e33079bd5740218c9ec6f56fa83357a6b3af69e10733c1ac3d07e7a6d11d234a 50022 xserver-common_1.6.1.901-2_all.deb
 3b401ebb6ceb92c7c154efe91cbcd3d204e50474fff0ecccd77d2ea538ea37a5 2168058 xserver-xorg-core_1.6.1.901-2_i386.deb
 da4472b0685f3e45f38278d5f049d2b8b4dfd31a0d50908efb05c0d4535ff47d 978228 xserver-xorg-dev_1.6.1.901-2_i386.deb
 fdf2f83db810e60192bce083ad5726f1324c867d883cd1ee4749d0a92716c3fc 1479096 xdmx_1.6.1.901-2_i386.deb
 08d3f84ba52f08099c264590094f1b2a6c0aed435e431ba38753ae0bda92c386 795740 xdmx-tools_1.6.1.901-2_i386.deb
 98815a012983f3cbfc89cc79747cc4544159204cf16c14bc6cd1fdcb271aa70c 1386580 xnest_1.6.1.901-2_i386.deb
 09cf90c99dc6b39f00e4ca93b0e7d4e2327d6384894baf8398212c3fb2f066c3 1496026 xvfb_1.6.1.901-2_i386.deb
 8707295b2b5944f721d15b8be218f20f74b4835826f422a4de9775b843d5db8e 1569156 xserver-xephyr_1.6.1.901-2_i386.deb
 faed001fa991ee149b0ecf9e670a73b638479707781beb075d847a0d6b169dda 1521014 xserver-xfbdev_1.6.1.901-2_i386.deb
 2aad5e6e208acd01a68584285092201ba1377214e24caa9dceee5c43ac609b55 6119134 xserver-xorg-core-dbg_1.6.1.901-2_i386.deb
Files: 
 39e50b7996819063ea003043f1fe2c64 3229 x11 optional xorg-server_1.6.1.901-2.dsc
 71b07147d0c6b2a651c78723fd2bd374 83680 x11 optional xorg-server_1.6.1.901-2.diff.gz
 074a174938a38c80f796958cd19f1d64 50022 x11 optional xserver-common_1.6.1.901-2_all.deb
 9063cae166d4884b392b879b0d406e8f 2168058 x11 optional xserver-xorg-core_1.6.1.901-2_i386.deb
 a8038a7bb18fbb8396902f02530a4680 978228 x11 optional xserver-xorg-dev_1.6.1.901-2_i386.deb
 b8982fd4a54446477e137d94b84173a0 1479096 x11 optional xdmx_1.6.1.901-2_i386.deb
 a93f08955b68c71a3b099c3795474b9b 795740 x11 optional xdmx-tools_1.6.1.901-2_i386.deb
 9c39ea9ba03828a3c76d28a46ece0c05 1386580 x11 optional xnest_1.6.1.901-2_i386.deb
 17bfcff08574fe620c0128a78b38c10c 1496026 x11 optional xvfb_1.6.1.901-2_i386.deb
 c47e3d71aad63501d2fad51d90f5ba88 1569156 x11 optional xserver-xephyr_1.6.1.901-2_i386.deb
 06ac5b7552dac3988f4e951ebc5f9c65 1521014 x11 optional xserver-xfbdev_1.6.1.901-2_i386.deb
 57627452e8c66ee3fa332d00120283bf 6119134 debug extra xserver-xorg-core-dbg_1.6.1.901-2_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkoMRBoACgkQmEvTgKxfcAxb9ACghadScQ/QVlDg806lae9eLcqe
/3sAn2ArOCD0zaI2NaIhkYBM+H8QAkk9
=4hbS
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: