vlc: moved to meta-multimedia

vlc depends on fluidsynth which is in meta-multimedia.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 0 insertions, 113 deletions

diff --git a/meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb b/meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
deleted file mode 100644
index 1a0b7b87e..000000000
--- a/meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r1"
-
-SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2"
-
-inherit autotools
-
-EXTRA_OECONF = " --disable-doc "
-
-SRC_URI[md5sum] = "ebd5370b79ac5a83e5c61b24a214cf74"
-SRC_URI[sha256sum] = "2394a75013ab66b592d8c91d53529ede392bc9faee37fe279bd29b455eff2220"
diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
deleted file mode 100644
index 1fe2d04f2..000000000
--- a/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ /dev/null
@@ -1,85 +0,0 @@
-DESCRIPTION = "Video player and streamer - davinci edition"
-HOMEPAGE = "http://www.videolan.org"
-LICENSE = "GPLv2"
-SECTION = "multimedia"
-
-DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
-
-SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
-
-inherit autotools gettext
-
-ARM_INSTRUCTION_SET = "arm"
-
-DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
-
-LEAD_SONAME = "libvlc.so.5"
-
-PACKAGES =+ "libvlc-dbg libvlc-dev libvlc"
-
-FILES_libvlc-dev = "${libdir}/lib*.so"
-
-FILES_libvlc-dbg = "\
-    ${libdir}/.debug \
-    ${libdir}/vlc/meta_engine/.debug \
-    ${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \
-    ${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \
-    ${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \
-    ${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \
-    ${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \
-    ${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \
-    ${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \
-    ${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \
-    ${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \
-    ${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \
-"
-
-FILES_libvlc = "${libdir}/lib*.so.*"
-
-FILES_${PN} += "${bindir}/vlc \
-    ${datadir}/applications \
-    ${datadir}/vlc/ \
-    ${datadir}/icons \
-"
-
-FILES_${PN}-dbg    += "${libdir}/vlc/*/.debug ${libdir}/vlc/plugins/*/.debug"
-
-EXTRA_OECONF = "\
-    --enable-dvdread \
-    --enable-libtool \
-    --with-contrib \
-    --enable-run-as-root \
-    --disable-wxwidgets \
-    --enable-x11 --enable-xvideo \ 
-    --disable-screen --disable-caca \
-    --enable-httpd --enable-vlm \
-    --enable-freetype \
-    --enable-sdl \ 
-    --enable-png \
-    --enable-live555 --enable-tremor \
-    --enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \
-    --enable-dbus \
-    --disable-hal \    
-    --without-contrib \
-    --without-kde-solid \
-    --disable-opengl --disable-glx \
-    --enable-realrtsp \
-    ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
-    ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
-    ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
-"
-
-
-do_configure() {
-    cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 
-    ./bootstrap    
-    gnu-configize --force
-    libtoolize --force
-    #autoreconf --force -i
-    cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
-    oe_runconf
-    rm config.log
-    sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
-    sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
-}
diff --git a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
deleted file mode 100644
index 11ecaa43a..000000000
--- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# This recipe packages vlc as a library as well, so qt4 dependencies
-# can be avoided when only the library is installed.
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13"
-
-require vlc.inc
-
-PR = "r4"
-
-# work around build failure
-EXTRA_OECONF += " --enable-libxml2=no"
-
-SRC_URI[md5sum] = "a64846d6f21ea179ae8e8bfb6f9447fe"
-SRC_URI[sha256sum] = "682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb"
-