diff options
author | Michael Lauer <mickey@vanille-media.de> | 2006-06-21 14:05:50 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-21 14:05:50 +0000 |
commit | 7d3136018630882e597a1c19d0fbac2f2fc2207c (patch) | |
tree | d45083267ff271bbf1ca081087ba370716b16100 | |
parent | 91564285c8b22b2ce3254cdcc00caff8eb3f15a9 (diff) | |
parent | 024cc3f57b51c3919ed7b543d6d86e46bb3735ca (diff) |
merge of 4d9248891bbabfcd869f50b24c59eb8d29c6c48c
and 819d48f7dfdcf5e59b36b88b9b518d8d76d04f06
-rw-r--r-- | packages/mplayer/mplayer_svn.bb (renamed from packages/mplayer/mplayer_1.0pre7+cvs20060519.bb) | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb b/packages/mplayer/mplayer_svn.bb index 9298f0645c..7af431430b 100644 --- a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -5,8 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" RDEPENDS = "mplayer-common" LICENSE = "GPL" -SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \ - http://www.xora.org.uk/oe/ffmpeg_20060519.tar.bz2 \ +SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \ file://vo_w100.c \ file://vo_w100_api.h \ file://vo_w100_fb.h \ @@ -19,13 +18,16 @@ SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \ MAINTAINER="Graeme Gregory <dp@xora.org.uk>" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" + +PV = "1.0pre8+svn${SRCDATE}" PR = "r0" +DEFAULT_PREFERENCE = "-1" PARALLEL_MAKE = "" DEPENDS_append_c7x0 = " sharp-aticore-oss" -S = "${WORKDIR}/mplayer_20060519" +S = "${WORKDIR}/mplayer/trunk/" PACKAGES =+ "mencoder" @@ -60,7 +62,6 @@ EXTRA_OECONF = " \ EXTRA_OECONF_append_c7x0 = " --enable-w100 " do_configure() { - cp -r ${WORKDIR}/ffmpeg_20060519/libavcodec ${WORKDIR}/ffmpeg_20060519/libavutil ${WORKDIR}/ffmpeg_20060519/libavformat ${S} cp ${WORKDIR}/vo_w100.c ${S}/libvo cp ${WORKDIR}/vo_w100_api.h ${S}/libvo cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo |