[PATCH 3/3 resend] mplayer: Enable live and tv options

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 3/3 resend] mplayer: Enable live and tv options

Kelvin Cheung
From: Kelvin Cheung <[hidden email]>

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

Signed-off-by: Kelvin Cheung <[hidden email]>
---
 package/multimedia/mplayer/mplayer.mk |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 4c03440..9ef98f1 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -75,6 +75,22 @@ else
 MPLAYER_CONF_OPTS += --disable-mad
 endif
 
+ifeq ($(BR2_PACKAGE_LIVE555),y)
+MPLAYER_DEPENDENCIES += live555
+MPLAYER_CONF_OPTS += --enable-live
+MPLAYER_LIVE555_CFLAGS += -I$(STAGING_DIR)/usr/include/live/liveMedia
+MPLAYER_LIVE555_CFLAGS += -I$(STAGING_DIR)/usr/include/live/groupsock
+MPLAYER_LIVE555_CFLAGS += -I$(STAGING_DIR)/usr/include/live/UsageEnvironment
+MPLAYER_LIVE555_CFLAGS += -I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment
+MPLAYER_LIVE555_LDFLAGS += -lliveMedia
+MPLAYER_LIVE555_LDFLAGS += -lgroupsock
+MPLAYER_LIVE555_LDFLAGS += -lUsageEnvironment
+MPLAYER_LIVE555_LDFLAGS += -lBasicUsageEnvironment
+MPLAYER_LIVE555_LDFLAGS += -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 +122,13 @@ define MPLAYER_CONFIGURE_CMDS
  --cc="$(TARGET_CC)" \
  --as="$(TARGET_AS)" \
  --charset=UTF-8 \
- --extra-cflags="$(TARGET_CFLAGS)" \
- --extra-ldflags="$(TARGET_LDFLAGS)" \
+ --extra-cflags="$(TARGET_CFLAGS) $(MPLAYER_LIVE555_CFLAGS)" \
+ --extra-ldflags="$(TARGET_LDFLAGS) $(MPLAYER_LIVE555_LDFLAGS)" \
  --enable-mad \
  --enable-fbdev \
  $(MPLAYER_CONF_OPTS) \
  --enable-cross-compile \
  --disable-ivtv \
- --disable-tv \
- --disable-live \
  --enable-dynamic-plugins \
  )
 endef
--
1.7.1

_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 3/3 resend] mplayer: Enable live and tv options

Peter Korsgaard-3
>>>>> "keguang" == keguang zhang <[hidden email]> writes:

 keguang> From: Kelvin Cheung <[hidden email]>
 keguang> 1.Enable TV interface.
 keguang> 2.Enable LIVE555 Streaming Media if live555 is available.

Committed with minor cleanups, thanks.

--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[hidden email]
http://lists.busybox.net/mailman/listinfo/buildroot