From: <sl...@ke...> - 2008-01-30 19:19:44
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Wed Jan 30 2008 19:19:47 UTC Log message: * 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. Modified files: . : ChangeLog configure.ac ext/metadata : metadataxmp.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3086&r2=1.3087 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/configure.ac.diff?r1=1.810&r2=1.811 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/metadata/metadataxmp.c.diff?r1=1.9&r2=1.10 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3086 retrieving revision 1.3087 diff -u -d -r1.3086 -r1.3087 --- ChangeLog 30 Jan 2008 16:53:39 -0000 1.3086 +++ ChangeLog 30 Jan 2008 19:19:32 -0000 1.3087 @@ -1,3 +1,11 @@ +2008-01-30 Sebastian Dröge <sl...@ci...> + + * 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 <edg...@in...> * ext/metadata/TODO: Index: configure.ac RCS file: /cvs/gstreamer/gst-plugins-bad/configure.ac,v retrieving revision 1.810 retrieving revision 1.811 diff -u -d -r1.810 -r1.811 --- configure.ac 30 Jan 2008 13:06:00 -0000 1.810 +++ configure.ac 30 Jan 2008 19:19:33 -0000 1.811 @@ -519,15 +519,10 @@ PKG_CHECK_MODULES(IPTC, libiptcdata >= 1.0.2, HAVE_IPTC="yes", [ HAVE_IPTC="no" ]) - AC_CHECK_HEADER(exempi-2.0/exempi/xmp.h, - [ - AC_CHECK_LIB(exempi, xmp_init, - [ - HAVE_XMP="yes" - XMP_CFLAGS="-I/usr/local/include/exempi-2.0/exempi/" - XMP_LIBS="-lexempi" - ], HAVE_XMP="no") - ], HAVE_XMP="no") + PKG_CHECK_MODULES(XMP, exempi-2.0, HAVE_XMP="yes", [ + HAVE_XMP="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 METADATA_CFLAGS="-DHAVE_EXIF $EXIF_CFLAGS $METADATA_CFLAGS" METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm" Index: metadataxmp.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/metadata/metadataxmp.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- metadataxmp.c 30 Jan 2008 16:05:24 -0000 1.9 +++ metadataxmp.c 30 Jan 2008 19:19:33 -0000 1.10 @@ -127,7 +127,7 @@ * includes */ -#include <xmp.h> +#include <exempi/xmp.h> #include <string.h> /* @@ -829,13 +829,21 @@ NULL, &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); +#endif } else { xmp_set_array_item (xmp, smap->schema, stagmap->xmp_tag, 1, value, 0); } } else { + xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value, 0); xmp_set_property (xmp, smap->schema, stagmap->xmp_tag, value); } g_free (value); |