diff options
| author | dinoex <dinoex@FreeBSD.org> | 2004-07-23 11:56:07 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2004-07-23 11:56:07 +0800 |
| commit | 390cdf1038fbba2ef257ab5a98144831b9b7dbe8 (patch) | |
| tree | 5a9eeb38e0ae129aac7367147cfa8c22930b8889 /multimedia | |
| parent | 17b8a1e7275ae253bc6efc8cb94f866b014ef4d8 (diff) | |
| download | freebsd-ports-gnome-390cdf1038fbba2ef257ab5a98144831b9b7dbe8.tar.gz freebsd-ports-gnome-390cdf1038fbba2ef257ab5a98144831b9b7dbe8.tar.zst freebsd-ports-gnome-390cdf1038fbba2ef257ab5a98144831b9b7dbe8.zip | |
- fix build with net/liveMedia (patch partly obtained from vlc cvs)
PR: 69410
Submitted by: Michael Johnson
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc-devel/files/patch-modules-demux-livedotcom.cpp | 73 | ||||
| -rw-r--r-- | multimedia/vlc/files/patch-modules-demux-livedotcom.cpp | 73 |
2 files changed, 146 insertions, 0 deletions
diff --git a/multimedia/vlc-devel/files/patch-modules-demux-livedotcom.cpp b/multimedia/vlc-devel/files/patch-modules-demux-livedotcom.cpp new file mode 100644 index 000000000000..c1ea03a976e0 --- /dev/null +++ b/multimedia/vlc-devel/files/patch-modules-demux-livedotcom.cpp @@ -0,0 +1,73 @@ +--- modules/demux/livedotcom.cpp.orig Thu Jul 22 01:54:30 2004 ++++ modules/demux/livedotcom.cpp Thu Jul 22 01:58:50 2004 +@@ -39,6 +39,12 @@ + #include "GroupsockHelper.hh" + #include "liveMedia.hh" + ++#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1089936000) ++#define RECLAIM_ENV(env) delete (env) ++#else ++#define RECLAIM_ENV(env) (env)->reclaim() ++#endif ++ + using namespace std; + + /***************************************************************************** +@@ -132,8 +138,7 @@ + } + if( ( rtsp = RTSPClient::createNew(*env, 1/*verbose*/, "VLC Media Player" ) ) == NULL ) + { +- delete env; +- delete scheduler; ++ env->reclaim(); delete scheduler; + msg_Err( p_input, "RTSPClient::createNew failed" ); + return VLC_EGENERIC; + } +@@ -149,8 +154,7 @@ + msg_Err( p_input, "describeURL failed (%s)", env->getResultMsg() ); + + free( psz_url ); +- delete env; +- delete scheduler; ++ env->reclaim(); delete scheduler; + free( p_sys ); + return VLC_EGENERIC; + } +@@ -160,8 +164,7 @@ + + //fprintf( stderr, "sdp=%s\n", p_sys->p_sdp ); + +- delete env; +- delete scheduler; ++ env->reclaim(); delete scheduler; + + var_Create( p_input, "rtsp-tcp", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); + var_Get( p_input, "rtsp-tcp", &val ); +@@ -670,11 +673,11 @@ + } + if( p_sys->env ) + { +- delete p_sys->env; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->scheduler ) + { +- delete p_sys->scheduler; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->p_sdp ) + { +@@ -724,11 +727,11 @@ + + if( p_sys->env ) + { +- delete p_sys->env; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->scheduler ) + { +- delete p_sys->scheduler; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->p_sdp ) + { diff --git a/multimedia/vlc/files/patch-modules-demux-livedotcom.cpp b/multimedia/vlc/files/patch-modules-demux-livedotcom.cpp new file mode 100644 index 000000000000..c1ea03a976e0 --- /dev/null +++ b/multimedia/vlc/files/patch-modules-demux-livedotcom.cpp @@ -0,0 +1,73 @@ +--- modules/demux/livedotcom.cpp.orig Thu Jul 22 01:54:30 2004 ++++ modules/demux/livedotcom.cpp Thu Jul 22 01:58:50 2004 +@@ -39,6 +39,12 @@ + #include "GroupsockHelper.hh" + #include "liveMedia.hh" + ++#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1089936000) ++#define RECLAIM_ENV(env) delete (env) ++#else ++#define RECLAIM_ENV(env) (env)->reclaim() ++#endif ++ + using namespace std; + + /***************************************************************************** +@@ -132,8 +138,7 @@ + } + if( ( rtsp = RTSPClient::createNew(*env, 1/*verbose*/, "VLC Media Player" ) ) == NULL ) + { +- delete env; +- delete scheduler; ++ env->reclaim(); delete scheduler; + msg_Err( p_input, "RTSPClient::createNew failed" ); + return VLC_EGENERIC; + } +@@ -149,8 +154,7 @@ + msg_Err( p_input, "describeURL failed (%s)", env->getResultMsg() ); + + free( psz_url ); +- delete env; +- delete scheduler; ++ env->reclaim(); delete scheduler; + free( p_sys ); + return VLC_EGENERIC; + } +@@ -160,8 +164,7 @@ + + //fprintf( stderr, "sdp=%s\n", p_sys->p_sdp ); + +- delete env; +- delete scheduler; ++ env->reclaim(); delete scheduler; + + var_Create( p_input, "rtsp-tcp", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); + var_Get( p_input, "rtsp-tcp", &val ); +@@ -670,11 +673,11 @@ + } + if( p_sys->env ) + { +- delete p_sys->env; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->scheduler ) + { +- delete p_sys->scheduler; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->p_sdp ) + { +@@ -724,11 +727,11 @@ + + if( p_sys->env ) + { +- delete p_sys->env; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->scheduler ) + { +- delete p_sys->scheduler; ++ RECLAIM_ENV(p_sys->env); + } + if( p_sys->p_sdp ) + { |