forked from pool/gstreamer-plugins-base
7f83027b02
New stable branch, please keep all subs in a "group" when acking/forwarding. Particulary important this time as there is a few plugins moving from one package to an other. OBS-URL: https://build.opensuse.org/request/show/607673 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=112
85 lines
3.2 KiB
Diff
85 lines
3.2 KiB
Diff
From c0c76a8788ae810de9fcaca225b5a2e879e382f6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
|
Date: Sun, 25 Mar 2018 12:48:12 +0300
|
|
Subject: gl: Disable glmixerbin for the time being too
|
|
|
|
Otherwise we have one copy in gst-plugins-bad and one (unused) here,
|
|
which makes static linking unhappy.
|
|
---
|
|
ext/gl/Makefile.am | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am
|
|
index abbb49b..cf93f1d 100644
|
|
--- a/ext/gl/Makefile.am
|
|
+++ b/ext/gl/Makefile.am
|
|
@@ -5,6 +5,8 @@ plugin_LTLIBRARIES = libgstopengl.la
|
|
# gstglbasemixer.h
|
|
# gstglmixer.c
|
|
# gstglmixer.h
|
|
+# gstglmixerbin.h
|
|
+# gstglmixerbin.c
|
|
# gstglstereomix.c
|
|
# gstglstereomix.h
|
|
# gstglvideomixer.c
|
|
@@ -16,7 +18,6 @@ libgstopengl_la_SOURCES = \
|
|
gstgldownloadelement.c \
|
|
gstglcolorconvertelement.c \
|
|
gstglfilterbin.c \
|
|
- gstglmixerbin.c \
|
|
gstglsinkbin.c \
|
|
gstglsrcbin.c \
|
|
gstglimagesink.c \
|
|
@@ -57,7 +58,6 @@ noinst_HEADERS = \
|
|
gstgldownloadelement.h \
|
|
gstglcolorconvertelement.h \
|
|
gstglfilterbin.h \
|
|
- gstglmixerbin.h \
|
|
gstglsinkbin.h \
|
|
gstglsrcbin.h \
|
|
gstglimagesink.h \
|
|
--
|
|
cgit v1.1
|
|
|
|
|
|
From 9261296858cb149767ceac44fd6bd13cc0de0d21 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
|
Date: Tue, 27 Mar 2018 10:43:16 +0100
|
|
Subject: gl: pick up GstVideo-1.0.gir from local build dir
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=794708
|
|
---
|
|
gst-libs/gst/gl/Makefile.am | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
|
|
index a3bbc94..2df0385 100644
|
|
--- a/gst-libs/gst/gl/Makefile.am
|
|
+++ b/gst-libs/gst/gl/Makefile.am
|
|
@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
|
|
-I$(top_builddir)/gst-libs \
|
|
$(GST_PLUGINS_BASE_CFLAGS) \
|
|
$(GL_CFLAGS) \
|
|
+ --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
|
|
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|
- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
|
|
+ --library-path="$(top_builddir)/gst-libs/gst/video/" \
|
|
--library=libgstgl-@GST_API_VERSION@.la \
|
|
--include=Gst-@GST_API_VERSION@ \
|
|
--include=GstBase-@GST_API_VERSION@ \
|
|
@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|
$(INTROSPECTION_COMPILER) \
|
|
--includedir=$(srcdir) \
|
|
--includedir=$(builddir) \
|
|
+ --includedir="$(top_builddir)/gst-libs/gst/video/" \
|
|
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
|
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
|
- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
|
|
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
|
|
|
CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
|
--
|
|
cgit v1.1
|
|
|