From c726a9c0bb42b812711f77c9856c44220bd1c79c Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 12 Jun 2014 13:20:08 +0200
Subject: [PATCH] mplayer: remove bbappend

In Yocto Daisy mplayer is not supported. Trying to build it fails with:

ERROR: Nothing PROVIDES 'mplayer'
ERROR: mplayer2 PROVIDES mplayer but was skipped: Recipe is blacklisted: Requires newer libav which has negative D_P

This is because it has been blacklisted in commit:

http://cgit.openembedded.org/meta-openembedded/commit/?id=2e7f3ce93b2c9864037fba8cc68fde46aafac4b0

The reason is that is has a build-time dependence on libav being newer
than the one provided by Yocto.

We don't use mplayer on ccimx6 as it has accelerated video using
gstreamer, so just remove the bbappend for this release.

Probably we need to revisit this when we upgrade our ccardimx28 support
to new versions of Yocto and upstream has removed the recipe from the
blacklist.

https://jira.digi.com/browse/DEL-1075

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../mplayer/mplayer2_git.bbappend             | 117 ------------------
 1 file changed, 117 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend

diff --git a/meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend b/meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend
deleted file mode 100644
index 3aa7d7ba6..000000000
--- a/meta-digi-dey/recipes-multimedia/mplayer/mplayer2_git.bbappend
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (C) 2012 Digi International.
-
-# live555 does not currently compile, this allows to remove it as a dependency.
-VIRTUAL-RUNTIME_streaming_framework = ""
-#VIRTUAL-RUNTIME_streaming_framework = "live555"
-
-# Compiling with fontconfig also fails, this allows to remove the dependency
-VIRTUAL-RUNTIME_fonts_management = ""
-#VIRTUAL-RUNTIME_fonts_management = "fontconfig"
-
-DEPENDS = "libdvdread libtheora ffmpeg zlib libpng jpeg liba52 freetype alsa-lib lzo ncurses lame libass \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
-DEPENDS += "${VIRTUAL-RUNTIME_streaming_framework}"
-DEPENDS += "${VIRTUAL-RUNTIME_fonts_management}"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libvpx virtual/libsdl xsp libxv virtual/libx11', '', d)}"
-
-EXTRA_LIBS = " -lstdc++ -lvorbis"
-EXTRA_LIBS += "${@base_contains('DISTRO_FEATURES', 'x11', ' -lXext -lX11', '', d)}"
-EXTRA_LIBS += "${@base_conditional('VIRTUAL-RUNTIME_streaming_framework', 'live555', ' -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia', '', d)}"
-
-EXTRA_OECONF = " \
-	--prefix=/usr \
-	--mandir=${mandir} \
-	--target=${SIMPLE_TARGET_SYS} \
-	\
-	--disable-lirc \
-	--disable-lircc \
-	--disable-joystick \
-	--disable-vm \
-	--disable-xf86keysym \
-	--enable-tv \
-	--disable-tv-v4l1 \
-	--enable-tv-v4l2 \
-	--disable-tv-bsdbt848 \
-	--enable-rtc \
-	--enable-networking \
-	--disable-smb \
-	--enable-live \
-	--disable-dvdnav \
-	--enable-dvdread \
-	--disable-dvdread-internal \
-	--disable-libdvdcss-internal \
-	--disable-cdparanoia \
-	--enable-freetype \
-	--enable-sortsub \
-	--disable-fribidi \
-	--disable-enca \
-	--disable-ftp \
-	--disable-vstream \
-	\
-	--disable-gif \
-	--enable-png \
-	--enable-jpeg \
-	--disable-libcdio \
-	--disable-qtx \
-	--disable-xanim \
-	--disable-real \
-	--disable-xvid \
-	\
-	--disable-speex \
-	--enable-theora \
-	--disable-ladspa \
-	--disable-libdv \
-	--enable-mad \
-	--disable-xmms \
-	--disable-musepack \
-	\
-	--disable-gl \
-	--disable-vesa \
-	--disable-svga \
-	--enable-sdl \
-	--disable-aa \
-	--disable-caca \
-	--disable-ggi \
-	--disable-ggiwmh \
-	--disable-directx \
-	--disable-dxr3 \
-	--disable-dvb \
-	--disable-mga \
-	--disable-xmga \
-        ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-xv', '', d)} \
-	--disable-vm \
-	--disable-xinerama \
-        ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11', '', d)} \
-	--enable-fbdev \
-	--disable-3dfx \
-	--disable-tdfxfb \
-	--disable-s3fb \
-	--disable-directfb \
-	--disable-bl \
-	--disable-tdfxvid \
-	--disable-tga \
-	--disable-pnm \
-	--disable-md5sum \
-	\
-	--enable-alsa \
-	--enable-ossaudio \
-	--disable-arts \
-	--disable-esd \
-	--disable-pulse \
-	--disable-jack \
-	--disable-openal \
-	--disable-nas \
-	--disable-sgiaudio \
-	--disable-sunaudio \
-	--disable-win32waveout \
-	--enable-select \
-	--enable-libass \
-	\
-        --extra-libs='${EXTRA_LIBS}' \
-"
-
-EXTRA_OECONF += " \
-     ${@base_conditional('VIRTUAL-RUNTIME_fonts_management', 'fontconfig', '', '--disable-fontconfig', d)} \
-     ${@base_conditional('VIRTUAL-RUNTIME_streaming_framework', 'live555', '', '--disable-live', d)} \
-"
-