[215/906] glbumper is compiled only when having GdkPixBuf. And update win32 codeblock...

diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index e0ee68b..115100b 100644 (file)
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -12,7 +12,7 @@ libgstopengl_la_SOURCES = \
        gstglupload.h \
        gstgldownload.c \
        gstgldownload.h \
-        gstglfilterblur.c \
+    gstglfilterblur.c \
        gstglfiltercube.c \
        gstglfiltercube.h \
        gstglfilterlaplacian.c \
@@ -21,12 +21,10 @@ libgstopengl_la_SOURCES = \
        gstglfilterapp.h \
        gstglcolorscale.c \
        gstglcolorscale.h \
-        gltestsrc.c \
-        gltestsrc.h \
+    gltestsrc.c \
+    gltestsrc.h \
        gstgltestsrc.c \
        gstgltestsrc.h \
-       gstglbumper.c \
-       gstglbumber.h \
        gstgleffects.c \
        gstgleffects.h \
        effects/gstgleffectssources.c \
@@ -44,10 +42,13 @@ libgstopengl_la_SOURCES = \
        effects/gstgleffectlumatocurve.c \
        effects/gstgleffectrgbtocurve.c \
        effects/gstgleffectsin.c \
-       effects/gstgleffectglow.c 
-       
+       effects/gstgleffectglow.c
+
 if HAVE_GDKPIXBUF
-libgstopengl_la_SOURCES += gstglpixbufoverlay.c gstgldifferencematte.c
+libgstopengl_la_SOURCES += gstglpixbufoverlay.c \
+                           gstgldifferencematte.c \
+                           gstglbumper.c \
+                           gstglbumber.h
 endif
 
 # check order of CFLAGS and LIBS, shouldn't the order be the other way around

diff --git a/gst/gl/gstopengl.c b/gst/gl/gstopengl.c
index 5b0cc87..adb04d7 100644 (file)
--- a/gst/gl/gstopengl.c
+++ b/gst/gl/gstopengl.c
@@ -34,7 +34,6 @@
 #include "gstglbumper.h"
 
 GType gst_gl_effects_get_type (void);
-GType gst_gl_bumper_get_type (void);
 GType gst_gl_filter_app_get_type (void);
 GType gst_gl_filter_cube_get_type (void);
 GType gst_gl_filterblur_get_type (void);
@@ -43,6 +42,7 @@ GType gst_gl_filter_laplacian_get_type (void);
 #ifdef HAVE_GDKPIXBUF
 GType gst_gl_pixbufoverlay_get_type (void);
 GType gst_gl_differencematte_get_type (void);
+GType gst_gl_bumper_get_type (void);
 #endif
 
 #define GST_CAT_DEFAULT gst_gl_gstgl_debug
@@ -77,7 +77,10 @@ plugin_init (GstPlugin * plugin)
           GST_RANK_NONE, gst_gl_differencematte_get_type())) {
     return FALSE;
   }
-
+  if (!gst_element_register (plugin, "glbumper",
+          GST_RANK_NONE, gst_gl_bumper_get_type())) {
+    return FALSE;
+  }
 #endif
 
   if (!gst_element_register (plugin, "gleffects",
@@ -85,11 +88,6 @@ plugin_init (GstPlugin * plugin)
     return FALSE;
   }
 
-  if (!gst_element_register (plugin, "glbumper",
-          GST_RANK_NONE, gst_gl_bumper_get_type())) {
-    return FALSE;
-  }
-
   if (!gst_element_register (plugin, "glfilterblur",
           GST_RANK_NONE, gst_gl_filterblur_get_type())) {
     return FALSE;