diff mbox

[14/18] package/mplayer: add optional libiconv support

Message ID 1427649094-1240-15-git-send-email-bernd.kuhls@t-online.de
State Accepted
Headers show

Commit Message

Bernd Kuhls March 29, 2015, 5:11 p.m. UTC
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Yann E. MORIN April 8, 2015, 9:30 p.m. UTC | #1
Bernd, All,

On 2015-03-29 19:11 +0200, Bernd Kuhls spake thusly:
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mplayer/mplayer.mk |    8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
> index 631e2fe..6d9c4f4 100644
> --- a/package/mplayer/mplayer.mk
> +++ b/package/mplayer/mplayer.mk
> @@ -68,6 +68,14 @@ else
>  MPLAYER_CONF_OPTS += --disable-enca
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBICONV),y)
> +MPLAYER_CONF_OPTS += --enable-iconv
> +MPLAYER_DEPENDENCIES += libiconv
> +MPLAYER_EXTRA_LIBS += -liconv

Even though that's jsut been merged, I think this has the same issue as
the librtmp: ./configure will find the appropriate CFLAGS/LIBS if not
explicitly told to use iconv, so I'd just add the dependency (like
already suggested for librtmp).

Care to address that ad send a respin, please?

Regards,
Yann E. MORIN.

> +else
> +MPLAYER_CONF_OPTS += --disable-iconv
> +endif
> +
>  ifeq ($(BR2_PACKAGE_NCURSES),y)
>  MPLAYER_CONF_OPTS += --enable-termcap
>  MPLAYER_DEPENDENCIES += ncurses
> -- 
> 1.7.10.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni April 8, 2015, 9:32 p.m. UTC | #2
Dear Yann E. MORIN,

On Wed, 8 Apr 2015 23:30:08 +0200, Yann E. MORIN wrote:

> > +ifeq ($(BR2_PACKAGE_LIBICONV),y)
> > +MPLAYER_CONF_OPTS += --enable-iconv
> > +MPLAYER_DEPENDENCIES += libiconv
> > +MPLAYER_EXTRA_LIBS += -liconv
> 
> Even though that's jsut been merged, I think this has the same issue as
> the librtmp: ./configure will find the appropriate CFLAGS/LIBS if not
> explicitly told to use iconv, so I'd just add the dependency (like
> already suggested for librtmp).
> 
> Care to address that ad send a respin, please?

I've addressed that when applying:

+# We intentionally don't pass --enable-libiconv, to let the
+# autodetection find which library to link with.
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+MPLAYER_DEPENDENCIES += libiconv
+else
+MPLAYER_CONF_OPTS += --disable-iconv
+endif

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index 631e2fe..6d9c4f4 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -68,6 +68,14 @@  else
 MPLAYER_CONF_OPTS += --disable-enca
 endif
 
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+MPLAYER_CONF_OPTS += --enable-iconv
+MPLAYER_DEPENDENCIES += libiconv
+MPLAYER_EXTRA_LIBS += -liconv
+else
+MPLAYER_CONF_OPTS += --disable-iconv
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 MPLAYER_CONF_OPTS += --enable-termcap
 MPLAYER_DEPENDENCIES += ncurses