package/multimedia: move multimedia libraries out

Move multimedia libraries ouf of the Audio and Video category into the
Libraries/Multimedia one.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

2 files changed, 0 insertions, 110 deletions

diff --git a/package/multimedia/live555/Config.in b/package/multimedia/live555/Config.in
deleted file mode 100644
index 610fafc1a..000000000
--- a/package/multimedia/live555/Config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-config BR2_PACKAGE_LIVE555
-	bool "live555"
-	depends on BR2_INSTALL_LIBSTDCPP
-	help
-	  LIVE555 Streaming Media forms a set of C++ libraries for multimedia
-	  streaming, using open standard protocols (RTP/RTCP, RTSP, SIP).
-
-	  http://www.live555.com/liveMedia/
-
-config BR2_PACKAGE_LIVE555_OPENRTSP
-	bool "OpenRTSP"
-	depends on BR2_PACKAGE_LIVE555
-	default y
-	help
-	  Live555 RTSP Client.
-
-config BR2_PACKAGE_LIVE555_MEDIASERVER
-	bool "live555MediaServer"
-	depends on BR2_PACKAGE_LIVE555
-	default y
-	help
-	  RTSP Server. Supports numerous media formats such as H.264 and MPEG2.
-
-config BR2_PACKAGE_LIVE555_MPEG2_INDEXER
-	bool "MPEG2TransportStreamIndexer"
-	depends on BR2_PACKAGE_LIVE555
-	default y
-	help
-	  MPEG2 Transport Stream Indexer. Provides indexes allowing 'trick play'
-	  operation in the Live555MediaServer.
-
-comment "Live555 needs C++ compiler"
-	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/multimedia/live555/live555.mk b/package/multimedia/live555/live555.mk
deleted file mode 100644
index c987fa27b..000000000
--- a/package/multimedia/live555/live555.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#############################################################
-#
-# live555 streaming media
-#
-#############################################################
-
-LIVE555_VERSION = 2011.06.16
-LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
-LIVE555_SITE = http://www.live555.com/liveMedia/public/
-LIVE555_INSTALL_STAGING = YES
-
-define LIVE555_CONFIGURE_CMDS
-	echo 'COMPILE_OPTS = $$(INCLUDES) -I. -DSOCKLEN_T=socklen_t $(TARGET_CFLAGS)' >> $(@D)/config.linux
-	echo 'C_COMPILER = $(TARGET_CC)' >> $(@D)/config.linux
-	echo 'CPLUSPLUS_COMPILER = $(TARGET_CXX)' >> $(@D)/config.linux
-	echo 'LINK = $(TARGET_CXX) -o' >> $(@D)/config.linux
-	echo 'LINK_OPTS = -L. $(TARGET_LDFLAGS)' >> $(@D)/config.linux
-	(cd $(@D); ./genMakefiles linux)
-endef
-
-define LIVE555_BUILD_CMDS
-	$(MAKE) -C $(@D) all
-endef
-
-define LIVE555_CLEAN_CMDS
-	$(MAKE) -C $(@D) clean
-endef
-
-LIVE555_HEADERS_TO_INSTALL = \
-	liveMedia/include \
-	groupsock/include \
-	UsageEnvironment/include \
-	BasicUsageEnvironment/include
-
-LIVE555_LIBS_TO_INSTALL = \
-	liveMedia/libliveMedia.a \
-	groupsock/libgroupsock.a \
-	UsageEnvironment/libUsageEnvironment.a \
-	BasicUsageEnvironment/libBasicUsageEnvironment.a
-
-LIVE555_FILES_TO_INSTALL- =
-LIVE555_FILES_TO_INSTALL-y =
-LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP
-LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live555MediaServer
-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
-	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`); \
-	done
-endef
-
-$(eval $(call GENTARGETS))