X Strike Force SVN commit: rev 594 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-09-27 04:21:47 -0500 (Sat, 27 Sep 2003)
New Revision: 594
Modified:
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff
Log:
Apply more fixes for libraries' weak shared object dependencies.
[ISHIKAWA Mutsumi]
- debian/patches/063_fix_weak_deps.diff:
+ define SharedXvReqs in xc/config/cf/lnxLib.tmpl
+ add MathLibrary to SharedDPSTKReqs #define in xc/config/cf/lnxLib.tmpl
+ add MathLibrary to REQUIREDLIBS in xc/lib/GL/mesa/src/OSmesa/Imakefile
+ (cleanup) replace $(EXTENSIONLIB) $(XONLYLIB) with $(XLIB) in
Shared*Reqs #defines in xc/config/cf/lnxLib.tmpl
- debian/TODO: remove the TODO item regarding the above
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2003-09-27 08:28:04 UTC (rev 593)
+++ branches/4.3.0/sid/debian/TODO 2003-09-27 09:21:47 UTC (rev 594)
@@ -3,50 +3,7 @@
0pre1v3
-------
-* libOSMesa.so.4.0
- libGL.so.1 => /usr/X11R6/lib/libGL.so.1 (0x6fdbd000)
- libc.so.6 => /lib/libc.so.6 (0x6fc64000)
- libpthread.so.0 => /lib/libpthread.so.0 (0x6fbf3000)
- libXext.so.6 => /usr/X11R6/lib/libXext.so.6 (0x6fbc1000)
- libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x6fac8000)
- libdl.so.2 => /lib/libdl.so.2 (0x6faa5000)
- /lib/ld.so.1 => /lib/ld.so.1 (0x08000000)
-undefined symbol: log (./libOSMesa.so.4.0)
-undefined symbol: sqrt (./libOSMesa.so.4.0)
-undefined symbol: cos (./libOSMesa.so.4.0)
-undefined symbol: sin (./libOSMesa.so.4.0)
-undefined symbol: pow (./libOSMesa.so.4.0)
-undefined symbol: exp (./libOSMesa.so.4.0)
-* libXv.so.1.0
- libc.so.6 => /lib/libc.so.6 (0x6fe81000)
- /lib/ld.so.1 => /lib/ld.so.1 (0x08000000)
-undefined symbol: XGetErrorDatabaseText (./libXv.so.1.0)
-undefined symbol: XextAddDisplay (./libXv.so.1.0)
-undefined symbol: _XFlushGCCache (./libXv.so.1.0)
-undefined symbol: XextFindDisplay (./libXv.so.1.0)
-undefined symbol: _XReply (./libXv.so.1.0)
-undefined symbol: XextCreateExtension (./libXv.so.1.0)
-undefined symbol: _XSetLastRequestRead (./libXv.so.1.0)
-undefined symbol: _XEatData (./libXv.so.1.0)
-undefined symbol: _XFlush (./libXv.so.1.0)
-undefined symbol: _XSend (./libXv.so.1.0)
-undefined symbol: _XRead (./libXv.so.1.0)
-undefined symbol: XextRemoveDisplay (./libXv.so.1.0)
-undefined symbol: XMissingExtension (./libXv.so.1.0)
-
-* libdpstk.so.1.0
- libdps.so.1 => /usr/X11R6/lib/libdps.so.1 (0x6ff65000)
- libXext.so.6 => /usr/X11R6/lib/libXext.so.6 (0x6ff33000)
- libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x6fe3a000)
- libc.so.6 => /lib/libc.so.6 (0x6fce1000)
- libXt.so.6 => /usr/X11R6/lib/libXt.so.6 (0x6fc63000)
- libSM.so.6 => /usr/X11R6/lib/libSM.so.6 (0x6fc39000)
- libICE.so.6 => /usr/X11R6/lib/libICE.so.6 (0x6fc01000)
- libdl.so.2 => /lib/libdl.so.2 (0x6fbde000)
- /lib/ld.so.1 => /lib/ld.so.1 (0x08000000)
-undefined symbol: ceil (./libdpstk.so.1.0)
-
-1
--
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-27 08:28:04 UTC (rev 593)
+++ branches/4.3.0/sid/debian/changelog 2003-09-27 09:21:47 UTC (rev 594)
@@ -16,8 +16,17 @@
Paul Anderson.
- debian/patches/000_post430.diff
- -- Branden Robinson <branden@debian.org> Sat, 27 Sep 2003 03:26:49 -0500
+ * Apply more fixes for libraries' weak shared object dependencies.
+ [ISHIKAWA Mutsumi]
+ - debian/patches/063_fix_weak_deps.diff:
+ + define SharedXvReqs in xc/config/cf/lnxLib.tmpl
+ + add MathLibrary to SharedDPSTKReqs #define in xc/config/cf/lnxLib.tmpl
+ + add MathLibrary to REQUIREDLIBS in xc/lib/GL/mesa/src/OSmesa/Imakefile
+ + (cleanup) replace $(EXTENSIONLIB) $(XONLYLIB) with $(XLIB) in
+ Shared*Reqs #defines in xc/config/cf/lnxLib.tmpl
+ -- Branden Robinson <branden@debian.org> Sat, 27 Sep 2003 03:43:37 -0500
+
xfree86 (4.3.0-0pre1v2) experimental; urgency=low
* debian/patches/911_debian_XF86Config_to_XF86Config-4.diff: merge this
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-09-27 08:28:04 UTC (rev 593)
+++ branches/4.3.0/sid/debian/patches/063_fix_weak_deps.diff 2003-09-27 09:21:47 UTC (rev 594)
@@ -7,21 +7,35 @@
* libXpm: libX11
* libXrandr: libX11, libXext, libXrender
* libDPS: libXt, libX11
- * libDPSTK: libDPS, libX11
+ * libDPSTK: libDPS, libX11, libm
+ * libXv: libX11, libXext
+ * libOSMesa: libGL, libm
--- xc/config/cf/lnxLib.tmpl~ 2003-09-17 22:54:47.000000000 -0500
+++ xc/config/cf/lnxLib.tmpl 2003-09-17 23:10:22.000000000 -0500
-@@ -32,6 +32,13 @@
+@@ -32,6 +32,14 @@
#define SharedXtstReqs $(LDPRELIB) $(XLIB)
#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
#define SharedSMReqs $(LDPRELIB) $(ICELIB)
+#define SharedGLUReqs $(LDPRELIB) $(GLXLIB)
+#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
-+#define SharedXpReqs $(LDPRELIB) $(EXTENSIONLIB) $(XONLYLIB)
++#define SharedXpReqs $(LDPRELIB) $(XLIB)
+#define SharedXpmReqs $(LDPRELIB) $(XONLYLIB)
-+#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(EXTENSIONLIB) $(XONLYLIB)
++#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
+#define SharedDPSReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-+#define SharedDPSTKReqs $(LDPRELIB) $(DPSLIB) $(XLIB)
-
++#define SharedDPSTKReqs $(LDPRELIB) $(DPSLIB) $(XLIB) MathLibrary
++#define SharedXvReqs $(LDPRELIB) $(XLIB)
+
#if GlxUseBuiltInDRIDriver
#define ExtraSharedGLReqs /**/
+--- xc/lib/GL/mesa/src/OSmesa/Imakefile~ 2002-11-28 03:28:02.000000000 +0900
++++ xc/lib/GL/mesa/src/OSmesa/Imakefile 2003-09-21 12:47:36.000000000 +0900
+@@ -55,7 +55,7 @@
+ #endif
+
+ #if !GlxUseBuiltInDRIDriver
+- REQUIREDLIBS = $(LDPRELIB) $(GLXLIB)
++ REQUIREDLIBS = $(LDPRELIB) $(GLXLIB) MathLibrary
+ #endif
+
+ #include <Library.tmpl>
Reply to: