diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2005-04-19 11:20:10 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2005-04-19 11:20:10 +0000 |
| commit | 23b3c2d920c2863e4040a23741466a7456bf448e (patch) | |
| tree | 5028c02f2067648477d39e0758c37f203d739bbe | |
| parent | fa9cca1138879727691249e286eaf0a4503483a3 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded
2005/04/19 12:18:56+01:00 (none)!XorA
Added some patches to change include order so we pick up internel tremor not the one in staging
BKrev: 4264e96aNeURBbvMnhtac3mX6VZAMw
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch | 0 | ||||
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch | 0 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_1.0pre7.bb | 6 |
3 files changed, 4 insertions, 2 deletions
diff --git a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch diff --git a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb index c154cd2d2f..ff8f8a6c82 100644 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ b/packages/mplayer/mplayer_1.0pre7.bb @@ -7,7 +7,9 @@ LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=1 \ file://sdl.patch;patch=0 \ - file://zlib.patch;patch=0 " + file://zlib.patch;patch=0 \ + 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 = "r0" @@ -54,7 +56,7 @@ EXTRA_OECONF = " \ --with-sdl-config=${STAGING_BINDIR}/sdl-config \ \ --enable-mad \ - --enable-vorbis \ + --enable-tremor-low \ \ --enable-ossaudio \ \ |