Commit 2619ccbb authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

package/mplayer: Fix linking with libvorbis/libdvdread 

Fixes
http://autobuild.buildroot.net/results/7f6/7f6e5396e95a3c3b676ca59bedc5317aa88e5f4c/
http://autobuild.buildroot.net/results/6ac/6acd9cf25c3088d313247510db47a214fff30c67/
http://autobuild.buildroot.net/results/a0d/a0da41bb734dbcdb17e13d852cfbdba5e069429e/
http://autobuild.buildroot.net/results/d0c/d0caf60c1ddf4e05086c93f646e32b5ddc75b6ce/



Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 97abbf21

package/mplayer/mplayer.mk

+4 −2
Original line number Diff line number Diff line
@@ -117,9 +117,10 @@ endif 
# https://github.com/pld-linux/mplayer/blob/master/mplayer-libcdio.patch

MPLAYER_CONF_OPTS += --disable-libcdio



# We intentionally don't pass --enable-dvdread, to let the

# autodetection find which library to link with.

ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)

MPLAYER_CONF_OPTS +=  \

	--enable-dvdread \

	--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config

MPLAYER_DEPENDENCIES += libdvdread

endif
@@ -175,9 +176,10 @@ MPLAYER_DEPENDENCIES += tremor 
MPLAYER_CONF_OPTS += --enable-tremor

endif



# We intentionally don't pass --enable-libvorbis, to let the

# autodetection find which library to link with.

ifeq ($(BR2_PACKAGE_LIBVORBIS),y)

MPLAYER_DEPENDENCIES += libvorbis

MPLAYER_CONF_OPTS += --enable-libvorbis

endif



ifeq ($(BR2_PACKAGE_LIBMAD),y)