This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: libdvbv5: Properly use and link iconv on non Linux systems Author: Gregor Jasny <[email protected]> Date: Mon Jun 18 19:28:03 2012 +0200 Signed-off-by: Gregor Jasny <[email protected]> configure.ac | 4 ++++ lib/libdvbv5/Makefile.am | 1 + lib/libdvbv5/parse_string.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=8db4e4acbb48b8587f37924ef0d322c5d61e8d1d diff --git a/configure.ac b/configure.ac index 05b9c3b..7ebe354 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,10 @@ LIBS=$argp_saved_libs AC_CHECK_HEADER([linux/i2c-dev.h], [linux_i2c_dev=yes], [linux_i2c_dev=no]) AM_CONDITIONAL([HAVE_LINUX_I2C_DEV], [test x$linux_i2c_dev = xyes]) +AM_GNU_GETTEXT_VERSION([0.17]) +AM_GNU_GETTEXT([external]) +AM_ICONV + # directories AC_ARG_WITH(libv4l1subdir, AS_HELP_STRING(--with-libv4l1subdir=DIR,set libv4l1 library subdir [default=libv4l]), diff --git a/lib/libdvbv5/Makefile.am b/lib/libdvbv5/Makefile.am index 660841b..d14cc13 100644 --- a/lib/libdvbv5/Makefile.am +++ b/lib/libdvbv5/Makefile.am @@ -23,6 +23,7 @@ libdvbv5_la_SOURCES = \ parse_string.c parse_string.h libdvbv5_la_CPPFLAGS = $(ENFORCE_LIBDVBV5_STATIC) libdvbv5_la_LDFLAGS = -version-info 0 $(ENFORCE_LIBDVBV5_STATIC) +libdvbv5_la_LIBADD = $(LTLIBICONV) EXTRA_DIST = README gen_dvb_structs.pl diff --git a/lib/libdvbv5/parse_string.c b/lib/libdvbv5/parse_string.c index 5a118f8..fc8d5f3 100644 --- a/lib/libdvbv5/parse_string.c +++ b/lib/libdvbv5/parse_string.c @@ -22,6 +22,7 @@ * c.f. EN 300 468 annex A */ +#include <config.h> #include <iconv.h> #include <stdio.h> #include <stdlib.h> @@ -344,7 +345,7 @@ static void charset_conversion(char **dest, const unsigned char *s, fprintf(stderr, "Conversion from %s to %s not supported\n", type, output_charset); } else { - iconv(cd, (char **)&s, &len, &p, &destlen); + iconv(cd, (ICONV_CONST char **)&s, &len, &p, &destlen); iconv_close(cd); *p = '\0'; } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
