Packman Build Service PMBS

Changes of Revision 107

MPlayer.spec Changed

MPlayer-bypass_live_detection.patch Changed

@@ -12,9 +12,7 @@
  libmpdemux/demux_rtp.cpp | 51 ++++++++++++++++++++++++++++++++----------------
  2 files changed, 35 insertions(+), 22 deletions(-)
 
-diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp
-index ad7a7f1..05d06e0 100644
---- libmpdemux/demux_rtp.cpp
+--- libmpdemux/demux_rtp.cpp.orig
 +++ libmpdemux/demux_rtp.cpp
 @@ -19,8 +19,6 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -41,7 +39,7 @@
  
  static char* openURL_sip(SIPClient* client, char const* url) {
    // If we were given a user name (and optional password), then use them:
-@@ -118,6 +107,19 @@ static char* openURL_sip(SIPClient* client, char const* url) {
+@@ -118,6 +107,19 @@ static char* openURL_sip(SIPClient* clie
  extern AVCodecContext *avcctx;
  #endif
  
@@ -61,7 +59,7 @@
  extern "C" int audio_id, video_id, dvdsub_id;
  extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
    Boolean success = False;
-@@ -146,13 +148,19 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
+@@ -146,13 +148,19 @@ extern "C" demuxer_t* demux_open_rtp(dem
  	  rtsp_transport_http = demuxer->stream->streaming_ctrl->url->port;
  	  rtsp_transport_tcp = 1;
  	}
@@ -83,7 +81,7 @@
        } else { // SIP
  	unsigned char desiredAudioType = 0; // PCMU (use 3 for GSM)
  	sipClient = SIPClient::createNew(*env, desiredAudioType, NULL,
-@@ -236,8 +244,12 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
+@@ -236,8 +244,12 @@ extern "C" demuxer_t* demux_open_rtp(dem
  
  	if (rtspClient != NULL) {
  	  // Issue a RTSP "SETUP" command on the chosen subsession:
@@ -98,7 +96,7 @@
  	  if (!strcmp(subsession->mediumName(), "audio"))
  	    audiofound = 1;
  	  if (!strcmp(subsession->mediumName(), "video"))
-@@ -248,7 +260,11 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
+@@ -248,7 +260,11 @@ extern "C" demuxer_t* demux_open_rtp(dem
  
      if (rtspClient != NULL) {
        // Issue a RTSP aggregate "PLAY" command on the whole session:
@@ -111,7 +109,7 @@
      } else if (sipClient != NULL) {
        sipClient->sendACK(); // to start the stream flowing
      }
-@@ -637,7 +653,8 @@ static void teardownRTSPorSIPSession(RTPState* rtpState) {
+@@ -637,7 +653,8 @@ static void teardownRTSPorSIPSession(RTP
    MediaSession* mediaSession = rtpState->mediaSession;
    if (mediaSession == NULL) return;
    if (rtpState->rtspClient != NULL) {
@@ -121,9 +119,9 @@
    } else if (rtpState->sipClient != NULL) {
      rtpState->sipClient->sendBYE();
    }
---- configure.orig	2013-11-12 01:23:33.985261789 +0100
-+++ configure	2013-11-12 01:23:34.025260964 +0100
-@@ -6929,58 +6929,11 @@
+--- configure.orig
++++ configure
+@@ -7125,58 +7125,21 @@ fi
  echores "$_nemesi"
  
  echocheck "LIVE555 Streaming Media libraries"
@@ -162,7 +160,14 @@
 -          cxx_check $inc_tmp $ld_tmp && _live_dist=yes && break
 -      done
 -  fi
--fi
++_live=yes
++inc_tmp=$($_pkg_config --cflags live555)
++ld_tmp=$($_pkg_config --libs live555)
++if test -n "$ld_tmp" ; then
++extra_ldflags="$extra_ldflags -lstdc++ $ld_tmp"
++else
++extra_ldflags="$_libdir/live/libliveMedia.a $_libdir/live/libUsageEnvironment.a $_libdir/live/libBasicUsageEnvironment.a $_libdir/live/libgroupsock.a -lstdc++ $extra_ldflags"
+ fi
 -if test "$_live" = yes && test "$networking" = yes; then
 -  test $_livelibdir && res_comment="using $_livelibdir"
 -  def_live='#define CONFIG_LIVE555 1'
@@ -174,14 +179,14 @@
 -  extra_ldflags="$extra_ldflags $ld_tmp"
 -  extra_cxxflags="$inc_tmp"
 - inputmodules="live555 $inputmodules"
--else
++if test -n "$inc_tmp" ; then
++extra_cxxflags="$extra_cxxflags $inc_tmp"
+ else
 -  _live=no
 -  def_live='#undef CONFIG_LIVE555'
 -  noinputmodules="live555 $noinputmodules"
--fi
-+_live=yes
-+extra_ldflags="$_libdir/live/libliveMedia.a $_libdir/live/libUsageEnvironment.a $_libdir/live/libBasicUsageEnvironment.a $_libdir/live/libgroupsock.a -lstdc++ $extra_ldflags"
 +extra_cxxflags="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment/ -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock $extra_cxxflags"
+ fi
 +def_live='#define CONFIG_LIVE555 1'
 +inputmodules="live555 $inputmodules"
  echores "$_live"