From 84d589a963d902849b7022091e97ec71c38ed82e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 30 Apr 2012 03:48:15 +0000 Subject: 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 Signed-off-by: Peter Korsgaard --- package/multimedia/Config.in | 8 --- package/multimedia/libdvdnav/Config.in | 13 ---- package/multimedia/libdvdnav/libdvdnav.mk | 19 ------ package/multimedia/libdvdread/Config.in | 11 ---- package/multimedia/libdvdread/libdvdread.mk | 14 ---- package/multimedia/libmms/Config.in | 15 ----- package/multimedia/libmms/libmms.mk | 14 ---- package/multimedia/libmpeg2/Config.in | 13 ---- .../libmpeg2/libmpeg2-0.5.1-altivec.patch | 23 ------- package/multimedia/libmpeg2/libmpeg2.mk | 30 --------- package/multimedia/libogg/Config.in | 5 -- package/multimedia/libogg/libogg.mk | 13 ---- package/multimedia/libplayer/Config.in | 31 --------- package/multimedia/libplayer/libplayer.mk | 44 ------------- package/multimedia/libtheora/Config.in | 9 --- package/multimedia/libtheora/libtheora.mk | 20 ------ package/multimedia/live555/Config.in | 33 ---------- package/multimedia/live555/live555.mk | 77 ---------------------- 18 files changed, 392 deletions(-) delete mode 100644 package/multimedia/libdvdnav/Config.in delete mode 100644 package/multimedia/libdvdnav/libdvdnav.mk delete mode 100644 package/multimedia/libdvdread/Config.in delete mode 100644 package/multimedia/libdvdread/libdvdread.mk delete mode 100644 package/multimedia/libmms/Config.in delete mode 100644 package/multimedia/libmms/libmms.mk delete mode 100644 package/multimedia/libmpeg2/Config.in delete mode 100644 package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch delete mode 100644 package/multimedia/libmpeg2/libmpeg2.mk delete mode 100644 package/multimedia/libogg/Config.in delete mode 100644 package/multimedia/libogg/libogg.mk delete mode 100644 package/multimedia/libplayer/Config.in delete mode 100644 package/multimedia/libplayer/libplayer.mk delete mode 100644 package/multimedia/libtheora/Config.in delete mode 100644 package/multimedia/libtheora/libtheora.mk delete mode 100644 package/multimedia/live555/Config.in delete mode 100644 package/multimedia/live555/live555.mk (limited to 'package/multimedia') diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in index ca6b791c7..89c5041ee 100644 --- a/package/multimedia/Config.in +++ b/package/multimedia/Config.in @@ -20,21 +20,13 @@ source "package/multimedia/libao/Config.in" source "package/multimedia/libcdaudio/Config.in" source "package/multimedia/libcue/Config.in" source "package/multimedia/libcuefile/Config.in" -source "package/multimedia/libdvdread/Config.in" -source "package/multimedia/libdvdnav/Config.in" source "package/multimedia/libid3tag/Config.in" source "package/multimedia/libmad/Config.in" -source "package/multimedia/libmms/Config.in" source "package/multimedia/libmpd/Config.in" -source "package/multimedia/libmpeg2/Config.in" -source "package/multimedia/libogg/Config.in" -source "package/multimedia/libplayer/Config.in" source "package/multimedia/libreplaygain/Config.in" source "package/multimedia/libsamplerate/Config.in" source "package/multimedia/libsndfile/Config.in" -source "package/multimedia/libtheora/Config.in" source "package/multimedia/libvorbis/Config.in" -source "package/multimedia/live555/Config.in" source "package/multimedia/madplay/Config.in" source "package/multimedia/mpd/Config.in" source "package/multimedia/mpg123/Config.in" diff --git a/package/multimedia/libdvdnav/Config.in b/package/multimedia/libdvdnav/Config.in deleted file mode 100644 index 5ba31e875..000000000 --- a/package/multimedia/libdvdnav/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBDVDNAV - bool "libdvdnav" - depends on BR2_LARGEFILE # libdvdread - select BR2_PACKAGE_LIBDVDREAD - help - libdvdnav is a library that allows easy use of sophisticated - DVD navigation features such as DVD menus, multiangle - playback and even interactive DVD games. - - http://www.mplayerhq.hu - -comment "libdvdnav requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE diff --git a/package/multimedia/libdvdnav/libdvdnav.mk b/package/multimedia/libdvdnav/libdvdnav.mk deleted file mode 100644 index f69f23877..000000000 --- a/package/multimedia/libdvdnav/libdvdnav.mk +++ /dev/null @@ -1,19 +0,0 @@ -############################################################# -# -# libdvdnav -# -############################################################# - -LIBDVDNAV_VERSION = 4.1.3 -LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 -LIBDVDNAV_SITE = http://dvdnav.mplayerhq.hu/releases -LIBDVDNAV_AUTORECONF = YES -LIBDVDNAV_INSTALL_STAGING = YES - -LIBDVDNAV_DEPENDENCIES = libdvdread - -# By default libdvdnav tries to find dvdread-config in $PATH. Because -# of cross compilation, we prefer using pkg-config. -LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread" - -$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libdvdread/Config.in b/package/multimedia/libdvdread/Config.in deleted file mode 100644 index b63f08286..000000000 --- a/package/multimedia/libdvdread/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBDVDREAD - bool "libdvdread" - depends on BR2_LARGEFILE - help - libdvdread provides a simple foundation for reading - DVD-Video images. - - http://www.mplayerhq.hu/MPlayer/releases/dvdnav/ - -comment "libdvdread requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE diff --git a/package/multimedia/libdvdread/libdvdread.mk b/package/multimedia/libdvdread/libdvdread.mk deleted file mode 100644 index 3a9d5be2f..000000000 --- a/package/multimedia/libdvdread/libdvdread.mk +++ /dev/null @@ -1,14 +0,0 @@ -############################################################# -# -# libdvdread -# -############################################################# - -LIBDVDREAD_VERSION = 4.1.3 -LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 -LIBDVDREAD_SITE = http://dvdnav.mplayerhq.hu/releases -LIBDVDREAD_AUTORECONF = YES -LIBDVDREAD_LIBTOOL_PATCH = YES -LIBDVDREAD_INSTALL_STAGING = YES - -$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libmms/Config.in b/package/multimedia/libmms/Config.in deleted file mode 100644 index 17cb406a6..000000000 --- a/package/multimedia/libmms/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - LibMMS is a common library for parsing mms:// and mmsh:// - type network streams. These are commonly used to stream - Windows Media Video content over the web. LibMMS itself is - only for receiving MMS stream, it doesn't handle sending at - all. - - http://launchpad.net/libmms - -comment "libmms requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR diff --git a/package/multimedia/libmms/libmms.mk b/package/multimedia/libmms/libmms.mk deleted file mode 100644 index 45d1844da..000000000 --- a/package/multimedia/libmms/libmms.mk +++ /dev/null @@ -1,14 +0,0 @@ -############################################################# -# -# libmms -# -############################################################# -LIBMMS_VERSION = 0.6.2 -LIBMMS_SOURCE = libmms-$(LIBMMS_VERSION).tar.gz -LIBMMS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libmms - -LIBMMS_INSTALL_STAGING = YES - -LIBMMS_DEPENDENCIES = host-pkg-config libglib2 - -$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libmpeg2/Config.in b/package/multimedia/libmpeg2/Config.in deleted file mode 100644 index 3694689a9..000000000 --- a/package/multimedia/libmpeg2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBMPEG2 - bool "libmpeg2" - help - MPEG1/MPEG2 video decoder library - - http://libmpeg2.sourceforge.net/ - -config BR2_PACKAGE_LIBMPEG2_BINS - bool "mpeg2 binaries" - depends on BR2_PACKAGE_LIBMPEG2 - help - Install mpeg2dec, corrupt_mpeg2 and extract_mpeg2 programs as - well. diff --git a/package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch b/package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch deleted file mode 100644 index 4928a62e6..000000000 --- a/package/multimedia/libmpeg2/libmpeg2-0.5.1-altivec.patch +++ /dev/null @@ -1,23 +0,0 @@ -[PATCH] fix altivec.h detection - -Patch from Gentoo: - -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch?revision=1.1&view=markup - -Signed-off-by: Peter Korsgaard ---- a/configure.ac.bak 2010-05-25 17:12:14.756245990 +0000 -+++ b/configure.ac 2010-05-25 17:11:51.629581723 +0000 -@@ -79,11 +79,10 @@ - CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS" - AC_MSG_CHECKING([if is needed]) - AC_TRY_COMPILE([], -- [typedef vector int t; -- vec_ld(0, (unsigned char *)0);], -+ [vector int t; t = vec_add(t,t);], - [have_altivec=yes; AC_MSG_RESULT(no)], - [AC_TRY_COMPILE([#include ], -- [typedef vector int t; vec_ld(0, (unsigned char *)0);], -+ [vector int t; t = vec_add(t,t);], - [AC_DEFINE([HAVE_ALTIVEC_H],, - [Define to 1 if you have the header.]) - have_altivec=yes; AC_MSG_RESULT(yes)], diff --git a/package/multimedia/libmpeg2/libmpeg2.mk b/package/multimedia/libmpeg2/libmpeg2.mk deleted file mode 100644 index 5290af15e..000000000 --- a/package/multimedia/libmpeg2/libmpeg2.mk +++ /dev/null @@ -1,30 +0,0 @@ -############################################################# -# -# libmpeg2 -# -############################################################# -LIBMPEG2_VERSION = 0.5.1 -LIBMPEG2_SOURCE = libmpeg2-$(LIBMPEG2_VERSION).tar.gz -LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files/ -LIBMPEG2_INSTALL_STAGING = YES -LIBMPEG2_AUTORECONF = YES -LIBMPEG2_CONF_OPT = --without-x --disable-directx - -ifeq ($(BR2_PACKAGE_SDL),y) -LIBMPEG2_CONF_ENV += ac_cv_prog_SDLCONFIG=$(STAGING_DIR)/usr/bin/sdl-config -LIBMPEG2_CONF_OPT += --enable-sdl -LIBMPEG2_DEPENDENCIES += sdl -else -LIBMPEG2_CONF_OPT += --disable-sdl -endif - -ifneq ($(BR2_PACKAGE_LIBMPEG2_BINS),y) -define LIBMPEG2_REMOVE_BINS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,\ - mpeg2dec corrupt_mpeg2 extract_mpeg2) -endef - -LIBMPEG2_POST_INSTALL_TARGET_HOOKS += LIBMPEG2_REMOVE_BINS -endif - -$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libogg/Config.in b/package/multimedia/libogg/Config.in deleted file mode 100644 index effe74fb3..000000000 --- a/package/multimedia/libogg/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_LIBOGG - bool "libogg" - help - Ogg is the name of Xiph.org's container format for audio, - video, and metadata diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk deleted file mode 100644 index c40f04eac..000000000 --- a/package/multimedia/libogg/libogg.mk +++ /dev/null @@ -1,13 +0,0 @@ -############################################################# -# -# libogg -# -############################################################# -LIBOGG_VERSION = 1.3.0 -LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz -LIBOGG_SITE = http://downloads.xiph.org/releases/ogg -LIBOGG_INSTALL_STAGING = YES - -LIBOGG_DEPENDENCIES = host-pkg-config - -$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libplayer/Config.in b/package/multimedia/libplayer/Config.in deleted file mode 100644 index fe851ac6b..000000000 --- a/package/multimedia/libplayer/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_LIBPLAYER - depends on BR2_LARGEFILE - bool "libplayer" - help - libplayer provides a generic A/V API that relies on various multimedia - player for Linux systems. It currently supports MPlayer, xine VLC and - GStreamer only - - http://libplayer.geexbox.org/ - -if BR2_PACKAGE_LIBPLAYER -config BR2_PACKAGE_LIBPLAYER_MPLAYER - bool "mplayer backend" - select BR2_PACKAGE_MPLAYER - -config BR2_PACKAGE_LIBPLAYER_GSTREAMER - bool "gstreamer backend" - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_GSTREAMER - -comment "gstreamer backend requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_LIBPLAYER_PYTHON - depends on BR2_PACKAGE_PYTHON - depends on BROKEN # player_init params, builds for host - bool "Libplayer python bindings" -endif - -comment "libplayer requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE diff --git a/package/multimedia/libplayer/libplayer.mk b/package/multimedia/libplayer/libplayer.mk deleted file mode 100644 index 093821e40..000000000 --- a/package/multimedia/libplayer/libplayer.mk +++ /dev/null @@ -1,44 +0,0 @@ -############################################################# -# -# libplayer -# -############################################################# -LIBPLAYER_VERSION = 2.0.1 -LIBPLAYER_SITE = http://libplayer.geexbox.org/releases/ -LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2 - -# When passing the standard buildroot configure arguments, the configure script -# breaks on --target and --host options. Thus we need to define a configure cmd -# ourselves. -define LIBPLAYER_CONFIGURE_CMDS - (cd $(@D) && rm -rf config.cache && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - --cross-compile \ - $(SHARED_STATIC_LIBS_OPTS) \ - $(QUIET) $(LIBPLAYER_CONF_OPT) \ - ) -endef - -ifeq ($(BR2_PACKAGE_LIBPLAYER_MPLAYER),y) - LIBPLAYER_DEPENDENCIES += mplayer - LIBPLAYER_CONF_OPT += --enable-mplayer -else - LIBPLAYER_CONF_OPT += --disable-mplayer -endif - -ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y) - LIBPLAYER_DEPENDENCIES += gstreamer - LIBPLAYER_CONF_OPT += --enable-gstreamer -else - LIBPLAYER_CONF_OPT += --disable-gstreamer -endif - -ifeq ($(BR2_PACKAGE_LIBPLAYER_PYTHON),y) - LIBPLAYER_DEPENDENCIES += python - LIBPLAYER_CONF_OPT += --enable-binding-python -endif - -$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libtheora/Config.in b/package/multimedia/libtheora/Config.in deleted file mode 100644 index bf20a5037..000000000 --- a/package/multimedia/libtheora/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBTHEORA - bool "libtheora" - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBVORBIS - help - A library for the free and open video compression format "Theora" - from the Xiph.org Foundation. - - http://www.theora.org/ diff --git a/package/multimedia/libtheora/libtheora.mk b/package/multimedia/libtheora/libtheora.mk deleted file mode 100644 index 89489b787..000000000 --- a/package/multimedia/libtheora/libtheora.mk +++ /dev/null @@ -1,20 +0,0 @@ -############################################################# -# -# libtheora -# -############################################################# -LIBTHEORA_VERSION = 1.1.1 -LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.bz2 -LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora -LIBTHEORA_INSTALL_STAGING = YES - -LIBTHEORA_CONF_OPT = \ - --disable-oggtest \ - --disable-vorbistest \ - --disable-sdltest \ - --disable-examples \ - --disable-spec - -LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkg-config - -$(eval $(call AUTOTARGETS)) 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)) -- cgit v1.2.3