mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 12:45:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

[262/906] Works on linux but still some bugs. Fix autotools build.

Browse source
This commit is contained in:
Julien Isorce 2008-11-09 23:23:30 +01:00 committed by Matthew Waters
parent c683760189
commit d404163d79
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/Makefile.am
View file

@ -19,13 +19,11 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \
libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_BASE_LIBS) $(GST_LIBS) \ $(GST_BASE_LIBS) $(GST_LIBS) \
${top_builddir}/gst-libs/gst/freeglut/libgstfreeglut-$(GST_MAJORMINOR).la \
-lGLU -lGLEW $(GL_LIBS) $(X_LIBS) -lGLU -lGLEW $(GL_LIBS) $(X_LIBS)
libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \ libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \
$(GL_CFLAGS) $(X_CFLAGS) \ $(GL_CFLAGS) $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-I$(top_srcdir)/gst-libs/gst/freeglut
libgstgl_@GST_MAJORMINOR@_la_LDFLAGS = \ libgstgl_@GST_MAJORMINOR@_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

3
gst-libs/gst/gl/gstglwindow_x11.c
View file

@ -447,7 +447,10 @@ gst_gl_window_run_loop (GstGLWindow *window)
case Expose: case Expose:
if (priv->draw_cb) if (priv->draw_cb)
{
priv->draw_cb (priv->draw_data); priv->draw_cb (priv->draw_data);
glXSwapBuffers (priv->device, priv->internal_win_id);
}
break; break;
case VisibilityNotify: case VisibilityNotify:

2
gst/gl/Makefile.am
View file

@ -61,7 +61,6 @@ endif
libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
-I$(top_srcdir)/gst-libs/gst/freeglut \
-I$(top_srcdir)/gst-libs/gst/gl \ -I$(top_srcdir)/gst-libs/gst/gl \
-I$(top_srcdir)/gst/gl/effects -I$(top_srcdir)/gst/gl/effects
if HAVE_GDKPIXBUF if HAVE_GDKPIXBUF
@ -69,7 +68,6 @@ libgstopengl_la_CFLAGS += $(GDKPIXBUF_CFLAGS)
endif endif
libgstopengl_la_LIBADD = \ libgstopengl_la_LIBADD = \
$(top_builddir)/gst-libs/gst/freeglut/libgstfreeglut-$(GST_MAJORMINOR).la \
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \