X Strike Force X.Org X11 SVN commit: r232 - in trunk/debian: . patches
Author: branden
Date: 2005-06-20 00:12:39 -0500 (Mon, 20 Jun 2005)
New Revision: 232
Modified:
trunk/debian/changelog
trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
trunk/debian/patches/600_amd64_support.diff
Log:
Revert part of r220; unfortunately, the Imake symbol "BuildRender" is used
to refer to both the protocol extension headers (render.h and
renderproto.h) and support for the extension in the X server itself. The
latter is possible without the former, since the extension headers can be
installed on the system from the renderext package (render-dev on Debian).
Nevertheless, there's only one Imake symbol to describe these two different
concepts. Revert changes to patch #003, and resyncs of patches #004,
#099c, and #600.
Ordinarily, I'd define new Imake symbols to distinguish protocol headers
from X server support for them (not just RENDER, but other extensions as
well), but since Imake is sorely deprecated in freedesktop.org circles
these days, though, a hack seems all that is warranted.
Update patch #058 to only define RENDERHEADERS as a build target, and
install renderproto.h as part of the SDK, if BuildRender is true *and*
HasRenderLibrary is false, or if we're bulding the Xft library. For
Debian, BuildRender and HasRenderLibrary will be true, and BuildXftLibrary
will be false.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-18 02:13:28 UTC (rev 231)
+++ trunk/debian/changelog 2005-06-20 05:12:39 UTC (rev 232)
@@ -171,11 +171,6 @@
* Document DFSG-non-freeness of PolyglotMan ("rman") in debian/copyright.
- * Update patch #003 to turn off "building" of RENDER protocol extension
- headers on Debian systems. Update patch #060 to not attempt to install
- the headers if they're not being "built". Resync patches #004, #099c,
- and #600.
-
* Update patch #058 to give Xcomposite, Xdamage, Xevie, and Xfixes their own
copies of the config-subst script, instead of hard-coding a within-tree
path to the copy in the Xcursor library. (I don't know what the point of
@@ -186,7 +181,9 @@
Convert local includes to system includes in the GLU library and X server
so that the RENDER protocol headers can actually be found. Define
RenderDefines if either BuildRender or HaveRenderLibrary is true, not just
- BuildRender.
+ BuildRender. Only specify render.h and renderproto.h as targets and
+ install renderproto.h as part of the SDK if we're building the extension
+ and *don't* have the extension library in the build environment.
* Stop removing the debian/local/xlibmesa-drm-source directory in
debian/rules's clean target, as nothing creates it, and nothing has since
@@ -197,7 +194,7 @@
symbols new to renderext 0.9 are used. Document dependency in detail in
debian/control comments.
- -- Branden Robinson <branden@debian.org> Fri, 17 Jun 2005 19:08:26 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 20 Jun 2005 00:03:36 -0500
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Modified: trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff
===================================================================
--- trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-18 02:13:28 UTC (rev 231)
+++ trunk/debian/patches/003_linux.cf_and_xfree86.cf.diff 2005-06-20 05:12:39 UTC (rev 232)
@@ -22,8 +22,9 @@
as they had no place in the upstream tree, per the policy of not placing
debian/ and the like in upstream trees. Due to be maintained externally.
---- xc/config/cf/linux.cf~ 2005-06-14 17:50:47.907861000 -0500
-+++ xc/config/cf/linux.cf 2005-06-14 17:51:22.662659864 -0500
+diff -urN xc/config/cf~/linux.cf xc/config/cf/linux.cf
+--- xc/config/cf~/linux.cf 2005-06-13 19:41:23.384951000 -0500
++++ xc/config/cf/linux.cf 2005-06-13 19:42:04.195129471 -0500
@@ -101,12 +101,22 @@
#endif
@@ -63,7 +64,7 @@
# define FSUseSyslog YES
# define DriverManSuffix 4x
-@@ -142,53 +150,121 @@
+@@ -142,53 +150,120 @@
*/
# ifdef DebianMaintainer
@@ -163,7 +164,6 @@
+# define BuildFontconfigLibrary NO
+# define HasFontconfig YES
+# define UseFontconfig YES
-+# define BuildRender NO
+# define BuildRenderLibrary NO
+# define HasRenderLibrary YES
+# define BuildXcursorLibrary NO
@@ -217,7 +217,7 @@
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -675,10 +751,10 @@
+@@ -675,10 +750,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -229,7 +229,7 @@
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -690,10 +766,10 @@
+@@ -690,10 +765,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -241,7 +241,7 @@
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -704,10 +780,10 @@
+@@ -704,10 +779,10 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -253,7 +253,7 @@
# endif /* Mc68020Architecture */
# ifdef AMD64Architecture
# define CcCmd gcc
-@@ -720,13 +796,14 @@
+@@ -720,13 +795,14 @@
# define CcCmd gcc
# define AsCmd CcCmd -c -x assembler
# define LdCmd CcCmd -nostdlib
@@ -270,7 +270,7 @@
# define DoLoadableServer NO
# else
# define DoLoadableServer YES
-@@ -793,7 +870,7 @@
+@@ -793,7 +869,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -279,7 +279,7 @@
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -806,7 +883,7 @@
+@@ -806,7 +882,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -288,7 +288,7 @@
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -814,7 +891,9 @@
+@@ -814,7 +890,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -299,7 +299,7 @@
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -822,7 +901,7 @@
+@@ -822,7 +900,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -308,7 +308,7 @@
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -831,7 +910,7 @@
+@@ -831,7 +909,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -317,7 +317,7 @@
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -840,7 +919,7 @@
+@@ -840,7 +918,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -326,7 +326,7 @@
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -849,7 +928,7 @@
+@@ -849,7 +927,7 @@
#ifdef MipsArchitecture
# ifndef OptimizedCDebugFlags
@@ -335,7 +335,7 @@
# endif
# define LinuxMachineDefines -D__mips__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -859,7 +938,7 @@
+@@ -859,7 +937,7 @@
#ifdef Ppc64Architecture
# define DefaultCCOptions -fsigned-char -mminimal-toc
# ifndef OptimizedCDebugFlags
@@ -344,7 +344,7 @@
# endif
# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -869,7 +948,7 @@
+@@ -869,7 +947,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions -fsigned-char
# ifndef OptimizedCDebugFlags
@@ -353,7 +353,7 @@
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -878,7 +957,7 @@
+@@ -878,7 +956,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -362,7 +362,7 @@
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -886,16 +965,17 @@
+@@ -886,16 +964,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -384,7 +384,7 @@
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -926,7 +1006,7 @@
+@@ -926,7 +1005,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
@@ -393,7 +393,7 @@
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -938,7 +1018,7 @@
+@@ -938,7 +1017,7 @@
#ifdef AMD64Architecture
# ifndef OptimizedCDebugFlags
Modified: trunk/debian/patches/004_imake_manpage_handling_overhaul.diff
===================================================================
--- trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2005-06-18 02:13:28 UTC (rev 231)
+++ trunk/debian/patches/004_imake_manpage_handling_overhaul.diff 2005-06-20 05:12:39 UTC (rev 232)
@@ -263,7 +263,7 @@
/*
*
*
-@@ -1055,26 +1057,6 @@
+@@ -1054,26 +1056,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
Modified: trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
===================================================================
--- trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-06-18 02:13:28 UTC (rev 231)
+++ trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-06-20 05:12:39 UTC (rev 232)
@@ -24,8 +24,9 @@
headers can actually be found.
xc/includes/extensions/Imakefile:
-* Only install renderproto.h as part of the SDK if we're building the
- extension.
+* Only specify render.h and renderproto.h as targets and install
+ renderproto.h as part of the SDK if we're building the extension and
+ *don't* have the extension library in the build environment.
xc/lib/Imakefile:
* Expand Imake variable namespace to be able to distinguish Xcursor, Xft,
@@ -334,13 +335,24 @@
#define GLU_TESS_DEFAULT_TOLERANCE 0.0
#define GLU_TESS_MESH 100112 /* void (*)(GLUmesh *mesh) */
---- xc/include/extensions/Imakefile~ 2005-06-14 17:47:53.185848707 -0500
-+++ xc/include/extensions/Imakefile 2005-06-14 17:48:57.272320612 -0500
+Index: xc/include/extensions/Imakefile
+===================================================================
+--- xc/include/extensions/Imakefile (revision 140)
++++ xc/include/extensions/Imakefile (working copy)
+@@ -39,7 +39,7 @@
+ #if BuildXinerama || BuildXineramaLibrary
+ XINERAMAHEADERS = Xinerama.h panoramiXext.h panoramiXproto.h
+ #endif
+-#if BuildRender || BuildXftLibrary
++#if (BuildRender && !HasRenderLibrary) || BuildXftLibrary
+ RENDERHEADERS = render.h renderproto.h
+ #endif
+ #if BuildXfixes || BuildXfixesLibrary
@@ -118,7 +118,9 @@
InstallDriverSDKNonExecFile(xf86misc.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
-+#if BuildRender
++#if BuildRender && !HasRenderLibrary
InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
+#endif
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
Modified: trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-06-18 02:13:28 UTC (rev 231)
+++ trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-06-20 05:12:39 UTC (rev 232)
@@ -13,7 +13,7 @@
diff -ruN xc-old/config/cf/linux.cf xc/config/cf/linux.cf
--- xc-old/config/cf/linux.cf 2004-10-27 08:40:39.015486000 +0000
+++ xc/config/cf/linux.cf 2004-10-27 08:41:15.188986920 +0000
-@@ -229,6 +229,8 @@
+@@ -228,6 +228,8 @@
# define HasRenderLibrary YES
# define BuildXcursorLibrary NO
# define HasXcursorLibrary YES
Modified: trunk/debian/patches/600_amd64_support.diff
===================================================================
--- trunk/debian/patches/600_amd64_support.diff 2005-06-18 02:13:28 UTC (rev 231)
+++ trunk/debian/patches/600_amd64_support.diff 2005-06-20 05:12:39 UTC (rev 232)
@@ -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
-@@ -632,7 +632,7 @@
+@@ -631,7 +631,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
Reply to: