[MPlayer-dev-eng] [PATCH] configure LIVE autodetection

[Torinthiel]

On Thu, Aug 05, 2004 at 12:34:10PM +0200, Diego Biurrun wrote:
> 
> Torinthiel writes:
> > Ok, so here is second version of the patch.
> 
> Where? ;-)

YAMP. Sorry

> If we were to get a euro for every forgotten patch, the project would
> be rich..

Oh, yes ;)
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)megapolis(dot)pl
   gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8  7346 2B6E 39F2 B069 01F1
 "No classmates may be used during this examination"
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.892
diff -u -r1.892 configure
--- configure	5 Aug 2004 06:31:42 -0000	1.892
+++ configure	5 Aug 2004 08:16:03 -0000
@@ -169,7 +169,7 @@
   --disable-network      disable network support (for: http/mms/rtp) [enable]
   --enable-winsock2      enable winsock2 usage [autodetect]
   --enable-smb           enable Samba (SMB) input support [autodetect]
-  --enable-live          enable LIVE.COM Streaming Media support [disable]
+  --enable-live          enable LIVE.COM Streaming Media support [autodetect]
   --disable-dvdread      Disable libdvdread support [autodetect]
   --disable-mpdvdkit     Disable mpdvdkit/mpdvdkit2 support [autodetect]
   --disable-cdparanoia   Disable cdparanoia support [autodetect]
@@ -1229,7 +1229,7 @@
 _dvdkit=auto
 _xanim=auto
 _real=auto
-_live=no
+_live=auto
 _xinerama=auto
 _mga=auto
 _xmga=auto
@@ -1573,7 +1573,6 @@
     ;;
   --with-livelibdir=*)
     _livelibdir=`echo $ac_option | cut -d '=' -f 2`
-    _live=yes
     ;;
   --with-mlibdir=*)
     _mlibdir=`echo $ac_option | cut -d '=' -f 2`
@@ -5169,11 +5168,21 @@
 
 echocheck "LIVE.COM Streaming Media libraries"
 if test "$_live" = auto  && test "$_network" = yes ; then
-  _live=yes
-  test "$_livelibdir" || _live=no
-  # TODO: deeper, more reliable test of libs, and version!
-  # (users may have empty live/ dir or something different there, for
-  # example 'live config files', or they may have old, incompatibel version)
+  _TMPC=$TMPC
+  TMPC=$TMPCPP
+  cat >$TMPC <<EOF
+#include <liveMedia.hh>
+#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200)
+#error Please upgrade to version 2004.07.19 or later of the "LIVE.COM Streaming Media" libraries - available from <www.live.com/liveMedia/>
+#endif
+int main(void) {}
+EOF
+  if cc_check -I$_livelibdir/liveMedia/include/ -I$_livelibdir/UsageEnvironment/include -I$_livelibdir/groupsock/include; then
+    _live=yes
+  else
+    _live=no
+  fi
+  TMPC=$_TMPC
 fi
 if test "$_live" = yes && test "$_network" = yes ; then
   echores "yes (using $_livelibdir)"
Index: libmpdemux/demux_rtp_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rtp_internal.h,v
retrieving revision 1.6
diff -u -r1.6 demux_rtp_internal.h
--- libmpdemux/demux_rtp_internal.h	20 Jul 2004 02:11:21 -0000	1.6
+++ libmpdemux/demux_rtp_internal.h	5 Aug 2004 08:16:03 -0000
@@ -17,10 +17,6 @@
 #include <liveMedia.hh>
 #endif
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200)
-#error Please upgrade to version 2004.07.19 or later of the "LIVE.COM Streaming Media" libraries - available from <www.live.com/liveMedia/>
-#endif
-
 // Codec-specific initialization routines:
 void rtpCodecInitialize_video(demuxer_t* demuxer,
 			      MediaSubsession* subsession, unsigned& flags);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20040805/1c2797ab/attachment.pgp>