configure.ac: fix build when the uvch264 plugin is not selected

Instead of checking for the gstreamer-video-1.0 package is installed,
just assume it is since we already check for the -base dependency.

With this replace the GST_VIDEO_* variables in makefiles and directly
link with libgstvideo.

https://bugzilla.gnome.org/show_bug.cgi?id=753820
This commit is contained in:
Arnaud Vrac 2015-08-19 15:31:16 +02:00 committed by Sebastian Dröge
parent 2ebebdbfbb
commit 697f117ddd
4 changed files with 5 additions and 10 deletions

View file

@ -1702,7 +1702,6 @@ dnl *** UVC H264 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_UVCH264, true)
AG_GST_CHECK_FEATURE(UVCH264, [UVC H264], uvch264, [
AC_CHECK_HEADER(linux/uvcvideo.h, HAVE_UVCVIDEO_H=yes, HAVE_UVCVIDEO_H=no)
AG_GST_PKG_CHECK_MODULES(GST_VIDEO, gstreamer-video-1.0)
PKG_CHECK_MODULES(G_UDEV, gudev-1.0 , [
AC_DEFINE([HAVE_GUDEV], 1, [Define if gudev is installed])
HAVE_GUDEV="yes" ],

View file

@ -14,12 +14,12 @@ libgstbadvideo_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_builddir)/gst-libs \
$(GST_CFLAGS) $(ORC_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_VIDEO_CFLAGS)
$(GST_BASE_CFLAGS)
libgstbadvideo_@GST_API_VERSION@_la_LIBADD = \
$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
$(GST_VIDEO_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
libgstbadvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

View file

@ -8,7 +8,6 @@ libgstuvch264_la_SOURCES = gstuvch264.c \
libgstuvch264_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(GST_CFLAGS) \
$(G_UDEV_CFLAGS) \
$(LIBUSB_CFLAGS) \
@ -18,9 +17,8 @@ libgstuvch264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstuvch264_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
libgstuvch264_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
$(GST_VIDEO_LIBS) \
$(GST_LIBS) \
$(G_UDEV_LIBS) \
$(LIBUSB_LIBS) \

View file

@ -11,14 +11,12 @@ test_uvch264_SOURCES = test-uvch264.c
test_uvch264_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(GST_CFLAGS) \
$(GTK_CFLAGS) \
$(GMODULE_EXPORT_CFLAGS) \
-DGST_USE_UNSTABLE_API
test_uvch264_LDADD = \
$(GST_PLUGINS_BASE_LIBS) \
$(GST_VIDEO_LIBS) \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_LIBS) \
$(GTK_LIBS) \
$(GMODULE_EXPORT_LIBS)