mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstglconfig: Put gstglconfig.h into $(libdir)/gstreamer-1.0/include

Browse source 
It's architecture dependent and should not be placed into the include
directory as the assumption is that all those headers are architecture
independent.

https://bugzilla.gnome.org/show_bug.cgi?id=739767
This commit is contained in:
Sebastian Dröge 2014-11-07 11:41:01 +01:00 committed by Tim-Philipp Müller
parent c3612847ef
commit 90022c451c
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ DIST_SUBDIRS = glprototypes android x11 win32 cocoa wayland dispmanx egl eagl
noinst_HEADERS = noinst_HEADERS =
built_header_configure = gstglconfig.h built_sys_header_configure = gstglconfig.h
libgstgl_@GST_API_VERSION@_la_SOURCES = \ libgstgl_@GST_API_VERSION@_la_SOURCES = \
gstgldisplay.c \ gstgldisplay.c \
@ -95,8 +95,8 @@ SUBDIRS += egl
libgstgl_@GST_API_VERSION@_la_LIBADD += egl/libgstgl-egl.la libgstgl_@GST_API_VERSION@_la_LIBADD += egl/libgstgl-egl.la
endif endif
nodist_libgstgl_@GST_API_VERSION@include_HEADERS = \ configexecincludedir = $(libdir)/gstreamer-@GST_API_VERSION@/include/gst/gl
$(built_header_configure) nodist_configexecinclude_HEADERS = $(built_sys_header_configure)
libgstgl_@GST_API_VERSION@_la_CFLAGS = \ libgstgl_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
@ -113,15 +113,13 @@ libgstgl_@GST_API_VERSION@_la_LDFLAGS = \
$(GST_LT_LDFLAGS) $(GST_LT_LDFLAGS)
# DISTCLEANFILES is for files generated by configure # DISTCLEANFILES is for files generated by configure
DISTCLEANFILES = $(built_header_configure) DISTCLEANFILES = $(built_sys_header_configure)
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstGL-@GST_API_VERSION@.gir BUILT_GIRSOURCES = GstGL-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstgl_@GST_API_VERSION@include_HEADERS)) gir_headers=$(patsubst %,$(srcdir)/%, $(libgstgl_@GST_API_VERSION@include_HEADERS))
gir_headers+=$(patsubst %,$(builddir)/%, $(built_headers))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstgl_@GST_API_VERSION@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstgl_@GST_API_VERSION@_la_SOURCES))
gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@.la GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \

2
pkgconfig/gstreamer-gl.pc.in
View file

@ -9,5 +9,5 @@ Description: Streaming media framework, OpenGL plugins libraries
Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@ Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@
Cflags: -I${includedir} @GL_CFLAGS@ Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@