[MPlayer-cygwin] Re: Mplayer fails compilation with Live555

[Diego Biurrun]

On Sun, Aug 06, 2006 at 11:16:21AM +0200, Diego Biurrun wrote:
> On Sat, Aug 05, 2006 at 05:49:34PM +0200, Frank Aurich wrote:
> > Diego Biurrun wrote:
> > >
> > >Could you try to verify if this problem was introduced in r19229 when I
> > >reorganized the LIVE555 test?
> > 
> > I think you got the revision number wrong, the live555 simplification was 
> > r19288. And it is indeed the culprit of the code not compiling properly.
> > r19287 compiles fine, r19288 shows the same error messages as above.
> 
> Hmmmm, please try the attached patch.

I mean the *attached* one ;)

Diego
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 19340)
+++ configure	(working copy)
@@ -5998,10 +5998,11 @@
 if test "$_live" = yes && test "$_network" = yes ; then
   _res_comment="using $_livelibdir"
   _def_live='#define STREAMING_LIVE555 1'
-  _ld_live="-lstdc++ $_livelibdir/liveMedia/libliveMedia.a \
+  _ld_live="$_livelibdir/liveMedia/libliveMedia.a \
            $_livelibdir/groupsock/libgroupsock.a \
            $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
-           $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a"
+           $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
+           -lstdc++"
   _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \
              -I$_livelibdir/UsageEnvironment/include \
              -I$_livelibdir/BasicUsageEnvironment/include \
@@ -6011,7 +6012,7 @@
   _res_comment="using distribution version"
   _live="yes"
   _def_live='#define STREAMING_LIVE555 1'
-  _ld_live="-lstdc++ -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment"
+  _ld_live="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++"
   _inc_extra="$_inc_extra -I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
              -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
  _inputmodules="live555 $_inputmodules"
@@ -7257,8 +7258,9 @@
 MPLAYER_NETWORK = $_network
 FTP = $_ftp
 STREAMING_LIVE555 = $_live
+LIVE_LIB = $_ld_live
 VSTREAM = $_vstream
-MPLAYER_NETWORK_LIB = $_ld_live $_ld_vstream $_ld_network
+MPLAYER_NETWORK_LIB = $_ld_vstream $_ld_network
 STREAM_CACHE = yes
 DVBIN = $_dvbin
 VIDIX = $_vidix_internal
Index: Makefile
===================================================================
--- Makefile	(revision 19338)
+++ Makefile	(working copy)
@@ -113,7 +113,7 @@
               $(CODEC_LIBS) \
               $(TERMCAP_LIB) \
               $(CDPARANOIA_LIB) \
-              $(MPLAYER_NETWORK_LIB) \
+              $(LIVE_LIB) \
               $(LIBCDIO_LIB) \
               $(WIN32_LIB) \
               $(GIF_LIB) \