* [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS.
@ 2011-09-20 9:01 keguang.zhang at gmail.com
2011-09-20 9:01 ` [Buildroot] [PATCH 2/3] live555: install to staging keguang.zhang at gmail.com
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: keguang.zhang at gmail.com @ 2011-09-20 9:01 UTC (permalink / raw)
To: buildroot
From: Kelvin Cheung <keguang.zhang@gmail.com>
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
linux/Config.in | 4 ++++
linux/linux.mk | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 5655286..09e5685 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -148,6 +148,10 @@ config BR2_LINUX_KERNEL_VMLINUX
bool "vmlinux"
depends on BR2_mips || BR2_mipsel
+config BR2_LINUX_KERNEL_VMLINUZ
+ bool "vmlinuz"
+ depends on BR2_mips || BR2_mipsel
+
config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
bool "custom target"
help
diff --git a/linux/linux.mk b/linux/linux.mk
index f249d96..32b588c 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -63,6 +63,8 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
LINUX_IMAGE_NAME=vmlinux.bin
else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
LINUX_IMAGE_NAME=vmlinux
+else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
+LINUX_IMAGE_NAME=vmlinuz
endif
endif
@@ -80,6 +82,8 @@ endif
ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
+else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
+LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
else
ifeq ($(KERNEL_ARCH),avr32)
LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX_IMAGE_NAME)
--
1.7.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/3] live555: install to staging
2011-09-20 9:01 [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS keguang.zhang at gmail.com
@ 2011-09-20 9:01 ` keguang.zhang at gmail.com
2011-10-28 4:14 ` Kelvin Cheung
2011-10-28 9:03 ` Peter Korsgaard
2011-09-20 9:01 ` [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options keguang.zhang at gmail.com
` (3 subsequent siblings)
4 siblings, 2 replies; 11+ messages in thread
From: keguang.zhang at gmail.com @ 2011-09-20 9:01 UTC (permalink / raw)
To: buildroot
From: Kelvin Cheung <keguang.zhang@gmail.com>
Install live555 library to staging for mplayer.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
package/multimedia/live555/live555.mk | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/package/multimedia/live555/live555.mk b/package/multimedia/live555/live555.mk
index 45a0375..47d6085 100644
--- a/package/multimedia/live555/live555.mk
+++ b/package/multimedia/live555/live555.mk
@@ -7,6 +7,7 @@
LIVE555_VERSION = 2011.06.16
LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
LIVE555_SITE = http://www.live555.com/liveMedia/public/
+LIVE555_INSTALL_STAGING=YES
LIVE555_INSTALL_TARGET = YES
define LIVE555_CONFIGURE_CMDS
@@ -26,6 +27,16 @@ define LIVE555_CLEAN_CMDS
$(MAKE) -C $(@D) clean
endef
+LIVE555_HEADERS_TO_INSTALL += liveMedia/include
+LIVE555_HEADERS_TO_INSTALL += groupsock/include
+LIVE555_HEADERS_TO_INSTALL += UsageEnvironment/include
+LIVE555_HEADERS_TO_INSTALL += BasicUsageEnvironment/include
+
+LIVE555_LIBS_TO_INSTALL += liveMedia/libliveMedia.a
+LIVE555_LIBS_TO_INSTALL += groupsock/libgroupsock.a
+LIVE555_LIBS_TO_INSTALL += UsageEnvironment/libUsageEnvironment.a
+LIVE555_LIBS_TO_INSTALL += BasicUsageEnvironment/libBasicUsageEnvironment.a
+
LIVE555_FILES_TO_INSTALL- =
LIVE555_FILES_TO_INSTALL-y =
LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP
@@ -33,12 +44,29 @@ LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live5
LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer
LIVE555_FILES_TO_INSTALL- += $(LIVE555_FILES_TO_INSTALL-y)
+define LIVE555_INSTALL_STAGING_CMDS
+ for i in $(LIVE555_HEADERS_TO_INSTALL); do \
+ mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+ cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+ done; \
+ for i in $(LIVE555_LIBS_TO_INSTALL); do \
+ $(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \
+ done
+endef
+
define LIVE555_INSTALL_TARGET_CMDS
for i in $(LIVE555_FILES_TO_INSTALL-y); do \
$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i`; \
done
endef
+define LIVE555_UNINSTALL_STAGING_CMDS
+ [ -d $(STAGING_DIR)/usr/include/live ] && rm -rf $(STAGING_DIR)/usr/include/live; \
+ for i in $(LIVE555_LIBS_TO_INSTALL); do \
+ rm -f $(addprefix $(STAGING_DIR)/usr/lib/, `basename $$i`); \
+ done
+endef
+
define LIVE555_UNINSTALL_TARGET_CMDS
for i in $(LIVE555_FILES_TO_INSTALL-); do \
rm -f $(addprefix $(TARGET_DIR)/usr/bin/, `basename $$i`); \
--
1.7.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options
2011-09-20 9:01 [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS keguang.zhang at gmail.com
2011-09-20 9:01 ` [Buildroot] [PATCH 2/3] live555: install to staging keguang.zhang at gmail.com
@ 2011-09-20 9:01 ` keguang.zhang at gmail.com
2011-09-23 1:49 ` Kelvin Cheung
` (2 more replies)
2011-10-28 4:12 ` [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS Kelvin Cheung
` (2 subsequent siblings)
4 siblings, 3 replies; 11+ messages in thread
From: keguang.zhang at gmail.com @ 2011-09-20 9:01 UTC (permalink / raw)
To: buildroot
From: Kelvin Cheung <keguang.zhang@gmail.com>
1.Enable TV interface.
2.Enable LIVE555 Streaming Media if live555 is available.
Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
---
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 f735464..416572c 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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options
2011-09-20 9:01 ` [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options keguang.zhang at gmail.com
@ 2011-09-23 1:49 ` Kelvin Cheung
2011-10-28 4:16 ` Kelvin Cheung
2011-10-31 9:05 ` Kelvin Cheung
2 siblings, 0 replies; 11+ messages in thread
From: Kelvin Cheung @ 2011-09-23 1:49 UTC (permalink / raw)
To: buildroot
Hi Peter and Thomas,
What about these patches?
Any suggestions?
2011/9/20, keguang.zhang at gmail.com <keguang.zhang@gmail.com>:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> 1.Enable TV interface.
> 2.Enable LIVE555 Streaming Media if live555 is available.
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> 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 f735464..416572c 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
>
>
--
Best Regards!
Kelvin
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS.
2011-09-20 9:01 [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS keguang.zhang at gmail.com
2011-09-20 9:01 ` [Buildroot] [PATCH 2/3] live555: install to staging keguang.zhang at gmail.com
2011-09-20 9:01 ` [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options keguang.zhang at gmail.com
@ 2011-10-28 4:12 ` Kelvin Cheung
2011-10-28 6:11 ` Thomas De Schampheleire
2011-10-28 8:52 ` Peter Korsgaard
4 siblings, 0 replies; 11+ messages in thread
From: Kelvin Cheung @ 2011-10-28 4:12 UTC (permalink / raw)
To: buildroot
bump
2011/9/20, keguang.zhang at gmail.com <keguang.zhang@gmail.com>:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> linux/Config.in | 4 ++++
> linux/linux.mk | 4 ++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/linux/Config.in b/linux/Config.in
> index 5655286..09e5685 100644
> --- a/linux/Config.in
> +++ b/linux/Config.in
> @@ -148,6 +148,10 @@ config BR2_LINUX_KERNEL_VMLINUX
> bool "vmlinux"
> depends on BR2_mips || BR2_mipsel
>
> +config BR2_LINUX_KERNEL_VMLINUZ
> + bool "vmlinuz"
> + depends on BR2_mips || BR2_mipsel
> +
> config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
> bool "custom target"
> help
> diff --git a/linux/linux.mk b/linux/linux.mk
> index f249d96..32b588c 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -63,6 +63,8 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
> LINUX_IMAGE_NAME=vmlinux.bin
> else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
> LINUX_IMAGE_NAME=vmlinux
> +else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
> +LINUX_IMAGE_NAME=vmlinuz
> endif
> endif
>
> @@ -80,6 +82,8 @@ endif
>
> ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
> LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
> +else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
> +LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
> else
> ifeq ($(KERNEL_ARCH),avr32)
> LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX_IMAGE_NAME)
> --
> 1.7.1
>
>
--
Best Regards!
Kelvin
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/3] live555: install to staging
2011-09-20 9:01 ` [Buildroot] [PATCH 2/3] live555: install to staging keguang.zhang at gmail.com
@ 2011-10-28 4:14 ` Kelvin Cheung
2011-10-28 9:03 ` Peter Korsgaard
1 sibling, 0 replies; 11+ messages in thread
From: Kelvin Cheung @ 2011-10-28 4:14 UTC (permalink / raw)
To: buildroot
bump
2011/9/20, keguang.zhang at gmail.com <keguang.zhang@gmail.com>:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> Install live555 library to staging for mplayer.
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> package/multimedia/live555/live555.mk | 28 ++++++++++++++++++++++++++++
> 1 files changed, 28 insertions(+), 0 deletions(-)
>
> diff --git a/package/multimedia/live555/live555.mk
> b/package/multimedia/live555/live555.mk
> index 45a0375..47d6085 100644
> --- a/package/multimedia/live555/live555.mk
> +++ b/package/multimedia/live555/live555.mk
> @@ -7,6 +7,7 @@
> LIVE555_VERSION = 2011.06.16
> LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
> LIVE555_SITE = http://www.live555.com/liveMedia/public/
> +LIVE555_INSTALL_STAGING=YES
> LIVE555_INSTALL_TARGET = YES
>
> define LIVE555_CONFIGURE_CMDS
> @@ -26,6 +27,16 @@ define LIVE555_CLEAN_CMDS
> $(MAKE) -C $(@D) clean
> endef
>
> +LIVE555_HEADERS_TO_INSTALL += liveMedia/include
> +LIVE555_HEADERS_TO_INSTALL += groupsock/include
> +LIVE555_HEADERS_TO_INSTALL += UsageEnvironment/include
> +LIVE555_HEADERS_TO_INSTALL += BasicUsageEnvironment/include
> +
> +LIVE555_LIBS_TO_INSTALL += liveMedia/libliveMedia.a
> +LIVE555_LIBS_TO_INSTALL += groupsock/libgroupsock.a
> +LIVE555_LIBS_TO_INSTALL += UsageEnvironment/libUsageEnvironment.a
> +LIVE555_LIBS_TO_INSTALL += BasicUsageEnvironment/libBasicUsageEnvironment.a
> +
> LIVE555_FILES_TO_INSTALL- =
> LIVE555_FILES_TO_INSTALL-y =
> LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) +=
> testProgs/openRTSP
> @@ -33,12 +44,29 @@
> LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) +=
> mediaServer/live5
> LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) +=
> testProgs/MPEG2TransportStreamIndexer
> LIVE555_FILES_TO_INSTALL- += $(LIVE555_FILES_TO_INSTALL-y)
>
> +define LIVE555_INSTALL_STAGING_CMDS
> + for i in $(LIVE555_HEADERS_TO_INSTALL); do \
> + mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
> + cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
> + done; \
> + for i in $(LIVE555_LIBS_TO_INSTALL); do \
> + $(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \
> + done
> +endef
> +
> define LIVE555_INSTALL_TARGET_CMDS
> for i in $(LIVE555_FILES_TO_INSTALL-y); do \
> $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i`; \
> done
> endef
>
> +define LIVE555_UNINSTALL_STAGING_CMDS
> + [ -d $(STAGING_DIR)/usr/include/live ] && rm -rf
> $(STAGING_DIR)/usr/include/live; \
> + for i in $(LIVE555_LIBS_TO_INSTALL); do \
> + rm -f $(addprefix $(STAGING_DIR)/usr/lib/, `basename $$i`); \
> + done
> +endef
> +
> define LIVE555_UNINSTALL_TARGET_CMDS
> for i in $(LIVE555_FILES_TO_INSTALL-); do \
> rm -f $(addprefix $(TARGET_DIR)/usr/bin/, `basename $$i`); \
> --
> 1.7.1
>
>
--
Best Regards!
Kelvin
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options
2011-09-20 9:01 ` [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options keguang.zhang at gmail.com
2011-09-23 1:49 ` Kelvin Cheung
@ 2011-10-28 4:16 ` Kelvin Cheung
2011-10-31 9:05 ` Kelvin Cheung
2 siblings, 0 replies; 11+ messages in thread
From: Kelvin Cheung @ 2011-10-28 4:16 UTC (permalink / raw)
To: buildroot
bump
2011/9/20, keguang.zhang at gmail.com <keguang.zhang@gmail.com>:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> 1.Enable TV interface.
> 2.Enable LIVE555 Streaming Media if live555 is available.
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> 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 f735464..416572c 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
>
>
--
Best Regards!
Kelvin
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS.
2011-09-20 9:01 [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS keguang.zhang at gmail.com
` (2 preceding siblings ...)
2011-10-28 4:12 ` [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS Kelvin Cheung
@ 2011-10-28 6:11 ` Thomas De Schampheleire
2011-10-28 8:52 ` Peter Korsgaard
4 siblings, 0 replies; 11+ messages in thread
From: Thomas De Schampheleire @ 2011-10-28 6:11 UTC (permalink / raw)
To: buildroot
On Tue, Sep 20, 2011 at 11:01 AM, <keguang.zhang@gmail.com> wrote:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> ?linux/Config.in | ? ?4 ++++
> ?linux/linux.mk ?| ? ?4 ++++
> ?2 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/linux/Config.in b/linux/Config.in
> index 5655286..09e5685 100644
> --- a/linux/Config.in
> +++ b/linux/Config.in
> @@ -148,6 +148,10 @@ config BR2_LINUX_KERNEL_VMLINUX
> ? ? ? ?bool "vmlinux"
> ? ? ? ?depends on BR2_mips || BR2_mipsel
>
> +config BR2_LINUX_KERNEL_VMLINUZ
> + ? ? ? bool "vmlinuz"
> + ? ? ? depends on BR2_mips || BR2_mipsel
> +
> ?config BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
> ? ? ? ?bool "custom target"
> ? ? ? ?help
> diff --git a/linux/linux.mk b/linux/linux.mk
> index f249d96..32b588c 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -63,6 +63,8 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX_BIN),y)
> ?LINUX_IMAGE_NAME=vmlinux.bin
> ?else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
> ?LINUX_IMAGE_NAME=vmlinux
> +else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
> +LINUX_IMAGE_NAME=vmlinuz
> ?endif
> ?endif
>
> @@ -80,6 +82,8 @@ endif
>
> ?ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
> ?LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
> +else ifeq ($(BR2_LINUX_KERNEL_VMLINUZ),y)
> +LINUX_IMAGE_PATH=$(LINUX_DIR)/$(LINUX_IMAGE_NAME)
> ?else
> ?ifeq ($(KERNEL_ARCH),avr32)
> ?LINUX_IMAGE_PATH=$(KERNEL_ARCH_PATH)/boot/images/$(LINUX_IMAGE_NAME)
> --
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS.
2011-09-20 9:01 [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS keguang.zhang at gmail.com
` (3 preceding siblings ...)
2011-10-28 6:11 ` Thomas De Schampheleire
@ 2011-10-28 8:52 ` Peter Korsgaard
4 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2011-10-28 8:52 UTC (permalink / raw)
To: buildroot
>>>>> "keguang" == keguang zhang <keguang.zhang@gmail.com> writes:
keguang> From: Kelvin Cheung <keguang.zhang@gmail.com>
keguang> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/3] live555: install to staging
2011-09-20 9:01 ` [Buildroot] [PATCH 2/3] live555: install to staging keguang.zhang at gmail.com
2011-10-28 4:14 ` Kelvin Cheung
@ 2011-10-28 9:03 ` Peter Korsgaard
1 sibling, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2011-10-28 9:03 UTC (permalink / raw)
To: buildroot
>>>>> "keguang" == keguang zhang <keguang.zhang@gmail.com> writes:
keguang> From: Kelvin Cheung <keguang.zhang@gmail.com>
keguang> Install live555 library to staging for mplayer.
Committed with minor fixes, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options
2011-09-20 9:01 ` [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options keguang.zhang at gmail.com
2011-09-23 1:49 ` Kelvin Cheung
2011-10-28 4:16 ` Kelvin Cheung
@ 2011-10-31 9:05 ` Kelvin Cheung
2 siblings, 0 replies; 11+ messages in thread
From: Kelvin Cheung @ 2011-10-31 9:05 UTC (permalink / raw)
To: buildroot
Hi Peter,
What about this patch?
Any problems?
2011/9/20, keguang.zhang at gmail.com <keguang.zhang@gmail.com>:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
>
> 1.Enable TV interface.
> 2.Enable LIVE555 Streaming Media if live555 is available.
>
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
> 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 f735464..416572c 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
>
>
--
Best Regards!
Kelvin
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-10-31 9:05 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-20 9:01 [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS keguang.zhang at gmail.com
2011-09-20 9:01 ` [Buildroot] [PATCH 2/3] live555: install to staging keguang.zhang at gmail.com
2011-10-28 4:14 ` Kelvin Cheung
2011-10-28 9:03 ` Peter Korsgaard
2011-09-20 9:01 ` [Buildroot] [PATCH 3/3] mplayer: Enable live and tv options keguang.zhang at gmail.com
2011-09-23 1:49 ` Kelvin Cheung
2011-10-28 4:16 ` Kelvin Cheung
2011-10-31 9:05 ` Kelvin Cheung
2011-10-28 4:12 ` [Buildroot] [PATCH 1/3] Add vmlinuz support in Kernel binary format for MIPS Kelvin Cheung
2011-10-28 6:11 ` Thomas De Schampheleire
2011-10-28 8:52 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.