[oe-commits] Julian_chu : mplayer_0.0+1.0rc2.bb: Apply ENTERPRISE_DISTRO condition for mplayer

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3a7cbb9ed94881b119fefb9f85f52840debd5914
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3a7cbb9ed94881b119fefb9f85f52840debd5914

Author: Julian_chu <julian_chu at openmoko.com>
Date:   Wed Nov 12 12:14:00 2008 +0800

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

disable libmpeg2 if ENTERPRISE_DISTRO=1, or enable libmpeg2

---

 packages/mplayer/mplayer_0.0+1.0rc2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index a2e9cd9..481acce 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 \