Commit 88b5a31f authored by Kelvin Cheung's avatar Kelvin Cheung Committed by Peter Korsgaard
Browse files

mplayer: Enable live and tv options 



1.Enable TV interface.
2.Enable LIVE555 Streaming Media if live555 is available.

[Peter: cleanup CFLAGS/LDFLAGS handling]
Signed-off-by: default avatarKelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent eb3785fc

package/multimedia/mplayer/mplayer.mk

+16 −4
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ MPLAYER_VERSION = 32726 
# MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases

MPLAYER_SITE = svn://svn.mplayerhq.hu/mplayer/trunk



MPLAYER_CFLAGS = $(TARGET_CFLAGS)

MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)



# 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
@@ -75,6 +78,17 @@ else 
MPLAYER_CONF_OPTS += --disable-mad

endif



ifeq ($(BR2_PACKAGE_LIVE555),y)

MPLAYER_DEPENDENCIES += live555

MPLAYER_CONF_OPTS += --enable-live

MPLAYER_LIVE555 = liveMedia groupsock UsageEnvironment BasicUsageEnvironment

MPLAYER_CFLAGS += \

	$(addprefix -I$(STAGING_DIR)/usr/include/live/,$(MPLAYER_LIVE555))

MPLAYER_LDFLAGS += $(addprefix -l,$(MPLAYER_LIVE555)) -lstdc++

else

MPLAYER_CONF_OPTS += --disable-live

endif



MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)

MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)

MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
@@ -106,15 +120,13 @@ define MPLAYER_CONFIGURE_CMDS 
		--cc="$(TARGET_CC)" \

		--as="$(TARGET_AS)" \

		--charset=UTF-8 \

		--extra-cflags="$(TARGET_CFLAGS)" \

		--extra-ldflags="$(TARGET_LDFLAGS)" \

		--extra-cflags="$(MPLAYER_CFLAGS)" \

		--extra-ldflags="$(MPLAYER_LDFLAGS)" \

		--enable-mad \

		--enable-fbdev \

		$(MPLAYER_CONF_OPTS) \

		--enable-cross-compile \

		--disable-ivtv \

		--disable-tv \

		--disable-live \

		--enable-dynamic-plugins \

	)

endef