mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

jifmux: Fix tests building

Browse source 
Only build jifmux tests if libexif headers are present
This commit is contained in:
Thiago Santos 2010-06-11 15:29:43 -03:00
parent 0e89bc8d54
commit 9ab8959b30
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configure.ac
View file

@ -739,13 +739,20 @@ AG_GST_CHECK_FEATURE(RESINDVD, [resindvd plugin], resindvd, [
]) ])
]) ])
dnl **** exif (used on metadata and jifmux tests) ****
translit(dnm, m, l) AM_CONDITIONAL(USE_EXIF, true)
AG_GST_CHECK_FEATURE(EXIF, [exif], exif, [
PKG_CHECK_MODULES(EXIF, libexif >= 0.6.16, HAVE_EXIF="yes", [
HAVE_EXIF="no"
AC_MSG_RESULT(no)
])
])
dnl *** METADATA *** dnl *** METADATA ***
translit(dnm, m, l) AM_CONDITIONAL(USE_METADATA, true) translit(dnm, m, l) AM_CONDITIONAL(USE_METADATA, true)
AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and demuxer], metadata, [ AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and demuxer], metadata, [
HAVE_METADATA="no" HAVE_METADATA="no"
PKG_CHECK_MODULES(EXIF, libexif >= 0.6.16, HAVE_EXIF="yes", [
HAVE_EXIF="no"
])
PKG_CHECK_MODULES(IPTC, libiptcdata >= 1.0.2, HAVE_IPTC="yes", [ PKG_CHECK_MODULES(IPTC, libiptcdata >= 1.0.2, HAVE_IPTC="yes", [
HAVE_IPTC="no" HAVE_IPTC="no"
]) ])
@ -754,7 +761,7 @@ AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and demuxer], metadata, [
]) ])
PKG_CHECK_MODULES(XMP_1_99_5, exempi-2.0 >= 1.99.5, XMP_CFLAGS="-DXMP_1_99_5 $XMP_CFLAGS", AC_MSG_RESULT(no)) PKG_CHECK_MODULES(XMP_1_99_5, exempi-2.0 >= 1.99.5, XMP_CFLAGS="-DXMP_1_99_5 $XMP_CFLAGS", AC_MSG_RESULT(no))
if test x$HAVE_EXIF = xyes; then if test x$HAVE_EXIF = xyes; then
METADATA_CFLAGS="-DHAVE_EXIF $EXIF_CFLAGS $METADATA_CFLAGS" METADATA_CFLAGS="$EXIF_CFLAGS $METADATA_CFLAGS"
METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm" METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm"
HAVE_METADATA="yes" HAVE_METADATA="yes"
fi fi

17
tests/check/Makefile.am
View file

@ -45,6 +45,12 @@ else
check_faad = check_faad =
endif endif
if USE_EXIF
check_jifmux = elements/jifmux
else
check_jifmux =
endif
if USE_METADATA if USE_METADATA
check_metadata = pipelines/metadata check_metadata = pipelines/metadata
else else
@ -133,7 +139,7 @@ check_PROGRAMS = \
elements/camerabin \ elements/camerabin \
elements/dataurisrc \ elements/dataurisrc \
elements/legacyresample \ elements/legacyresample \
elements/jifmux \ $(check_jifmux) \
elements/jpegparse \ elements/jpegparse \
elements/qtmux \ elements/qtmux \
elements/selector \ elements/selector \
@ -165,13 +171,8 @@ elements_camerabin_LDADD = \
-lgstinterfaces-@GST_MAJORMINOR@ -lgstinterfaces-@GST_MAJORMINOR@
elements_camerabin_SOURCES = elements/camerabin.c elements_camerabin_SOURCES = elements/camerabin.c
exif_CFLAGS = elements_jifmux_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(AM_CFLAGS) $(EXIF_CFLAGS)
exif_LDADD = elements_jifmux_LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) $(EXIF_LIBS) $(LDADD)
if test x$HAVE_EXIF = xyes; then
exif_CFLAGS = -DHAVE_EXIF
elements_jifmux_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(exif_CFLAGS)
elements_jifmux_LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) $(EXIF_LIBS)
elements_jifmux_SOURCES = elements/jifmux.c elements_jifmux_SOURCES = elements/jifmux.c
elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)

6
tests/check/elements/jifmux.c
View file

@ -28,7 +28,6 @@
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>
#ifdef HAVE_EXIF
#include <libexif/exif-data.h> #include <libexif/exif-data.h>
#include <libexif/exif-loader.h> #include <libexif/exif-loader.h>
@ -194,18 +193,13 @@ GST_START_TEST (test_jifmux_tags)
} }
GST_END_TEST; GST_END_TEST;
#endif
static Suite * static Suite *
asfmux_suite (void) asfmux_suite (void)
{ {
Suite *s = suite_create ("jifmux"); Suite *s = suite_create ("jifmux");
TCase *tc_chain = tcase_create ("general"); TCase *tc_chain = tcase_create ("general");
#ifdef HAVE_EXIF
tcase_add_test (tc_chain, test_jifmux_tags); tcase_add_test (tc_chain, test_jifmux_tags);
#else
GST_WARNING ("Not running jifmux tags tests that depend on libexif");
#endif
suite_add_tcase (s, tc_chain); suite_add_tcase (s, tc_chain);