mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix build with exempi >= 1.99.5 and fix the include path for exempi.

Browse source 
Original commit message from CVS:
* configure.ac:
* ext/metadata/metadataxmp.c:
(metadatamux_xmp_for_each_tag_in_list):
Fix build with exempi >= 1.99.5 and fix the include
path for exempi.
This commit is contained in:
Sebastian Dröge 2008-01-30 19:19:33 +00:00
parent 8473ffb754
commit 65d96c7063
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-01-30 Sebastian Dröge <slomo@circular-chaos.org>
* configure.ac:
* ext/metadata/metadataxmp.c:
(metadatamux_xmp_for_each_tag_in_list):
Fix build with exempi >= 1.99.5 and fix the include
path for exempi.
2008-01-30 Edgard Lima <edgard.lima@indt.org.br> 2008-01-30 Edgard Lima <edgard.lima@indt.org.br>
* ext/metadata/TODO: * ext/metadata/TODO:

13
configure.ac
View file

@ -519,15 +519,10 @@ AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and demuxer], metadata, [
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"
]) ])
AC_CHECK_HEADER(exempi-2.0/exempi/xmp.h, PKG_CHECK_MODULES(XMP, exempi-2.0, HAVE_XMP="yes", [
[ HAVE_XMP="no"
AC_CHECK_LIB(exempi, xmp_init, ])
[ 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))
HAVE_XMP="yes"
XMP_CFLAGS="-I/usr/local/include/exempi-2.0/exempi/"
XMP_LIBS="-lexempi"
], HAVE_XMP="no")
], HAVE_XMP="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="-DHAVE_EXIF $EXIF_CFLAGS $METADATA_CFLAGS"
METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm" METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm"

10
ext/metadata/metadataxmp.c
View file

@ -127,7 +127,7 @@ metadatamux_xmp_create_chunk_from_tag_list (guint8 ** buf, guint32 * size,
* includes * includes
*/ */
#include <xmp.h> #include <exempi/xmp.h>
#include <string.h> #include <string.h>
/* /*
@ -829,13 +829,21 @@ metadatamux_xmp_for_each_tag_in_list (const GstTagList * list,
NULL, &options)) { NULL, &options)) {
if (XMP_IS_PROP_SIMPLE (options)) { if (XMP_IS_PROP_SIMPLE (options)) {
#ifdef XMP_1_99_5
xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value, 0);
#else
xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value); xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value);
#endif
} else { } else {
xmp_set_array_item (xmp, smap->schema, stagmap->xmp_tag, 1, xmp_set_array_item (xmp, smap->schema, stagmap->xmp_tag, 1,
value, 0); value, 0);
} }
} else { } else {
#ifdef XMP_1_99_5
xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value, 0);
#else
xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value); xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value);
#endif
} }
g_free (value); g_free (value);