diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | sys/glsink/Makefile.am | 2 | ||||
| -rw-r--r-- | sys/glsink/glimagesink.c | 8 |
4 files changed, 24 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2006-02-22 Jan Schmidt <thaytan@mad.scientist.com> + + * configure.ac: + * sys/glsink/Makefile.am: + Merge patch from #317048 for building on Cygwin. Patch by + Cygwin Ports maintainer. + * sys/glsink/glimagesink.c: (gst_glimage_sink_init_display): + Move normal debug output to LOG level not ERROR. + 2006-02-19 Jan Gerber <j@bootlab.org> Reviewed by : Edward Hervey <edward@fluendo.com> diff --git a/configure.ac b/configure.ac index 3bcb92d2..e67f046f 100644 --- a/configure.ac +++ b/configure.ac @@ -389,12 +389,12 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_X, true) GST_CHECK_FEATURE(X, [X libraries and plugins], [ximagesrc], [ AC_PATH_XTRA + + dnl now try to find the HEADER ac_cflags_save="$CFLAGS" ac_cppflags_save="$CPPFLAGS" CFLAGS="$CFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" - - dnl now try to find the HEADER AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no") if test "x$HAVE_X" = "xno" @@ -457,7 +457,7 @@ GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], [ximagesrc w/ xshm], [ ] ) dnl *** BZ2 *** -translit(bz2, m, l) AM_CONDITIONAL(USE_BZ2, true) +translit(dnm, m, l) AM_CONDITIONAL(USE_BZ2, true) GST_CHECK_FEATURE(BZ2, [bz2 library], bz2, [ GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzCompress, ,bzlib.h, BZ2_LIBS="-lbz2") AC_SUBST(BZ2_LIBS) @@ -609,10 +609,16 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [ dnl *** OpenGL *** translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true) +save_CPPFLAGS="$CPPFLAGS" +save_LIBS="$LIBS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +LIBS="$LIBS $X_LIBS" GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [ - GST_CHECK_LIBHEADER(GL, GLU, glTexImage2D,, + GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no") ]) +CPPFLAGS="$save_CPPFLAGS" +LIBS="$save_LIBS" dnl *** XVID *** translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true) diff --git a/sys/glsink/Makefile.am b/sys/glsink/Makefile.am index 408a64dd..93a1bb56 100644 --- a/sys/glsink/Makefile.am +++ b/sys/glsink/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstglimagesink.la libgstglimagesink_la_SOURCES = glimagesink.c libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) -libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL -lGLU \ +libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL \ $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c index 1ec68c4b..b5a7a129 100644 --- a/sys/glsink/glimagesink.c +++ b/sys/glsink/glimagesink.c @@ -568,11 +568,11 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink) const char *extstring; Window window; - GST_ERROR ("initializing display"); + GST_LOG_OBJECT (glimage_sink, "initializing display"); glimage_sink->display = XOpenDisplay (NULL); if (glimage_sink->display == NULL) { - GST_ERROR ("Could not open display"); + GST_ERROR_OBJECT (glimage_sink, "Could not open display"); return FALSE; } @@ -582,13 +582,13 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink) ret = glXQueryExtension (glimage_sink->display, &error_base, &event_base); if (!ret) { - GST_ERROR ("No GLX extension"); + GST_LOG_OBJECT (glimage_sink, "No GLX extension"); return FALSE; } visinfo = glXChooseVisual (glimage_sink->display, scrnum, attrib); if (visinfo == NULL) { - GST_ERROR ("No usable visual"); + GST_LOG_OBJECT (glimage_sink, "No usable visual"); return FALSE; } |