Date: Thu, 22 Jul 2004 02:02:21 -0400 (EDT) From: Michael Johnson <ahze@ahze.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/69410: [PATCH] multimedia/vlc: [Fix build with net/liveMedia] Message-ID: <200407220602.i6M62L9W040468@gentoo.ahze.net> Resent-Message-ID: <200407220610.i6M6AAVD091968@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69410
>Category: ports
>Synopsis: [PATCH] multimedia/vlc: [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 06:10:10 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 net/liveMedia (patch partly obtained from vlc cvs)
Port maintainer (dinoex@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- vlc-0.7.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/vlc.orig/files/patch-modules::demux::livedotcom.cpp /usr/ports/multimedia/vlc/files/patch-modules::demux::livedotcom.cpp
--- /usr/ports/multimedia/vlc.orig/files/patch-modules::demux::livedotcom.cpp Wed Dec 31 19:00:00 1969
+++ /usr/ports/multimedia/vlc/files/patch-modules::demux::livedotcom.cpp Thu Jul 22 01:59:22 2004
@@ -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 )
+ {
--- vlc-0.7.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407220602.i6M62L9W040468>