Skip to contentSkip to conversation

package/mplayer: add optional dependencies

PATCH New Bernd Kuhls 4 participants 37 messages Mar 29, 2015 – Apr 8, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

cover package/mplayer: add optional dependencies

mplayer supports a lot of third-party libraries, to have reproducable builds add them to the package. Some packages need the explicit mention of -llibfoo in --extra-libs=

$ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/bin/mplayer | grep NEEDED | sort
 0x00000001 (NEEDED)                     Shared library: [libasound.so.2]
 0x00000001 (NEEDED)                     Shared library: [libass.so.5]
 0x00000001 (NEEDED)                     Shared library: [libbluray.so.1]
 0x00000001 (NEEDED)                     Shared library: [libbz2.so.1.0]
 0x00000001 (NEEDED)                     Shared library: [libc.so.0]
 0x00000001 (NEEDED)                     Shared library: [libdl.so.0]
 0x00000001 (NEEDED)                     Shared library: [libdvdnavmini.so.4]
 0x00000001 (NEEDED)                     Shared library: [libdvdread.so.4]
 0x00000001 (NEEDED)                     Shared library: [libenca.so.0]
 0x00000001 (NEEDED)                     Shared library: [libfaad.so.2]
 0x00000001 (NEEDED)                     Shared library: [libfontconfig.so.1]
 0x00000001 (NEEDED)                     Shared library: [libfreetype.so.6]
 0x00000001 (NEEDED)                     Shared library: [libfribidi.so.0]
 0x00000001 (NEEDED)                     Shared library: [libgif.so.7]
 0x00000001 (NEEDED)                     Shared library: [libiconv.so.2]
 0x00000001 (NEEDED)                     Shared library: [libjpeg.so.9]
 0x00000001 (NEEDED)                     Shared library: [liblzo2.so.2]
 0x00000001 (NEEDED)                     Shared library: [libmad.so.0]
 0x00000001 (NEEDED)                     Shared library: [libmpeg2.so.0]
 0x00000001 (NEEDED)                     Shared library: [libm.so.0]
 0x00000001 (NEEDED)                     Shared library: [libncurses.so.5]
 0x00000001 (NEEDED)                     Shared library: [libogg.so.0]
 0x00000001 (NEEDED)                     Shared library: [libpng16.so.16]
 0x00000001 (NEEDED)                     Shared library: [libpthread.so.0]
 0x00000001 (NEEDED)                     Shared library: [librtmp.so.1]
 0x00000001 (NEEDED)                     Shared library: [libsmbclient.so.0]
 0x00000001 (NEEDED)                     Shared library: [libspeex.so.1]
 0x00000001 (NEEDED)                     Shared library: [libvorbisidec.so.1]
 0x00000001 (NEEDED)                     Shared library: [libz.so.1]

Bernd Kuhls (18):
package/mplayer: needs host-pkgconf package/mplayer: add optional giflib support package/mplayer: add optional ncurses support package/mplayer: add optional samba support package/mplayer: add optional libbluray support package/mplayer: add optional fontconfig support package/mplayer: add optional libfribidi support package/mplayer: add optional libass support package/mplayer: add optional libenca support package/mplayer: add optional lzo support package/mplayer: add optional faad2 support package/mplayer: add optional rtmpdump support package/mplayer: add optional speex support package/mplayer: add optional libiconv support package/mplayer: disable optional libcdio support package/mplayer: add optional bzip2 support package/mplayer: add optional lame support package/mplayer: add optional libmpeg2 support

Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 1/18 package/mplayer: needs host-pkgconf

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    2 ++
 1 file changed, 2 insertions(+)
package/mplayer/mplayer.mk +2 -0
index b2530e4..192a42e 100644
@@ -11,6 +11,8 @@ MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
 MPLAYER_CFLAGS = $(TARGET_CFLAGS)
 MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)
 
+MPLAYER_DEPENDENCIES += host-pkgconf
+
 # mplayer needs pcm+mixer support, but configure fails to check for it
 ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
 MPLAYER_DEPENDENCIES += alsa-lib
Signature · 1 line
1.7.10.4
Applied
#2 lore raw

PATCH 1/18 package/mplayer: needs host-pkgconf

Dear Bernd Kuhls,

Quoted 5 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    2 ++
 1 file changed, 2 insertions(+)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH 2/18 package/mplayer: add optional giflib support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    6 ++++++
 1 file changed, 6 insertions(+)
package/mplayer/mplayer.mk +6 -0
index 192a42e..f004ca9 100644
@@ -100,6 +100,11 @@ else
 MPLAYER_CONF_OPTS += --disable-live
 endif
 
+ifeq ($(BR2_PACKAGE_GIFLIB),y)
+MPLAYER_DEPENDENCIES += giflib
+MPLAYER_EXTRA_LIBS += -lgif
+endif
+
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)

@@ -145,6 +150,7 @@ define MPLAYER_CONFIGURE_CMDS
 		--yasm='' \
 		--enable-fbdev \
 		$(MPLAYER_CONF_OPTS) \
+		--extra-libs="$(MPLAYER_EXTRA_LIBS)" \
 		--enable-cross-compile \
 		--disable-ivtv \
 		--enable-dynamic-plugins \
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 2/18 package/mplayer: add optional giflib support

Dear Bernd Kuhls,

Quoted 11 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    6 ++++++
 1 file changed, 6 insertions(+)
package/mplayer/mplayer.mk +0 -0
index 192a42e..f004ca9 100644

package/mplayer/mplayer.mk else · line 106

Quoted 7 lines
package/mplayer/mplayer.mk +4 -0
@@ -100,6 +100,11 @@ else
 MPLAYER_CONF_OPTS += --disable-live
 endif
 
+ifeq ($(BR2_PACKAGE_GIFLIB),y)
+MPLAYER_DEPENDENCIES += giflib
+MPLAYER_EXTRA_LIBS += -lgif
+endif

Any reason not to use --enable-gif / --disable-gif here? Then you don't need to pass a --extra-libs value. I've applied the patch with this change, as it seems to build fine. Let me know if that causes a problem.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

PATCH 2/18 package/mplayer: add optional giflib support

Hello,

Quoted 8 lines · Thomas Petazzoni

package/mplayer/mplayer.mk else · line 106

Quoted 4 lines
package/mplayer/mplayer.mk +4 -0
+ifeq ($(BR2_PACKAGE_GIFLIB),y)
+MPLAYER_DEPENDENCIES += giflib
+MPLAYER_EXTRA_LIBS += -lgif
+endif

Any reason not to use --enable-gif / --disable-gif here? Then you don't need to pass a --extra-libs value. I've applied the patch with this change, as it seems to build fine. Let me know if that causes a problem.

Hum, looking at the ncurses case, things seem to be a bit annoying:

echocheck "termcap"
if test "$_termcap" = auto ; then
_termcap=no
for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do

    statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
      extra_ldflags="$extra_ldflags $ld_tmp" && _termcap=yes && break

done
fi
if test "$_termcap" = yes ; then
def_termcap='#define HAVE_TERMCAP 1'
test $ld_tmp && res_comment="using $ld_tmp"
else
def_termcap='#undef HAVE_TERMCAP'
fi
echores "$_termcap"

So, if you explicitly pass --enable-termcap, autodetection is not done, and you have to pass -lncurses explicitly in --extra-libs. Otherwise, if you don't use --enable-termcap and let the autodetection do its work, it detects -lncurses automatically.

So I'm not sure which one to choose:

*) Autodetection, which avoids the need for passing explicit -l<foo> values, but has the drawback of autodetection: we're not explicitly saying which features we want to enable, which may cause mis-use of certain libraries.

*) No autodetection, which forces us to pass the proper -l<foo> value for each dependency.

Opinions?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#6 lore raw

PATCH 2/18 package/mplayer: add optional giflib support

Quoted 43 lines · Thomas Petazzoni

Hello,

Quoted 8 lines · Thomas Petazzoni

package/mplayer/mplayer.mk else · line 106

Quoted 4 lines
package/mplayer/mplayer.mk +4 -0
+ifeq ($(BR2_PACKAGE_GIFLIB),y)
+MPLAYER_DEPENDENCIES += giflib
+MPLAYER_EXTRA_LIBS += -lgif
+endif

Any reason not to use --enable-gif / --disable-gif here? Then you don't need to pass a --extra-libs value. I've applied the patch with this change, as it seems to build fine. Let me know if that causes a problem.

Hum, looking at the ncurses case, things seem to be a bit annoying:

echocheck "termcap"
if test "$_termcap" = auto ; then
_termcap=no
for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do

    statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
      extra_ldflags="$extra_ldflags $ld_tmp" && _termcap=yes && break

done
fi
if test "$_termcap" = yes ; then
def_termcap='#define HAVE_TERMCAP 1'
test $ld_tmp && res_comment="using $ld_tmp"
else
def_termcap='#undef HAVE_TERMCAP'
fi
echores "$_termcap"

So, if you explicitly pass --enable-termcap, autodetection is not done, and you have to pass -lncurses explicitly in --extra-libs. Otherwise, if you don't use --enable-termcap and let the autodetection do its work, it detects -lncurses automatically.

So I'm not sure which one to choose:

*) Autodetection, which avoids the need for passing explicit -l<foo> values, but has the drawback of autodetection: we're not explicitly saying which features we want to enable, which may cause mis-use of certain libraries.

Quoted 4 lines

*) No autodetection, which forces us to pass the proper -l<foo> value for each dependency.

Opinions?

For the positive case (--enable-termcap), autodetection should be fine. What we
want to catch is that termcap happens to have been built before, so we want an explicit --disable-termcap.

Of course, there should be a comment why we don't put the --enable-termcap.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#7 lore raw

PATCH 2/18 package/mplayer: add optional giflib support

Arnout Vandecappelle <[email protected]> wrote in
news:551AE9C1.70701 at mind.be:

Quoted 1 line

For the positive case (--enable-termcap), autodetection should be fine.

Hi,

no, it is broken:

osdep/`termcap_addgetch2.o:': In
getch2.c function:( .text`termcap_add+0x15':):
getch2.c undefined:(.text+ reference0x15) to: undefined tgetstr' osdep/getch2.o: In function reference to tgetstr' osdep`load_termcap/getch2.o'::
getch2.c:In (.function text+`load_termcap0x9f)'::
getch2.cundefined :(reference .textto +0x9ftgetent): undefined reference' to getch2.c :(tgetent'.text
getch2.c+0xdb:():.text undefined+0xdb reference): to undefined ` referencetgetnum' to
getch2.c:( .text`tgetnum+0xec'
):getch2.c: undefined (.reference textto +0xec`tgetnum):'
undefinedgetch2.c: reference(.text+ to0x132) : `tgetnumundefined '
reference getch2.cto:( `.texttgetstr'+0x132)
: undefined reference to `tgetstr'

using this defconfig:

BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_MPLAYER_MENCODER=y
BR2_PACKAGE_NCURSES=y

Regards, Bernd

#8 lore raw

PATCH 2/18 package/mplayer: add optional giflib support

Quoted 8 lines · Bernd Kuhls

Arnout Vandecappelle <[email protected]> wrote in
news:551AE9C1.70701 at mind.be:

Quoted 1 line

For the positive case (--enable-termcap), autodetection should be fine.

Hi,

no, it is broken:

I meant, in case termcap is available, it should be OK to build without
--enable-termcap because in that case the configure script adds the required libs.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#9 lore raw

PATCH 3/18 package/mplayer: add optional ncurses support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +8 -0
index f004ca9..5ecd25a 100644
@@ -45,6 +45,14 @@ else
 MPLAYER_CONF_OPTS += --disable-freetype
 endif
 
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+MPLAYER_CONF_OPTS += --enable-termcap
+MPLAYER_DEPENDENCIES += ncurses
+MPLAYER_EXTRA_LIBS += -lncurses
+else
+MPLAYER_CONF_OPTS += --disable-termcap
+endif
+
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
 MPLAYER_CONF_OPTS +=  \
 	--enable-dvdread \
Signature · 1 line
1.7.10.4
#10 lore raw

PATCH 3/18 package/mplayer: add optional ncurses support

Dear Bernd Kuhls,

Quoted 11 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +0 -0
index f004ca9..5ecd25a 100644

package/mplayer/mplayer.mk else · line 49

Quoted 5 lines
package/mplayer/mplayer.mk +2 -0
@@ -45,6 +45,14 @@ else
 MPLAYER_CONF_OPTS += --disable-freetype
 endif
 
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+MPLAYER_CONF_OPTS += --enable-termcap

I've removed this line.

package/mplayer/mplayer.mk else · line 51

Quoted 2 lines
package/mplayer/mplayer.mk +2 -0
+MPLAYER_DEPENDENCIES += ncurses
+MPLAYER_EXTRA_LIBS += -lncurses

This line.

And added a comment above to explain why we don't pass --enable-termcap.

And then I applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#11 lore raw

PATCH 4/18 package/mplayer: add optional samba support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index 5ecd25a..1dbad7d 100644
@@ -53,6 +53,13 @@ else
 MPLAYER_CONF_OPTS += --disable-termcap
 endif
 
+ifeq ($(BR2_PACKAGE_SAMBA_SMBCLIENT),y)
+MPLAYER_CONF_OPTS += --enable-smb
+MPLAYER_DEPENDENCIES += samba
+else
+MPLAYER_CONF_OPTS += --disable-smb
+endif
+
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
 MPLAYER_CONF_OPTS +=  \
 	--enable-dvdread \
Signature · 1 line
1.7.10.4
#12 lore raw

PATCH 4/18 package/mplayer: add optional samba support

Dear Bernd Kuhls,

package/mplayer/mplayer.mk else · line 61

Quoted 6 lines · Bernd Kuhls
package/mplayer/mplayer.mk +6 -0
+ifeq ($(BR2_PACKAGE_SAMBA_SMBCLIENT),y)
+MPLAYER_CONF_OPTS += --enable-smb
+MPLAYER_DEPENDENCIES += samba
+else
+MPLAYER_CONF_OPTS += --disable-smb
+endif

Samba 3 has been deprecated. So I've merged this patch, but it's actually a no-op, unless deprecated packages are enabled. Can you check whether Samba 4 can be used instead ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#13 lore raw

PATCH 5/18 package/mplayer: add optional libbluray support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index 1dbad7d..7992c4c 100644
@@ -60,6 +60,13 @@ else
 MPLAYER_CONF_OPTS += --disable-smb
 endif
 
+ifeq ($(BR2_PACKAGE_LIBBLURAY),y)
+MPLAYER_CONF_OPTS += --enable-bluray
+MPLAYER_DEPENDENCIES += libbluray
+else
+MPLAYER_CONF_OPTS += --disable-bluray
+endif
+
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
 MPLAYER_CONF_OPTS +=  \
 	--enable-dvdread \
Signature · 1 line
1.7.10.4
author
#14 lore raw

PATCH 6/18 package/mplayer: add optional fontconfig support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +8 -0
index 7992c4c..db6bbd9 100644
@@ -45,6 +45,14 @@ else
 MPLAYER_CONF_OPTS += --disable-freetype
 endif
 
+ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
+MPLAYER_CONF_OPTS += --enable-fontconfig
+MPLAYER_DEPENDENCIES += fontconfig
+MPLAYER_EXTRA_LIBS += -lfontconfig
+else
+MPLAYER_CONF_OPTS += --disable-fontconfig
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 MPLAYER_CONF_OPTS += --enable-termcap
 MPLAYER_DEPENDENCIES += ncurses
Signature · 1 line
1.7.10.4
author
#15 lore raw

PATCH 7/18 package/mplayer: add optional libfribidi support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +8 -0
index db6bbd9..900a6ce 100644
@@ -53,6 +53,14 @@ else
 MPLAYER_CONF_OPTS += --disable-fontconfig
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
+MPLAYER_CONF_OPTS += --enable-fribidi
+MPLAYER_DEPENDENCIES += libfribidi
+MPLAYER_EXTRA_LIBS += -lfribidi
+else
+MPLAYER_CONF_OPTS += --disable-fribidi
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 MPLAYER_CONF_OPTS += --enable-termcap
 MPLAYER_DEPENDENCIES += ncurses
Signature · 1 line
1.7.10.4
author
#16 lore raw

PATCH 8/18 package/mplayer: add optional libass support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    6 ++++++
 1 file changed, 6 insertions(+)
package/mplayer/mplayer.mk +6 -0
index 900a6ce..245ed91 100644
@@ -110,6 +110,12 @@ else
 MPLAYER_CONF_OPTS += --disable-mencoder
 endif
 
+ifeq ($(BR2_PACKAGE_LIBASS),y)
+MPLAYER_DEPENDENCIES += libass
+MPLAYER_EXTRA_LIBS += -lass
+MPLAYER_CONF_OPTS += --disable-ass-internal --enable-ass
+endif
+
 ifeq ($(BR2_PACKAGE_TREMOR),y)
 MPLAYER_DEPENDENCIES += tremor
 MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
Signature · 1 line
1.7.10.4
author
#17 lore raw

PATCH 9/18 package/mplayer: add optional libenca support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index 245ed91..6fbdd72 100644
@@ -61,6 +61,13 @@ else
 MPLAYER_CONF_OPTS += --disable-fribidi
 endif
 
+ifeq ($(BR2_PACKAGE_LIBENCA),y)
+MPLAYER_CONF_OPTS += --enable-enca
+MPLAYER_DEPENDENCIES += libenca
+else
+MPLAYER_CONF_OPTS += --disable-enca
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 MPLAYER_CONF_OPTS += --enable-termcap
 MPLAYER_DEPENDENCIES += ncurses
Signature · 1 line
1.7.10.4
author
#18 lore raw

PATCH 10/18 package/mplayer: add optional lzo support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index 6fbdd72..a09cf43 100644
@@ -156,6 +156,13 @@ MPLAYER_DEPENDENCIES += giflib
 MPLAYER_EXTRA_LIBS += -lgif
 endif
 
+ifeq ($(BR2_PACKAGE_LZO),y)
+MPLAYER_DEPENDENCIES += lzo
+MPLAYER_CONF_OPTS += --enable-liblzo
+else
+MPLAYER_CONF_OPTS += --disable-liblzo
+endif
+
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
Signature · 1 line
1.7.10.4
#19 lore raw

PATCH 10/18 package/mplayer: add optional lzo support

Bernd, All,

On 2015-03-29 19:11 +0200, Bernd Kuhls spake thusly:

Quoted 2 lines
Signed-off-by Bernd Kuhls <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index 6fbdd72..a09cf43 100644
@@ -156,6 +156,13 @@ MPLAYER_DEPENDENCIES += giflib
 MPLAYER_EXTRA_LIBS += -lgif
 endif
 
+ifeq ($(BR2_PACKAGE_LZO),y)
+MPLAYER_DEPENDENCIES += lzo
+MPLAYER_CONF_OPTS += --enable-liblzo
+else
+MPLAYER_CONF_OPTS += --disable-liblzo
+endif
+
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#20 lore raw

PATCH 11/18 package/mplayer: add optional faad2 support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index a09cf43..442f82b 100644
@@ -117,6 +117,13 @@ else
 MPLAYER_CONF_OPTS += --disable-mencoder
 endif
 
+ifeq ($(BR2_PACKAGE_FAAD2),y)
+MPLAYER_DEPENDENCIES += faad2
+MPLAYER_CONF_OPTS += --enable-faad
+else
+MPLAYER_CONF_OPTS += --disable-faad
+endif
+
 ifeq ($(BR2_PACKAGE_LIBASS),y)
 MPLAYER_DEPENDENCIES += libass
 MPLAYER_EXTRA_LIBS += -lass
Signature · 1 line
1.7.10.4
#21 lore raw

PATCH 11/18 package/mplayer: add optional faad2 support

Bernd, All,

On 2015-03-29 19:11 +0200, Bernd Kuhls spake thusly:

Quoted 2 lines
Signed-off-by Bernd Kuhls <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index a09cf43..442f82b 100644
@@ -117,6 +117,13 @@ else
 MPLAYER_CONF_OPTS += --disable-mencoder
 endif
 
+ifeq ($(BR2_PACKAGE_FAAD2),y)
+MPLAYER_DEPENDENCIES += faad2
+MPLAYER_CONF_OPTS += --enable-faad
+else
+MPLAYER_CONF_OPTS += --disable-faad
+endif
+
 ifeq ($(BR2_PACKAGE_LIBASS),y)
 MPLAYER_DEPENDENCIES += libass
 MPLAYER_EXTRA_LIBS += -lass
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#22 lore raw

PATCH 12/18 package/mplayer: add optional rtmpdump support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +8 -0
index 442f82b..5f9a8d1 100644
@@ -163,6 +163,14 @@ MPLAYER_DEPENDENCIES += giflib
 MPLAYER_EXTRA_LIBS += -lgif
 endif
 
+ifeq ($(BR2_PACKAGE_RTMPDUMP),y)
+MPLAYER_DEPENDENCIES += rtmpdump
+MPLAYER_CONF_OPTS += --enable-librtmp
+MPLAYER_EXTRA_LIBS += -lrtmp
+else
+MPLAYER_CONF_OPTS += --disable-librtmp
+endif
+
 ifeq ($(BR2_PACKAGE_LZO),y)
 MPLAYER_DEPENDENCIES += lzo
 MPLAYER_CONF_OPTS += --enable-liblzo
Signature · 1 line
1.7.10.4
#23 lore raw

PATCH 12/18 package/mplayer: add optional rtmpdump support

Bernd, All,

On 2015-03-29 19:11 +0200, Bernd Kuhls spake thusly:

Quoted 11 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +0 -0
index 442f82b..5f9a8d1 100644

package/mplayer/mplayer.mk MPLAYER_DEPENDENCIES += giflib · line 169

Quoted 7 lines
package/mplayer/mplayer.mk +4 -0
@@ -163,6 +163,14 @@ MPLAYER_DEPENDENCIES += giflib
 MPLAYER_EXTRA_LIBS += -lgif
 endif
 
+ifeq ($(BR2_PACKAGE_RTMPDUMP),y)
+MPLAYER_DEPENDENCIES += rtmpdump
+MPLAYER_CONF_OPTS += --enable-librtmp
+MPLAYER_EXTRA_LIBS += -lrtmp

Instead of passin extra libs, just let ./configure detect it all by itself:

    # ./configure will auto-detet librtmp if present, and will use
    # appropriate CFLAGS/LDFLAGS/LIBS (otherwise, it fails to do so
    # if told explicitly to use librtmp with --enable-librtmp
    ifeq ($(BR2_PACKAGE_RTMPDUMP),y)
    MPLAYER_DEPENDENCIES += rtmpdump
    else
    MPLAYER_CONF_OPTS += --disable-librtmp
    endif

Regards,
Yann E. MORIN.

Quoted 14 lines
package/mplayer/mplayer.mk +4 -0
+else
+MPLAYER_CONF_OPTS += --disable-librtmp
+endif
+
 ifeq ($(BR2_PACKAGE_LZO),y)
 MPLAYER_DEPENDENCIES += lzo
 MPLAYER_CONF_OPTS += --enable-liblzo
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#24 lore raw

PATCH 12/18 package/mplayer: add optional rtmpdump support

Dear Yann E. MORIN,

Quoted 11 lines · Yann E. MORIN

Instead of passin extra libs, just let ./configure detect it all by itself:

    # ./configure will auto-detet librtmp if present, and will use
    # appropriate CFLAGS/LDFLAGS/LIBS (otherwise, it fails to do so
    # if told explicitly to use librtmp with --enable-librtmp
    ifeq ($(BR2_PACKAGE_RTMPDUMP),y)
    MPLAYER_DEPENDENCIES += rtmpdump
    else
    MPLAYER_CONF_OPTS += --disable-librtmp
    endif

Done when applying:

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

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#25 lore raw

PATCH 13/18 package/mplayer: add optional speex support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index 5f9a8d1..631e2fe 100644
@@ -171,6 +171,13 @@ else
 MPLAYER_CONF_OPTS += --disable-librtmp
 endif
 
+ifeq ($(BR2_PACKAGE_SPEEX),y)
+MPLAYER_DEPENDENCIES += speex
+MPLAYER_CONF_OPTS += --enable-speex
+else
+MPLAYER_CONF_OPTS += --disable-speex
+endif
+
 ifeq ($(BR2_PACKAGE_LZO),y)
 MPLAYER_DEPENDENCIES += lzo
 MPLAYER_CONF_OPTS += --enable-liblzo
Signature · 1 line
1.7.10.4
author
#26 lore raw

PATCH 14/18 package/mplayer: add optional libiconv support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +8 -0
index 631e2fe..6d9c4f4 100644
@@ -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
Signature · 1 line
1.7.10.4
#27 lore raw

PATCH 14/18 package/mplayer: add optional libiconv support

Bernd, All,

On 2015-03-29 19:11 +0200, Bernd Kuhls spake thusly:

Quoted 11 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/mplayer/mplayer.mk +0 -0
index 631e2fe..6d9c4f4 100644

package/mplayer/mplayer.mk else · line 74

Quoted 7 lines
package/mplayer/mplayer.mk +4 -0
@@ -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.

Quoted 14 lines
package/mplayer/mplayer.mk +4 -0
+else
+MPLAYER_CONF_OPTS += --disable-iconv
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 MPLAYER_CONF_OPTS += --enable-termcap
 MPLAYER_DEPENDENCIES += ncurses
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#28 lore raw

PATCH 14/18 package/mplayer: add optional libiconv support

Dear Yann E. MORIN,

Quoted 11 lines · Yann E. MORIN

package/mplayer/mplayer.mk else · line 74

Quoted 4 lines
package/mplayer/mplayer.mk +4 -0
+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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#29 lore raw

PATCH 15/18 package/mplayer: disable optional libcdio support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    5 +++++
 1 file changed, 5 insertions(+)
package/mplayer/mplayer.mk +5 -0
index 6d9c4f4..76c53d7 100644
@@ -98,6 +98,11 @@ else
 MPLAYER_CONF_OPTS += --disable-bluray
 endif
 
+# cdio support is broken in buildroot atm due to missing libcdio-paranoia
+# package and this patch
+# https://github.com/pld-linux/mplayer/blob/master/mplayer-libcdio.patch
+MPLAYER_CONF_OPTS += --disable-libcdio
+
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
 MPLAYER_CONF_OPTS +=  \
 	--enable-dvdread \
Signature · 1 line
1.7.10.4
author
#30 lore raw

PATCH 16/18 package/mplayer: add optional bzip2 support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    1 +
 1 file changed, 1 insertion(+)
package/mplayer/mplayer.mk +1 -0
index 76c53d7..97e6a5d 100644
@@ -198,6 +198,7 @@ else
 MPLAYER_CONF_OPTS += --disable-liblzo
 endif
 
+MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_BZIP2),bzip2)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
 MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
Signature · 1 line
1.7.10.4
author
#31 lore raw

PATCH 17/18 package/mplayer: add optional lame support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/mplayer/mplayer.mk +7 -0
index 97e6a5d..da6e468 100644
@@ -137,6 +137,13 @@ else
 MPLAYER_CONF_OPTS += --disable-faad
 endif
 
+ifeq ($(BR2_PACKAGE_LAME),y)
+MPLAYER_DEPENDENCIES += lame
+MPLAYER_CONF_OPTS += --enable-mp3lame
+else
+MPLAYER_CONF_OPTS += --disable-mp3lame
+endif
+
 ifeq ($(BR2_PACKAGE_LIBASS),y)
 MPLAYER_DEPENDENCIES += libass
 MPLAYER_EXTRA_LIBS += -lass
Signature · 1 line
1.7.10.4
author
#32 lore raw

PATCH 18/18 package/mplayer: add optional libmpeg2 support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    6 ++++++
 1 file changed, 6 insertions(+)
package/mplayer/mplayer.mk +6 -0
index da6e468..61c4594 100644
@@ -150,6 +150,12 @@ MPLAYER_EXTRA_LIBS += -lass
 MPLAYER_CONF_OPTS += --disable-ass-internal --enable-ass
 endif
 
+ifeq ($(BR2_PACKAGE_LIBMPEG2),y)
+MPLAYER_DEPENDENCIES += libmpeg2
+MPLAYER_CONF_OPTS += --disable-libmpeg2-internal --enable-libmpeg2
+MPLAYER_EXTRA_LIBS += -lmpeg2
+endif
+
 ifeq ($(BR2_PACKAGE_TREMOR),y)
 MPLAYER_DEPENDENCIES += tremor
 MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
Signature · 1 line
1.7.10.4
#33 lore raw

PATCH 18/18 package/mplayer: add optional libmpeg2 support

Bernd, All,

On 2015-03-29 19:11 +0200, Bernd Kuhls spake thusly:

Quoted 11 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mplayer/mplayer.mk |    6 ++++++
 1 file changed, 6 insertions(+)
package/mplayer/mplayer.mk +0 -0
index da6e468..61c4594 100644

package/mplayer/mplayer.mk MPLAYER_EXTRA_LIBS += -lass · line 157

Quoted 8 lines
package/mplayer/mplayer.mk +5 -0
@@ -150,6 +150,12 @@ MPLAYER_EXTRA_LIBS += -lass
 MPLAYER_CONF_OPTS += --disable-ass-internal --enable-ass
 endif
 
+ifeq ($(BR2_PACKAGE_LIBMPEG2),y)
+MPLAYER_DEPENDENCIES += libmpeg2
+MPLAYER_CONF_OPTS += --disable-libmpeg2-internal --enable-libmpeg2
+MPLAYER_EXTRA_LIBS += -lmpeg2
+endif

Ditto, ./configure detects the LDFLAGS if it auto-finds libmpeg2 (i.e. without passing --enable-libmpeg2).

Regards,
Yann E. MORIN.

Quoted 10 lines
package/mplayer/mplayer.mk +0 -0
 ifeq ($(BR2_PACKAGE_TREMOR),y)
 MPLAYER_DEPENDENCIES += tremor
 MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#34 lore raw

cover package/mplayer: add optional dependencies

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 10 lines · Bernd Kuhls

Bernd Kuhls (18):
package/mplayer: needs host-pkgconf package/mplayer: add optional giflib support package/mplayer: add optional ncurses support package/mplayer: add optional samba support package/mplayer: add optional libbluray support package/mplayer: add optional fontconfig support package/mplayer: add optional libfribidi support package/mplayer: add optional libass support package/mplayer: add optional libenca support

Applied up to this point, after switching some of them to autodetection instead of the extra libs thing.

Quoted 9 lines

package/mplayer: add optional lzo support package/mplayer: add optional faad2 support package/mplayer: add optional rtmpdump support package/mplayer: add optional speex support package/mplayer: add optional libiconv support package/mplayer: disable optional libcdio support package/mplayer: add optional bzip2 support package/mplayer: add optional lame support package/mplayer: add optional libmpeg2 support

I'll have a look at those ones later on.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Applied
#35 lore raw

cover package/mplayer: add optional dependencies

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

package/mplayer: add optional lzo support package/mplayer: add optional faad2 support package/mplayer: add optional rtmpdump support package/mplayer: add optional speex support package/mplayer: add optional libiconv support package/mplayer: disable optional libcdio support package/mplayer: add optional bzip2 support package/mplayer: add optional lame support package/mplayer: add optional libmpeg2 support

I've applied those patches, after fixing up things to rely on autodection in order to avoid the "extra libs" thing.

However, I'm not entirely happy with how the mplayer package looks like. Some dependencies have explicit disable:

ifeq ($(BR2_PACKAGE_LAME),y)
MPLAYER_DEPENDENCIES += lame
MPLAYER_CONF_OPTS += --enable-mp3lame
else
MPLAYER_CONF_OPTS += --disable-mp3lame
endif

but some do not:

ifeq ($(BR2_PACKAGE_TREMOR),y)
MPLAYER_DEPENDENCIES += tremor
MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor endif

and for example, when --disable-tremor is not passed, an internal tremor implementation is used, as far as I can see.

There are also cases like:

MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_BZIP2),bzip2)

All of this should probably be harmonized to properly get an explicit disabling for all dependencies, unless there is a good reason not to do so.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#36 lore raw

cover package/mplayer: add optional dependencies

Thomas, All,

On 2015-04-08 23:35 +0200, Thomas Petazzoni spake thusly:

Quoted 35 lines · Bernd Kuhls
Quoted 10 lines

package/mplayer: add optional lzo support package/mplayer: add optional faad2 support package/mplayer: add optional rtmpdump support package/mplayer: add optional speex support package/mplayer: add optional libiconv support package/mplayer: disable optional libcdio support package/mplayer: add optional bzip2 support package/mplayer: add optional lame support package/mplayer: add optional libmpeg2 support

I've applied those patches, after fixing up things to rely on autodection in order to avoid the "extra libs" thing.

However, I'm not entirely happy with how the mplayer package looks like. Some dependencies have explicit disable:

ifeq ($(BR2_PACKAGE_LAME),y)
MPLAYER_DEPENDENCIES += lame
MPLAYER_CONF_OPTS += --enable-mp3lame
else
MPLAYER_CONF_OPTS += --disable-mp3lame
endif

but some do not:

ifeq ($(BR2_PACKAGE_TREMOR),y)
MPLAYER_DEPENDENCIES += tremor
MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor endif

and for example, when --disable-tremor is not passed, an internal tremor implementation is used, as far as I can see.

Quoted 7 lines

There are also cases like:

MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_BZIP2),bzip2)

All of this should probably be harmonized to properly get an explicit disabling for all dependencies, unless there is a good reason not to do so.

Well, the reason is pretty obvious:

- it's not an autotools package, the configure is hand-written
- some options have explicit --enable/disable-foo
- some options only have --enable-foo
- and some only rely on detecting the optional lib(s)

For example, there's no option for bzip2: if the lib is present, it is enabled, otherwise it is disabled.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'