Bug#478559: mesa: FTBFS (ppc64): cp: cannot stat `debian/tmp/usr/lib/libGL.so': No such file or directory
Package: mesa
Version: 7.0.3-1
Severity: wishlist
Tags: patch
Hello,
when building 'mesa' on ppc64/unstable, I get the following error:
dh_installdocs -i
dh_installexamples -i
dh_install --sourcedir=debian/tmp --list-missing -i
cp: cannot stat `debian/tmp/usr/lib/libGL.so': No such file or directory
dh_install: command returned error code 256
make: *** [binary-indep] Error 1
dpkg-buildpackage: failure: debian/rules binary gave error exit status 2
This error occurs because the file libGL.so is created in usr/lib64
instead of the correct usr/lib directory.
With the attached patch 'mesa' can be built on ppc64.
The patch does the following:
* Remove 'LIB_DIR = lib64' from config/debian-swx11+glu-ppc64 and
config/debian-swx11-glu-static-ppc64. The Debian ppc64 port uses
basically the same directory structure as the Debian amd64 port
which also does _not_ use 'LIB_DIR = lib64'.
* Add 'ppc64' to the Architecture lines of the libgl1-mesa-dri
and libgl1-mesa-dri-dbg packages.
Regards
Andreas Jochens
diff -urN ../tmp-orig/mesa-7.0.3/configs/debian-swx11+glu-ppc64
./configs/debian-swx11+glu-ppc64
--- ../tmp-orig/mesa-7.0.3/configs/debian-swx11+glu-ppc64 2008-04-28
13:57:42.0 +
+++ ./configs/debian-swx11+glu-ppc642008-04-28 13:23:44.0 +
@@ -5,7 +5,6 @@
CONFIG_NAME = debian-swx11+glu-ppc64
-LIB_DIR = lib64
# vim: ft=make
diff -urN ../tmp-orig/mesa-7.0.3/configs/debian-swx11+glu-static-ppc64
./configs/debian-swx11+glu-static-ppc64
--- ../tmp-orig/mesa-7.0.3/configs/debian-swx11+glu-static-ppc64
2008-04-28 13:57:42.0 +
+++ ./configs/debian-swx11+glu-static-ppc64 2008-04-28 13:24:00.0
+
@@ -5,7 +5,6 @@
CONFIG_NAME = debian-swx11+glu-static-ppc64
-LIB_DIR = lib64
# vim: ft=make
diff -urN ../tmp-orig/mesa-7.0.3/debian/control ./debian/control
--- ../tmp-orig/mesa-7.0.3/debian/control 2008-04-28 13:57:42.0
+
+++ ./debian/control2008-04-28 05:45:12.0 +
@@ -158,7 +158,7 @@
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri ( 1:7.0.0)
@@ -179,7 +179,7 @@
Package: libgl1-mesa-dri-dbg
Section: libdevel
Priority: extra
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc ppc64 s390 sparc
Depends: libgl1-mesa-dri (= ${binary:Version})
Description: Debugging symbols for the Mesa DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#393166: xkeyboard-config: FTBFS: Patch attempted to create file rules/base.lst, which already exists.
Package: xkeyboard-config Version: 0.9-2 Severity: serious When building 'xkeyboard-config' on unstable, I get the following error: dh_clean debian/rules build mkdir stamp-dir Applying patches...failed! (check stamp-dir/patch-log for details) make: *** [stamp-dir/patch] Error 1 The stamp-dir/patch-log shows the following problem: Applying patch resync_rules_base.diff patching file rules/base The next patch would create the file rules/base.lst, which already exists! Applying it anyway. patching file rules/base.lst Patch attempted to create file rules/base.lst, which already exists. Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- rejects in file rules/base.lst patching file rules/compat/base.ml1_s.part patching file rules/compat/base.ml1v1_s.part Regards Andreas Jochens -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#392577: xserver-xorg-input-magellan: FTBFS: conflicting types for 'xf86usleep'
Package: xserver-xorg-input-magellan Version: 1:1.0.0.5-2 Severity: serious When building 'xserver-xorg-input-magellan' on unstable, I get the following error: make[3]: Entering directory `/xserver-xorg-input-magellan-1.0.0.5/obj-x86_64-linux-gnu/src' if /bin/sh ../libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I../../src -I.. -Wall -g -O2 -DXFree86Server -DIN_MODULE -DXFree86Module -DXFree86LOADER -I/usr/include/xorg-I../../src -MT magellan.lo -MD -MP -MF .deps/magellan.Tpo \ -c -o magellan.lo `test -f '../../src/magellan.c' || echo '../../src/'`../../src/magellan.c; \ then mv -f .deps/magellan.Tpo .deps/magellan.Plo; \ else rm -f .deps/magellan.Tpo; exit 1; \ fi mkdir .libs gcc -DHAVE_CONFIG_H -I. -I../../src -I.. -Wall -g -O2 -DXFree86Server -DIN_MODULE -DXFree86Module -DXFree86LOADER -I/usr/include/xorg -I../../src -MT magellan.lo -MD -MP -MF .deps/magellan.Tpo -c ../../src/magellan.c -fPIC -DPIC -o .libs/magellan.o ../../src/magellan.c:48:1: warning: NEED_XF86_TYPES redefined In file included from ../config.h:4, from ../../src/magellan.c:38: /usr/include/xorg/xorg-server.h:75:1: warning: this is the location of the previous definition In file included from /usr/include/xorg/xisb.h:32, from ../../src/magellan.c:52: /usr/include/unistd.h:405: error: conflicting types for 'xf86usleep' /usr/include/xorg/xf86_ansic.h:345: error: previous declaration of 'xf86usleep' was here In file included from /usr/include/xorg/xisb.h:32, from ../../src/magellan.c:52: /usr/include/unistd.h:884:29: error: macro getpagesize passed 1 arguments, but takes just 0 make[3]: *** [magellan.lo] Error 1 make[3]: Leaving directory `/xserver-xorg-input-magellan-1.0.0.5/obj-x86_64-linux-gnu/src' make: *** [build-stamp] Error 2 Regards Andreas Jochens -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#362085: xorg: FTBFS (ppc64): Please add debian/scripts/vars.ppc64
Hello, the attached patch is an updated version of the ppc64 support patch which applies to the latest xorg version 7.0.14 in unstable. The patch just creates the debian/scripts/vars.ppc64 file. Regards Andreas Jochens diff -urN ../tmp-orig/xorg-7.0.14/debian/scripts/vars.ppc64 ./debian/scripts/vars.ppc64 --- ../tmp-orig/xorg-7.0.14/debian/scripts/vars.ppc64 1970-01-01 00:00:00.0 + +++ ./debian/scripts/vars.ppc64 2006-04-18 08:28:26.0 + @@ -0,0 +1,12 @@ + +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (Bourne shell). +XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-vga + +# xserver-xorg-video-v4l, + +XSERVER_XORG_INPUT_DEPENDS=xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics + +# , xserver-xorg-input-wacom -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#362085: xorg: FTBFS (ppc64): Please add debian/scripts/vars.ppc64
Package: xorg Version: 1:7.0.10 Severity: wishlist Tags: patch When building 'xorg' on ppc64/unstable, I get the following error: dpkg-buildpackage: host architecture ppc64 debian/rules clean debian/rules:39: debian/scripts/vars.ppc64: No such file or directory make: *** No rule to make target `debian/scripts/vars.ppc64'. Stop. With the attached patch 'xorg' can be compiled on ppc64. The patch adds the file debian/scripts/vars.ppc64 which has been copied from debian/scripts/vars.powerpc. Regards Andreas Jochens diff -urN ../tmp-orig/xorg-7.0.10/debian/scripts/vars.ppc64 ./debian/scripts/vars.ppc64 --- ../tmp-orig/xorg-7.0.10/debian/scripts/vars.ppc64 1970-01-01 00:00:00.0 + +++ ./debian/scripts/vars.ppc64 2006-04-12 05:46:43.0 + @@ -0,0 +1,8 @@ + +# This file is NOT a shell script. +# +# This file gets included by both debian/rules (make) AND the scripts in +# debian/scripts (Bourne shell). +XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-vga + +# xserver-xorg-video-v4l, -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#362085: xorg: FTBFS (ppc64): Please add debian/scripts/vars.ppc64
Hello, thanks for your reply! On 06-Apr-12 08:47, Michel Dänzer wrote: On Wed, 2006-04-12 at 08:09 +0200, Andreas Jochens wrote: +XSERVER_XORG_VIDEO_DEPENDS=xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis, xserver-xorg-video-sisusb, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-vga Why vga but not vesa? Looks good otherwise. I just copied the list from vars.powerpc to vars.ppc64. The list in vars.powerpc does not contain vesa. But it would probably make sense to add vesa to the powerpc and to the ppc64 lists. Regards Andreas Jochens -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#362150: xorg-server: FTBFS (ppc64): Please add ppc64 to the architecture list in debian/control
Package: xorg-server
Version: 1:1.0.2-2
Severity: wishlist
Tags: patch
When building 'xorg-server' on ppc64/unstable,
I get the following error:
dh_shlibdeps
dpkg-shlibdeps: warning: format of `NEEDED libxf1bpp.so' not recognized
dh_gencontrol
dpkg-gencontrol: error: current build architecture ppc64 does not appear in
package's list (alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k
mips mipsel netbsd-i386 powerpc sparc)
dh_gencontrol: command returned error code 65280
make: *** [binary-arch] Error 1
With the attached patch 'xorg-server' can be compiled on ppc64.
The patch adds ppc64 to the architecture list in debian/control.
Regards
Andreas Jochens
diff -urN ../tmp-orig/xorg-server-1.0.2/debian/control ./debian/control
--- ../tmp-orig/xorg-server-1.0.2/debian/control2006-04-12
11:45:19.0 +
+++ ./debian/control2006-04-12 11:45:02.0 +
@@ -11,7 +11,7 @@
Standards-Version: 3.6.1.0
Package: xserver-xorg-core
-Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips
mipsel netbsd-i386 powerpc sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips
mipsel netbsd-i386 powerpc ppc64 sparc
Depends: x11-common (= 1:7.0.0), xserver-xorg-video-all | xserver-xorg-video,
xserver-xorg-input-all | xserver-xorg-input, ${shlibs:Depends}, ${misc:Depends}
Recommends: xkeyboard-config
Conflicts: xserver-xorg ( 6.8.2-38), xserver-xfree86 ( 1:7.0.0)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [Debian-ppc64-devel] x libraries and powerpc/ppc64 biarch setup.
On 05-Sep-23 10:17, Sven Luther wrote: x apparently already builds just fine in 64bit mode, or at least Andreas Jochens has done it, and if multi-arch ever becomes really usable, then another approach would be needed, in the meantime, the biarch is support we will have for etch. 'xorg-x11' indeed builds fine on the native 64-bit ppc64 port when the patch from BTS #319178 is applied. That patch just adds minimal support to make the package build on the ppc64 architecture: * Add ppc64 to 'Architecture:' fields in debian/control * Add ppc64 handling to debian/xserver-xorg.config.in * Add the following new files: debian/scripts/vars.ppc64 debian/MANIFEST.ppc64.in debian/libxvmc-dev.install.ppc64 debian/libxvmc1-dbg.install.ppc64 debian/libxvmc1.install.ppc64 debian/xlibmesa-dri-dbg.install.ppc64 debian/xlibmesa-dri.install.ppc64 debian/xserver-xorg.config.in debian/xserver-xorg.docs.ppc64 debian/xserver-xorg.install.ppc64 Note that this patch has nothing to do with the powerpc/ppc64 biarch 'lib64...' approach that Sven has in mind. I have no idea if a biarch approach would work for the 'xorg-x11' package. Even if it is possible, I fear that it would complicate the packaging of 'xorg-x11'. It would certainly be nice to have 64-bit versions of the X libraries available on powerpc (and also on i386). However, IMHO this problem should be solved by implementing 'multiarch', i.e. by allowing the installation of packages that have been built on a different architecture. Regards Andreas Jochens -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [Debian-ppc64-devel] x libraries and powerpc/ppc64 biarch setup.
On 05-Sep-23 13:16, Sven Luther wrote: On Fri, Sep 23, 2005 at 12:09:17PM +0200, Andreas Jochens wrote: On 05-Sep-23 10:17, Sven Luther wrote: x apparently already builds just fine in 64bit mode, or at least Andreas Jochens has done it, and if multi-arch ever becomes really usable, then another approach would be needed, in the meantime, the biarch is support we will have for etch. 'xorg-x11' indeed builds fine on the native 64-bit ppc64 port when the patch from BTS #319178 is applied. That patch just adds minimal support to make the package build on the ppc64 architecture: Notice in any case that this patch is probably not going to be used in any case, since we will either go biarch for etch, or real multi-arch, which hasn't been decided yet, and that in any case the 64bit name will be powerpc64, not ppc64. Please do not start the naming debate for the ppc64 port again. This has been discussed and decided months ago. The Debian packaging name is 'ppc64' which conforms to the LSB. This name is already used by dpkg, apt and many other packages. Regards Andreas Jochens -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [Debian-ppc64-devel] x libraries and powerpc/ppc64 biarch setup.
On 05-Sep-23 14:03, Sven Luther wrote: Andreas Jochens wrote: Please do not start the naming debate for the ppc64 port again. This has been discussed and decided months ago. Decided ? i don't think i was part of this discussion, and with the ppc/ppc64 kernel upstream thingy changing to a single powerpc one, things did indeed change. Sven, you wrote the following in that discussing on debian-devel (see http://lists.debian.org/debian-devel/2005/03/msg01828.html). Sven Luther wrote: Notice that ppc64 is what is widely known in the outside world on anyone working with 64bit powerpc, that both the kernel and the toolchain use it, that all the documentation referent to it uses ppc64 and that the other distributions doin 64bit powerpc (gento, suze and redhat) use it too, as well as all cross toolchain out there. Will we want to do something different as pure dogma, despite the cost involved ? The only voice against 'ppc64' in that discussion was from the dpkg maintainer Scott James Remnant. And yes, it was decided to use the name 'ppc64'. Following that decision, this name was used by 'dpkg', 'apt', 'gcc-4.0' and a lot of other packages. Sven, please do not work against the ppc64 port by confusing people. Regards Andreas Jochens -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: /usr/X11R6/lib64 symlink for amd64
On 04-Dec-19 03:50, Goswin von Brederlow wrote: Branden Robinson [EMAIL PROTECTED] writes: I still say /lib64 is one of the nastiest pieces of shit I've ever heard of. The link could go into the LSB package. The link is not needed for Debian but only for LSB compliance and 3rd party software. The LSB package seems to be the right place for the /usr/X11R6/lib64 symlink (and for the /usr/lib64 symlink as well) IMHO. We do not really need them and I think we should try to convince the LSB (or more exactly the FHS) to allow for systems without those links. Regards Andreas Jochens
Bug#277760: xfree86: Please drop Build-Depends on 'libstdc++5-dev | libstdc++'
Package: xfree86 Severity: wishlist Tags: patch Please drop 'libstdc++5-dev | libstdc++-dev' from Build-Depends. It is not necessary to specify this explicitly because the default version of 'libstdc++-dev' is build-essential anyway. Regards Andreas Jochens diff -urN ../tmp-orig/xfree86-4.3.0.dfsg.1/debian/control ./debian/control --- ../tmp-orig/xfree86-4.3.0.dfsg.1/debian/control 2004-09-25 09:41:16.528803296 +0200 +++ ./debian/control2004-09-25 09:41:03.734748288 +0200 @@ -4,7 +4,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: Branden Robinson [EMAIL PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED] Standards-Version: 3.6.1 -Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, po-debconf, debhelper (= 4.1.16), lynx, libglide2-dev ( 2001.01.26) [i386], libglide3-dev (= 2002.04.10-7) [alpha amd64 i386 ia64], linux-kernel-headers [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], linux-kernel-headers (= 2.5.999-test7-bk-15) [sparc], libpng12-dev | libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev (= 2.1.2), libxrender-dev (= 0.8.3), libxcursor-dev, dbs, m4 +Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (= 4.1.16), lynx, libglide2-dev ( 2001.01.26) [i386], libglide3-dev (= 2002.04.10-7) [alpha amd64 i386 ia64], linux-kernel-headers [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], linux-kernel-headers (= 2.5.999-test7-bk-15) [sparc], libpng12-dev | libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev (= 2.1.2), libxrender-dev (= 0.8.3), libxcursor-dev, dbs, m4 Build-Conflicts: cpp-3.3 ( 1:3.3.3-0pre1) Package: lbxproxy
Bug#240889: AMD64 Port: Almost all packages are ready to be uploaded
On 04-May-12 04:25, Branden Robinson wrote: Hmmm. When you submitted the original patch, you said it was tested. In the future, please don't oversell the state of a patch you submit. Come on, I did not oversell anything. The original bug report stated two build problems on amd64 and described a possible solution. You added the 'help' tag to the bug and requested a patch against the current svn trunk. I tried to figure out how to do that, created a patch and checked if it solved the build problems stated in the original bug report. It did solve those build problems and I posted the patch to the BTS with the statement that 'it works for me'. What I meant with this was that it solves the build problems stated in the original bug report. This patch still stands as I originally posted it. I never claimed that this patch solves all problems for the amd64 architecture. However, I tried to create another patch to solve the remaining xfree86 build problems on amd64 and posted the result of these efforts to the BTS. With the help of others working on the amd64 port and two small changes/additions to my patch there is now a patch which seems to make xfree86 work on amd64. What would be the correct way to proceed now? Regards Andreas Jochens
Bug#240889: AMD64 Port: Almost all packages are ready to be uploaded
On 04-May-09 17:47, Frederik Schueler wrote: Hi, On Sun, May 09, 2004 at 04:14:13PM +0200, Andreas Jochens wrote: Yes, you can find my xfree86 patch in the BTS (#240889). It simply switches off the 'lib64' installation feature in the original xfree86 sources for amd64 and uses 'lib' instead. Please try my second patch (the first one was incomplete). Great. Did you build glide, too? I cannot find any patches of yours in the bts and xfree86 build-depends on it. This is a bug in my patch. I do not have any patch for glide on amd64. xfree86 build-depends on libglide2-dev and libglide3-dev for i386 only. I just added the build-depends for amd64 when I first experimented with xfree86 on amd64 and simply forgot to remove them later. You can just remove the dependencies on libglide2-dev and libglide3-dev for amd64 from the Build-Depends in debian/control in my patch. Then xfree86 compiles without problems (at least for me). I will send an updated patch without these Build-Depends to the BTS in a separate mail. Please report if you can successfully build and install xfree86 on amd64. Regards Andreas Jochens
Bug#240889: AMD64 Port: Almost all packages are ready to be uploaded
On 04-May-09 20:13, Frederik Schueler wrote: I could succesfully build it, install and configure it and it works, I have now X11 on my pure64 system =) I am actually rebuilding a full source upload in order to upload it to alioth this night. Great. +amd64) + DRIVER_LIST=apm, ark, ati, chips, cirrus, cyrix, fbdev, glide, glint, i128, i740, i810, imstt, mga, neomagic, newport, nsc, nv, rendition, s3, s3virge, savage, siliconmotion, sis, tga, trident, tseng, vesa, vga + ;; Should 'glide' be deleted from DRIVER_LIST since we dropped the build-dependency on libglide[2|3]-dev ? Regards Andreas Jochens
Bug#240889: Patch for bug 240889 (amd64 build) against current svn trunk/debian
tag 240889 + patch
The following patch works for me.
Regards
Andreas Jochens
diff -urN debian.trunk/control debian/control
--- debian.trunk/control2004-04-15 11:47:16.0 +0200
+++ debian/control 2004-04-15 15:28:58.0 +0200
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: Branden Robinson [EMAIL PROTECTED], Fabio Massimo Di Nitto
[EMAIL PROTECTED]
Standards-Version: 3.6.1
-Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin,
po-debconf, debhelper (= 4.1.16), html2text, libglide2-dev ( 2001.01.26)
[i386], libglide3-dev (= 2002.04.10-3) [alpha i386], linux-kernel-headers
[alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh],
linux-kernel-headers (= 2.5.999-test7-bk-15) [sparc], libpng12-dev |
libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev
(= 2.1.2), libxrender-dev (= 0.8.3), libxcursor-dev, dbs, m4
+Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin,
po-debconf, debhelper (= 4.1.16), html2text, libglide2-dev ( 2001.01.26)
[i386], libglide3-dev (= 2002.04.10-3) [alpha i386], linux-kernel-headers
[alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh],
linux-kernel-headers (= 2.5.999-test7-bk-15) [sparc], libpng12-dev |
libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev
(= 2.1.2), libxrender-dev (= 0.8.3), libxcursor-dev, dbs, m4
Build-Conflicts: cpp-3.3 ( 1:3.3.3-0pre1)
Package: lbxproxy
@@ -1240,7 +1240,7 @@
Internet hosts will be allowed inbound access to local X servers.
Package: xlibmesa-dri
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibmesa-gl
Conflicts: xlibmesa3 ( 4.2.1-5), xlibmesa3-gl
Replaces: xlibmesa3 ( 4.2.1-5), xlibmesa3-gl
@@ -1251,7 +1251,7 @@
not by the X server itself.)
Package: xlibmesa-dri-dbg
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibmesa-dri (= ${Source-Version})
Conflicts: xlibmesa-gl-dbg ( 4.3.0), xlibmesa3-gl-dbg (= 4.2.1-13)
Replaces: xlibmesa-gl-dbg ( 4.3.0), xlibmesa3-gl-dbg (= 4.2.1-13)
@@ -1372,7 +1372,7 @@
Package: xlibosmesa4
Section: libs
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Mesa off-screen rendering library [XFree86]
Mesa is a 3D graphics library which presents an API intended to be compatible
@@ -1391,7 +1391,7 @@
Package: xlibosmesa4-dbg
Section: libdevel
Priority: extra
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibosmesa4 (= ${Source-Version}), ${misc:Depends}
Description: Mesa off-screen rendering library (unstripped) [XFree86]
This package is useful to provide a backtrace with symbol names in a
@@ -1406,7 +1406,7 @@
Package: xlibosmesa-dev
Section: libdevel
-Architecture: alpha i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibosmesa4 (= ${Source-Version}), libgl-dev, libc6-dev | libc-dev
Description: Mesa off-screen rendering library development files [XFree86]
xlibosmesa-dev provides static versions of the libraries provided in
@@ -1582,7 +1582,7 @@
xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable packages.
Package: xserver-xfree86
-Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386
powerpc sh3 sh4 sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel
netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
Suggests: discover, mdetect, read-edid, libglide2 ( 2001.01.26)
Conflicts: libxfont-xtt
@@ -1616,7 +1616,7 @@
Package: xserver-xfree86-dbg
Priority: extra
-Architecture: alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386
powerpc sh3 sh4 sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel
netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (= 4.2.1-10), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xfree86
Suggests: discover, mdetect, read-edid
diff -urN debian.trunk/patches/899-amd64-XlcDL.diff
debian/patches/899-amd64-XlcDL.diff
--- debian.trunk/patches/899-amd64-XlcDL.diff 1970-01-01 01:00:00.0
+0100
+++ debian/patches/899-amd64-XlcDL.diff 2004-04-15 12:23:29.0 +0200
@@ -0,0 +1,12 @@
+diff -urN xc-dist/lib/X11/XlcDL.c xc/lib/X11/XlcDL.c
+--- xc-dist/lib/X11/XlcDL.c2002-11-25 08:04:53.0 -0600
xc/lib/X11/XlcDL.c 2004-04-15 05:10:31.325361544 -0500
+@@ -58,7 +58,7
