mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-09 13:21:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

[054/906] Fixes to make project compile. Probably still doesn't work. * configure.ac: * gst-libs/gst/Makefile.am: * gst-libs/gst/gl/Makefile.am: * gst/Makefile.am: * gst/gl/Makefile.am: * gst/gl/gstgltestsrc.c: * po/LINGUAS: * win32/MANIFEST:

Browse source
This commit is contained in:
David Schleef 2008-01-17 23:23:31 +00:00 committed by Matthew Waters
parent 3308a6e8c6
commit 46f9f1a828
3 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,24 @@
lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la
libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
glextensions.c \
gstglbuffer.c \
gstgldisplay.c
libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl
libgstgl_@GST_MAJORMINOR@include_HEADERS = \
glextensions.h \
gstglbuffer.h \
gstgldisplay.h
libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
$(GSTPB_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
$(X_LIBS) $(GL_LIBS)
libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \
$(GSTPB_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstgl_@GST_MAJORMINOR@_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

30
gst/gl/Makefile.am
View file

@ -1,36 +1,28 @@
plugin_LTLIBRARIES = libgstglimagesink.la plugin_LTLIBRARIES = libgstopengl.la
noinst_PROGRAMS = color_matrix noinst_PROGRAMS = color_matrix
AM_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) AM_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
AM_LIBS = $(GST_BASE_LIBS) AM_LIBS = $(GST_BASE_LIBS)
libgstglimagesink_la_SOURCES = \ libgstopengl_la_SOURCES = \
glimagesink.c \ glimagesink.c \
gstgldisplay.c \
gstopengl.c \ gstopengl.c \
glextensions.c \
gstglbuffer.c \
gstglupload.c \ gstglupload.c \
gstgldownload.c \ gstgldownload.c \
gstgltestsrc.c \ gstgltestsrc.c \
gstgltestsrc.h \
gltestsrc.c \ gltestsrc.c \
gstglfilter.c \ gltestsrc.h \
gstglfilterexample.c \ gstglfilterexample.c \
gstglconvert.c gstglconvert.c
libgstglimagesink_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) $(GSTPB_CFLAGS) $(GL_CFLAGS) \
libgstglimagesink_la_LIBADD = $(GL_LIBS) \ -I$(top_srcdir)/gst-libs \
-I$(top_srcdir)/gst-libs/gst/gl
libgstopengl_la_LIBADD = $(GL_LIBS) \
$(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) $(GSTPB_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstopengl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
glimagesink.h \
gstgldisplay.h \
glextensions.h \
gstgltestsrc.h \
gltestsrc.h \
gstglbuffer.h \
gstglfilter.h

3
gst/gl/gstgltestsrc.c
View file

@ -44,6 +44,7 @@
#include "gltestsrc.h" #include "gltestsrc.h"
#include "gstglbuffer.h" #include "gstglbuffer.h"
#include "glextensions.h" #include "glextensions.h"
#include <gst/gst-i18n-plugin.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -587,7 +588,7 @@ gst_gl_test_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
not_negotiated: not_negotiated:
{ {
GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, (NULL),
("format wasn't negotiated before get function")); (_("format wasn't negotiated before get function")));
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;
} }
eos: eos: