summaryrefslogtreecommitdiff
path: root/packages/mplayer
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2006-11-13 18:57:30 +0000
committerCliff Brake <cbrake@bec-systems.com>2006-11-13 18:57:30 +0000
commit40951de5f883d7a2d9d5445a9b73c3424ee245f1 (patch)
tree6a9d8dfe2fef258e9dd8b079c3517b0c1edbfbe6 /packages/mplayer
parent1c9e8b7ced097812f43cdd5782023464cef09ed8 (diff)
parente2e9b0ab1d6af8ec246cef0f9d848083dff2b8e0 (diff)
merge of '9ebe19c38b13611632684c440b048e45471bf916'
and 'e0d42dfa54011bb501a5a723ec0554c757bfc933'
Diffstat (limited to 'packages/mplayer')
-rw-r--r--packages/mplayer/mplayer_1.0pre8.bb25
1 files changed, 13 insertions, 12 deletions
diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb
index b38cdecc0f..b5af659fe9 100644
--- a/packages/mplayer/mplayer_1.0pre8.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -6,25 +6,26 @@ DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig als
RDEPENDS = "mplayer-common"
LICENSE = "GPL"
SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
- file://vo_w100.c \
- file://vo_w100_api.h \
- file://vo_w100_fb.h \
- file://Makefile.patch;patch=1 \
- file://w100-configure.patch;patch=1 \
- file://w100-Makefile.patch;patch=1 \
- file://w100-video_out.patch;patch=1 \
- file://w100-mplayer.patch;patch=1 \
+ file://vo_w100.c \
+ file://vo_w100_api.h \
+ file://vo_w100_fb.h \
+ file://Makefile.patch;patch=1 \
+ file://w100-configure.patch;patch=1 \
+ file://w100-Makefile.patch;patch=1 \
+ file://w100-video_out.patch;patch=1 \
+ file://w100-mplayer.patch;patch=1 \
file://libmpdemux-ogg-include.patch;patch=1 \
file://libmpcodecs-ogg-include.patch;patch=1 \
- file://pld-onlyarm5.patch;patch=1"
+ file://pld-onlyarm5.patch;patch=1 \
+ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1"
RCONFLICTS_${PN} = "mplayer-atty"
RREPLACES_${PN} = "mplayer-atty"
-PR = "r2"
+PR = "r3"
PARALLEL_MAKE = ""
-DEPENDS_append_c7x0 = " sharp-aticore-oss"
+DEPENDS_append_c7x0 = " sharp-aticore-oss libw100 "
S = "${WORKDIR}/MPlayer-${PV}"
@@ -166,7 +167,7 @@ EXTRA_OECONF = " \
--disable-runtime-cpudetection \
"
-EXTRA_OECONF_append_c7x0 = " --enable-w100 "
+EXTRA_OECONF_append_c7x0 = " --enable-w100 --enable-imageon "
do_configure() {
cp ${WORKDIR}/vo_w100.c ${S}/libvo