Author: ishikawa Date: 2003-06-22 11:37:38 -0500 (Sun, 22 Jun 2003) New Revision: 237
Modified: branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff Log: revert latest change of #063 patch, and add Note about libGLU. libGLU weak dependency problem should be fixed even if Debian will not ship libGLU binary from XFree86 source. Modified: branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff ============================================================================== --- branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 2003-06-22 13:22:53 UTC (rev 236) +++ branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 2003-06-22 16:37:38 UTC (rev 237) @@ -3,10 +3,17 @@ * libXp: libX11, libXext * libXmuu: libX11 * libXrandr: libX11, libXext, libXrender + * libGLU: libGL +Note: + Debian will not ship libGLU binary from XFree86 source tree. + But these weak depencencies should be fixed on upstream, + of casuse we, XSF, will send this patch to upstream so it + includes libGLU related things. + --- xc/config/cf/lnxLib.tmpl.orig 2003-06-22 20:17:28.000000000 +0900 +++ xc/config/cf/lnxLib.tmpl 2003-06-22 20:20:48.000000000 +0900 -@@ -32,6 +32,10 @@ +@@ -32,6 +32,11 @@ #define SharedXtstReqs $(LDPRELIB) $(XLIB) #define SharedXieReqs $(LDPRELIB) $(XLIBONLY) #define SharedSMReqs $(LDPRELIB) $(ICELIB) @@ -14,6 +21,7 @@ +#define SharedXpReqs $(LDPRELIB) $(EXTENSIONLIB) $(XONLYLIB) +#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) +#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(EXTENSIONLIB) $(XONLYLIB) ++#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) #if GlxUseBuiltInDRIDriver #define ExtraSharedGLReqs /**/