mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 03:35:21 +00:00
fix for moved interfaces
This commit is contained in:
parent
f585848d4b
commit
759d62bafe
8 changed files with 10 additions and 7 deletions
|
@ -21,7 +21,7 @@ libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS = \
|
|||
$(GST_CFLAGS)
|
||||
libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD = \
|
||||
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
|
||||
-lgstapp-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS)
|
||||
|
||||
libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <gst/gst.h>
|
||||
#include <gst/gstbin.h>
|
||||
#include <gst/interfaces/photography.h>
|
||||
#include <gst/interfaces/colorbalance.h>
|
||||
#include <gst/video/colorbalance.h>
|
||||
#include "gstcamerabin-enum.h"
|
||||
#include "gstcamerabinpreview.h"
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@ gst_camera_LDADD = \
|
|||
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
|
||||
$(GST_PLUGINS_BASE_LIBS) \
|
||||
-lgstinterfaces-@GST_MAJORMINOR@ \
|
||||
-lgstvideo-@GST_MAJORMINOR@ \
|
||||
$(GST_LIBS) \
|
||||
$(GTK_LIBS) \
|
||||
$(GMODULE_EXPORT_LIBS)
|
||||
|
@ -40,6 +41,7 @@ gst_camerabin_test_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUG
|
|||
gst_camerabin_test_LDADD = \
|
||||
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
|
||||
-lgstinterfaces-@GST_MAJORMINOR@ \
|
||||
-lgstvideo-@GST_MAJORMINOR@ \
|
||||
$(GST_LIBS) \
|
||||
$(GST_PLUGINS_BASE_LIBS) \
|
||||
$(X11_LIBS)
|
||||
|
|
|
@ -32,8 +32,8 @@
|
|||
#include "gst-camera.h"
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/interfaces/videooverlay.h>
|
||||
#include <gst/interfaces/colorbalance.h>
|
||||
#include <gst/video/videooverlay.h>
|
||||
#include <gst/video/colorbalance.h>
|
||||
#include <gst/interfaces/photography.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkx.h>
|
||||
|
|
|
@ -89,7 +89,7 @@
|
|||
#define GST_USE_UNSTABLE_API 1
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/interfaces/videooverlay.h>
|
||||
#include <gst/video/videooverlay.h>
|
||||
#include <gst/interfaces/photography.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
|
|
|
@ -15,6 +15,7 @@ gst_camera2_LDADD = \
|
|||
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
|
||||
$(GST_PLUGINS_BASE_LIBS) \
|
||||
-lgstinterfaces-@GST_MAJORMINOR@ \
|
||||
-lgstvideo-@GST_MAJORMINOR@ \
|
||||
$(GST_LIBS) \
|
||||
$(GTK_LIBS) \
|
||||
$(GMODULE_EXPORT_LIBS)
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "gst-camera2.h"
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/interfaces/videooverlay.h>
|
||||
#include <gst/video/videooverlay.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkx.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
|
|
|
@ -105,7 +105,7 @@
|
|||
#define GST_USE_UNSTABLE_API 1
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/interfaces/videooverlay.h>
|
||||
#include <gst/video/videooverlay.h>
|
||||
#include <gst/interfaces/photography.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
|
|
Loading…
Reference in a new issue