Author: branden
Date: 2004-07-14 11:11:44 -0500 (Wed, 14 Jul 2004)
New Revision: 1640
Modified:
trunk/debian/CHANGESETS
trunk/debian/MANIFEST.powerpc
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
trunk/debian/patches/048_via_driver_enable.diff
trunk/debian/patches/103_sparc_dont_build_useless_drivers.diff
trunk/debian/patches/150_powerpc_build_nv_driver.diff
trunk/debian/patches/250_m68k_build_scanpci.diff
trunk/debian/patches/500_s390_support.diff
trunk/debian/patches/600_amd64_support.diff
trunk/debian/xlibmesa-dri-dbg.install.powerpc
trunk/debian/xlibmesa-dri.install.powerpc
Log:
Update Glide3 library support for amd64 and ia64 thanks to Guillem Jover.
+ Increment versioned build-dependency on libglide3 to >= 2002.04.10-7, and
require this library for building on amd64 and ia64.
+ Edit patch #003 to enable compilation of tdfx DRI Mesa module on amd64
and ia64.
+ Shut up cpp warnings when generating Makefiles by defining a default
value for HasGlide3 in xfree86.cf ("NO").
+ Resync patches #004, #048, #103, #150, #250, #500, and #600.
(Closes: #255270)
Fix up Glide3 library support in various respects.
+ Stop shipping tdfx DRI Mesa module on powerpc until it stops being
useless (i.e., until libglide3-dev is available on that architecture).
+ Move xlibmesa-gl's suggestion of the libglide3 package (and explanation
thereof) to the xlibmesa-dri package.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-07-14 07:20:51 UTC (rev 1639)
+++ trunk/debian/CHANGESETS 2004-07-14 16:11:44 UTC (rev 1640)
@@ -51,4 +51,17 @@
is run by a user?" to document existence of sux.
1635
+Update Glide3 library support for amd64 and ia64 thanks to Guillem Jover.
+Increment versioned build-dependency on libglide3 to >= 2002.04.10-7, and
+require this library for building on amd64 and ia64. Edit patch #003 to enable
+compilation of tdfx DRI Mesa module on amd64 and ia64. Shut up cpp warnings
+when generating Makefiles by defining a default value for HasGlide3 in
+xfree86.cf ("NO"). Resync patches #004, #048, #103, #150, #250, #500, and
#600.
+Fix up Glide3 library support in various respects. Stop shipping tdfx DRI Mesa
+module on powerpc until it stops being useless (i.e., until libglide3-dev is
+available on that architecture). Move xlibmesa-gl's suggestion of the
libglide3
+package (and explanation thereof) to the xlibmesa-dri package. (Closes:
+#255270)
+ 1640
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/MANIFEST.powerpc
===================================================================
--- trunk/debian/MANIFEST.powerpc 2004-07-14 07:20:51 UTC (rev 1639)
+++ trunk/debian/MANIFEST.powerpc 2004-07-14 16:11:44 UTC (rev 1640)
@@ -6045,7 +6045,6 @@
usr/X11R6/lib/modules/dri/r128_dri.so
usr/X11R6/lib/modules/dri/r200_dri.so
usr/X11R6/lib/modules/dri/radeon_dri.so
-usr/X11R6/lib/modules/dri/tdfx_dri.so
usr/X11R6/lib/modules/drivers/ati_drv.o
usr/X11R6/lib/modules/drivers/atimisc_drv.o
usr/X11R6/lib/modules/drivers/chips_drv.o
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-07-14 07:20:51 UTC (rev 1639)
+++ trunk/debian/TODO 2004-07-14 16:11:44 UTC (rev 1640)
@@ -59,7 +59,6 @@
* Import XTerm #192 (fixes #241717, #254650, #255197, #256086, #257073,
#254316).
* Grab latest version of Thomas Dickey's XTerm FAQ from his website.
-* #255270: Apply patch to add libglide3 support for ia64 and amd64.
* Shut up preprocessor warning at xc/config/cf/xfree86.cf:1031; test for
"HasGlide3" symbol being defined before testing its value.
* #253480: xdm: XDM fails if the user is over disk quota, but empty files can
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-07-14 07:20:51 UTC (rev 1639)
+++ trunk/debian/changelog 2004-07-14 16:11:44 UTC (rev 1640)
@@ -32,8 +32,22 @@
* Update FAQ entry "How do I run an X client as root when the X session
is run by a user?" to document existence of sux.
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 13 Jul 2004 14:40:47 -0500
+ * Update Glide3 library support for amd64 and ia64 thanks to Guillem Jover.
+ Increment versioned build-dependency on libglide3 to >= 2002.04.10-7, and
+ require this library for building on amd64 and ia64. Edit patch #003 to
+ enable compilation of tdfx DRI Mesa module on amd64 and ia64. Shut up cpp
+ warnings when generating Makefiles by defining a default value for
+ HasGlide3 in xfree86.cf ("NO"). Resync patches #004, #048, #103, #150,
+ #250, #500, and #600. (Closes: #255270)
+ * Fix up Glide3 library support in various respects. Stop shipping tdfx DRI
+ Mesa module on powerpc until it stops being useless (i.e., until
+ libglide3-dev is available on that architecture). Move xlibmesa-gl's
+ suggestion of the libglide3 package (and explanation thereof) to the
+ xlibmesa-dri package.
+
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Jul 2004 11:02:43 -0500
+
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Changes by Branden Robinson:
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-07-14 07:20:51 UTC (rev 1639)
+++ trunk/debian/control 2004-07-14 16:11:44 UTC (rev 1640)
@@ -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-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-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-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
Package: lbxproxy
@@ -1256,6 +1256,7 @@
Package: xlibmesa-dri
Architecture: alpha amd64 i386 ia64 powerpc sparc
Depends: xlibmesa-gl
+Suggests: libglide3
Conflicts: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
Replaces: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
Description: Mesa 3D graphics library modules [XFree86]
@@ -1263,6 +1264,12 @@
machine architecture, are provided in this package. (Unlike the modules in
the xserver-xfree86 package, the DRI modules are loaded by the Mesa library,
not by the X server itself.)
+ .
+ This package suggests the libglide3 package, which is necessary for 3D
+ acceleration support for users of 3Dfx Interactive's Voodoo Banshee, Voodoo3,
+ Voodoo4, and Voodoo5 cards. Users of other video cards need not install
+ libglide3. Note that 3D acceleration support for 3Dfx cards is not available
+ for the PowerPC and SPARC architectures.
Package: xlibmesa-dri-dbg
Architecture: alpha amd64 i386 ia64 powerpc sparc
@@ -1282,7 +1289,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libglide3, xlibmesa-dri
+Suggests: xlibmesa-dri
Conflicts: libgl1, libutahglx1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
Provides: libgl1
Replaces: libgl1, libutahglx1, xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
@@ -1296,11 +1303,6 @@
.
Chipset-specific acceleration modules, if available for your machine
architecture, are provided in the xlibmesa-dri package.
- .
- This package suggests the libglide3 package, which is necessary for 3D
- acceleration support for users of 3Dfx Interactive's Voodoo Banshee, Voodoo3,
- Voodoo4, and Voodoo5 cards. Users of other video cards need not install
- libglide3.
Package: xlibmesa-gl-dbg
Section: libdevel
Modified: trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2004-07-14
07:20:51 UTC (rev 1639)
+++ trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2004-07-14
16:11:44 UTC (rev 1640)
@@ -1,59 +1,22 @@
$Id$
Various Debian changes to xfree86.cf and linux.cf, including better
-support for gcc flags. Forward-ported with some updates from 4.2.1.
+support for GCC flags, including tweakability of optimization level.
-Originally by Branden Robinson. Forward-ported with a few updates by
-Daniel Stone.
+This patch mostly by Branden Robinson.
FontLibSharedFreeType disabled by ISHIKAWA Mutsumi; this change should be
-dropped when we can build the module-loading XFree86 X server liked against
-an external FreeType2 library.
+dropped when we can build the module-loading XFree86 X server linked
+against an external FreeType2 library.
-Build with external Xrender, Xft and Xcursor by ISHIKAWA Mutsumi.
+External Xrender, Xft and Xcursor support by ISHIKAWA Mutsumi.
---- xc/config/cf/xfree86.cf.orig Fri Jan 3 11:55:00 2003
-+++ xc/config/cf/xfree86.cf Fri Jan 3 11:55:09 2003
-@@ -1952,27 +1952,33 @@
- #define GccAliasingArgs /* */
- #endif
-
-+#if HasGcc2
-+# ifndef DefaultGcc2OptimizeOpt
-+# define DefaultGcc2OptimizeOpt -O2
-+# endif
-+#endif
-+
- #if HasGcc2 && defined(i386Architecture)
- # ifndef DefaultGcc2i386Opt
--# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
-+# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
-
- #if HasGcc2 && defined(x86_64Architecture)
- # ifndef DefaultGcc2x86_64Opt
--# define DefaultGcc2x86_64Opt -O2 -fno-strength-reduce GccAliasingArgs
-+# define DefaultGcc2x86_64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
-
- #if HasGcc2 && defined(AlphaArchitecture)
- # ifndef DefaultGcc2AxpOpt
--# define DefaultGcc2AxpOpt -O2 GccAliasingArgs
-+# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
-
- #if HasGcc2 && defined(PpcArchitecture)
- # ifndef DefaultGcc2PpcOpt
--# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
-+# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
-
---- xc/config/cf/linux.cf.orig 2004-01-19 17:18:24.000000000 -0500
-+++ xc/config/cf/linux.cf 2004-01-19 18:00:57.000000000 -0500
+Enhanced Glide3 support in part by Guillem Jover.
+
+Not submitted to XFree86.
+
+--- xc/config/cf/linux.cf~ 2004-07-13 15:19:08.000000000 -0500
++++ xc/config/cf/linux.cf 2004-07-13 17:35:34.000000000 -0500
@@ -93,17 +93,23 @@
#endif
@@ -80,7 +43,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -152,33 +158,81 @@
+@@ -152,33 +158,82 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n
xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -157,12 +120,15 @@
# define Glide2IncDir /usr/include/glide
# endif /* i386Architecture */
-/* at present, glide3 only works on alpha and i386 */
-+/* Glide3 only works on alpha and i386. */
- # if defined(i386Architecture) || defined(AlphaArchitecture)
+-# if defined(i386Architecture) || defined(AlphaArchitecture)
++/* Glide3 only works on alpha, amd64, ia64 and i386. */
++# if defined(i386Architecture) || defined(AlphaArchitecture) || \
++ defined(ia64Architecture) || defined(x86_64Architecture)
# define HasGlide3 YES
# define Glide3IncDir /usr/include/glide3
- # endif /* i386Architecture || AlphaArchitecture */
+-# endif /* i386Architecture || AlphaArchitecture */
-/* extended instruction set support */
++# endif /* defined(i386Architecture) || defined(AlphaArchitecture) || ... */
+/* Enable extended instruction set support. */
# ifdef i386Architecture
-# define HasX86Support YES
@@ -175,7 +141,7 @@
# endif /* i386Architecture */
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -649,10 +703,10 @@
+@@ -649,10 +704,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -187,7 +153,7 @@
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -664,10 +718,10 @@
+@@ -664,10 +719,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -199,7 +165,7 @@
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -678,29 +732,30 @@
+@@ -678,29 +733,30 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -238,7 +204,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -745,7 +800,7 @@
+@@ -745,7 +801,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -247,7 +213,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -758,7 +813,7 @@
+@@ -758,7 +814,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -256,7 +222,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -766,7 +821,9 @@
+@@ -766,7 +822,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -267,7 +233,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -774,7 +831,7 @@
+@@ -774,7 +832,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -276,7 +242,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -783,7 +840,7 @@
+@@ -783,7 +841,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -285,7 +251,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -792,7 +849,7 @@
+@@ -792,7 +850,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -294,7 +260,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -801,7 +858,7 @@
+@@ -801,7 +859,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -303,7 +269,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -811,7 +868,7 @@
+@@ -811,7 +869,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -312,7 +278,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -820,7 +877,7 @@
+@@ -820,7 +878,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -321,7 +287,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -828,16 +885,17 @@
+@@ -828,16 +886,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -345,7 +311,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -859,7 +917,7 @@
+@@ -859,7 +918,7 @@
# else
# define SuperHArchOptFlags -m3
# endif
@@ -354,7 +320,7 @@
# ifndef SuperHebArchitecture
# ifdef SuperHebArchitecture
# define SuperHEndianFlags -mb
-@@ -868,7 +926,7 @@
+@@ -868,7 +927,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
@@ -363,3 +329,108 @@
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+--- xc/config/cf/xfree86.cf~ 2004-07-13 15:19:08.000000000 -0500
++++ xc/config/cf/xfree86.cf 2004-07-13 17:44:52.000000000 -0500
+@@ -221,6 +221,11 @@
+ #define GlideDriver /**/
+ #endif
+
++/* The 3Dfx DRI driver can only be built if the glide3 library is available.
*/
++#ifndef HasGlide3
++#define HasGlide3 NO
++#endif
++
+ /*
+ * There are three parameters that determine where and how the Matrox HAL
+ * library is used:
+@@ -470,8 +475,11 @@
+ vga dummy fbdev vesa
+ # endif
+
+-/* DRI tdfx driver needs Glide, which is not available for x86_64 */
+-# define TdfxDriDriver /**/
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
+
+ # define DevelDRIDrivers /**/
+
+@@ -841,8 +849,13 @@
+ savage nv cirrus DevelDrivers siliconmotion \
+ vga XF86OSCardDrivers XF86ExtraCardDrivers
+ # endif
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/
++# define DriDrivers gamma TdfxDriDriver mga r128 radeon r200 /*sis*/
+ # endif
+ #endif
+
+@@ -933,8 +946,13 @@
+ DevelDrivers vga \
+ XF86OSCardDrivers XF86ExtraCardDrivers
+ # endif
++# if HasGlide3
++# define TdfxDriDriver tdfx
++# else
++# define TdfxDriDriver /**/
++# endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma tdfx mga r128 radeon r200
++# define DriDrivers gamma TdfxDriDriver mga r128 radeon r200
+ # endif
+ #endif
+
+@@ -1027,7 +1045,7 @@
+ # define TdfxDriDriver /**/
+ # endif
+ # ifndef DriDrivers
+-# define DriDrivers gamma tdfx mga r128 radeon r200
++# define DriDrivers gamma TdfxDriDriver mga r128 radeon r200
+ # endif
+ #endif
+
+@@ -1952,27 +1970,33 @@
+ #define GccAliasingArgs /* */
+ #endif
+
++#if HasGcc2
++# ifndef DefaultGcc2OptimizeOpt
++# define DefaultGcc2OptimizeOpt -O2
++# endif
++#endif
++
+ #if HasGcc2 && defined(i386Architecture)
+ # ifndef DefaultGcc2i386Opt
+-# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(x86_64Architecture)
+ # ifndef DefaultGcc2x86_64Opt
+-# define DefaultGcc2x86_64Opt -O2 -fno-strength-reduce GccAliasingArgs
++# define DefaultGcc2x86_64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(AlphaArchitecture)
+ # ifndef DefaultGcc2AxpOpt
+-# define DefaultGcc2AxpOpt -O2 GccAliasingArgs
++# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
+ #if HasGcc2 && defined(PpcArchitecture)
+ # ifndef DefaultGcc2PpcOpt
+-# define DefaultGcc2PpcOpt -O2 GccAliasingArgs
++# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+ # endif
+ #endif
+
Modified: trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
2004-07-14 07:20:51 UTC (rev 1639)
+++ trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
2004-07-14 16:11:44 UTC (rev 1640)
@@ -299,7 +299,7 @@
#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
#endif
--- xc/config/cf/linux.cf~ 2004-03-17 13:06:13.000000000 -0500
-+++ xc/config/cf/linux.cf 2004-03-17 13:06:18.000000000 -0500
++++ xc/config/cf/linux.cf 2004-07-13 17:56:22.000000000 -0500
@@ -164,6 +164,7 @@
*/
# define StaticNeedsPicForShared NO
@@ -308,7 +308,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -975,26 +976,6 @@
+@@ -976,26 +977,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
@@ -336,8 +336,8 @@
# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath)
Concat(-l,libname) -Wl,-Bdynamic
#endif
--- xc-old/config/cf/xfree86.cf 2004-01-18 04:41:52.000000000 +0100
-+++ xc/config/cf/xfree86.cf 2004-01-18 04:46:32.000000000 +0100
-@@ -1887,10 +1887,6 @@
++++ xc/config/cf/xfree86.cf 2004-07-13 17:56:23.000000000 -0500
+@@ -1905,10 +1905,6 @@
# define UseRgbTxt YES
#endif
Modified: trunk/debian/patches/048_via_driver_enable.diff
===================================================================
--- trunk/debian/patches/048_via_driver_enable.diff 2004-07-14 07:20:51 UTC
(rev 1639)
+++ trunk/debian/patches/048_via_driver_enable.diff 2004-07-14 16:11:44 UTC
(rev 1640)
@@ -7,9 +7,9 @@
Not submitted to XFree86.
---- xc/config/cf/xfree86.cf Wed Mar 24 13:00:29 2004
-+++ xc/config/cf/xfree86.cf Wed Mar 24 11:20:36 2004
-@@ -360,7 +360,7 @@
+--- xc/config/cf/xfree86.cf~ 2004-07-13 18:02:14.000000000 -0500
++++ xc/config/cf/xfree86.cf 2004-07-13 18:02:48.000000000 -0500
+@@ -365,7 +365,7 @@
/* Pure PCI drivers should go first */
# ifndef XF86CardDrivers
@@ -18,7 +18,7 @@
# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
neomagic i740 tdfx savage \
cirrus vmware tseng trident chips apm \
-@@ -371,7 +371,7 @@
+@@ -376,7 +376,7 @@
dummy XF86OSCardDrivers XF86ExtraCardDrivers
# else
# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
Modified: trunk/debian/patches/103_sparc_dont_build_useless_drivers.diff
===================================================================
--- trunk/debian/patches/103_sparc_dont_build_useless_drivers.diff
2004-07-14 07:20:51 UTC (rev 1639)
+++ trunk/debian/patches/103_sparc_dont_build_useless_drivers.diff
2004-07-14 16:11:44 UTC (rev 1640)
@@ -1,8 +1,14 @@
$Id$
---- xc/config/cf/xfree86.cf.orig 2002-12-14 03:33:49.000000000 +0900
-+++ xc/config/cf/xfree86.cf 2002-12-14 03:38:16.000000000 +0900
-@@ -567,9 +567,9 @@
+Don't build the i810, newport, or tga drivers on SPARC.
+
+This patch by Daniel Stone.
+
+Not submitted to XFree86.
+
+--- xc/config/cf/xfree86.cf~ 2004-07-14 01:03:49.000000000 -0500
++++ xc/config/cf/xfree86.cf 2004-07-14 01:03:49.000000000 -0500
+@@ -575,9 +575,9 @@
* require changes (or even removal) for things like endianness, etc. Move
* those known to work into the main XF86CardDrivers #define.
*/
Modified: trunk/debian/patches/150_powerpc_build_nv_driver.diff
===================================================================
--- trunk/debian/patches/150_powerpc_build_nv_driver.diff 2004-07-14
07:20:51 UTC (rev 1639)
+++ trunk/debian/patches/150_powerpc_build_nv_driver.diff 2004-07-14
16:11:44 UTC (rev 1640)
@@ -1,10 +1,14 @@
$Id$
-Build the nVidia driver for PowerPC. This patch originally by Branden Robinson.
+Build the nvidia driver for PowerPC.
---- xc/config/cf/xfree86.cf.orig 2002-09-13 03:49:17.000000000 -0500
-+++ xc/config/cf/xfree86.cf 2002-09-13 03:50:06.000000000 -0500
-@@ -935,7 +935,7 @@
+This patch by Branden Robinson.
+
+Not submitted to XFree86.
+
+--- xc/config/cf/xfree86.cf~ 2004-07-14 01:03:49.000000000 -0500
++++ xc/config/cf/xfree86.cf 2004-07-14 01:03:49.000000000 -0500
+@@ -948,7 +948,7 @@
/* Pure PCI drivers should go first */
# ifndef XF86CardDrivers
Modified: trunk/debian/patches/250_m68k_build_scanpci.diff
===================================================================
--- trunk/debian/patches/250_m68k_build_scanpci.diff 2004-07-14 07:20:51 UTC
(rev 1639)
+++ trunk/debian/patches/250_m68k_build_scanpci.diff 2004-07-14 16:11:44 UTC
(rev 1640)
@@ -4,11 +4,13 @@
example. Anyway, pcitweak was getting built for m68k, so there's
really no point leaving this utility disabled for the architecture.
-This patch by Branden Robinson. Not submitted upstream yet.
+This patch by Branden Robinson.
---- xc/config/cf/xfree86.cf~ 2003-10-16 17:39:37.000000000 -0500
-+++ xc/config/cf/xfree86.cf 2003-10-16 17:40:17.000000000 -0500
-@@ -1693,7 +1693,7 @@
+Not submitted to XFree86.
+
+--- xc/config/cf/xfree86.cf~ 2004-07-14 01:03:49.000000000 -0500
++++ xc/config/cf/xfree86.cf 2004-07-14 01:03:49.000000000 -0500
+@@ -1711,7 +1711,7 @@
#endif
#ifndef BuildScanpci
# if SystemV || SystemV4 || \
Modified: trunk/debian/patches/500_s390_support.diff
===================================================================
--- trunk/debian/patches/500_s390_support.diff 2004-07-14 07:20:51 UTC (rev
1639)
+++ trunk/debian/patches/500_s390_support.diff 2004-07-14 16:11:44 UTC (rev
1640)
@@ -1,8 +1,14 @@
$Id$
---- xc/config/cf/xfree86.cf.orig 2002-09-13 03:50:06.000000000 -0500
-+++ xc/config/cf/xfree86.cf 2002-09-13 03:50:41.000000000 -0500
-@@ -1117,6 +1117,15 @@
+Miscellaneous fixes for S/390.
+
+This patch by Gerhard Tonn.
+
+Not submitted to XFree86.
+
+--- xc/config/cf/xfree86.cf~ 2004-07-14 01:03:49.000000000 -0500
++++ xc/config/cf/xfree86.cf 2004-07-14 01:03:49.000000000 -0500
+@@ -1135,6 +1135,15 @@
# endif
#endif
Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff 2004-07-14 07:20:51 UTC (rev
1639)
+++ trunk/debian/patches/600_amd64_support.diff 2004-07-14 16:11:44 UTC (rev
1640)
@@ -16,10 +16,9 @@
Not submitted to XFree86.
-diff -urN xc/config/cf/linux.cf xc/config/cf/linux.cf
---- xc/config/cf/linux.cf 2003-02-20 23:30:20.000000000 -0600
-+++ xc/config/cf/linux.cf 2004-05-12 14:29:51.000000000 -0500
-@@ -578,7 +578,7 @@
+--- xc/config/cf/linux.cf~ 2004-07-14 02:22:02.000000000 -0500
++++ xc/config/cf/linux.cf 2004-07-14 02:23:09.000000000 -0500
+@@ -579,7 +579,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Modified: trunk/debian/xlibmesa-dri-dbg.install.powerpc
===================================================================
--- trunk/debian/xlibmesa-dri-dbg.install.powerpc 2004-07-14 07:20:51 UTC
(rev 1639)
+++ trunk/debian/xlibmesa-dri-dbg.install.powerpc 2004-07-14 16:11:44 UTC
(rev 1640)
@@ -3,4 +3,3 @@
usr/X11R6/lib/modules/dri/r128_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r200_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/radeon_dri.so /usr/X11R6/lib/modules/dri/debug
-usr/X11R6/lib/modules/dri/tdfx_dri.so /usr/X11R6/lib/modules/dri/debug
Modified: trunk/debian/xlibmesa-dri.install.powerpc
===================================================================
--- trunk/debian/xlibmesa-dri.install.powerpc 2004-07-14 07:20:51 UTC (rev
1639)
+++ trunk/debian/xlibmesa-dri.install.powerpc 2004-07-14 16:11:44 UTC (rev
1640)
@@ -3,4 +3,3 @@
usr/X11R6/lib/modules/dri/r128_dri.so
usr/X11R6/lib/modules/dri/r200_dri.so
usr/X11R6/lib/modules/dri/radeon_dri.so
-usr/X11R6/lib/modules/dri/tdfx_dri.so
