diff options
author | Phil Blundell <philb@gnu.org> | 2005-04-19 13:57:26 +0000 |
---|---|---|
committer | Phil Blundell <philb@gnu.org> | 2005-04-19 13:57:26 +0000 |
commit | b4afe3888612bf2b18712a32e00512230fb7c533 (patch) | |
tree | 6ba6d104c2916a3a6736e66e5708cdad77a2ca20 /packages/mplayer/mplayer-atty_1.0.1.bb | |
parent | 6778414ad9576f9c73578619a5626ba4ace23a55 (diff) |
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mebius.reciva.com:/home/pb/oe/oe
2005/04/19 14:34:50+01:00 (none)!XorA
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded
2005/04/19 14:33:43+01:00 (none)!XorA
Import the changes from mplayer for compile problems into mplayer-atty
2005/04/19 15:31:37+02:00 utwente.nl!koen
pivotboot-image.bb:
fix feed locations
BKrev: 42650e46qaSLeGzMeVn_kfodIpKH0w
Diffstat (limited to 'packages/mplayer/mplayer-atty_1.0.1.bb')
-rw-r--r-- | packages/mplayer/mplayer-atty_1.0.1.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/mplayer/mplayer-atty_1.0.1.bb b/packages/mplayer/mplayer-atty_1.0.1.bb index 68996bd68d..6d5796aa9e 100644 --- a/packages/mplayer/mplayer-atty_1.0.1.bb +++ b/packages/mplayer/mplayer-atty_1.0.1.bb @@ -8,12 +8,14 @@ SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ file://Makefile.patch;patch=1;pnum=0 \ file://sdl.patch;patch=1 \ file://Makefile-libs.patch;patch=1 \ - file://dsputil.patch;patch=1" + file://dsputil.patch;patch=1 \ + file://libmpdemux-ogg-include.patch;patch=1 \ + file://libmpcodecs-ogg-include.patch;patch=1 " RCONFLICTS="mplayer" MAINTAINER="Graeme Gregory <dp@xora.org.uk>" -PR = "r2" +PR = "r3" PARALLEL_MAKE = "" |