ports/69409: [PATCH] multimedia/mplayer: [fix build with net/liveMedia]

[Michael Johnson]

>Number:         69409
>Category:       ports
>Synopsis:       [PATCH] multimedia/mplayer: [fix build with net/liveMedia]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 22 05:50:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Johnson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #57: Fri Jul 16 00:36:31 EDT 2004
>Description:
- fix build with liveMedia (patch obtained from mplayer cvs) 

Port maintainer (riggs at rrr.de) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- mplayer-gtk-esound-0.99.4_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/mplayer.orig/files/patch-libmpdemux-demux_rtp.cpp /usr/ports/multimedia/mplayer/files/patch-libmpdemux-demux_rtp.cpp
--- /usr/ports/multimedia/mplayer.orig/files/patch-libmpdemux-demux_rtp.cpp	Wed Dec 31 19:00:00 1969
+++ /usr/ports/multimedia/mplayer/files/patch-libmpdemux-demux_rtp.cpp	Thu Jul 22 01:38:06 2004
@@ -0,0 +1,40 @@
+--- libmpdemux/demux_rtp.cpp.orig	Fri Mar 19 05:15:41 2004
++++ libmpdemux/demux_rtp.cpp	Thu Jul 22 01:36:55 2004
+@@ -2,6 +2,10 @@
+ ////////// and the "LIVE.COM Streaming Media" libraries:
+ 
+ extern "C" {
++// on MinGW, we must include windows.h before the things it conflicts
++#ifdef __MINGW32__    // with.  they are each protected from
++#include <windows.h>  // windows.h, but not the other way around.
++#endif
+ #include "demux_rtp.h"
+ #include "stheader.h"
+ }
+@@ -119,6 +123,7 @@
+ 
+ int rtspStreamOverTCP = 0; 
+ 
++extern "C" int audio_id, video_id, dvdsub_id;
+ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
+   Boolean success = False;
+   do {
+@@ -263,7 +268,8 @@
+   // code to recognize this:
+   if (demux_is_multiplexed_rtp_stream(demuxer)) {
+     stream_t* s = new_ds_stream(demuxer->video);
+-    demuxer_t* od = demux_open(s, DEMUXER_TYPE_UNKNOWN, -1, -1, -1, NULL);
++    demuxer_t* od = demux_open(s, DEMUXER_TYPE_UNKNOWN,
++			       audio_id, video_id, dvdsub_id, NULL);
+     demuxer = new_demuxers_demuxer(od, od, od);
+   }
+ 
+@@ -401,7 +407,7 @@
+   delete rtpState->sdpDescription;
+   delete rtpState;
+ 
+-  delete env; delete scheduler;
++  env->reclaim(); delete scheduler;
+ }
+ 
+ ////////// Extra routines that help implement the above interface functions:
--- mplayer-gtk-esound-0.99.4_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: