svn commit: r310215 - in head/www/chromium: . files

[Cy Schubert]

In message <50F1CA26.4050604 at freebsd.org>, =?ISO-8859-1?Q?Ren=E9_Ladan?= 
writes
:
> On 12-01-2013 19:59, Cy Schubert wrote:
> > In message <201301110114.r0B1Eq5P003555 at svn.freebsd.org>, Rene Ladan writes
> :
> >> Author: rene
> >> Date: Fri Jan 11 01:14:52 2013
> >> New Revision: 310215
> >> URL: http://svnweb.freebsd.org/changeset/ports/310215
> >>
> >> Log:
> >>   Update to 24.0.1312.52, which add support for MathML.
> >>   
> >>   FreeBSD-specific improvements:
> >>   - working WiFi geolocation [1] (can be turned off in preferences)
> >>   - fix build with clang (use external libvpx)
> >>   - use SysV SHM model and where possible OS_BSD, which saves some patches
> >>   - no need to use ZygoteProcess switch
> >>   
> >>   HTML5 audio is currently broken.
> >>   
> >>   PR:		ports/174402 [1]
> >>   Submitted by:	J.R. Oldroyd <fbsd at opal.com> [1]
> >>   Security:	http://www.vuxml.org/freebsd/46bd747b-5b84-11e2-b06d-00
> 262d5ed8
> >> ee.html
> > [...]
> >
> > Hi Rene,
> >
> > It doesn't build. I don't have the actual error before me but the the 
> > following patch resolves the issue.
> >
> > ===== cut here
> > --- media/filters/decrypting_audio_decoder.cc.orig	2013-01-07 
> > 18:40:10.000000000 -0800
> > +++ media/filters/decrypting_audio_decoder.cc	2013-01-12 09:05:12.737
> 640582 
> > -0800
> > @@ -30,7 +30,7 @@
> >    // Out of sync of 100ms would be pretty noticeable and we should keep an
> y
> >    // drift below that.
> >    const int64 kOutOfSyncThresholdInMicroseconds = 100000;
> > -  return std::abs(timestamp_1.InMicroseconds() - timestamp_2.InMicrosecond
> s
> > ()) >
> > +  return std::labs(timestamp_1.InMicroseconds() - 
> > timestamp_2.InMicroseconds()) >
> >           kOutOfSyncThresholdInMicroseconds;
> >  }
> >  
> > ===== cut here
> >
> This looks like the error I got when building chromium on 8 or 9 with
> clang (from [1]):
> 
> In file included from media/filters/decrypting_audio_decoder.cc:1:
> media/filters/decrypting_audio_decoder.cc:33:10: error: call to 'abs' is ambi
> guous
>   return std::abs(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds()
> ) >
>          ^~~~~~~~
> /usr/include/stdlib.h:83:5: note: candidate function
> int abs(int) __attribute__((__const__));
>     ^
> /usr/include/c++/4.2/cstdlib:142:3: note: candidate function
>   abs(long __i) { return labs(__i); }
>   ^
> 1 error generated.
> gmake: *** [out/Release/obj.target/media/media/filters/decrypting_audio_decod
> er.o] Error 1

Yes, that's exactly the error I got.

> 
> 
> I'll rebuild the port in my tinderbox with your patch.

Cool, thanks.


-- 
Cheers,
Cy Schubert <Cy.Schubert at komquats.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.