From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 6 Apr 2005 15:29:42 +0000 (+0000)
Subject: Switch to using atilib-oss for mplayer on c7x0
X-Git-Tag: Release-2010-05/1~14486
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c4aaef516c05de683679028875f72218219b1c7;p=openembedded.git

Switch to using atilib-oss for mplayer on c7x0

BKrev: 42540066_xzXozn2NE2PVJ-4aZQYng
---

diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
index 90d6255d67..a9decc8a44 100644
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ b/packages/mplayer/mplayer_1.0pre3try2.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
            file://sdl.patch;patch=0 \
            file://zlib.patch;patch=0 "
 
-DEPENDS_append_c7x0 = " sharp-aticore"
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
 PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
 SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
                        file://Makefile-vidix.patch;patch=0 "
diff --git a/packages/mplayer/mplayer_1.0pre6a.bb b/packages/mplayer/mplayer_1.0pre6a.bb
index 002631bdf3..a9248ec343 100644
--- a/packages/mplayer/mplayer_1.0pre6a.bb
+++ b/packages/mplayer/mplayer_1.0pre6a.bb
@@ -13,7 +13,7 @@ PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 PARALLEL_MAKE = ""
 
-DEPENDS_append_c7x0 = " sharp-aticore"
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
 PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}"
 SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
                        file://Makefile-vidix.patch;patch=0 \
diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index 9aa0f463cb..f96b29106a 100644
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -30,8 +30,7 @@ do_install() {
 }
 
 # Currently incompatible with the way sharp-aticore.bb stages.
-#do_stage() {
-#	install -m 0644 aticore.h ${STAGING_INCDIR}
-#	oe_libinstall -so libaticore ${STAGING_LIBDIR}
-#}	
-
+do_stage() {
+	install -m 0644 aticore.h ${STAGING_INCDIR}
+	oe_libinstall -so libaticore ${STAGING_LIBDIR}
+}
\ No newline at end of file