mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Cygwin Ports maintainer.

Browse source 
Original commit message from CVS:
* 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.
This commit is contained in:
Jan Schmidt 2006-02-22 14:37:20 +00:00
parent 091e939344
commit f27209c6d7
4 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2006-02-19 Jan Gerber <j@bootlab.org>
Reviewed by : Edward Hervey <edward@fluendo.com> Reviewed by : Edward Hervey <edward@fluendo.com>

14
configure.ac
View file

@ -389,12 +389,12 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
GST_CHECK_FEATURE(X, [X libraries and plugins], GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesrc], [ [ximagesrc], [
AC_PATH_XTRA AC_PATH_XTRA
dnl now try to find the HEADER
ac_cflags_save="$CFLAGS" ac_cflags_save="$CFLAGS"
ac_cppflags_save="$CPPFLAGS" ac_cppflags_save="$CPPFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS" CFLAGS="$CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $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") AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
if test "x$HAVE_X" = "xno" if test "x$HAVE_X" = "xno"
@ -457,7 +457,7 @@ GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], [ximagesrc w/ xshm], [
] ) ] )
dnl *** BZ2 *** 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_FEATURE(BZ2, [bz2 library], bz2, [
GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzCompress, ,bzlib.h, BZ2_LIBS="-lbz2") GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzCompress, ,bzlib.h, BZ2_LIBS="-lbz2")
AC_SUBST(BZ2_LIBS) AC_SUBST(BZ2_LIBS)
@ -609,10 +609,16 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
dnl *** OpenGL *** dnl *** OpenGL ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true) 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_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") GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
]) ])
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
dnl *** XVID *** dnl *** XVID ***
translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true) translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true)

2
sys/glsink/Makefile.am
View file

@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstglimagesink.la
libgstglimagesink_la_SOURCES = glimagesink.c libgstglimagesink_la_SOURCES = glimagesink.c
libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_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_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

8
sys/glsink/glimagesink.c
View file

@ -568,11 +568,11 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink)
const char *extstring; const char *extstring;
Window window; Window window;
GST_ERROR ("initializing display"); GST_LOG_OBJECT (glimage_sink, "initializing display");
glimage_sink->display = XOpenDisplay (NULL); glimage_sink->display = XOpenDisplay (NULL);
if (glimage_sink->display == NULL) { if (glimage_sink->display == NULL) {
GST_ERROR ("Could not open display"); GST_ERROR_OBJECT (glimage_sink, "Could not open display");
return FALSE; return FALSE;
} }
@ -582,13 +582,13 @@ gst_glimage_sink_init_display (GstGLImageSink * glimage_sink)
ret = glXQueryExtension (glimage_sink->display, &error_base, &event_base); ret = glXQueryExtension (glimage_sink->display, &error_base, &event_base);
if (!ret) { if (!ret) {
GST_ERROR ("No GLX extension"); GST_LOG_OBJECT (glimage_sink, "No GLX extension");
return FALSE; return FALSE;
} }
visinfo = glXChooseVisual (glimage_sink->display, scrnum, attrib); visinfo = glXChooseVisual (glimage_sink->display, scrnum, attrib);
if (visinfo == NULL) { if (visinfo == NULL) {
GST_ERROR ("No usable visual"); GST_LOG_OBJECT (glimage_sink, "No usable visual");
return FALSE; return FALSE;
} }