X Strike Force X.Org X11 SVN commit: r334 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-07-12 10:21:48 -0500 (Tue, 12 Jul 2005)
New Revision: 334
Added:
trunk/debian/patches/104_sparc_no_mv8_flag.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/009_disable_Xprt.diff
trunk/debian/patches/600_amd64_support.diff
trunk/debian/rules
Log:
- Add 104_sparc_no_mv8_flag.diff to fix a build problem on sparc (thanks
Julien Cristau)
Incorporate the following by Daniel Stone:
- Fix FTBFS by only forcing BuildXprintLib building when we're not
BuildingServersOnly (i.e. only in the normal build, not in -dbg).
- Change NOT_BUILDING_XFREE86_X_SERVER to _XORG_ in vars.s390 (fixes FTBFS
also).
- Add 000_stolen_from_drm.diff from Ubuntu, with annotations, which fixes
FTBFS when using linux-libc-headers.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-12 02:43:14 UTC (rev 333)
+++ trunk/debian/changelog 2005-07-12 15:21:48 UTC (rev 334)
@@ -14,9 +14,18 @@
- Update xlibs-static-dev package description with libXprint* libs (thanks
Nathanael Nerode)
- - Change XFREE86 -> XORG in debian/scripts/vars.s390 to fix FTBFS (thanks
- Daniel Stone)
+ - Add 104_sparc_no_mv8_flag.diff to fix a build problem on sparc (thanks
+ Julien Cristau)
+
+ Changes by Daniel Stone:
+ - Fix FTBFS by only forcing BuildXprintLib building when we're not
+ BuildingServersOnly (i.e. only in the normal build, not in -dbg).
+ - Change NOT_BUILDING_XFREE86_X_SERVER to _XORG_ in vars.s390 (fixes FTBFS
+ also).
+ - Add 000_stolen_from_drm.diff from Ubuntu, with annotations, which fixes
+ FTBFS when using linux-libc-headers.
+
-- David Nusinow <dnusinow@debian.org> Mon, 11 Jul 2005 20:47:31 -0400
xorg-x11 (6.8.2.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/patches/009_disable_Xprt.diff
===================================================================
--- trunk/debian/patches/009_disable_Xprt.diff 2005-07-12 02:43:14 UTC (rev 333)
+++ trunk/debian/patches/009_disable_Xprt.diff 2005-07-12 15:21:48 UTC (rev 334)
@@ -1,16 +1,18 @@
diff -Nru xc.orig/config/cf/linux.cf xc/config/cf/linux.cf
--- xc.orig/config/cf/linux.cf 2005-07-07 20:40:56.000000000 +0800
+++ xc/config/cf/linux.cf 2005-07-07 20:41:57.000000000 +0800
-@@ -233,6 +233,13 @@
+@@ -233,6 +233,15 @@
# define FontLibSharedFreeType NO
# define HasLatex YES
+/*
+ * The XFree86 Debian package no longer builds the Xprt server, in favor
-+ * of a separate xprint package. We do still build the library.
++ * of a separate xprint package. We do still build the library,
++ * but only when we're not building servers only, so it gets built in the
++ * normal build, but not -dbg (as it requires libXt headers).
+ */
+# define XprtServer NO
-+# define BuildXprintLib YES
++# define BuildXprintLib !BuildServersOnly
+
# ifdef UseInstalled
# define RenderLibraryDir /usr
Added: trunk/debian/patches/104_sparc_no_mv8_flag.diff
===================================================================
--- trunk/debian/patches/104_sparc_no_mv8_flag.diff 2005-07-12 02:43:14 UTC (rev 333)
+++ trunk/debian/patches/104_sparc_no_mv8_flag.diff 2005-07-12 15:21:48 UTC (rev 334)
@@ -0,0 +1,17 @@
+Don't use deprecated -mv8 option on Linux, as it has been deprecated in
+gcc4. See Freedesktop bug #2073.
+
+This patch by Ferris McCormick of Gentoo, and adapted for Debian by David
+Nusinow.
+
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile- 2004-06-16 09:44:00.000000000 +0000
++++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile 2004-10-27 20:27:01.000000000 +0000
+@@ -19,7 +19,7 @@
+ VISOPTIONS = -DUSE_VIS
+ ASVISOPTION = AsVISOption
+ GCCVISOPTION = -Wa,$(ASVISOPTION)
+-#if AsOutputArchSize == 32
++#if AsOutputArchSize == 32 && !defined(LinuxArchitecture)
+ #define FFBCObjectRule(name) @@\
+ name.o: name.c @@\
+ ObjectCompile(-mv8 -mtune=ultrasparc \
Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff 2005-07-12 02:43:14 UTC (rev 333)
+++ trunk/debian/patches/600_amd64_support.diff 2005-07-12 15:21:48 UTC (rev 334)
@@ -11,7 +11,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-18 14:39:52.737468000 +0200
+++ xc/config/cf/linux.cf 2004-10-18 14:41:57.429512384 +0200
-@@ -638,7 +638,7 @@
+@@ -640,7 +640,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-07-12 02:43:14 UTC (rev 333)
+++ trunk/debian/rules 2005-07-12 15:21:48 UTC (rev 334)
@@ -81,7 +81,7 @@
IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"'
# XXX: replace -DDefaultGcc2OptimizeOpt=-O0 with $(DEBUGFLAGS) when the time
# comes (see above)
-SERVERDEBUG_IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXdmxServer=NO -DDefaultGcc2OptimizeOpt=-O0
+SERVERDEBUG_IMAKE_DEFINES:=-DXorgCustomVersion='\"Debian (static) $(SOURCE_VERSION) $(TIMESTAMP) $(BUILDER)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXdmxServer=NO -DDefaultGcc2OptimizeOpt=-O0 -DXprtServer=NO -DBuildXprintLib=NO
# If this is an official build, set the BuilderEMailAddr that gets displayed in
# some error messages.
Reply to: