[Spice-devel] current master doesn't build with libjpeg

[Alon Levy]

On Wed, Dec 29, 2010 at 04:08:17PM +0200, Alon Levy wrote:
> On Wed, Dec 29, 2010 at 02:38:53PM +0100, Tiziano Müller wrote:
> > Hi
> > 
> > The current master doesn't build here on Gentoo Linux with jpeg-8b and I
> > guess it doesn't for many others.
> > 
> > Attached patch changes the detection for the jpeg_boolean symbol since
> > that is a mingw32-specific thing as far as I can tell.
> 
> Thanks,
> 
> Alon

Applied.

> 
> > 
> > Cheers,
> > Tiziano
> > 
> > -- 
> > stepping stone GmbH
> > Neufeldstrasse 9
> > CH-3012 Bern
> > 
> > Telefon: +41 31 332 53 63
> > www.stepping-stone.ch
> > tiziano.mueller at stepping-stone.ch
> 
> > From 9704ae49647547c213bc553d586e6497072c6d87 Mon Sep 17 00:00:00 2001
> > From: Tiziano Mueller <dev-zero at gentoo.org>
> > Date: Wed, 29 Dec 2010 14:23:04 +0100
> > Subject: [PATCH] jpeg_boolean is a mingw32-libjpeg specific thing. Use a define check rather than a version check.
> > 
> > ---
> >  client/jpeg_decoder.cpp  |    2 +-
> >  client/mjpeg_decoder.cpp |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/client/jpeg_decoder.cpp b/client/jpeg_decoder.cpp
> > index f5a0198..18be6ae 100644
> > --- a/client/jpeg_decoder.cpp
> > +++ b/client/jpeg_decoder.cpp
> > @@ -20,7 +20,7 @@
> >  #include "debug.h"
> >  #include "utils.h"
> >  
> > -#if JPEG_LIB_VERSION < 70
> > +#ifndef jpeg_boolean
> >  #define jpeg_boolean boolean
> >  #endif
> >  
> > diff --git a/client/mjpeg_decoder.cpp b/client/mjpeg_decoder.cpp
> > index bad90d4..eed856b 100644
> > --- a/client/mjpeg_decoder.cpp
> > +++ b/client/mjpeg_decoder.cpp
> > @@ -21,7 +21,7 @@
> >  #include "utils.h"
> >  #include "mjpeg_decoder.h"
> >  
> > -#if JPEG_LIB_VERSION < 70
> > +#ifndef jpeg_boolean
> >  #define jpeg_boolean boolean
> >  #endif
> >  
> > -- 
> > 1.7.3.4
> > 
> 
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel