Re: xfree86 4.3.0-pre1v1 sources ?
On Thu, Aug 07, 2003 at 08:37:52PM +1000, Daniel Stone wrote:
> On Thu, Aug 07, 2003 at 11:52:13AM +0200, Sven Luther wrote:
> > Is there somewhere the 4.3.0-pre1v1 source package are available while
> > they are waiting in the new queue ? I wish to build them, and try to
> > work on providing the driver SDK this weekend.
>
> http://auric.debian.org/~branden/
A, ok. I had trouble building the package with your -ds4 packages, since
libxcursor is needed to build, but it overwrites a file from the -ds4 xlibs-dev,
and installing the 4.2.1 stuff would have meant removing all the -0ds4
packages, which i didn't want to do. I just forced the overwrite and it
went fine.
> > I tried building the today nightly snapshots, but they failed with the
> > hunk 1 of the 003_linux.cf_and_xfree86.cf.diff patch. It failed in
> > linux.cf, because the upstream tarball seem to have a :
> >
> > #if LinuxDistribution == LinuxDebian
> > # define SystemManDirectory /usr/share/man
> > # define CppCmd cpp-3.2
> > # define HasPam YES
> > # define HasTk YES
> > # define TkLibDir /usr/lib
> > # define TkIncDir /usr/include
> > # define TkLibName tk8.3
> > # define XF86SetupUsesStaticTk NO
> > # define HasTcl YES
> > # define TclLibDir /usr/lib
> > # define TclIncDir /usr/include
> > # define TclLibName tcl8.3
> > # define XF86SetupUsesStaticTcl NO
> > /* un-comment this when it is un-broken */
> > /* # define JoystickSupport YES */
> >
> > The :
> >
> > # define CppCmd cpp-3.2
> >
> > Not being found in the patch. I suppose we want to build with cpp-3.3
> > also, right ?
>
> Umm, no. We want to build with cpp-3.2, because cpp-3.3 doesn't process text,
Ok, i noticed that when looking at the 003a patch.
> and it should be appled by patch #001b or such. Are you *sure* all the patches
> are getting applied?
Yep, the problem is that branden added the define CppCmd
cpp-3.2 in the 003a patch, which gets applied just before the 003 one,
and apparently didn't rebuild the 003 patch. I will attach here the
fixed version.
> > I will try to fix this, and provide a corrected patch, and see if it
> > fails further down.
>
> The patch is correct.
No, it is not, it doesn't apply, it doesn't know about the CppCmd line,
which got added by 003a.
That said, maybe the problem is because i used the nightly snapshot, and
it has already fixed in SVN, or something such.
Anyway, it is building now.
> > BTW, what is the prefered way of handling this kind of stuff ? Using
> > debian-x, mail to Branden directly, or perhaps to the X task force ?
>
> debian-x is the best way to reach the XSF, yes.
Ok.
BTW, you have already added my SDK patch, right ? I will try to build it
now, and create a separate package with it inside as a tarball, unless
you want to do it yourself as you told me some month back.
Then i will be building drivers snapshot packages out of the X CVS, but
using a totally separate source tarball, as it should be.
BTW, is it to early to upload my gnome-randr-applet package, which
depends on 4.3.0 ? I have it ready for month, but couldn't upload it
previously. If i upload it to experimental, it should enter experimental
together with xfree86, but then, maybe i should wait to have an official
4.3.0 package in unstable ?
Friendly,
Sven Luther
Various Debian changes to xfree86.cf and linux.cf, including better
support for gcc flags. Forward-ported with some updates from 4.2.1.
This patch originally by Branden Robinson, forward-ported with a few
updates by Daniel Stone.
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.
Build with external Xrender, Xft and Xcursor 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 2003-06-11 23:55:12.000000000 +0900
+++ xc/config/cf/linux.cf 2003-06-12 00:01:31.000000000 +0900
@@ -87,18 +87,24 @@
XCOMM binutils: (LinuxBinUtilsMajorVersion)
#if LinuxDistribution == LinuxDebian
+# ifndef DefaultGcc2OptimizeOpt
+# define DefaultGcc2OptimizeOpt -O2
+# endif
+# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt
+# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt
+# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt
# define SystemManDirectory /usr/share/man
# define CppCmd cpp-3.2
# define HasPam YES
# define HasTk YES
# define TkLibDir /usr/lib
# define TkIncDir /usr/include
-# define TkLibName tk8.3
+# define TkLibName tk8.4
# define XF86SetupUsesStaticTk NO
# define HasTcl YES
# define TclLibDir /usr/lib
# define TclIncDir /usr/include
-# define TclLibName tcl8.3
+# define TclLibName tcl8.4
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
@@ -146,14 +152,59 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
# define BuildRman NO
# define BuildHtmlManPages NO
+# define StaticNeedsPicForShared NO /* we handle provide static libraries with PIC symbols using a different method */
+# define KernelVersionInBanner YES
+/* The TT/Meltho fonts are all under non-free licenses. */
+# define BuildTrueTypeFonts NO
+# define BuildBethMarduthoFonts NO
+
+/* We build-dep on expat, fontconfig, Xrender, Xft and Xcursor */
+# define BuildExpatLibrary NO
+# define HasExpat YES
+# define ExpatIncDirStandard YES
+# define BuildFontconfigLibrary NO
+# define HasFontconfig YES
+# define UseFontconfig YES
+# define FontconfigIncDir /usr/include/fontconfig
+# define BuildXftLibrary NO
+# define HasXftLibrary YES
+# define BuildXft1Library YES
+# define IconDir Concat(ProjectRoot,/lib/X11/icons)
+# define BuildXcursorLibrary NO
+# define HasXcursorLibrary YES
+# define BuildRenderLibrary NO
+# define HasRenderLibrary YES
+
+# ifdef UseInstalled
+# define RenderLibraryDir /usr/X11R6
+# define XftLibraryDir /usr/X11R6
+# define XcursorLibraryDir /usr
+# else
+/* for Debian xfree86 build hack */
+# define RenderLibraryDir $(TOP)/../../debian/local/exports
+# define XftLibraryDir $(TOP)/../../debian/local/exports
+# define XcursorLibraryDir $(TOP)/../../debian/local/exports
+# endif
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
# define HasFreetype2 YES
-/* m68k has no 2.4 kernel yet */
-# ifndef Mc68020Architecture
-# define HasLinuxInput YES
-# endif
+
+/*
+ We want to be sure that the normal XFree86 X server and the debugging X
+ server use the same FreeType2 library. We'd *like* it if we could achieve
+ this by both packages dynamically linking against the system's FreeType2
+ library; however, the normal X server package (xserver-xfree86) *cannot* be
+ built dynamically linked against the FreeType2 library when the module
+ loader is enabled because of code/design issues. Therefore, we encapsulate
+ XFree86's internal "fork" of the FreeType2 library into *both*
+ xserver-xfree86 and xserver-xfree86-dbg. When it becomes possible to build
+ the module-loading server against an external FreeType2 shared library, we
+ can drop this define:
+*/
+# define FontLibSharedFreeType NO
+
+# define HasLinuxInput YES
# define HasXdmAuth YES
# define HasLatex YES
/* at present, glide2 only works on i386 */
@@ -701,7 +752,7 @@
#if UseElfFormat
# ifndef DoLoadableServer
-# ifdef HPArchitecture
+# if defined(HPArchitecture) || defined(MipsArchitecture) || defined(SuperHArchitecture)
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
@@ -746,7 +797,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags DefaultGcc2AxpOpt
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2AxpOpt
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -759,7 +810,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O3
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -767,7 +818,7 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
-# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
@@ -775,7 +826,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2i386Opt
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -784,7 +835,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -793,7 +844,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -802,7 +853,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -812,7 +863,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags DefaultGcc2PpcOpt
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2PpcOpt
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -821,7 +872,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -829,16 +880,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
-/*#define DefaultCCOptions -fsigned-char */
-#define OptimizedCDebugFlags -O3 -fomit-frame-pointer
-#define LinuxMachineDefines -D__s390x__
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
+# endif
+# define LinuxMachineDefines -D__s390x__
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* s390xArchitecture */
#ifdef SparcArchitecture
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
@@ -869,7 +921,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
+# define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt SuperHArchOptFlags SuperHEndianFlags
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
Reply to: