From: Julian_chu <julian_chu@openmoko.com>
Date: Wed, 12 Nov 2008 04:14:00 +0000 (+0800)
Subject: mplayer_0.0+1.0rc2.bb: Apply ENTERPRISE_DISTRO condition for mplayer
X-Git-Tag: Release-2010-05/1~5331^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a7cbb9ed94881b119fefb9f85f52840debd5914;p=openembedded.git

mplayer_0.0+1.0rc2.bb: Apply ENTERPRISE_DISTRO condition for mplayer

disable libmpeg2 if ENTERPRISE_DISTRO=1, or enable libmpeg2
---

diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index a2e9cd9f3e..481acce475 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -45,7 +45,7 @@ ARM_INSTRUCTION_SET = "ARM"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PR = "r11"
+PR = "r12"
 
 PARALLEL_MAKE = ""
 
@@ -126,7 +126,7 @@ EXTRA_OECONF = " \
         --disable-twolame \
         --disable-xmms \
 	--disable-mp3lib \
-        --enable-libmpeg2 \
+        ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-libmpeg2', '--enable-libmpeg2', d)} \
         --disable-musepack \
 	\
         --disable-gl \