diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index adcec83029..5bf1f6cfd9 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -43,7 +43,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" PREFERRED_RPROVIDER_libdevmapper = "lvm2" SIGGEN_EXCLUDERECIPES_ABISAFE += " \ - mplayer-common \ fbset-modes \ gpsd-machine-conf \ distro-feed-configs \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 8358e933d7..0812da1af6 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -210,7 +210,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ alsa-oss audiofile cdrkit id3lib \ a2jmidid jack libass libburn libcdio libcdio-paranoia \ libdvdread libmms libmodplug libopus live555 \ - mplayer-common opus-tools \ + opus-tools \ sound-theme-freedesktop v4l-utils yavta wavpack libvpx \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol xsp", "", d)} \ libmikmod \ diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb deleted file mode 100644 index 829c3b2439..0000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright Matthias Hentges (c) 2006 -# License: MIT (see COPYING.MIT) - -SUMMARY = "Preconfigured mplayer preferences" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PV = "0.0.1" -PR = "r1" - -SRC_URI = "file://mplayer.conf" - -# Yes, really /usr/etc!!! -do_install() { - install -d "${D}/usr${sysconfdir}/mplayer" - - install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer" -} - -FILES_${PN} = "/usr${sysconfdir}/mplayer" - -inherit allarch diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf deleted file mode 100644 index 37ad65fa2d..0000000000 --- a/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf +++ /dev/null @@ -1,15 +0,0 @@ - -# You probably shouldn't touch these -ac=mad, -ao=alsa, - -# Required on SL-Cxxxx for correct rotation in the *VT*, -# breaks rotation in X! -# vf=rotate=1 - -# Enable fullscreen display by default -# fs=true - -# Drop frames to keep audio and video in sync -framedrop=true -