From 533e180ce8eb17fe7dfc84dcd4c7176cf7a97727 Mon Sep 17 00:00:00 2001
From: Julien Isorce <julien.isorce@gmail.com>
Date: Fri, 18 Nov 2011 11:52:10 +0100
Subject: [PATCH] [474/906] build: make libjpeg use conditional

Disable gloverlay element if we do not hve libjpeg
---
 gst/gl/Makefile.am |  5 ++++-
 gst/gl/gstopengl.c | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index f59c7551f9..41a3119c12 100644
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -50,11 +50,14 @@ OPENGL_SOURCES += \
 	gstglbumper.c \
 	gstglbumper.h \
 	gstgldifferencematte.c \
-	gstgldifferencematte.h \
+	gstgldifferencematte.h
+if HAVE_JPEG
+OPENGL_SOURCES += \
 	gstgloverlay.c \
 	gstgloverlay.h
 endif
 endif
+endif
 
 libgstopengl_la_SOURCES = \
 	gstopengl.c \
diff --git a/gst/gl/gstopengl.c b/gst/gl/gstopengl.c
index 2ad53bf911..6d6a8702a1 100644
--- a/gst/gl/gstopengl.c
+++ b/gst/gl/gstopengl.c
@@ -62,7 +62,6 @@ GType gst_gl_effects_get_type (void);
 #include "gstglfiltershader.h"
 #include "gstglcolorscale.h"
 #include "gstgldeinterlace.h"
-#include "gstglbumper.h"
 #include "gstglmosaic.h"
 
 GType gst_gl_deinterlace_get_type (void);
@@ -73,10 +72,22 @@ GType gst_gl_filtershader_get_type (void);
 GType gst_gl_filtersobel_get_type (void);
 GType gst_gl_filter_laplacian_get_type (void);
 GType gst_gl_filter_glass_get_type (void);
-GType gst_gl_overlay_get_type (void);
+GType gst_gl_mosaic_get_type (void);
+
+#ifdef HAVE_PNG
+#include "gstgldifferencematte.h"
+#include "gstglbumper.h"
+
 GType gst_gl_differencematte_get_type (void);
 GType gst_gl_bumper_get_type (void);
-GType gst_gl_mosaic_get_type (void);
+
+#ifdef HAVE_JPEG
+#include "gstgloverlay.h"
+
+GType gst_gl_overlay_get_type (void);
+
+#endif
+#endif
 #endif
 
 #define GST_CAT_DEFAULT gst_gl_gstgl_debug
@@ -177,12 +188,13 @@ plugin_init (GstPlugin * plugin)
           GST_RANK_NONE, gst_gl_bumper_get_type ())) {
     return FALSE;
   }
-
+#ifdef HAVE_JPEG
   if (!gst_element_register (plugin, "gloverlay",
           GST_RANK_NONE, gst_gl_overlay_get_type ())) {
     return FALSE;
   }
 #endif
+#endif
 #endif
 
   return TRUE;