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

[Simon Morlat]

Hi Giorgio,

I applied most of the patch and now linphone and mediastreamer2 are
completely independant projects for i18n.
I say "most of the patch", because there were things that would break
execution on windows and macosx. Indeed on these platforms, the binary
bundles do not lie in a standard place, they can be anywhere, so all
paths to resources must be relative to the working directory. This is
why I cannot use $(datadir) as is in the source code.
I think this should fit your needs and reach the goal of the cleaner
separation between the two projects.
In case I missed something please let me know.

Best regards,

Simon

Le mercredi 16 février 2011 à 13:37 +0100, address@hidden a écrit :
> Hi Simon,
> 
> I suspect you've never read my last mail with the i18n patches
> for linphone and 
> mediastreamer2. It was sent during the week
> when the mailing list was down because some gnu server 
> was hacked...
> Anyway, here is the next one.
> 
> >----Messaggio originale----
> >Da: simon.
> address@hidden
> >Data: 16/11/2010 17.09
> >A: "address@hidden"<address@hidden>, <linphone-
> address@hidden>
> >Ogg: Re: [Linphone-developers] Mediastreamer as external project with --
> enable-external-mediastreamer?
> >
> >Hi Giorgio,
> >
> >Thanks for the patch. I reviewed but found two 
> issues that prevents its
> >inclusion:
> >- use of gettext.h with GPL within the sources changes the 
> copyright
> >ownership: why is this file necessary ? Couldn't we use libintl.h from
> >system ?
> 
> OK I 
> understand.
> When you call the command 'gettextize -c' to automatically
> update your project to 
> support i18n with gettext you get this info/hint on the
> console:
> ...
> You might also want to copy 
> the convenience header file gettext.h from the
> /usr/share/gettext directory into your package.
> It 
> is a wrapper around <libintl.h> that implements the configure --disable-nls 
> option.
> 
> --disable-
> nls/--enable-nls has the effect to un/define the cpp variable
> ENABLE_NLS in config.h.
> Then you can 
> just include the gettext.h and it will properly #define some
> functions, like gettext() or 
> ngettext(), to the actual function call or to a noop.
> Anyway it is always possible to do it 
> manually, limiting the #define's to the functions
> that are actually used in the linphone and 
> mediastreamer2 projects, avoiding
> the #include <gettext.h> (see patch to linphone/coreapi/private.h 
> and
> include/mediastreamer2/mscommon.h).
> 
> >- multiple modifications of .c files to add macros: I 
> would prefer these
> >macros to be defined in a single file, for example include/mscommon.h
> >for 
> mediastreamer2 inside a #ifdef MS2_INTERNAL so that these defines
> >are not exported to upper 
> layers. For coreapi, private.h can be used for
> >that purpose.
> 
> OK, the multiple definitions of the 
> same macros was a bad solution;
> in the included patch I have followed your suggestions (see again 
> patch
> to linphone/coreapi/private.h and include/mediastreamer2/mscommon.h).
> What I don't like with 
> the include/mscommon.h is that we install this
> header system-wide under '/usr/include' (with 'make 
> install') and than
> we must 'protect' the definitions with the cpp var. MS2_INTERNAL. It would be
> 
> better to have a private header, like the linphone's private.h, for this kind 
> of
> stuff that we use 
> only when compiling 'linphone' and that does not get installed.
> 
> Moreover I removed the subdir. 
> 'intl' in the 'linphone' project;
> as far as I know it is no longer needed and is also deprecated.
> 
> 
> Let me know if you find more problems with the current patches.
> 
> Attached find an archive with two 
> patches:
> - mediastreamer2_i18n.patch: adds i18n to mediastreamer2.
>    Applies to the mediastreamer2 
> git repo. at id:
>     b9a6dad7339175e894d1a0f291ccb5d1143e3199
> 
> - linphone_i18n.patch: updates the 
> i18n support in
>    linphone so that it does not conflict with the one in
>    mediastreamer2.
>    
> Applies to the linphone git repo. at id:
>     9b461a99a68c2a45e2365b4035155f9cd2b264ff
> 
> Best 
> regards,
> 
> giorgio
> 
> giorgio
> 
> >If you can improve your patch on these points, I will merge it.
> >
> 
> >Best regards,
> >
> >Simon
> >
> >Le jeudi 21 octobre 2010 à 11:24 +0200, address@hidden a écrit :
> >> > 
> 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
> >> 
> >> Hi all,
> >> 
> >> I think the actual problem 
> >> with the strings in 
> mediastreamer2 is that
> >> they should be traduced in mediastreamer2 itself, not in linphone.
> >> In 
> other words the package 
> >> mediastreamer2 lacks an internationalization support
> >> on its own.
> >> 
> 
> >> Attached find an archive with two patches for this:
> >>  - mediastreamer_i18n.
> >> patch: adds 
> i18n to mediastreamer2.
> >>    I've also copied the strings already traduced from linphone/po/*.po
> 
> >>    to mediastreamer2/po/*.po
> >>    
> >> Applies to the mediastreamer2 git repo. at id:
> >>     
> e3a50ec460494101e925fa112e97adbc82c45306
> >> 
> >>  - linphone_i18n.patch: updates the i18n 
> >> 
> support in linphone so that it does
> >>    not conflict with the one in mediastreamer2.
> >>    
> Applies to the linphone git repo. at id:
> >>     
> >> c6c7d662ded5e787f18f6057275d601efc0d0faf
> >> 
> >> 
> I tried to avoid any unwanted side effect.
> >> 
> >> I've successfully tested the patches on a PC 
> system, 
> >> on an ARM native system
> >> and on an ARM crosscompiled system.
> >> 
> >> giorgio
> >> 
> >> 
> 
> >> 
> >> Supera i limiti: raddoppia la velocità da 10 a 20 Mega! 
> >> 
> >> Risparmia con Tutto Incluso: 
> telefono + adsl 20 mega a soli 26,60 € al mese per un anno!
> >> 
> >> SCONTO DI 160 EURO!
> >> 
> >> http:
> //abbonati.tiscali.it/telefono-adsl/prodotti/tc/tuttoincluso/?WT.mc_id=01fw
> >> 
> _______________________________________________ Linphone-developers mailing 
> list Linphone-
> address@hidden http://lists.nongnu.org/mailman/listinfo/linphone-developers
> >
> >
> >
> 
> 
> 
> 
> Supera i limiti: raddoppia la velocità da 10 a 20 Mega! 
> 
> Risparmia con Tutto Incluso: telefono + adsl 20 mega a soli 29,95 € al mese 
> per due anni!
> 
> SCONTO DI 240 EURO!
> 
> http://abbonati.tiscali.it/telefono-adsl/prodotti/tc/tuttoincluso/?WT.mc_id=01fw