diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-01-16 11:31:53 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-16 11:31:53 +0000 |
| commit | 1e3581ca5d4a089088ce527ae2585305896ed2d3 (patch) | |
| tree | ad604af7b72f09be19c4b3d070a38699dc4bbd58 /packages/mplayer/mplayer_1.0pre7.bb | |
| parent | bab3b6997fea8de97fb325f5d1a069f78be8d038 (diff) | |
mplayer_1.0pre7.bb, mplayer-atty_1.1.5.bb : small changes to packaging
Remove the libpostproc package produced by mplayer-atty as this is an
unnofficial mplayer version.
Fix the RCONFLICTS so only mplayer/mplayer-atty conflict, not libpostproc
as well.
Diffstat (limited to 'packages/mplayer/mplayer_1.0pre7.bb')
| -rw-r--r-- | packages/mplayer/mplayer_1.0pre7.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index 961f68ec92..a9ace88530 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://libmpdemux-ogg-include.patch;patch=1 \ file://libmpcodecs-ogg-include.patch;patch=1 " MAINTAINER="Graeme Gregory <dp@xora.org.uk>" -RCONFLICTS="mplayer-atty" -PR = "r1" +RCONFLICTS_${PN} = "mplayer-atty" +PR = "r2" PARALLEL_MAKE = "" |