Commit 25cfd660 authored by Alexander Larsson's avatar Alexander Larsson

Add clutter-gst build fix for gobject-introspection

This is backported from git.
parent dd6f0617
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index 0df17b3..ef501c1 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -67,17 +67,14 @@ libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_SOURCES = \
$(glib_enum_h) \
$(NULL)
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(NULL)
-
AM_CPPFLAGS = \
-DCLUTTER_GST_COMPILATION \
-DG_DISABLE_SINGLE_INCLUDES \
-DCOGL_ENABLE_EXPERIMENTAL_API \
-DCLUTTER_ENABLE_EXPERIMENTAL_API \
-DG_LOG_DOMAIN=\"Clutter-Gst\" \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
$(NULL)
AM_CFLAGS = \
@@ -140,11 +137,9 @@ BUILT_GIRSOURCES =
ClutterGst-@CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gst-@CLUTTER_GST_API_VERSION@.la
$(QUIET_GEN) \
GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no DISPLAY="" \
+ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
$(INTROSPECTION_SCANNER) -v \
--namespace ClutterGst --nsversion=@CLUTTER_GST_API_VERSION@ \
- $(INCLUDES) \
- $(AM_CPPFLAGS) \
- -D GST_USE_UNSTABLE_API \
--quiet --warn-all \
--add-include-path=$(srcdir) --add-include=path=. \
--c-include="clutter-gst/clutter-gst.h" \
@@ -162,7 +157,7 @@ ClutterGst-@CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gs
--include=GstAudio-1.0 \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-1.0` \
--include=GstPbutils-1.0 \
- --add-init-section="gst_init(0, NULL);" \
+ --add-init-section="extern void gst_init (int *argc, char *argv[]); gst_init(0, NULL);" \
--library=libclutter-gst-@CLUTTER_GST_API_VERSION@.la \
--libtool="${LIBTOOL}" \
--output $@ \
@@ -173,6 +168,14 @@ ClutterGst-@CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gs
--pkg gstreamer-1.0 \
--pkg gstreamer-base-1.0 \
--pkg-export clutter-gst-@CLUTTER_GST_API_VERSION@ \
+ --cflags-begin \
+ $(AM_CPPFLAGS) \
+ $(CLUTTER_GST_CFLAGS) \
+ $(GST_CFLAGS) \
+ $(GUDEV_CFLAGS) \
+ $(HW_CFLAGS) \
+ -DGST_USE_UNSTABLE_API \
+ --cflags-end \
$(cluttergstheaders_HEADERS) \
$(source_c)
......@@ -411,6 +411,10 @@
"type": "archive",
"url": "https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.18.tar.xz",
"sha256": "0aec0d0c6020cd19a5bb0dab1165a92748f81a9a3acdfabb0f966d5f53bc8093"
},
{
"type": "patch",
"path": "clutter-gst-gi-build-fix.patch"
}
]
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment