Re: [Linphone-developers] Mediastreamer as external project with --enable-external-mediastreamer?

[Simon Morlat]

Hi Simon,

It is annoying that the translated strings of mediastreamer2 are
ignored. Indeed they traduce the description string of each encoder
decoder so that they appear translated in the GUI, within the codec
selection list. Since you consider mediastreamer2 and oRTP must be
present anyway, it shouldn't be a problem to keep them, what do you
think ?

Simon


Le vendredi 08 octobre 2010 à 14:20 +0200, Simon Brenner a écrit :
> Hi,
> 
> here is another patch for the external-mediastreamer problem.
> With this patch the default behaviour, when the external-mediastreamer and 
> external-ortp options are
> missing, remains as in the original case, that is, the subdirs 
> 'mediastreamer2' and 'oRTP' are
> expected to be present to compile the package.
> 
> The attached patch was generated against a linphone git repository with 
> commit id:
> 
> f3db122cd03bf836afbdbb3cecf17e648a0ceb13
> 
> Regards,
> -Simon.
> 
> 
> On 09/27/2010 05:39 PM, Simon Brenner wrote:
> > Hi,
> > 
> > once again I'm sending a patch file with some proposals to change.
> > 
> > Makefile.am:
> > - I had to remove the paragraphs for MS2_DIR and ORTP_DIR: this is to make 
> > 'make dist' work.
> >   With the current state 'make dist' pretends to 'cd' into 'mediastreamer2' 
> > and 'oRTP' and archive
> >   them also.
> > 
> > configure.ac:
> > - Had to remove AM_PROG_LIBTOOL: there is already a call to 
> > 'AC_PROG_LIBTOOL'.
> > - I changed the default behaviour of --enable-external-mediastreamer and 
> > --enable-external-ortp to
> >   "yes". This is perhaps a major change but has to be done in order to get 
> > "make distcheck" working.
> >   If you build 'linphone' with the 'mediastreamer2' and 'oRTP' submodules 
> > you have now to configure
> >   your build with '--disable-external-mediastreamer' and 
> > '--disable-external-ortp'.
> > 
> > POTFILES.in
> > - I don't know why there were still some mediastreamer source files 
> > references there, I removed
> >   them to suppress errors.
> > 
> > POTFILES.skip
> > - Added the mediastreamer files to avoid errors from 'make distcheck'.
> > 
> > autogen.sh
> > - fix a problem when srcdir='.'.
> > 
> > console/linphonec.c, coreapi/sal_eXosip2_presence.c
> > - Cosmetic changes to some template strings to avoid 'make distcheck' 
> > errors.
> > 
> > 
> > Now, everything seems to be alright! "make dist" and "make distcheck" also 
> > run.
> > The attached patch was generated against a linphone git repository with 
> > commit id:
> > 
> > 0845662322bf1df00bcc96b32c714a32314cc84e
> > 
> > Regards,
> > -Simon.
> > 
> > 
> > 
> > 
> > On 09/25/2010 05:44 PM, Simon Morlat wrote:
> >> I merged it, thanks.
> >> I had to rework it because it broke the default behaviour with various
> >> errors and "make distcheck" failed.
> >> I hope my fixes didn't break the "external" mode, let me know
> >> otherwise !
> >>
> >> Simon
> >>
> >> Le mercredi 22 septembre 2010 à 17:02 +0200, Simon Brenner a écrit :
> >>> Hi Simon,
> >>>
> >>> ok, I created a patch file with all the things I consider worth doing to 
> >>> prepare this thing. Please
> >>> have a careful look at everything and include it into mainline if you 
> >>> want to.
> >>>
> >>> I created and tested my patch with a Linphone from git with the commit id
> >>> 8210107a35463f30894027ad271ee0f66d79cb00 (22.09.2010).
> >>>
> >>> Regards,
> >>> -Simon
> >>>
> >>>
> >>>
> >>> On 09/17/2010 09:28 AM, Simon Morlat wrote:
> >>>> Hi Simon,
> >>>>
> >>>> There is no reason not to include this patch in mainline. This is of
> >>>> interest for people packaging linphone, mediastreamer2 and oRTP in linux
> >>>> distros.
> >>>> Please send it and I'll merge it to master branch.
> >>>>
> >>>> Simon
> >>>>
> >>>> Le lundi 06 septembre 2010 à 12:00 +0200, Simon Brenner a écrit :
> >>>>> Hi,
> >>>>>
> >>>>> the current linphone configure script offers the option 
> >>>>> '--enable-external-ortp' so that it is
> >>>>> possible to build/install the ortp package independently from the 
> >>>>> 'linphone' one and make 'linphone'
> >>>>> use the installed 'ortp' instead of the ortp subproject within the 
> >>>>> linphone git repository.
> >>>>>
> >>>>> I was wondering whether the same is possible with the 'mediastreamer2' 
> >>>>> project.
> >>>>> Looking, for example, at the coreapi/Makefile.am I see a hard-coded 
> >>>>> include path for mediastreamer2
> >>>>> and linker path:
> >>>>>
> >>>>> INCLUDES = \
> >>>>>         -I$(top_srcdir)\
> >>>>>         -I$(top_srcdir)/mediastreamer2/include
> >>>>>
> >>>>> liblinphone_la_LIBADD= \
> >>>>>                 $(EXOSIP_LIBS) \
> >>>>>                 $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
> >>>>>                 $(ORTP_LIBS)
> >>>>>
> >>>>> I actually tried myself to add a '--enable-external-mediastreamer' 
> >>>>> option to the configure.in and
> >>>>> replaced these hard-coded paths with the two variables 
> >>>>> 'MEDIASTREAMER_CFLAGS' and
> >>>>> 'MEDIASTREAMER_LIBS' and it actually worked as expected.
> >>>>>
> >>>>> Are there specific reasons not to include this in mainline?
> >>>>>
> >>>>> Thanks,
> >>>>>
> >>>>> -Simon.