From fb5cb56591025d38d004779ebfdb7160a8c59553 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 7 Apr 2012 16:40:48 +0200
Subject: [PATCH] libv4lconvert: Fix building when configured with
 --without-jpeg

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 lib/libv4lconvert/jl2005bcd.c       | 4 ++++
 lib/libv4lconvert/jpeg_memsrcdest.c | 6 +++++-
 lib/libv4lconvert/libv4lconvert.c   | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/libv4lconvert/jl2005bcd.c b/lib/libv4lconvert/jl2005bcd.c
index 7197df4..14171a1 100644
--- a/lib/libv4lconvert/jl2005bcd.c
+++ b/lib/libv4lconvert/jl2005bcd.c
@@ -23,9 +23,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_JPEG
 #include "libv4lconvert-priv.h"
 #include "jpeg_memsrcdest.h"
 #include "libv4lsyscall-priv.h"
@@ -210,3 +212,5 @@ int v4lconvert_decode_jl2005bcd(struct v4lconvert_data *data,
 	jpeg_destroy_decompress(&dinfo);
 	return 0;
 }
+
+#endif /* HAVE_JPEG */
diff --git a/lib/libv4lconvert/jpeg_memsrcdest.c b/lib/libv4lconvert/jpeg_memsrcdest.c
index d934afa..b70af8e 100644
--- a/lib/libv4lconvert/jpeg_memsrcdest.c
+++ b/lib/libv4lconvert/jpeg_memsrcdest.c
@@ -16,8 +16,11 @@
 
 /* this is not a core library module, so it doesn't define JPEG_INTERNALS */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
+
+#ifdef HAVE_JPEG
 #include <jpeglib.h>
 #include <jerror.h>
 #include "jpeg_memsrcdest.h"
@@ -302,4 +305,5 @@ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
 	dest->pub.free_in_buffer = dest->buf_size;
 }
 
-#endif
+#endif /* JPEG_LIB_VERSION < 80 */
+#endif /* HAVE_JPEG */
diff --git a/lib/libv4lconvert/libv4lconvert.c b/lib/libv4lconvert/libv4lconvert.c
index 1e95875..fd59dcc 100644
--- a/lib/libv4lconvert/libv4lconvert.c
+++ b/lib/libv4lconvert/libv4lconvert.c
@@ -79,7 +79,9 @@ static const struct v4lconvert_pixfmt supported_src_pixfmts[] = {
 	{ V4L2_PIX_FMT_SN9C2028,	 0,	 9,	 9,	1 },
 	{ V4L2_PIX_FMT_PAC207,		 0,	 9,	 9,	1 },
 	{ V4L2_PIX_FMT_MR97310A,	 0,	 9,	 9,	1 },
+#ifdef HAVE_JPEG
 	{ V4L2_PIX_FMT_JL2005BCD,	 0,	 9,	 9,	1 },
+#endif
 	{ V4L2_PIX_FMT_SQ905C,		 0,	 9,	 9,	1 },
 	/* special */
 	{ V4L2_PIX_FMT_SE401,		 0,	 8,	 9,	1 },
@@ -595,7 +597,9 @@ static int v4lconvert_processing_needs_double_conversion(
 	case V4L2_PIX_FMT_SN9C10X:
 	case V4L2_PIX_FMT_PAC207:
 	case V4L2_PIX_FMT_MR97310A:
+#ifdef HAVE_JPEG
 	case V4L2_PIX_FMT_JL2005BCD:
+#endif
 	case V4L2_PIX_FMT_SN9C2028:
 	case V4L2_PIX_FMT_SQ905C:
 	case V4L2_PIX_FMT_SBGGR8:
@@ -796,7 +800,9 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
 	case V4L2_PIX_FMT_SN9C10X:
 	case V4L2_PIX_FMT_PAC207:
 	case V4L2_PIX_FMT_MR97310A:
+#ifdef HAVE_JPEG
 	case V4L2_PIX_FMT_JL2005BCD:
+#endif
 	case V4L2_PIX_FMT_SN9C2028:
 	case V4L2_PIX_FMT_SQ905C:
 	case V4L2_PIX_FMT_STV0680: { /* Not compressed but needs some shuffling */
@@ -835,6 +841,7 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
 			}
 			tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8;
 			break;
+#ifdef HAVE_JPEG
 		case V4L2_PIX_FMT_JL2005BCD:
 			if (v4lconvert_decode_jl2005bcd(data, src, src_size,
 							tmpbuf,
@@ -845,6 +852,7 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
 			}
 			tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SRGGB8;
 			break;
+#endif
 		case V4L2_PIX_FMT_SN9C2028:
 			v4lconvert_decode_sn9c2028(src, tmpbuf, width, height);
 			tmpfmt.fmt.pix.pixelformat = V4L2_PIX_FMT_SBGGR8;
-- 
2.7.4