diff options
| author | Arnaud Vrac <avrac@freebox.fr> | 2015-08-19 15:31:16 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-08-19 16:52:03 +0300 |
| commit | 697f117ddda44d0386e46e082dbd6190d837db2a (patch) | |
| tree | 53c384c315eeb7d552e3e5bcf0480decf0da5db4 | |
| parent | 2ebebdbfbb7f5cfa7b438bb6b02fc723c9349d51 (diff) | |
| download | gstreamer-plugins-bad-697f117ddda44d0386e46e082dbd6190d837db2a.tar.gz | |
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | gst-libs/gst/video/Makefile.am | 6 | ||||
| -rw-r--r-- | sys/uvch264/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/examples/uvch264/Makefile.am | 4 |
4 files changed, 5 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 4594b3fd8..955244c6b 100644 --- a/configure.ac +++ b/configure.ac @@ -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" ], diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 2d16768cf..510828190 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -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) diff --git a/sys/uvch264/Makefile.am b/sys/uvch264/Makefile.am index aec14556b..6af247498 100644 --- a/sys/uvch264/Makefile.am +++ b/sys/uvch264/Makefile.am @@ -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) \ diff --git a/tests/examples/uvch264/Makefile.am b/tests/examples/uvch264/Makefile.am index 43d0c5441..3c3914bba 100644 --- a/tests/examples/uvch264/Makefile.am +++ b/tests/examples/uvch264/Makefile.am @@ -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) |